Commit Graph

1818 Commits

Author SHA1 Message Date
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
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
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
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
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