wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
20598 commits 157 branches 562 tags 714 MiB
Commit graph

1910 commits

Author SHA1 Message Date
Robin Appelman
d0266c0bf8 Use public api for getting l10n 2014-08-31 10:08:22 +02:00
Jenkins for ownCloud
23137f4798 [tx-robot] updated from transifex 2014-08-31 01:56:20 -04:00
Jenkins for ownCloud
53f3b7ab52 [tx-robot] updated from transifex 2014-08-30 01:57:04 -04:00
Morris Jobke
0aede0f413 move hardcoded color to CSS class - for themeability 2014-08-29 17:50:59 +02:00
Jan-Christoph Borchardt
41ace03911 color quota bar yellow for feedback if usage is over 90% 2014-08-29 16:46:08 +02:00
Morris Jobke
2764ceb14c Merge pull request #9684 from owncloud/fix-9367 
Ability to show/hide last log in and storage location in user management
 2014-08-29 12:46:53 +02:00
Jenkins for ownCloud
359590d576 [tx-robot] updated from transifex 2014-08-29 01:56:59 -04:00
Jan-Christoph Borchardt
ba841d9561 user mgmt: move 'Show storage location' and 'Show last log in' to settings area 2014-08-29 00:08:01 +02:00
Stephane V
c7c54d9361 Adds 2 checkboxes at the top of userlist in the settings, to display/hide optional columns 
This fixes #9367.
 2014-08-28 23:45:21 +02:00
Clark Tomlinson
54eb2f42df Merge pull request #10647 from owncloud/implementing_momentjs 
Implementing momentjs
 2014-08-28 11:47:37 -04:00
Clark Tomlinson
92685acf60 Implementing moment.js 
Updating Usages

Removing unused method

Adding JS Doc
 2014-08-28 09:28:45 -04:00
Jenkins for ownCloud
1b342a70d6 [tx-robot] updated from transifex 2014-08-28 01:56:36 -04:00
Jenkins for ownCloud
2740908a5b [tx-robot] updated from transifex 2014-08-27 01:54:40 -04:00
Dan Callahan
6cca20fb36 Set email input field to type=email for better UX 2014-08-26 11:14:30 -05:00
Jenkins for ownCloud
c733842a9a [tx-robot] updated from transifex 2014-08-26 01:56:33 -04:00
Jenkins for ownCloud
adca48aa93 [tx-robot] updated from transifex 2014-08-25 01:56:07 -04:00
Jenkins for ownCloud
70db496b58 [tx-robot] updated from transifex 2014-08-24 01:56:10 -04:00
Jenkins for ownCloud
047ec64ac0 [tx-robot] updated from transifex 2014-08-23 01:57:00 -04:00
Thomas Müller
a77d468d35 Merge pull request #10584 from owncloud/simple-wizard-trusted-domains 
Add a trusted domain wizard
 2014-08-22 17:12:17 +02:00
Lukas Reschke
dd871098c5 Redirect user after clicking on link 
Use DI
 2014-08-22 16:01:03 +02:00
Jenkins for ownCloud
8c94153d3e [tx-robot] updated from transifex 2014-08-22 01:56:25 -04:00
Lukas Reschke
97b536e3df Add a trusted domain wizard 
Adds a little button to the trusted domain warning, if an admin clicks on the warning he will be redirected to ownCloud and asked whether he want to trust this domain.

By far not the cleanest code, or clean at all, but does the job and I don't see a reason to make a lot of changes for this little improvement.
 2014-08-21 22:22:35 +02:00
Jenkins for ownCloud
952fac8493 [tx-robot] updated from transifex 2014-08-21 01:56:31 -04:00
Jenkins for ownCloud
ea8c0bce08 [tx-robot] updated from transifex 2014-08-20 01:56:58 -04:00
Robin Appelman
fdfc5c67f8 Merge pull request #9866 from owncloud/app-upgrade 
Don't do app upgrades in the background
 2014-08-19 13:33:38 +02:00
Morris Jobke
43266526e8 Merge pull request #10500 from owncloud/fix_userlist_settings_ajax 
properly encode groups as json, not ',' separated
 2014-08-19 10:36:10 +02:00
