e2c935d6fb
increase/decrease everyone count on user creation/deletion
2014-07-09 14:32:10 +02:00
5e5a02cc2f
decrease user count in affected groups after user delete
2014-07-09 14:30:39 +02:00
a584022ecc
increment group counters when a user is created
2014-07-09 14:30:39 +02:00
6e2e0108ee
[tx-robot] updated from transifex
2014-07-09 01:55:51 -04:00
2561ef123b
fix apostrophe fixes #9486
2014-07-08 21:48:29 +02:00
20fc4b8b53
[tx-robot] updated from transifex
2014-07-08 01:55:17 -04:00
ec4cb56bd7
Merge pull request #9505 from stephane84/fix-9497
...
Refocus input field after user creation
2014-07-07 23:11:23 +02:00
179a707e29
Fixes #9497
2014-07-07 18:32:51 +02:00
a26370e585
Merge pull request #9479 from stephane84/fix-9147
...
Log table design glitch in date field
2014-07-07 11:27:56 +02:00
6e9905d7cf
[tx-robot] updated from transifex
2014-07-07 01:54:28 -04:00
d3e65bc974
Merge pull request #9469 from owncloud/replace_uninstall_button_with_link
...
improvements for uninstall button
2014-07-06 23:56:44 +02:00
e6cea04a30
Bug 9147 owncloud/core
...
Added class="date" in the latest column of the log table to get everything on one line (in the ajax request).
2014-07-06 16:15:33 +02:00
33492b4448
[tx-robot] updated from transifex
2014-07-06 01:54:33 -04:00
485be909ff
improvements for uninstall button
2014-07-05 13:39:25 +02:00
23e0ef6ed0
[tx-robot] updated from transifex
2014-07-05 01:56:33 -04:00
e4a3f8d3c4
[tx-robot] updated from transifex
2014-07-04 01:56:01 -04:00
dc15223edf
Merge pull request #9390 from owncloud/fix-9368
...
Revert 'hides table header while users load.'
2014-07-03 13:00:40 +02:00
1a1c5aa3c0
[tx-robot] updated from transifex
2014-07-03 01:56:24 -04:00
5a7b58ac45
Merge pull request #9374 from owncloud/link-contribute-promote
...
add link to contribute and promote pages in personal settings
2014-07-02 23:36:43 +02:00
bbea031090
Revert "hides table header while users load."
...
This reverts commit 0dc12a3737
2014-07-02 22:56:26 +02:00
03fbd6d540
remove shadow effects from settings icons, reduce size
2014-07-02 19:50:58 +02:00
1b83ac7de2
personal: link straight to /promote as @tomneedham said
2014-07-02 19:29:57 +02:00
4878c734e2
add link to contribute and promote pages in personal settings
2014-07-02 17:41:26 +02:00
9933b33166
[tx-robot] updated from transifex
2014-07-02 01:55:17 -04:00
ff416eaa57
Merge pull request #9330 from owncloud/jumpingheader
...
Hides table header while users load in User Management
2014-07-01 15:43:31 +02:00
0dc12a3737
hides table header while users load.
2014-07-01 17:05:44 +05:30
1b871da59e
Fixes typo with sendmail detection - fixes #9203
2014-06-30 15:01:12 +02:00
d94d307f52
Merge pull request #9207 from owncloud/prevent-default-for-mail-test
...
Fix test mail behaviour
2014-06-30 11:22:20 +02:00
589f68ebf6
[tx-robot] updated from transifex
2014-06-30 01:54:47 -04:00
ebf93448f2
[tx-robot] updated from transifex
2014-06-29 01:56:00 -04:00
26d0978993
[tx-robot] updated from transifex
2014-06-28 01:54:54 -04:00
36f771e9f0
[tx-robot] updated from transifex
2014-06-27 01:55:44 -04:00
a5154450cf
[tx-robot] updated from transifex
2014-06-26 01:54:40 -04:00
6e2aaaaa31
Fix test mail behaviour
...
* ref #8854
* prevent default of "send test mail" button
* drop unused form serialization
* use display name of user for test mail
2014-06-25 15:32:40 +02:00
b1116880f8
[tx-robot] updated from transifex
2014-06-25 06:33:53 -04:00
c6bcb07f83
Merge pull request #9145 from owncloud/everyonecount
...
Enhancement: Displays users and admin count in the Users Management.
2014-06-24 20:58:35 +02:00
6a4a474aa9
[tx-robot] updated from transifex
2014-06-24 01:54:39 -04:00
720fa33274
Better Logic to display user count for everyone.
2014-06-24 00:50:36 +05:30
b8b7c97a41
[tx-robot] updated from transifex
2014-06-23 01:54:38 -04:00
2b4c2a7b14
[tx-robot] updated from transifex
2014-06-22 01:54:36 -04:00
ca96b9d3d5
[tx-robot] updated from transifex
2014-06-20 01:54:32 -04:00
85894654ae
Make sure last seen tooltip always appears even after searching and filtering
2014-06-19 14:30:22 +02:00
e1fd10f226
[tx-robot] updated from transifex
2014-06-19 01:55:38 -04:00
baf46c74cd
[tx-robot] updated from transifex
2014-06-18 01:55:13 -04:00
9e74787c8a
Migrate table layout to p layout for share settings
...
ref #8906
2014-06-17 14:33:14 +02:00
ce179dcdcb
[tx-robot] updated from transifex
2014-06-17 01:55:43 -04:00
dd2dd7eaae
Merge pull request #9059 from owncloud/simplify-warning-layout
...
simplify security warning on admin page
2014-06-16 21:30:46 +02:00
a5f1846170
simplify security warning on admin page
2014-06-16 20:25:02 +02:00
c42d087fc5
Merge pull request #9053 from owncloud/small_ux_improvement
...
share settings, small ux improvement
2014-06-16 20:18:51 +02:00
15c215cd03
Merge pull request #8808 from owncloud/update_shipped_apps_from_appstore
...
Make shipped apps updatable via appstore
2014-06-16 15:54:50 +02:00
c1ef536896
show explenation only if the setting is activated
2014-06-16 15:33:46 +02:00
f12c4f6d11
style
2014-06-16 13:46:31 +02:00
3ebb1565a7
escape before output, fixes #9041
2014-06-16 13:44:41 +02:00
83b45926ee
Merge pull request #8716 from owncloud/forget-documentation
...
app manager forgets the documentation links workaround for #8081
2014-06-16 12:24:39 +02:00
ec5448bf7d
[tx-robot] updated from transifex
2014-06-16 01:54:35 -04:00
4d6fc6f309
[tx-robot] updated from transifex
2014-06-15 01:55:06 -04:00
01de7b8b9e
Merge pull request #9028 from owncloud/table-to-paragraph-layout-for-https
...
migrate table layout to paragraph layout for HTTPS setting
2014-06-14 13:08:58 +02:00
4a26219ecf
[tx-robot] updated from transifex
2014-06-14 01:55:24 -04:00
fd5fad194d
remove double space
2014-06-14 01:03:03 +02:00
c378e76412
skip certain tests for shipped apps
2014-06-13 21:45:31 +02:00
dc2212cd46
migrate table layout to paragraph layout for HTTPS setting
2014-06-13 16:54:47 +02:00
f5da0052cf
fix mail settings save function - ref #8854
2014-06-13 15:31:35 +02:00
083cf63cc2
[tx-robot] updated from transifex
2014-06-13 01:54:32 -04:00
55b5ddd735
[tx-robot] updated from transifex
2014-06-12 01:54:34 -04:00
f769c52522
[tx-robot] updated from transifex
2014-06-11 01:55:07 -04:00
ecc41fe0c3
Merge pull request #8908 from owncloud/fix-placeholders
...
fix split translations. fix for the discussion in the description
2014-06-10 10:47:23 +02:00
6546b589ce
[tx-robot] updated from transifex
2014-06-10 01:54:54 -04:00
e5c47a5e30
[tx-robot] updated from transifex
2014-06-09 01:54:32 -04:00
1f2722053f
[tx-robot] updated from transifex
2014-06-08 01:56:13 -04:00
e34a8bb9d6
fix hidden user group search field
2014-06-07 21:12:12 +02:00
e0446a1df5
[tx-robot] updated from transifex
2014-06-07 01:56:13 -04:00
f56b86e857
fix split translations
2014-06-06 15:31:51 +02:00
6f3b95052f
app manager forgets the documentation links
2014-06-06 15:22:02 +02:00
23c83c076c
unify controls bar, remove duplicate from user management
2014-06-06 12:22:09 +02:00
289accc31b
Merge pull request #8159 from owncloud/mobile-sidebar-swipe
...
Mobile sidebar swipe
2014-06-06 11:27:04 +02:00
1745fe1664
Merge pull request #8911 from owncloud/common-lang
...
Add Turkish to common languages
2014-06-06 09:38:10 +02:00
ca739a59f0
[tx-robot] updated from transifex
2014-06-06 01:57:10 -04:00
0fe8f77c17
Merge branch 'master' into update_shipped_apps_from_appstore
...
Conflicts:
lib/private/app.php
settings/templates/apps.php
2014-06-05 22:54:27 +02:00
11a857f653
Add Turkish to common languages
2014-06-05 22:32:35 +02:00
9063a25bb4
slightly widen sidebar to 250px, works better with apps and on mobile
2014-06-05 21:19:28 +02:00
6578f00b4b
unify share settings
2014-06-05 15:49:34 +02:00
cf9099c788
This settings doesn't belong together
...
Revert "make reshare settings foldable"
This reverts commit c01f196f72
2014-06-05 15:44:56 +02:00
c991e148a6
improve share settings working
2014-06-05 15:44:55 +02:00
1c20c72efe
Merge pull request #8620 from owncloud/design-navigation-two
...
Toggle app navigation not only on mobile, but on desktop as well
2014-06-05 10:53:22 +02:00
218131d30d
fix leading decimal Scrutinizer coding style issue
2014-06-05 10:52:06 +02:00
cb61d8a226
[tx-robot] updated from transifex
2014-06-05 01:57:20 -04:00
39eeb7def9
Merge pull request #8882 from owncloud/remove-placeholdercall
...
remove obsolete placeholder call, fix #8881
2014-06-05 00:07:13 +02:00
e26936e94f
remove obsolete placeholder call, fix #8881
2014-06-04 18:44:12 +02:00
210a1ef7e6
add to app navigation after enabling
2014-06-04 18:22:40 +02:00
71ba457372
personal settings: unbold clients header and remove obsolete CSS
2014-06-04 17:05:44 +02:00
724d027f19
add unit test
2014-06-04 16:29:41 +02:00
bc47e56f9f
fix related layout issues in user management
2014-06-04 16:24:39 +02:00
56a8010c9f
remove console.log in apps.js
2014-06-04 09:51:43 +02:00
6b2b903ea6
Merge pull request #8468 from owncloud/remove-infieldlabels
...
Remove infieldlabels
2014-06-04 09:28:20 +02:00
f5c4754c2b
[tx-robot] updated from transifex
2014-06-04 01:57:48 -04:00
cdf8a123e7
Merge pull request #8264 from owncloud/app-enable-by-group
...
Add the option to enable apps only for specific groups
2014-06-03 19:01:12 +02:00
cfc1d5623e
Merge pull request #8840 from owncloud/share_settings
...
by default don't show option to send mail notifications for shares
2014-06-03 16:42:44 +02:00
9396b22fe3
add missing placeholder shim for change password fields in IE8/9
2014-06-03 15:30:10 +02:00
a5dd8e84f1
Merge pull request #8827 from owncloud/add-sqlite-info
...
add info about sqlite on setup page
2014-06-03 15:07:59 +02:00
79b3558c6d
Merge pull request #7151 from owncloud/user-jquery
...
Continuing the New User management
2014-06-03 15:04:30 +02:00
a3202f1f03
bring back the line breaks
2014-06-03 12:48:36 +02:00
de012667c7
Apps: fix wording and layout for 'enable only for specific groups'
2014-06-03 12:42:36 +02:00
49f1e4a811
Fix syntax error
2014-06-03 12:42:36 +02:00
0f82b8efb3
Preserve changed groups when switching between apps
2014-06-03 12:42:36 +02:00
953e194245
Dont show group settings for login, filesystem, etc apps after enabling them
2014-06-03 12:42:36 +02:00
e3567242b2
Remove debug statements
2014-06-03 12:42:36 +02:00
7e07ff6f4f
Disable enabling apps by groups for filesystem, authentication and loggin apps
2014-06-03 12:42:36 +02:00
402a31f196
adding some line breaks
2014-06-03 12:42:36 +02:00
7272779456
Prevent js error
2014-06-03 12:42:35 +02:00
53dc30af4f
Add option to enable app for specific groups
2014-06-03 12:42:35 +02:00
25c676f203
simplify SQLite warning
2014-06-03 12:02:23 +02:00
f88482355f
check for user count and files count
2014-06-03 11:39:16 +02:00
5097bcc16d
improve settings name
2014-06-03 11:29:51 +02:00
8e583f55dc
set "allow users to send mail notification for shared files default" setting to "no" now that we have the activity app
2014-06-03 11:29:28 +02:00
68a4fd44e6
add notification on admin page
2014-06-03 08:01:39 +02:00
c84b226cb5
add arrow icon for external links
2014-06-02 23:18:25 +02:00
2e6a27614e
move Help section from controls bar to sidebar
2014-06-02 22:59:16 +02:00
eea501b847
various fixes as requested by pr reviewers
2014-06-02 21:39:15 +02:00
f12a5248a3
Merge pull request #8820 from owncloud/design-details
...
Design details
2014-06-02 21:26:43 +02:00
39982c2aea
fix grouplist behaviour (blank after filtering)
2014-06-02 17:32:59 +02:00
bdfad3440c
fix success status symbol to a circle
2014-06-02 17:25:08 +02:00
6f4bdbdb94
Merge pull request #8784 from owncloud/fold-reshare-settings
...
make reshare settings foldable
2014-06-02 14:37:10 +02:00
75cc16f2bd
remove debug output
2014-06-02 12:53:59 +02:00
28a012410a
polish JSDoc
2014-06-02 12:53:59 +02:00
92b8344489
replace setTimeout and clearTimeout handling by _.debounce
2014-06-02 12:53:59 +02:00
ec572607e1
remove group rename stuff, there is not support in the backends yet. to do for oc8.
2014-06-02 12:53:59 +02:00
7b63c2c036
cleanup
2014-06-02 12:53:59 +02:00
d030c28d69
bind undo to current deleteHandler
2014-06-02 12:53:59 +02:00
29ef2f7a2f
user mgmt: hide group rename function because it’s not supported in the backend yet
2014-06-02 12:53:59 +02:00
fc7438b221
Fix UserList.empty(), use _.defer() instead of setTimeout()
2014-06-02 12:53:58 +02:00
4de14fe6da
Javascript cleanup for groups.
2014-06-02 12:53:58 +02:00
c38548a1aa
Rebase cleanup.
...
Removing code that should not have been restored.
Originally removed in 45fd8f6d.
2014-06-02 12:53:58 +02:00
ad1c34db45
Revisions from review.
...
* Explicit toString()-based getters for uid and displayname data.
* Restored user check for group multiselect in new user creation form.
* Removed jQuery colon expr for uid.
2014-06-02 12:53:58 +02:00
1115d68f25
Fix broken span.
2014-06-02 12:53:58 +02:00
097887a659
Add the admin group to the group list data.
...
Fixes the admin group disappearing from the list when updating the display as the result of a search.
This group data should probably be managed on the page entirely by the javascript GroupList object, but this seems like the interim method.
2014-06-02 12:53:58 +02:00
747c011615
More specific selectors, javascript cleanup.
...
* Assigned jQuery selector results to variables for speed.
* Moved all .attr('data') calls to .data() calls.
* Added :data(uid) selector.
* Split the multiselect checkhandlers into separate functions.
* De-duped click event on password change/img.
* Used fluent interface on jQuery object for event binding.
* Removed redundant tag names in class selectors.
* Fixed incorrect date display for last login.
* Added Userlist.has() to search for uid.
* General code convention compliance fixes.
to-do: Group dropdowns currently don't add the admin group after the search result, not sure why yet.
2014-06-02 12:53:58 +02:00
f324aa7b24
fix some jshint errors
2014-06-02 12:53:58 +02:00
1abf69893d
user management: display table at full width
2014-06-02 12:53:58 +02:00
57cc51d21d
user management: remove autocompletion of user/password fields, fix #8464
2014-06-02 12:53:58 +02:00
66d00cf782
user management: remove unneeded and erroneous user filter reset function
2014-06-02 12:53:57 +02:00
1ae8ec698b
Make sure group data is returned.
2014-06-02 12:53:57 +02:00
f9f9550969
small fixes / cleanup
2014-06-02 12:53:57 +02:00
f2fed6de4e
Rename $accessiblegroups to $accessibleGroups
2014-06-02 12:53:57 +02:00
8141b9181c
Add space
2014-06-02 12:53:57 +02:00
59fef54e92
Rename $accessibleusers to $accessibleUsers
2014-06-02 12:53:57 +02:00
0067306fd6
Remove uneeded last comma
2014-06-02 12:53:57 +02:00
b56d14260d
Rename $isadmin to $isAdmin
2014-06-02 12:53:57 +02:00
a9bd416643
add reset button for the filter field
2014-06-02 12:53:57 +02:00
3ff123f247
more appropriate label
2014-06-02 12:53:57 +02:00
dea7f45782
stick with current group when the filter is used
2014-06-02 12:53:57 +02:00
7b8935abda
show users whose username starts with the search pattern first
...
We may want to switch or extend it to display name. I leave it like this for now, continued work on this needs to have sortable columns in mind
2014-06-02 12:53:56 +02:00
5444a1114d
cleanup
2014-06-02 12:53:56 +02:00
3e411c82a5
unify and consolidate group fetching method for initial template fill and ajax request
2014-06-02 12:53:56 +02:00
d87347e64e
update GroupList when a users is added or removed to a group
2014-06-02 12:53:56 +02:00
3c9788d40c
js cleanup + typos
2014-06-02 12:53:56 +02:00
d779db5aba
js cleanup
2014-06-02 12:53:56 +02:00
08ad073cf5
make string translatable
2014-06-02 12:53:56 +02:00
cbcda49ee3
get translations from settings, not core
2014-06-02 12:53:56 +02:00
249e42c4cd
enable group filtering
2014-06-02 12:53:55 +02:00
dbc854d8b8
Fire up server request only on typing printed or modifying characters and when the string actually changed
2014-06-02 12:53:55 +02:00
8df50acce7
some documentation
2014-06-02 12:53:55 +02:00
68dc665c65
dynamically decide whether to load 10 or 30 users
2014-06-02 12:53:55 +02:00
5b8ba79356
make filter work on server-side
2014-06-02 12:53:55 +02:00
19fd7cd9c7
When emptying a list, a hidden entry remains. If the user uid is the same as of a user being to be loaded, it will not be appended but removed. Thus, add a random user name to avoid such happenings.
2014-06-02 12:53:55 +02:00
5f57d72b93
kick out deprecated and dislodged OC.Router
2014-06-02 12:53:55 +02:00
fe4b1f8b10
Enhancement: Adds Group to grouplist when added via multiselect
2014-06-02 12:53:55 +02:00
d3cee79b5a
Enhancement: Adding Group on the Sidebar updates the multiselect on the Userlist.
2014-06-02 12:53:55 +02:00
e159f7e4a9
Enhancement: Implements Grouplist Toggle, Courtesy Calendar App Settings.
2014-06-02 12:53:55 +02:00
7aca126086
Adds @blizzz to authors
2014-06-02 12:53:54 +02:00
b3d68fc175
refactor delete handling and apply it to users and groups
2014-06-02 12:53:54 +02:00
b6b133237a
Initial Commit with Group Toggle.
2014-06-02 12:53:54 +02:00
cfba7e20cf
don't hide add group when text is entered (except for ESC press)
2014-06-02 12:53:54 +02:00
853ced644d
hide Add Group when clicking away or pressing ESC
2014-06-02 12:53:54 +02:00
a4cfa95545
restructure group.js and put functions to object, also add group list sorting after adding.
2014-06-02 12:53:54 +02:00
480173569f
put Add Group elements hiding and showing into its own function
2014-06-02 12:53:54 +02:00
330dfeb46b
group name input shall not vanish upon click, plus cleanup (groups do not have home folders)
2014-06-02 12:53:54 +02:00
749afe74df
when clicking on Add Group also put the focus into the group name field
2014-06-02 12:53:54 +02:00
faab6c095c
move group-click initialization to groups.js and only react on elements with a data-gid attribute given
2014-06-02 12:53:54 +02:00
65aa20433c
Enhancement : Toggle Add Group on Click, @blizzz have a look here.
2014-06-02 12:53:53 +02:00
17e640af22
set admin gid to Admins filter. I.e. hard-coding the admin group, but this is OC reality atm - other admin groups are not possible.
2014-06-02 12:53:53 +02:00
506e065f23
stricter test for 0
2014-06-02 12:53:53 +02:00
004dd73c5e
fix user creation, checkSubAdminUser is only available in OC_JSON
2014-06-02 12:53:53 +02:00
b3221f0e4e
LDAP: adjust main template according to PR 7291
2014-06-02 12:53:53 +02:00
eed108ec1b
Enhancement : The edit icon looks like files app rename fileaction.
2014-06-02 12:53:53 +02:00
6526b939d3
Enhancement: Transparency added to icons, changes opacity to 1 on hover.
2014-06-02 12:53:53 +02:00
ceb6c4df04
Enhancement: Makes Edit and Delete Icons Tapable, 44px by 44px dimensions.
2014-06-02 12:53:53 +02:00
d51b384c0c
Enhancement: Always show edit & delete for the active group.
2014-06-02 12:53:53 +02:00
f946a52819
Rename and Delete Happens only on Active Group.
2014-06-02 12:53:53 +02:00
d650cd66dc
mark selected group active
2014-06-02 12:53:53 +02:00
1f4bc7cb10
port scroll improvements
2014-06-02 12:53:52 +02:00
f7903e92be
do not forget to pass parameters to subtemplate
2014-06-02 12:53:52 +02:00
86d3cf53d1
Let's switch to OCP\JSON
2014-06-02 12:53:52 +02:00
ed1a23c9a2
Use OCP\JSON instead of OC_JSON
2014-06-02 12:53:52 +02:00
8a8800203e
Remove legacy "Check for user comment"
...
I don't think these comments are necessary anymore and therefore they should get killed.
2014-06-02 12:53:52 +02:00
16fb48f2eb
Adds admin check on groupname changes.
2014-06-02 12:53:52 +02:00
63645461f0
Fixes Markup in templates.
2014-06-02 12:53:52 +02:00
9ba4a76214
resolving conflict when picking 8b81a0b
2014-06-02 12:53:52 +02:00
bf88bd108e
do not show 0 when administered group has no users
2014-06-02 12:53:52 +02:00
1734cc09fd
sort groups by user count
2014-06-02 12:53:52 +02:00
7d3ac194e3
do not show 0 when group has no users
2014-06-02 12:53:52 +02:00
478393e15a
load groups when clicking on them
2014-06-02 12:53:52 +02:00
e681e1eec0
Initial Commit: Takes Quota Settings inside Navigation, Changes Create -> Add Group
2014-06-02 12:53:51 +02:00
f751e0bc48
Splits Code for Users and Groups.
2014-06-02 12:53:51 +02:00
3a92d48104
reduce template function calls
2014-06-02 12:53:51 +02:00
57ffaddf26
add Last Login column
2014-06-02 12:53:51 +02:00
970f899726
Initial Commit : Changes Storage to Quota, Implements GroupName editing.
2014-06-02 12:52:53 +02:00
dc28f58951
add Storage Location col
2014-06-02 12:52:53 +02:00
dc1523355b
Adds Admin to Grouplist Everywhere
2014-06-02 12:52:53 +02:00
4a30665ec3
Removes Delete Icon from Admin Group.
2014-06-02 12:52:53 +02:00
8e4bbe8297
Adds class button to fix font sizes.
2014-06-02 12:52:53 +02:00
8e34316e04
Fixes User Search by username.
2014-06-02 12:52:53 +02:00
c7af9cd6dd
Initial Commit : User Search, Fixes Typos
2014-06-02 12:52:53 +02:00
223e342664
Fixes delete icon only on hover.
2014-06-02 12:52:52 +02:00
78e1b71003
Reverts Bogus Changes.
2014-06-02 12:52:52 +02:00
71160ff853
Deletes Group Clientside Effectively.
2014-06-02 12:52:52 +02:00
ce46cd3680
Implements Group Creation from Sidebar
2014-06-02 12:52:52 +02:00
b506388b75
Reverts last commit, implements user in group count.
2014-06-02 12:52:52 +02:00
b2ca595509
Add GroupList Ajax to Users.
2014-06-02 12:52:52 +02:00
43ced8c6c7
Splits Controls overlap in files and users.
2014-06-02 12:52:52 +02:00
0663d954e6
resolve conflicts while picking c0fb623
2014-06-02 12:52:52 +02:00
d39216c5e7
[tx-robot] updated from transifex
2014-06-02 01:54:37 -04:00
36b0c599f5
[tx-robot] updated from transifex
2014-06-01 01:55:19 -04:00
020255b4e5
add button for properly uninstalling apps
2014-05-31 17:50:39 +02:00
c8636ca4d9
Merge branch 'master' into update_shipped_apps_from_appstore
...
Conflicts:
lib/private/app.php
lib/private/installer.php
2014-05-31 14:55:00 +02:00
2bcfd8e084
make it possible to update shipped apps via the appstore
2014-05-31 12:17:54 +02:00
cff9440a37
[tx-robot] updated from transifex
2014-05-31 01:55:46 -04:00
555b9cc245
Merge pull request #7614 from owncloud/test_annotations_working
...
Check if ReflectionMethod::getDocComment is working
2014-05-30 22:17:30 +02:00
4843d13056
prevent pageload if pressed enter on name email change
2014-05-30 15:12:39 +02:00
929882a32a
[tx-robot] updated from transifex
2014-05-30 01:55:11 -04:00
5cd0fd2559
Merge pull request #8700 from owncloud/design-smallfixes
...
Design detail fixes
2014-05-29 21:54:15 +02:00
c01f196f72
make reshare settings foldable
2014-05-29 21:14:20 +02:00
368006c7af
[tx-robot] updated from transifex
2014-05-29 01:54:40 -04:00
dc83b17f49
Fix double "saved" message when changing email settings
2014-05-28 11:50:55 +02:00
80641cae72
[tx-robot] updated from transifex
2014-05-28 01:56:09 -04:00
e70ed36d8e
Merge pull request #8740 from owncloud/l10n-forgotten-tags
...
reverts 188c543
2014-05-27 14:47:21 +02:00
1a22478446
reverts 188c543 and translates only mail
2014-05-27 12:58:46 +02:00
17276af6ad
Merge pull request #8733 from owncloud/l10n-forgotten-tags
...
unwrapped strings fix
2014-05-27 11:55:33 +02:00
a756666585
[tx-robot] updated from transifex
2014-05-27 01:54:54 -04:00
188c5435d8
unwrapped strings fix
2014-05-27 03:48:24 +02:00
790c0e8e7c
[tx-robot] updated from transifex
2014-05-26 01:55:36 -04:00
3029029afd
[tx-robot] updated from transifex
2014-05-25 01:54:35 -04:00
2afdd1bf1a
[tx-robot] updated from transifex
2014-05-24 01:55:34 -04:00
c6c4bb62e1
move saved notification for mail server, so it's smaller
2014-05-23 18:09:45 +02:00
b1ccfcde9e
fix border-radius in settings to 3px
2014-05-23 18:07:25 +02:00
12338e0ef0
allow admin to disable sharing for specific groups of users
2014-05-22 10:43:44 +02:00
40fc1d5b4b
[tx-robot] updated from transifex
2014-05-20 01:54:53 -04:00
30f1ec2521
Merge branch 'master' into test_annotations_working
...
Conflicts:
lib/private/util.php
2014-05-19 21:42:30 +02:00
d52252998a
[tx-robot] updated from transifex
2014-05-19 01:54:46 -04:00
a7509e5fd9
[tx-robot] updated from transifex
2014-05-18 01:55:01 -04:00
a1b356c7b6
[tx-robot] updated from transifex
2014-05-17 01:57:38 -04:00
b52cb8f557
Merge pull request #8604 from owncloud/sharing_encforce_password
...
allow admin to enforce passwords for public link shares
2014-05-16 12:23:01 -04:00
b6e14af861
allow admin to enforce passwords for public link shares
2014-05-16 17:41:09 +02:00
1fb0d5412c
Merge pull request #6260 from owncloud/jan-navigation-filesidebar
...
Files app navigation sidebar
2014-05-16 13:00:35 +02:00
43d6650d19
[tx-robot] updated from transifex
2014-05-16 01:55:55 -04:00
9ccb3279dd
Added app navigation for files app
...
- Added links to trashbin and shared dir
- Moved "WebDAV" settings block to the app nav's settings section
- Added sidebar support in trashbin app as well
2014-05-15 17:51:04 +02:00
3daaf6ba4f
Merge pull request #8597 from owncloud/l10n-fix-typo
...
fix typo encryption
2014-05-15 10:05:37 +02:00
d9d684197a
[tx-robot] updated from transifex
2014-05-15 01:55:53 -04:00
5291f47c66
fix typo encryption
2014-05-15 01:29:14 +02:00
dab3cb65cf
Merge pull request #8522 from owncloud/sharing_ux_improvements
...
Sharing ux improvements
2014-05-14 12:54:27 -04:00
b8de1e5d71
Merge pull request #8398 from owncloud/enc_backup_keys
...
backup the encryption key after the encryption was disabled
2014-05-13 09:25:16 -04:00
a9ac11718e
backup the encryption key after the encryption was disabled so that the user
...
can restore them if needed
2014-05-13 12:35:25 +02:00
ec045b251c
hide input field if default expire date isn't activated
2014-05-13 11:28:25 +02:00
e0dd69e4e6
remove legacy aka deprecated code: OC_FilesystemView
2014-05-12 16:30:39 +02:00
f4e8de3cbb
[tx-robot] updated from transifex
2014-05-12 01:55:44 -04:00
b6d76e9985
[tx-robot] updated from transifex
2014-05-11 01:57:00 -04:00
b7981910f7
adopt new settings style
2014-05-09 22:53:01 +02:00
287c8981bc
Check if ReflectionMethod::getDocComment is working
2014-05-09 22:44:55 +02:00
283b483100
[tx-robot] updated from transifex
2014-05-07 01:55:48 -04:00
cf20de185c
[tx-robot] updated from transifex
2014-05-03 01:56:11 -04:00
17f5a18922
[tx-robot] updated from transifex
2014-05-01 01:56:01 -04:00
654a6e6c6a
[tx-robot] updated from transifex
2014-04-30 01:57:53 -04:00
b4a5093da8
[tx-robot] updated from transifex
2014-04-29 01:56:49 -04:00
e27dc5b6f9
Merge pull request #8309 from DavidPrevot/chosen
...
Adapt chosen (css) path
2014-04-28 12:34:40 +02:00
642f57c1d5
[tx-robot] updated from transifex
2014-04-28 01:56:24 -04:00
8e5c9eea3a
[tx-robot] updated from transifex
2014-04-27 01:54:54 -04:00
c591cf0836
[tx-robot] updated from transifex
2014-04-26 01:55:32 -04:00
ad1265da13
typo fix, by translators on transifex
2014-04-25 16:26:30 +02:00
3fc809dfd8
[tx-robot] updated from transifex
2014-04-25 01:56:28 -04:00
6650be9913
add setting to set default expire date
2014-04-24 13:34:31 +02:00
435672feaa
[tx-robot] updated from transifex
2014-04-24 01:55:33 -04:00
3f453d1641
[tx-robot] updated from transifex
2014-04-23 01:56:35 -04:00
eebb756c38
Adapt chosen (css) path
...
Avoid shipping duplicate files in 3rdparty/css.
3rdparty/css/chosen/ already contains chosen.css and chosen-sprite.png
so its useless to duplicate them in 3rdparty/css.
Taking the same approach as in apps/calendar/appinfo/app.php and
apps/files_external/settings.php.
2014-04-22 14:15:09 -04:00
54476c468c
fix spelling 'Allow user ...' -> 'Allow users ...'
2014-04-22 09:34:08 +02:00
a9b4fba528
[tx-robot] updated from transifex
2014-04-22 01:54:58 -04:00
e88731a477
Some more PHPDoc fixes
2014-04-21 15:44:54 +02:00
4fe5ca1908
[tx-robot] updated from transifex
2014-04-21 01:56:06 -04:00
eecd4bd18e
Use JS as content-type due to mimesniffing
2014-04-17 10:40:19 +02:00
23f2c48a43
[tx-robot] updated from transifex
2014-04-16 01:57:34 -04:00
1903895172
Make email display name change translatable again
2014-04-15 00:27:54 +02:00
2a2aabbdaf
[tx-robot] updated from transifex
2014-04-14 01:55:09 -04:00
982d2bcc5b
[tx-robot] updated from transifex
2014-04-13 01:55:12 -04:00
10dc1de644
Merge pull request #8069 from owncloud/fix-localization-issues-with-file-encrypt-app
...
Fix some localization issues with file encryption/decryption strings
2014-04-11 17:22:13 +02:00
7c072510d3
[tx-robot] updated from transifex
2014-04-10 01:55:39 -04:00
e79a027e77
Always define sendmail_is_available
...
Fix #8048
2014-04-09 10:18:46 +02:00
796f719548
[tx-robot] updated from transifex
2014-04-09 01:56:49 -04:00
4ad4b9768c
[tx-robot] updated from transifex
2014-04-08 01:57:51 -04:00
647abe512b
reduce code duplication, fix parse error, prevent page reload on hitting enter while changing the display name - refs #8085
2014-04-07 14:04:16 +02:00
e295d48fd4
[tx-robot] updated from transifex
2014-04-07 01:56:11 -04:00
286323f7a4
Fix some localization issues with file encryption/decription strings
2014-04-05 19:28:53 +02:00
33a2aa8865
Delete oauth.css
2014-04-04 22:38:16 +02:00
b2f8e34388
Remove uneeded file
...
This file seems not to be actually used anywhere.
2014-04-04 22:14:51 +02:00
0805f678cc
[tx-robot] updated from transifex
2014-04-04 01:57:01 -04:00
20f26068e7
Merge pull request #7476 from owncloud/type-hinting
...
Type hinting
2014-04-03 20:02:27 +02:00
5301056ab1
fix h3 style, move out from settings to apps CSS
2014-04-02 09:18:33 +02:00
73dd5ff26c
[tx-robot] updated from transifex
2014-04-02 01:56:39 -04:00
bd2cf6ee29
Merge pull request #7817 from owncloud/app-navigation-for-apps
...
Makes #app-navigation a part of app management.
2014-04-01 21:38:43 +02:00
a179335775
Merge pull request #7940 from owncloud/settings-userlistajaxcallfix
...
Fixed user list offset call
2014-04-01 14:17:05 +02:00
5807681c09
Merge pull request #7975 from owncloud/fix-7973-master-2
...
remove pl_PL - fixes #7973
2014-04-01 12:38:47 +02:00
18acfa8bb3
Merge pull request #7915 from owncloud/replace-personalblock
...
Replace personalblock with .section
2014-04-01 11:20:16 +02:00
7a4a836abe
[tx-robot] updated from transifex
2014-04-01 01:56:15 -04:00
6b061c236d
Merge branch 'master' into type-hinting
...
Conflicts:
lib/private/image.php
lib/private/l10n.php
lib/private/request.php
lib/private/share/mailnotifications.php
lib/private/template/base.php
2014-03-31 21:38:54 +02:00
fe2c6f4e6d
remove pl_PL - fixes #7973
2014-03-31 18:03:42 +02:00
ab696edba6
Merge pull request #7916 from owncloud/fix-input-sizes
...
Fix input sizes
2014-03-31 15:56:19 +02:00
2be2a5d2c5
external storage: fix merge conflict, indentation
2014-03-31 13:12:04 +02:00
881c66df52
Removes highlighting of selected items, padding from apps management.
2014-03-30 15:48:47 +05:30
bfb0b9a044
[tx-robot] updated from transifex
2014-03-30 01:55:42 -04:00
915fa3da74
[tx-robot] updated from transifex
2014-03-29 01:55:44 -04:00
82f98fb3d3
Fixed user list offset call
2014-03-28 18:12:34 +01:00
5fa8f7cf12
Merge pull request #7107 from owncloud/load-apps-proper-master
...
Load apps proper master
2014-03-28 10:33:55 +01:00
ccc55f40e6
[tx-robot] updated from transifex
2014-03-28 01:55:47 -04:00
53b1e4a00b
remove additional radio button width declaration
2014-03-27 17:13:12 +01:00
5b2abb32a6
remove CSS rules for personalblock, remove it from core
2014-03-27 17:00:47 +01:00
69be5bdbd8
replace personalblock fieldset with section div in admin and personal settings
2014-03-27 17:00:47 +01:00
ed0cba0ff4
[tx-robot] updated from transifex
2014-03-27 01:56:30 -04:00
1816f43722
Merge pull request #7864 from owncloud/routing-performance
...
Routing performance
2014-03-25 23:00:36 +01:00
4900ad9119
update type hint in PHPDoc
2014-03-25 22:59:42 +01:00
5111fad006
Merge pull request #7689 from owncloud/last_cron_log
...
Log last cron execution
2014-03-25 19:17:36 +01:00
f9279ac77a
killing some more calls to OC_App::loadApps(); - because we load all apps in handleRequest()
2014-03-25 17:42:41 +01:00
531c9564b3
Merge pull request #7861 from owncloud/idn-domains-support-on-emails-master
...
idn have to be converted before being used
2014-03-25 12:38:32 +01:00
b92dad992f
[tx-robot] updated from transifex
2014-03-25 01:55:34 -04:00
3eb5898f7b
use \OC_Mail::validateAddress() to validate the email address - fixes #7862
2014-03-24 15:35:07 +01:00
3d8ce8104f
Adds Style changes to app-navigation in core/css/apps.css
2014-03-24 17:59:53 +05:30
abdc823bb6
[tx-robot] updated from transifex
2014-03-24 01:55:51 -04:00
0245e64cec
[tx-robot] updated from transifex
2014-03-22 01:56:09 -04:00
e6b4d28229
Move success/error squircles to settings
2014-03-21 20:27:22 +01:00
dda7129a24
Merge branch 'master' of https://github.com/owncloud/core into last_cron_log
2014-03-21 20:23:31 +01:00
bcf388d3c5
[tx-robot] updated from transifex
2014-03-21 01:55:35 -04:00
59d1ee565e
Makes #app-navigation a part of app management.
2014-03-20 13:34:50 +05:30
3aa8647634
[tx-robot] updated from transifex
2014-03-20 01:56:42 -04:00
7b1d52f5b9
[tx-robot] updated from transifex
2014-03-19 01:55:39 -04:00
b75ca9fb50
Display admin option for public upload with encryption enabled
...
Now that public upload works with encryption, the admin option to toggle
it must be made visible.
2014-03-18 11:28:56 +01:00
518903c6eb
[tx-robot] updated from transifex
2014-03-17 01:56:06 -04:00
c89aa6d5fe
[tx-robot] updated from transifex
2014-03-16 03:13:21 -04:00
b2e929d580
[tx-robot] updated from transifex
2014-03-15 02:14:22 -04:00
4b802aa7cb
[tx-robot] updated from transifex
2014-03-13 17:12:37 -04:00
3c03ff5bb5
Merge pull request #7340 from owncloud/hide_remove_image_avatar
...
Hide remove image, if there's no custom avatar
2014-03-13 13:20:00 +01:00
1295e54173
[tx-robot] updated from transifex
2014-03-13 01:55:50 -04:00
5fcfb2ef84
Merge pull request #7564 from owncloud/issue/7559
...
Hide QMail when not selected and hide SendMail when not available on the server
2014-03-12 18:32:38 +01:00
556c6eca23
Use OC_Util::formatDate()
2014-03-12 17:53:39 +01:00
c5440fa133
Move cron status to the right of the heading
2014-03-12 17:29:26 +01:00
8fafee31ef
Use $.hide() instead of .hidden for now
...
.inlineblock ranks higher than .hidden
2014-03-12 15:42:29 +01:00
dd97d532be
Remove OC.Router usage
2014-03-12 15:31:48 +01:00
1c82b4751e
Merge branch 'master' into hide_remove_image_avatar
2014-03-12 15:29:26 +01:00
547b563464
Log last cron execution
...
Fixes #2012
2014-03-12 15:20:51 +01:00
efbca04ab4
Use command -v to check for sendmail
...
Fix #7559
2014-03-12 11:47:21 +01:00
8320b8eb7a
[tx-robot] updated from transifex
2014-03-12 01:57:17 -04:00
5713b0dedb
Authentification -> Authentication
2014-03-11 16:24:50 +01:00
b0ec38e202
[tx-robot] updated from transifex
2014-03-11 01:59:39 -04:00
32b29c9d73
Merge branch 'master' into fix-7307
...
Conflicts:
core/js/router.js
settings/js/admin.js
2014-03-06 00:15:08 +01:00
0285d5b6e2
Hide QMail when not selected and hide sendmail when not available on the server
...
Fix #7559
2014-03-05 14:53:20 +01:00
d583d61b69
Merge pull request #7412 from owncloud/issue/7175
...
Add button to send a test mail after changing the email settings
2014-03-05 13:18:41 +01:00
5b8cde48dc
Add button to send a test mail after changing the email settings
...
Fix #7175
2014-03-05 10:01:34 +01:00
af2c2b3a16
update wording of email field
2014-03-04 10:22:54 +01:00
5f711912a1
remove OC.Router.registerLoadedCallback()
2014-03-02 23:45:23 +01:00
1291303c5a
Replace OC.Router.generate() with OC.generateUrl()
2014-03-02 22:30:24 +01:00
8951328a87
More PHPDoc updates
2014-02-28 21:03:43 +01:00
3c11dc0006
Merge branch 'master' into hide_remove_image_avatar
2014-02-28 19:28:29 +01:00
e78da036c1
profile image: relabel technical 'Abort' to more widely used 'Cancel'
2014-02-28 10:09:34 +01:00
86b3cdc132
close encryption session after decryption was finished
2014-02-26 17:18:38 +01:00
d9a153dbe9
Merge pull request #7174 from owncloud/issue/7166
...
Add option to change email settings in admin section
2014-02-26 14:41:07 +01:00
84eea47991
Merge pull request #7406 from owncloud/settings-apps.js-style
...
coding style fixes: cut long lines, whitespace
2014-02-26 14:24:34 +01:00
9847912257
Remove unused variables, add doc blocks and break lines
...
Fix #7166
2014-02-26 13:10:46 +01:00
593adab258
Fix scrutinizer issue in settings/js/apps.js
2014-02-26 11:41:32 +01:00
a1600a289c
Merge pull request #7401 from owncloud/highlight_selected_app_settings
...
Highlight the selected app in app-settings
2014-02-26 11:07:43 +01:00
bc1c136cd6
coding style fixes: cut long lines, whitespace
2014-02-26 10:34:38 +01:00
331bd527a7
Hide SMTP options based on selected send mode
...
Fix #7166
2014-02-26 10:30:22 +01:00
1a561fced0
fix for coding style
2014-02-26 09:32:20 +01:00
e32acf933d
Highlight the selected app in app-settings
2014-02-26 04:03:41 +01:00
80481a1e41
Merge branch 'master' into mobile-header
2014-02-21 12:46:09 +01:00
88882e3fa7
Use addClass('hidden') and removeClass('hidden')
2014-02-21 12:42:07 +01:00
0e0b4d5575
Hide remove image, if there's no custom avatar
...
Fix #7308
2014-02-20 21:53:59 +01:00
917a505af4
Merge pull request #7291 from owncloud/adminess-raghu
...
Move isadmin to template and rename it to oc_isadmin
2014-02-20 19:01:28 +01:00
bfe6dfe5da
Merge pull request #7056 from owncloud/users-scrollperformance
...
Improve users list scrolling performance
2014-02-20 16:45:36 +01:00
20b740f8e4
do not show display name on mobile when profile picture is present
2014-02-20 13:37:23 +01:00
16262e3fd2
Move isadmin to template and rename it to oc_isadmin
2014-02-19 17:56:12 +01:00
c196e59e88
Add event parameter to keyup event
...
Fix issue #7277
2014-02-19 10:25:52 +01:00
fdb0d2067f
Remove duplicated definition and move OC.msg to js/js.js
...
Fix issue #7166
2014-02-19 10:20:52 +01:00
8387cd8ae3
Add option to change email settings in admin section
...
Fix issue #7166
2014-02-18 14:26:03 +01:00
dafa8fc37e
do not autocapitalize fields on mobile, fix user name input. Also disable autocorrect and specify autocomplete
2014-02-18 10:58:00 +01:00
58b1dc5e76
Added loading spinner to users list on scroll
2014-02-18 10:52:05 +01:00
c732764eb5
Improve users list scrolling performance
...
- fixed JS error when avatar mode is disabled
- added spinner at the bottom of the table
- scroll detection now happens earlier
- single/multiselect init is deferred so that the new rows are first appended
into the list (more responsive) and initialized afterwards
- disabled users sorting after add (assuming they are always sorted on
the server side)
2014-02-17 19:32:45 +01:00
f2f5769df7
catch errors during decryption
2014-02-17 10:03:57 +01:00
13fa0e2a9d
Fix implied evals and doubled definition of variable
...
fixes #7119
fixes #7120
fixes #7121
fixes #7122
2014-02-07 17:47:42 +01:00
61aa6ead83
Merge pull request #6490 from owncloud/theming-for-appstemplate
...
do not show 'Add app' and 'More apps' for themed ownCloud
2014-02-05 16:49:07 +01:00
13ed59c1cf
merge master into mobile-style
2014-01-29 10:55:44 +01:00
d182b4f59f
Merge pull request #6927 from owncloud/enc_dont_reload_page_on_decrypt
...
remove the form, it isn't needed here
2014-01-27 04:30:06 -08:00
150d3856a0
prevent autofill for password change settings, prevent leak of existing password, fix #6552
2014-01-24 18:58:56 +01:00
6bb27ea76b
disable button and input field during decryption
2014-01-24 12:15:06 +01:00
2a3cb7ac5b
remove the form, it isn't needed here
2014-01-24 11:41:24 +01:00
5956277ed4
Merge pull request #6234 from owncloud/change-email-by-enter
...
change mail address by pressing enter - fixes #6179
2014-01-23 08:03:22 -08:00
f950ce82ae
Merge branch 'master' into mobile-style
...
Conflicts:
apps/files/js/files.js
apps/files_sharing/css/public.css
apps/files_sharing/js/public.js
apps/files_sharing/templates/public.php
2014-01-23 00:39:11 +01:00
80dead5a9f
fix double call of changeEmailAddress()
2014-01-18 22:59:49 +01:00
80d871ab1e
added website field
2014-01-17 16:35:48 +01:00
e2de3b8337
distinguish app links from doc links
2014-01-17 16:08:32 +01:00
bf0471a92e
show link to app documentation
2014-01-17 14:56:25 +01:00
d36da7e43a
use appstoreenabled config switch
2014-01-16 12:58:17 +01:00
45709937af
Merge pull request #6786 from wakeup/master
...
Fix untranslated text when deleting user
2014-01-16 03:22:55 -08:00
97b0840bbe
Fix untranslated text when deleting user
...
This should fix issue #6728
2014-01-15 18:40:04 +01:00
5f95356592
remove unused log icon
2014-01-15 15:48:42 +01:00
5c1a9f35f1
Indicate password strength using strengthify
...
* uses zxcvbn
* outsourced to separate jquery plugin
* async loading
* hide strength meter if input is empty
* feedback if user enters weakest password
* fade in and out
* show tipsy with strength
* Opera 12, IE8-10, FF 23, Chromium 29
2014-01-15 11:10:12 +01:00
92969052d7
remove ru_RU - it has bee removed from transifex
2014-01-13 16:41:10 +01:00
0e843b9d7d
[tx-robot] updated from transifex
2014-01-06 01:55:59 -05:00
e4616199df
[tx-robot] updated from transifex
2014-01-05 01:55:53 -05:00
aaa48576ee
[tx-robot] updated from transifex
2014-01-04 01:55:57 -05:00
095f9b8ee0
[tx-robot] updated from transifex
2014-01-02 01:56:21 -05:00
e345f3f511
[tx-robot] updated from transifex
2013-12-29 01:55:36 -05:00
dbbd99db09
[tx-robot] updated from transifex
2013-12-24 01:55:40 -05:00
f60ecfc7fd
[tx-robot] updated from transifex
2013-12-22 01:56:05 -05:00
cd26631a6d
[tx-robot] updated from transifex
2013-12-21 01:56:13 -05:00
37cdbc3be0
[tx-robot] updated from transifex
2013-12-19 01:57:03 -05:00
3c21fd5bfc
do not show 'Add app' and 'More apps' for themed ownCloud
2013-12-18 14:59:57 +01:00
6488ff2c75
[tx-robot] updated from transifex
2013-12-17 16:43:17 -05:00
a99dd3183c
[tx-robot] updated from transifex
2013-12-17 06:46:52 -05:00
77b68505c2
[tx-robot] updated from transifex
2013-12-13 14:44:31 -05:00
7b20212c0a
[tx-robot] updated from transifex
2013-12-11 13:32:13 -05:00
bc23f46198
fix typo
2013-12-09 16:05:10 +01:00
079d20a80e
[tx-robot] updated from transifex
2013-12-07 22:28:29 -05:00
44a55056e7
change mail address by pressing enter - fixes #6179
2013-12-07 17:33:27 +01:00
db0b291f63
Merge pull request #6213 from owncloud/fix-full-name-edit
...
Fix full name edit for repetitive edit
2013-12-06 06:46:34 -08:00
ac77218d57
parent().parent() -> closest()
2013-12-06 13:53:01 +01:00
4dd84b3627
[tx-robot] updated from transifex
2013-12-05 22:24:39 -05:00
008bfc6793
Fix full name edit for repetive edit
...
fixes #6212
fixes the data attributes after edit
fixes markup to successfully re-edit display name
2013-12-05 23:44:59 +01:00
7e702f294f
[tx-robot] updated from transifex
2013-12-04 18:14:17 -05:00
61296ed7bb
lower required php version to 5.3.3
2013-12-04 10:25:22 +01:00
83ec234f53
[tx-robot] updated from transifex
2013-12-02 17:28:29 -05:00
1b18c5a047
[tx-robot] updated from transifex
2013-11-29 14:10:40 -05:00
4a78f12682
[tx-robot] updated from transifex
2013-11-27 12:10:54 -05:00
8506d2bf42
fix wording
2013-11-27 00:38:56 +01:00
2d822e3b95
add warning for HTTP connection
2013-11-27 00:05:48 +01:00
4f15282bc9
Merge pull request #6058 from owncloud/ldap2avatar
...
Set Avatar for LDAP users automatically (if a picture is available)
2013-11-26 12:05:32 -08:00
fb7aa2f014
[tx-robot] updated from transifex
2013-11-26 10:47:07 -05:00
2556647a10
check if user is logged in
2013-11-26 12:47:59 +01:00
dc67c7efa9
[tx-robot] updated from transifex
2013-11-26 04:04:05 -05:00
de2b444030
Merge pull request #5960 from owncloud/enc_small_visual_improvements
...
[encryption] some small visual improvements
2013-11-25 02:12:31 -08:00
f1f172e16e
fix typo
2013-11-25 11:09:31 +01:00
f6df4b349f
remove logic from template and fix syntax error
2013-11-24 21:27:32 +01:00
77bb168007
replace echo with p
2013-11-24 17:17:10 +01:00
22e39baf77
show the build number if on the daily build update channel
2013-11-24 16:46:07 +01:00
ba0e09adce
[tx-robot] updated from transifex
2013-11-24 00:14:51 -05:00
8ccac86c98
Enable user backends to provide avatar images
2013-11-22 13:25:20 +01:00
60cfdae503
[tx-robot] updated from transifex
2013-11-21 21:07:12 -05:00
4a2f9636cf
Merge pull request #5773 from owncloud/fix-2152-master
...
Make working en_US.UTF-8 locale a hard requirement
2013-11-21 08:03:21 -08:00
5d9731cef2
[tx-robot] updated from transifex
2013-11-21 10:05:34 -05:00
cd1cf58875
Fixing the warning notifications
2013-11-21 14:44:25 +01:00
caf486d6e7
- show a spinner while decrypting files if the encryption app was disabled
...
- don't fade-out the decryption result
2013-11-20 12:23:10 +01:00
c3746e866a
[tx-robot] updated from transifex
2013-11-15 22:56:31 -05:00
368342a085
Update error messages
2013-11-15 14:46:00 +01:00
913cde816f
Fix spacing issue for checkboxes, vertically center checkboxes on personal page
2013-11-11 18:03:57 +01:00
3428c03b80
[tx-robot] updated from transifex
2013-11-09 01:45:32 -05:00
263603aa4c
[tx-robot] updated from transifex
2013-11-06 21:44:36 -05:00
d62b683c6a
change 'Display Name' to more understandable 'Full Name', fix #5612
2013-11-06 14:20:43 +01:00
e89f080f09
[tx-robot] updated from transifex
2013-11-03 14:39:28 -05:00
07e540613e
[tx-robot] updated from transifex
2013-11-03 12:44:12 -05:00
ea4dfa7e38
Merge pull request #5638 from owncloud/admin-quotafield
...
Improve quota input field
2013-10-31 04:25:42 -07:00
680f4963dc
fix translation strings
2013-10-31 12:21:42 +01:00
9d230bcc75
Improve quota input field
...
- Added tooltip with examples
- The quota value returned by the server is now displayed after update
- Fixes #5346
2013-10-30 20:46:53 +01:00
aba7335d3f
Changed wording in log level dropdown
2013-10-30 18:39:21 +01:00
e3b13b13c9
Changed log level labels in log level dropdown
2013-10-30 18:23:48 +01:00
b0b76fe064
[tx-robot] updated from transifex
2013-10-29 07:31:51 -04:00
8df8211225
[tx-robot] updated from transifex
2013-10-27 07:27:22 -04:00
aa06983345
Merge pull request #5552 from owncloud/admin-warninghomeexistsfix
...
Fixed user dir existence check when creating new user
2013-10-27 03:11:11 -07:00
119ecc6f34
[tx-robot] updated from transifex
2013-10-27 02:32:11 -04:00
1ee4b680f6
Fixed user dir existence check when creating new user
...
The check was done too later. It turns out that createUser() had already
created the dir, which caused the warning message to be shown every
time.
2013-10-25 16:23:29 +02:00
2102ab8fec
Fix leftcontent/right content, fixes tasks app
...
Tasks app layout was broken since the controls bar is higher now.
This change should hopefully fix other apps using the same layout.
2013-10-24 12:28:28 +02:00
5aeafab9ab
Fixed wrong id when reading checkbox value for force SSL setting
...
Fixes #5488
2013-10-23 15:21:18 +02:00
00f4928866
Added warning notification when user home already exists
...
When creating a user and the home already exists in the data dir, a
warning notification will be displayed.
Fixes #5161
2013-10-22 18:10:29 +02:00
cadd71ec8a
Merge pull request #5455 from owncloud/fixing-2423-master
...
introduce link_to_docs() and migrate links
2013-10-22 01:28:43 -07:00
efd71c80f0
Merge pull request #5426 from owncloud/fix-3612
...
Adds margin to the SSL root certificate button
2013-10-22 01:16:20 -07:00
148d2616e5
introduce link_to_docs() and migrate links
2013-10-21 21:29:45 +02:00
a376407da3
[tx-robot] updated from transifex
2013-10-21 13:03:32 -04:00
744ddc2664
Takes Import button to next line.
2013-10-21 15:19:02 +05:30
2747862b13
Merge pull request #5429 from owncloud/fix_cron_docu
...
harmonize this with the documentation. Once every minute is way to often.
2013-10-20 08:49:59 -07:00
44d15d497e
change the language
2013-10-20 15:22:50 +02:00
6aee83cadf
[tx-robot] updated from transifex
2013-10-19 08:27:13 -04:00
37b89b11b6
harmonize this with the documentation. Once every minute is way to often. Every 15min should be fine just as the documentation suggests: http://doc.owncloud.org/server/5.0/admin_manual/configuration/background_jobs.html
2013-10-19 01:42:59 +02:00
45cecc9c08
Adds margin to the SSL root certificate button
2013-10-19 03:09:45 +05:30
7a1d0b8497
Merge pull request #5321 from owncloud/settings-applistwidths
...
Fixed app list right container to not overlap left container scrollbar
2013-10-18 05:18:49 -07:00
2845747528
[tx-robot] updated from transifex
2013-10-17 13:48:52 -04:00
630be99ddf
[tx-robot] updated from transifex
2013-10-16 00:31:48 -04:00
c60f52ddf7
Fixed app list right container to not overlap left container scrollbar
...
- Container widths in apps list now use pixels instead of em
- Container widths now match properly and rightcontainer doesn't overlap
the scrollbar any more
2013-10-14 16:29:33 +02:00
e9ce704f17
Merge pull request #5297 from owncloud/quota-style
...
Fixes Default Quota Style in User Management.
2013-10-14 03:59:51 -07:00
f06df170cb
finally fix the app sorting
2013-10-14 10:54:38 +02:00
e0d3046590
Fixes Default Quota Style in User Management.
2013-10-14 10:35:24 +02:00
f3336f8877
[tx-robot] updated from transifex
2013-10-13 20:33:30 -04:00
7cf81f2d12
show the channel. Also mark git as git channel so that someone can see where this build comes from
2013-10-13 21:51:47 +02:00
3f54e3c783
Merge pull request #5299 from owncloud/settings-ie8-tablegridstyles
...
Fixed table grid styles for IE8
2013-10-12 03:51:01 -07:00
fce198874f
Merge pull request #5272 from mrflix/master
...
fix label to checkbox binding in admin -> force-https
2013-10-12 01:41:30 -07:00
1a05ed2f38
Fixed table grid styles for IE8
...
The selector :not() isn't supported in IE8, replaced it with the "grid"
class.
- Fixes the log table style in IE8 (#5057 )
- Fixes the users table layout bug in IE8
2013-10-11 15:58:15 +02:00
02c7f95687
Includes <optgroup> tag
2013-10-11 18:52:27 +05:30
7c2f1fd580
Puts the language divider in place. thanks @Kondou-ger ;)
2013-10-11 18:46:59 +05:30
4b2bb11716
Removes the Bogus Label
2013-10-11 18:42:02 +05:30
e27bb660bd
Uniform Styles and Indentation Fixes for Personal Block
2013-10-11 18:03:53 +05:30
6970774776
Fixed display name change for IE8
...
After saving the display name, the oldDisplayName field's value was
wrongly set with text(), which would append the text inside the input
element which is considered as an invalid operation in IE8.
This fix for #5054 correctly puts the old value into the field with a val() call.
2013-10-11 10:48:30 +02:00
44a5b0bad0
[tx-robot] updated from transifex
2013-10-10 22:30:58 -04:00
01d3536a76
fix checkbox <-> label binding
...
clicking the label will trigger the checkbox
2013-10-10 23:10:06 +02:00
209392587f
[tx-robot] updated from transifex
2013-10-08 07:24:19 -04:00
c655eec3d1
[tx-robot] updated from transifex
2013-10-07 12:21:38 -04:00
a240e63981
Fix new user avatar. Ref#5166
2013-10-07 18:00:15 +03:00
3613e79e10
[tx-robot] updated from transifex
2013-10-06 19:16:10 -04:00
2b521327c0
more elegant style for Personal and Admin settings
2013-10-05 11:23:49 +02:00
041837de2c
merge master into input-simplify
2013-10-04 17:08:34 +03:00
51295e9a6b
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
apps/files/index.php
apps/files/templates/index.php
2013-10-04 12:30:49 +02:00
ecd2bf2a55
Merge pull request #5109 from owncloud/controls-bar-height
...
Controls bar height
2013-10-04 01:01:54 -07:00
c335169f6d
increase height of controls bar and elements to more clickable 44px
2013-10-04 08:41:16 +03:00
b0ff10a536
Hide defaultavatar in #header and don't darken proper avatars in #header
2013-10-04 02:27:53 +02:00
3c13afee98
better style and color for warning and success feedback on inputs
2013-10-03 16:58:48 +03:00
8b08b1b455
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
lib/private/util.php
2013-10-02 10:11:18 +02:00
a711399e62
[tx-robot] updated from transifex
2013-09-30 10:19:22 -04:00
59e4ff7d24
[tx-robot] updated from transifex
2013-09-29 00:03:26 -04:00
24d092c4ba
Have uniform (wrong) indention
2013-09-28 17:49:07 +02:00
4907685405
Base defaultavatar text on displayname
...
Fix #4876
2013-09-28 16:46:53 +02:00
f31d31844e
[tx-robot] updated from transifex
2013-09-27 00:02:30 -04:00
2d12e52769
[tx-robot] updated from transifex
2013-09-24 12:59:48 -04:00
40871bab88
Merge pull request #4930 from owncloud/fix-apps-settings
...
Fix the apps enabling/disabling in settings
2013-09-24 01:02:50 -07:00
fc76a13c52
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
lib/public/share.php
2013-09-23 11:18:00 +02:00
28918d61d2
[tx-robot] updated from transifex
2013-09-22 12:58:42 -04:00
45a7b0dbac
Fix the apps enabling/disabling in settings
2013-09-20 20:29:15 +02:00
5b95e7aa0f
[tx-robot] updated from transifex
2013-09-20 10:50:14 -04:00
de8d0783ed
fixing syntax error - it it that hard to test own code?
2013-09-18 23:46:58 +02:00
6b1843d91b
[tx-robot] updated from transifex
2013-09-18 11:50:02 -04:00
817b8d151b
Merge pull request #4745 from owncloud/split_personal-user_passwordchange
...
Split personal and user-mgmt password change logic
2013-09-18 07:53:11 -07:00
18a2c48ceb
Translate errormsgs in settings/changepassword/controller
2013-09-18 16:47:27 +02:00
534d93d2d3
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
apps/files/index.php
2013-09-16 10:40:06 +02:00
a58e176852
Merge pull request #4506 from owncloud/oc_avatars
...
OC Avatars
2013-09-14 16:00:36 -07:00
556bd1ef23
[tx-robot] updated from transifex
2013-09-13 21:49:24 -04:00
18da2f9cf7
Improve changepassword route naming
2013-09-13 17:07:23 +02:00
306a8681c5
Move ajax/changepassword to changepassword/controller to use autoloading
2013-09-13 17:03:13 +02:00
3790cbb493
Allow numeric group names
2013-09-13 09:06:20 -04:00
c9c5e1b97f
Merge branch 'master' into oc_avatars
2013-09-12 07:41:44 +02:00
2ae3ab98d8
Merge branch 'master' into split_personal-user_passwordchange
2013-09-11 16:35:55 +02:00
f6faec0e0b
Use a controller instead of two files for changepassword.php
2013-09-11 16:35:13 +02:00
72689f643b
[tx-robot] updated from transifex
2013-09-10 10:42:16 -04:00
1832eb8872
Pass view in \OC_Avatar to constructor and use $_ for enable_avatars
2013-09-09 16:57:46 +02:00
92f6c3bb10
[tx-robot] updated from transifex
2013-09-08 21:37:53 -04:00
4963a5b30f
Fix language selection; Fix #4756
2013-09-07 16:28:51 +02:00
e895cf9188
[tx-robot] updated from transifex
2013-09-07 04:46:57 -04:00
4aa84047fe
Remove $recoveryPassword from changepersonalpassword & fix indent
2013-09-06 17:05:10 +02:00
d18a070a03
Have the "notsquare" error as data, not as message
2013-09-06 13:46:50 +02:00
a21376480d
Split personal and user-mgmt password change logic
2013-09-06 08:05:07 +02:00
3774632ecc
Clean up avatars and preliminary use JSON->rawlist.php
2013-09-05 23:12:52 +02:00
15ab798353
Fix an IE8 bug with the avatarcropper.
...
1. Crop an avatar
2. Crop another avatar without reloading
-> Second cropper is 28px x 30px big
2013-09-05 19:26:02 +02:00
f8563ec583
Merge branch 'master' into sharing_mail_notification_master
...
increased version number to trigger db update
Conflicts:
lib/util.php
2013-09-05 13:39:45 +02:00
0527fb05ad
[tx-robot] updated from transifex
2013-09-05 07:37:32 -04:00
6db96603a0
Have login-checks and CSRF checks
2013-09-05 00:04:31 +02:00
fca5db748b
Remove backgroundcolor on updating avatar, and add a missing parameter
2013-09-04 13:16:21 +02:00
820fd42161
Merge branch 'master' into oc_avatars
2013-09-04 12:56:40 +02:00
a1e7614d73
Clean up oc_avatars
2013-09-04 12:56:14 +02:00
09187f3b3b
Merge pull request #4449 from owncloud/clean_up_util
...
Clean up \OC\Util
2013-09-03 22:53:03 -07:00
32a7ba9823
Don't update avatar on displayNameChange anymore
2013-09-04 07:13:09 +02:00
6d42f51d0c
Fix unwanted caching in IE8
2013-09-03 18:34:40 +02:00
4724d60ecd
Partly fix cropper in IE8 and don't use a dialog for it
2013-09-03 17:40:41 +02:00
fe0b8ac2c0
[tx-robot] updated from transifex
2013-09-03 07:46:55 -04:00
65413a95dc
Merge branch 'master' into oc_avatars
...
Conflicts:
config/config.sample.php
2013-09-03 04:43:11 +02:00
3ce4bf5ec7
use css class hidden to hide setting elements
2013-09-02 17:14:11 +02:00
e7e3f1b81a
Fix some of @jancborchardt's complaints in oc_avatars
2013-09-02 17:07:38 +02:00
b918c06be6
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
lib/util.php
2013-09-02 14:41:46 +02:00
91c0923cce
Merge pull request #4663 from owncloud/fix-sticky-apps
...
fix issues caused by introduction of sticky Apps management footer
2013-09-02 01:11:09 -07:00
e5fc7b9dbe
Merge branch 'master' into clean_up_util
...
Conflicts:
lib/base.php
2013-09-02 07:58:06 +02:00
e68b5f8b0d
[tx-robot] updated from transifex
2013-09-01 13:30:40 -04:00
c95d4cafa9
Fix @tanghus's complains in avatars and clean up cropper after closing with "x"
2013-09-01 19:12:54 +02:00
76b1b5b6a3
Provide 'enable_avatars' in config.php, to disable avatars
2013-09-01 18:17:14 +02:00
aa88eea9cf
Sanitize displayname, respect data @ $element, fix routename, clean after cropping, updateAvatar with displayname
2013-08-31 18:27:28 +02:00
5d653753bd
Merge branch 'master' into oc_avatars
2013-08-31 12:56:36 +02:00
dbc78b1a58
[tx-robot] updated from transifex
2013-08-30 09:38:20 -04:00
77adaee645
enable user to inform recipients about a shared file by mail
2013-08-30 13:53:49 +02:00
1e834c57a4
fix issues caused by introduction of sticky Apps management footer
2013-08-30 13:46:10 +02:00
80e10f01c4
Clean up
2013-08-30 13:16:13 +02:00
ecf187393b
Finish cropper, Get rid of TODOs, Improve \OCP\Avatar and "fix" unitests
2013-08-30 09:00:37 +02:00
c533b80682
Use OC_Cache and finish cropper functionality
2013-08-29 16:56:32 +02:00
0c708be76b
Use defaultavatars
2013-08-29 14:26:11 +02:00
e66113f50d
Include placeholder.js
2013-08-28 23:23:17 +02:00
1d04843ef0
no duplicate declaration of appLicense + camelCase
2013-08-28 22:42:43 +02:00
6c7efd5dac
Work around #4630 to fix license showing
2013-08-28 22:12:01 +02:00
bdf48a6daa
Use OC.Router.generate, TODO use cache, prepare for defaultavatars
2013-08-28 21:20:28 +02:00
67c5be9f19
Merge branch 'master' into oc_avatars
...
Conflicts:
3rdparty
2013-08-28 16:44:11 +02:00
8d8a57de7f
Continue work on cropper
2013-08-28 16:39:00 +02:00
0c02e1efef
Merge pull request #4563 from owncloud/use_personal-password
...
Use personal-password for the password name in personal.php
2013-08-28 06:23:13 -07:00
3e7ddbc9d9
[tx-robot] updated from transifex
2013-08-28 06:24:14 -04:00
d5062b9e0e
[tx-robot] updated from transifex
2013-08-27 11:23:18 -04:00
ea446544ef
Merge pull request #4586 from owncloud/fixing-3431-master
...
kill zh_CN.GB2312
2013-08-27 02:00:48 -07:00
c9123263ab
kill zh_CN.GB2312
2013-08-27 01:27:05 +02:00
8cf9336bcb
storage information is path specific
2013-08-27 00:59:58 +02:00
e6473e6d49
Clean up some cruft
2013-08-26 17:41:19 +02:00
31736a1df3
Have a controller instead ofo avatar.php and fix some cropper-design
2013-08-26 16:46:55 +02:00
d587146a5a
[tx-robot] updated from transifex
2013-08-25 19:21:52 -04:00
9a8908b643
Use Jcrop, have inline errormsg, work on cropping, clean up, WIP
2013-08-25 21:06:44 +02:00
81cadd5ea3
Remove gravatar and no-avatar functionality, prepare for default avatars even more and reword some stuff
2013-08-25 21:06:02 +02:00
0a4febf1eb
Integrate newavatar.php into avatar.php by using GET, POST & DELETE
2013-08-25 21:06:01 +02:00
cd2f7bdaef
Deny access for non-users and add a (not-working) override button
2013-08-25 21:06:01 +02:00
9c12da6a94
Several improvements
...
- Don't use gravatars default avatars
- Use "profile image" instead of "avatar"
- Use <p> instead of tables
- Ease updateAvatar()
- Actually return something in \OCP\Avatar
2013-08-25 21:05:40 +02:00
d7e6c77e20
Have a fancy uploadavatar button
2013-08-25 21:05:40 +02:00
9500109349
Refactor newavatar.php and show (for now) an alert on problems when setting new avatars
2013-08-25 21:05:40 +02:00
33827d690e
Use avatar.php in user-management
2013-08-25 21:05:38 +02:00
131d0edab6
Show avatar on personal.php always (except if avatars are disabled)
2013-08-25 21:04:49 +02:00
4521b54c67
Have /avatar.php as a central avatar-point
2013-08-25 21:04:49 +02:00
252548c62c
Improve styling & enable avatar-upload at personal page
2013-08-25 21:04:45 +02:00
a58d270684
Load avatar from path, if one's provided
2013-08-25 21:04:09 +02:00
2bfe662235
Add unittests & check filetype in setLocalAvatar()
...
TODO: Fix OC_Image->mimetype(), it always returns "image/png"
2013-08-25 21:04:09 +02:00
fac671b14e
Modularize get(), async getAvatar, avatars @ usermgmt
...
And other small improvements
2013-08-25 21:04:04 +02:00
4a08f7d710
Add basic avatars and gravatar
2013-08-25 21:02:43 +02:00
b8965c6107
Merge pull request #4331 from owncloud/improve_app-management
...
Improve app-management
2013-08-25 11:56:56 -07:00
fbe7a68ce8
Use personal-password for the password name in personal.php
...
Fix #4491
2013-08-24 14:31:32 +02:00
596ac40b7f
[tx-robot] updated from transifex
2013-08-23 20:17:08 -04:00
02b2b5a808
[tx-robot] updated from transifex
2013-08-22 10:37:23 -04:00
0ce35af02a
Merge branch 'master' into improve_app-management
...
Conflicts:
settings/js/apps.js
2013-08-21 19:20:25 +02:00
a89199cc7b
[tx-robot] updated from transifex
2013-08-21 08:14:27 -04:00
90da518e3e
Merge pull request #4262 from owncloud/fix_jslint_kondou
...
Fix some JSLint warnings
2013-08-20 12:45:10 -07:00
f1518a54df
Merge branch 'master' into clean_up_util
...
Conflicts:
lib/util.php
2013-08-20 17:20:30 +02:00
de949b1caa
Merge pull request #4447 from owncloud/fix_4351_master
...
Use JSON to send/receive group data.
2013-08-20 02:49:48 -07:00
e9644c2f52
[tx-robot] updated from transifex
2013-08-19 15:14:38 -04:00
9be836814c
Merge pull request #4239 from owncloud/decrypt_files_again
...
Enable user to decrypt files again after encryption app was disabled
2013-08-18 09:51:48 -07:00
7c296a6cf9
Move .errormsg from settings-css to .warning in core. Reusable!
2013-08-18 17:37:22 +02:00
c7af26ec84
Merge pull request #4497 from owncloud/newlines_at_eof_kondou
...
Add newlines at the end of files
2013-08-18 07:16:15 -07:00
db424cc86b
Use appitem instead of always recreating a jquery object
...
Also fix some wrong data storages
2013-08-18 14:49:11 +02:00
9f4bd7cb47
Don't use an alert for displaying app-mgmt-errors
...
Rather display a dominant div and mark the problematic app in the applist.
Fix #305
2013-08-18 13:49:34 +02:00
c741a25eaa
Merge branch 'master' into improve_app-management
2013-08-18 12:15:22 +02:00
9e8a6b704d
Add _many_ newlines at the end of files
2013-08-18 11:06:59 +02:00
9840363488
Break long lines into smaller ones.
2013-08-18 05:03:20 -04:00
65d802329f
Fix some naming and spacing in lib/util.php
2013-08-18 10:33:09 +02:00
edd92e4c09
Merge branch 'master' into fix_jslint_kondou
...
Conflicts:
apps/files/js/file-upload.js
2013-08-18 00:38:52 +02:00
4f462e9b6f
Add trailing comma for all touched array lines.
2013-08-17 23:39:26 +02:00
d38929fb10
Fix spacing of all touched lines.
2013-08-17 23:38:26 +02:00
cabe92ef12
Merge branch 'master' into decrypt_files_again
...
Conflicts:
apps/files_encryption/tests/keymanager.php
2013-08-17 13:15:22 +02:00
29b6dd53a0
Compare result are already true/false
2013-08-17 12:58:10 +02:00
264ee9df9a
Merge pull request #4476 from owncloud/doc-on-master
...
fix difference between packaged version and master
2013-08-17 03:13:17 -07:00
de52157e76
remove ru_RU - fixes #3135
2013-08-17 11:43:37 +02:00
746d32eb05
fix difference between packaged version and master
2013-08-17 10:33:11 +02:00
1e8849b04e
Merge pull request #4314 from owncloud/css-fixes
...
Design fixes
2013-08-16 01:05:29 -07:00
6bd0ba79df
[tx-robot] updated from transifex
2013-08-16 01:32:30 -04:00
399adf67b0
merge master into css-fixes
2013-08-16 00:29:43 +02:00
9c5416fe4a
Clean up \OC\Util
...
- Use camelCase
- Add some phpdoc
- Fix some indents
- Use some more spacing
2013-08-15 15:57:32 +02:00
cd7e57e8ec
Use JSON to send/receive group data.
...
Squashed commits from PR #4364 for master.
2013-08-15 06:19:40 -04:00
9492aeffe9
[tx-robot] updated from transifex
2013-08-13 09:13:11 -04:00
53bb89824d
check if some encrypted files are left after the app was disabled and warn the user
2013-08-12 17:25:27 +02:00
80e9744da0
Merge branch 'master' into improve_app-management
2013-08-09 18:02:40 +02:00
605050df9b
Log exception at the catching code
2013-08-09 18:01:49 +02:00
4c0ec974b9
Merge pull request #4344 from owncloud/appmgmt-in-navigation
...
show 'More apps' link to app administration directly in app navigation
2013-08-09 08:49:41 -07:00
98f836363a
[tx-robot] updated from transifex
2013-08-09 08:06:31 -04:00
8652137ad6
Merge pull request #3912 from owncloud/css_cleanup_kondou
...
General CSS cleanup
2013-08-08 07:31:01 -07:00
31d50288a5
draw attention to the newly added app entry by flashing it twice
2013-08-07 21:54:28 +02:00
7a9daa99d1
scroll the app navigation down so the newly added app is seen
2013-08-07 21:53:53 +02:00
775f33cc1b
prepend the new app before the 'More apps' function
2013-08-07 21:53:25 +02:00
367b248bc0
show 'More apps' link to app administration directly in app navigation
2013-08-07 18:18:09 +02:00
0deae7b86f
[tx-robot] updated from transifex
2013-08-07 09:04:32 -04:00
1a4465f41d
Improve app-management
...
- Better error messages
- Translate untranslated strings
Basically picks non-app-dependency related stuff from #4017
2013-08-06 17:19:18 +02:00
9923fe655b
[tx-robot] updated from transifex
2013-08-04 02:01:28 -04:00
17fe748abc
[tx-robot] updated from transifex
2013-08-03 01:56:46 -04:00
16726ab793
[tx-robot] updated from transifex
2013-08-02 02:00:45 -04:00
0c1008bb69
Some styling to user list
2013-08-01 19:53:41 +03:00
1348330c7d
Fix a syntax error & have if-conds in an own line
2013-08-01 18:44:01 +02:00
b037f2dc6e
[tx-robot] updated from transifex
2013-08-01 01:57:04 -04:00
aaf0fec9f5
Fix some JSLint warnings
2013-07-31 21:21:02 +02:00
8eaa0e7336
remove table layout for background jobs
2013-07-31 10:04:02 +02:00
761f40328c
[tx-robot] updated from transifex
2013-07-31 02:01:45 -04:00
c7eba69aea
only show decrypt all files option if encrypted files are available
2013-07-30 12:26:07 +02:00
a7a7ef2b3a
improved error handling
2013-07-30 09:48:30 +02:00
88e1ccbce3
[tx-robot] updated from transifex
2013-07-30 01:57:50 -04:00
b6fa0e4eef
working decrypt files method
2013-07-29 17:06:05 +02:00
830f5d24c7
add decryptall.php
2013-07-29 13:39:56 +02:00
0a3d662dd0
register decrypt all route
2013-07-29 13:39:37 +02:00
e15e394fcc
add ajax call to decrypt all files
...
Conflicts:
apps/files_encryption/lib/crypt.php
2013-07-29 13:39:05 +02:00
2c8e5ec84f
user interface to allow user to decrypt all his files once the encryption app was disabled
...
Conflicts:
settings/templates/personal.php
2013-07-29 13:36:06 +02:00
0fde473cb7
[tx-robot] updated from transifex
2013-07-29 01:57:04 -04:00
48621115c1
[tx-robot] updated from transifex
2013-07-28 01:58:28 -04:00
fa35650e0a
[tx-robot] updated from transifex
2013-07-27 02:03:03 -04:00
92af840a51
Merge branch 'master' into css_cleanup_kondou
...
Conflicts:
core/css/styles.css
settings/templates/personal.php
2013-07-24 20:35:00 +02:00
75fd6d4fde
initialize OC_Defaults in template constructorX
2013-07-24 11:51:21 +02:00
1a73e607bd
Merge branch 'master' into more-themable-strings
...
Conflicts:
lib/template.php
2013-07-24 09:35:33 +02:00
7bb6aab8ee
[tx-robot] updated from transifex
2013-07-24 01:57:21 -04:00
840e96cda3
Merge branch 'master' into disable-anon-upload-master
...
Conflicts:
settings/templates/admin.php
2013-07-22 11:55:20 +02:00
934f2e94a3
Merge branch 'master' into disable-anon-upload-master
2013-07-22 11:36:52 +02:00
342a54bf7b
Merge pull request #2980 from owncloud/===_and_!==_in_settings
...
Use !== and === in settings.
2013-07-22 02:32:40 -07:00
01f3f8e0cc
[tx-robot] updated from transifex
2013-07-22 02:03:23 -04:00
05084e03a0
Use !== and === in settings.
2013-07-21 13:55:25 +02:00
9a13b687cc
[tx-robot] updated from transifex
2013-07-21 02:02:41 -04:00
ae82f7fd17
[tx-robot] updated from transifex
2013-07-19 02:03:14 -04:00
279a71acb3
[tx-robot] updated from transifex
2013-07-18 02:02:51 -04:00
a8acbfdf7b
[tx-robot] updated from transifex
2013-07-16 02:06:21 -04:00
2964027cad
Merge branch 'disable-anon-upload-master' of github.com:owncloud/core into disable-anon-upload-master
2013-07-14 22:00:42 +02:00
79d23463f8
No admin option to enable public upload in case encryption is enabled
...
No upload on pubic page if public upload is disabled
2013-07-14 21:58:08 +02:00
995feea42a
Use transifex.com on link to translations
2013-07-14 11:54:39 +02:00
29d8ae2f95
[tx-robot] updated from transifex
2013-07-14 02:10:41 +02:00
583addaea1
[tx-robot] updated from transifex
2013-07-13 02:07:35 +02:00
7a44d45714
change anonymous to public
2013-07-12 21:34:38 +02:00
fc2d538311
new admin setting added which allows to turn off anonymous uploads
2013-07-12 17:03:51 +02:00
3fbf7ab189
[tx-robot] updated from transifex
2013-07-12 02:12:25 +02:00
7741ca0bcc
use themable strings for admin page, simplify admin export, fix rest of #3791
2013-07-11 17:41:36 +02:00
f74659f3f6
[tx-robot] updated from transifex
2013-07-11 02:26:22 +02:00
efb707a431
Use OC instead of oc to show alert at an error.
...
Related to #4001
2013-07-10 04:28:54 +02:00
7ec6f3bde9
[tx-robot] updated from transifex
2013-07-10 02:20:59 +02:00
Arthur Schiwon
Jenkins for ownCloud
Volkan Gezer
Vincent Petry
Stephane V
Morris Jobke
Georg Ehrke
Jan-Christoph Borchardt
icewind1991
raghunayyar
Steffen Lindner
Joas Schilling
Morris Jobke
Bjoern Schiessle
Lukas Reschke
Volkan Gezer
Thomas Müller
Bart Visscher
Robin Appelman
Frank Karlitschek
ringmaster
Thomas Tanghus
David Prévot
kondou
Felix Niklas
Victor Dubiniuk
Bernhard Posselt
Björn Schießle
Andreas Fischer
rolandgeider