Jenkins for ownCloud
77cfddff0f [tx-robot] updated from transifex 2014-08-19 01:57:09 -04:00
Jörn Friedrich Dreyer
a1e8dd14a1 properly encode groups as json, not ',' separated 2014-08-18 19:47:50 +02:00
Vincent Petry
a820df71ee Merge pull request #10339 from owncloud/users-defaultquotafix 
Fixed default quota field on user management page
 2014-08-18 18:50:43 +02:00
Joas Schilling
64d64610d2 Add a note about overwritewebroot when using system cron 
If the current webroot is non-empty but the webroot from the config is,
and system cron is used, the URL generator fails to build valid URLs.
So we notify the admin to set it up correctly.

Fix #9995
 2014-08-18 11:10:22 +02:00
Jenkins for ownCloud
4dd07f572c [tx-robot] updated from transifex 2014-08-18 01:56:30 -04:00
Lukas Reschke
69e0e23789 Merge pull request #10407 from owncloud/rm-obsolete-japanese 
remove obsolete japanese lang code
 2014-08-17 19:07:14 +02:00
Jenkins for ownCloud
b1415fc4fc [tx-robot] updated from transifex 2014-08-17 01:56:22 -04:00
Jenkins for ownCloud
c132dd6357 [tx-robot] updated from transifex 2014-08-16 01:56:44 -04:00
Jenkins for ownCloud
93f5e90c9f [tx-robot] updated from transifex 2014-08-15 01:56:14 -04:00
Volkan Gezer
a4b416f115 Merge pull request #10410 from owncloud/typo 
ascii typo
 2014-08-14 12:23:49 +02:00
Jenkins for ownCloud
67b7160e7b [tx-robot] updated from transifex 2014-08-14 01:55:35 -04:00
Volkan Gezer
46309a9ee4 ascii typo 2014-08-14 00:32:08 +02:00
Volkan Gezer
d1f483c9ed remove obsolete japanese lang code 2014-08-13 22:35:08 +02:00
Arthur Schiwon
4220e0c7da it does not affect gravity on planet earth, but only for tipsy 2014-08-13 14:20:14 +02:00
Jenkins for ownCloud
609a52ebe2 [tx-robot] updated from transifex 2014-08-13 01:54:44 -04:00
Bjoern Schiessle
c67fee3abd fix broken variable name, recoveryPasswordSupported is now recoveryEnabledForUser 2014-08-12 21:15:55 +02:00
Arthur Schiwon
288b6d4071 make singleselect check for gravity wish, and make it south for default quota 2014-08-12 18:04:52 +02:00
Vincent Petry
25a8588f7b Fix default quota settings field 
The default quota settings field is initially hidden which makes it
impossible for singleSelect() to make its width measurements.

This fix uses the app navigation slide "show" event to defer the
singleSelect() initialization on the default quota field.

Refactored setQuota() into UserList._updateQuota().
Refactored duplicate event handler code into UserList.onQuotaSelect().
 2014-08-12 12:00:34 +02:00
Vincent Petry
c208796c47 Use global apps slide toggle logic 
Remove local app settings slide logic and make it use the global one
triggered by the "data-apps-slide-toggle" attribute.
 2014-08-12 12:00:34 +02:00
Thomas Müller
3e493501da Merge pull request #9890 from owncloud/check-php-charset-master 
setting and checking default_charset in php.ini to be UTF-8
 2014-08-11 22:11:11 +02:00
Vincent Petry
173059f6d0 Fixed file list sorting 
Now using a natural sort algorithm that is more consistent between JS
and PHP (although not perfect in some corner cases)

- added OC.Util.naturalSortComparator that uses the same algo that was
  used for the user list
- changed user list and files list to use OC.Util.naturalSortComparator
- removed toLowerCase() and changed the comparator to use
  String.localeCompare()
- added unit tests
- added OC_NaturalSort that is used by OCP\Util::naturalSortCompare()
 2014-08-11 13:28:53 +02:00
Thomas Müller
c42ce20054 Merge pull request #10312 from owncloud/fix-old-japanese 
fix old Japanese language code redirection
 2014-08-11 12:55:39 +02:00
Jenkins for ownCloud
411f6c7704 [tx-robot] updated from transifex 2014-08-11 01:54:32 -04:00
Volkan Gezer
bcee9d6ab7 fix old Japanese language code redirection 
ja_JP has not been updated since March and the reference
to this language should be removed. It also exists as *ja*
on Transifex
 2014-08-09 16:52:08 +02:00
Jenkins for ownCloud
2821f7241b [tx-robot] updated from transifex 2014-08-07 01:55:10 -04:00
Björn Schießle
d35bfc9a4c Merge pull request #9520 from owncloud/theme_urls 
Add ability to theme iOS and Android client URLs just like desktop URLs.
 2014-08-05 17:53:18 +02:00
Morris Jobke
54030f4eef Merge pull request #10176 from owncloud/fix-install-icon-size 
use correct app-icon class for new apps as well, fix icon size
 2014-08-05 16:04:30 +02:00
Morris Jobke
892d824804 Merge pull request #10154 from owncloud/uninstall-undefined-appitem 
Fix undefined variable when uninstalling an app
 2014-08-05 15:13:15 +02:00
Jan-Christoph Borchardt
fa9659ae69 use correct app-icon class for new apps as well, fix icon size 2014-08-05 14:23:25 +02:00
scolebrook
8c43584450 Added to personal settings page. 2014-08-05 13:16:51 +02:00
Robin Appelman
087e68b11a Fix undefined variable when uninstalling an app 2014-08-04 17:42:02 +02:00
tomneedham
7c39c02ee5 Set group usercount to 0, not '', fixes #9782 2014-08-04 13:55:33 +00:00
Robin Appelman
5c1f572149 Set maintaince mode when updating an app from the app store 2014-08-04 13:41:05 +02:00
Jenkins for ownCloud
5a2952e2eb [tx-robot] updated from transifex 2014-08-04 01:54:39 -04:00
Jenkins for ownCloud
d1aaa7a12e [tx-robot] updated from transifex 2014-08-02 01:54:33 -04:00
Jenkins for ownCloud
c1562057e8 [tx-robot] updated from transifex 2014-07-31 01:55:01 -04:00
Der-Jan
84ea393393 Fixed wrong brackets in apps settings 2014-07-30 17:23:19 +02:00
Thomas Müller
673a8bb2b8 only call exec() if allowed to 2014-07-29 16:59:40 +02:00
Jenkins for ownCloud
29a3f1e2af [tx-robot] updated from transifex 2014-07-29 09:16:02 +02:00
Jenkins for ownCloud
a169572223 [tx-robot] updated from transifex 2014-07-28 01:54:30 -04:00
Jenkins for ownCloud
9a4d2871eb [tx-robot] updated from transifex 2014-07-27 01:54:31 -04:00
Jenkins for ownCloud
010732019a [tx-robot] updated from transifex 2014-07-26 01:54:40 -04:00
Thomas Müller
07dc0b2fdf setting and checking default_charset in php.ini to be UTF-8 2014-07-25 09:53:25 +02:00
Jenkins for ownCloud
3f58d949e0 [tx-robot] updated from transifex 2014-07-25 01:54:32 -04:00
Jenkins for ownCloud
e2327f83ed [tx-robot] updated from transifex 2014-07-24 01:54:37 -04:00
Jenkins for ownCloud
5696a88fc3 [tx-robot] updated from transifex 2014-07-22 01:54:29 -04:00
Vincent Petry
675e3eec32 Merge pull request #9750 from owncloud/issue/9745 
Correctly use groups parameter only when its not empty
 2014-07-21 20:45:24 +02:00
Joas Schilling
0dc67cb1c2 Do not force isAdmin as true and so the list is filtered correctly 2014-07-21 11:30:47 +02:00
Joas Schilling
e6c75aa974 Fix username for subadmins and only send subadmin groups 
Fix #9748
 2014-07-21 11:20:55 +02:00
Joas Schilling
c84c1f519f Correctly use groups parameter only when its not empty 
Fix #9745
 2014-07-21 10:46:21 +02:00
Jenkins for ownCloud
ddd8eae932 [tx-robot] updated from transifex 2014-07-21 01:54:30 -04:00
Morris Jobke
252c239a2a Merge pull request #9732 from owncloud/fix-9716 
do not show selected groups twice after user creation
 2014-07-20 16:08:39 +02:00
Jenkins for ownCloud
ddc85a9871 [tx-robot] updated from transifex 2014-07-20 01:54:40 -04:00
Jenkins for ownCloud
d09ec36751 [tx-robot] updated from transifex 2014-07-19 01:54:42 -04:00
Arthur Schiwon
1d39282360 $.unique works only for DOM elements 2014-07-18 21:10:19 +02:00
Jenkins for ownCloud
80983f5853 [tx-robot] updated from transifex 2014-07-18 01:54:43 -04:00
blizzz
e85f078d17 Merge pull request #9705 from owncloud/ie8-userspagefix 
Fixed JS and CSS issues in users page
 2014-07-17 16:42:19 +02:00
Vincent Petry
4d5ebe61c4 Fixed JS and CSS issues in users page 
- Renamed "delete" to "deleteEntry" to make IE8 happy.
- Added missing "svg" class for the "+" button
- Added height to "+" button but was unable to properly align it
 2014-07-17 13:13:03 +02:00
Jenkins for ownCloud
b736864e78 [tx-robot] updated from transifex 2014-07-17 01:55:09 -04:00
Stephan Peijnik
4d74aa09bf Port of #9584 
Fixes #9583

lib/private/group/metadata.php: For subadmins also return an array of groups, indexed by their GIDs.
settings/users.php: Convert array of arrays to array of GIDs before calling into OC_Group::displayNamesInGroups.

Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>

Fix indentation.

Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>

Renamed $grp to $group in foreach loop.

Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>

Use is_null() instead of empty() when checking the return value of GroupManager::get().

Additionally, $grp was renamed to $group inside
 \OC\Group\MetaData::fetchGroups().

Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>

Updated code to reflect changes introduced to \OC\Group\MetaData.

Now that fetchGroups() does not exist anymore and getGroups() is called
directory, the 'groups' property does not exist anymore.
Instead, we now generate that array on the fly and return it from getGroups.

Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
 2014-07-16 12:23:26 +02:00
Jenkins for ownCloud
0155326227 [tx-robot] updated from transifex 2014-07-16 01:55:55 -04:00
blizzz
d22904612b Merge pull request #9628 from edozzo/master 
Userlist: async load doesnt fill checked group/subadmin array
 2014-07-15 19:10:01 +02:00
DeLtAfOx
cd97847cd6 Strinct comparsion fix 2014-07-15 13:44:41 +02:00
DeLtAfOx
26d9993b3e Userlist: async load doesnt fill checked group/subadmin array 2014-07-15 07:52:04 +02:00
Arthur Schiwon
ab2c7e06a4 remove dead code 
do not filter groups. but update the user count according to the filter

improve phpdoc

improve metadata runtime cache

add metadata tests
 2014-07-14 21:26:37 +02:00
Jenkins for ownCloud
5dd76b510f [tx-robot] updated from transifex 2014-07-14 01:54:27 -04:00
Jenkins for ownCloud
d7b8e3209b [tx-robot] updated from transifex 2014-07-13 01:54:35 -04:00
Jenkins for ownCloud
c1e95d62ec [tx-robot] updated from transifex 2014-07-12 01:54:39 -04:00
Vincent Petry
4d08367b7c Merge pull request #9525 from owncloud/incrementuser2 
increment/decrement group and user counts when necessary
 2014-07-10 16:09:18 +02:00
Jenkins for ownCloud
77792b5b7e [tx-robot] updated from transifex 2014-07-10 04:59:40 -04:00
Thomas Müller
db07c33ecd use .filterAttr() 2014-07-09 16:52:52 +02:00
Thomas Müller
56f029d524 use .filterAttr() 2014-07-09 16:48:26 +02:00
Thomas Müller
899d6eab00 some more cleanup 2014-07-09 16:36:51 +02:00
Thomas Müller
b15510ed9a magic strings - bad kungfu 2014-07-09 16:13:33 +02:00