summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #10410 from owncloud/typoVolkan Gezer2014-08-141-1/+1
|\ | | | | ascii typo
| * ascii typoVolkan Gezer2014-08-141-1/+1
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2014-08-143-0/+6
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-08-1310-0/+23
|
* fix broken variable name, recoveryPasswordSupported is now ↵Bjoern Schiessle2014-08-121-3/+3
| | | | recoveryEnabledForUser
* Merge pull request #9890 from owncloud/check-php-charset-masterThomas Müller2014-08-112-6/+21
|\ | | | | setting and checking default_charset in php.ini to be UTF-8
| * setting and checking default_charset in php.ini to be UTF-8Thomas Müller2014-07-252-6/+21
| |
* | Merge pull request #10312 from owncloud/fix-old-japaneseThomas Müller2014-08-111-1/+1
|\ \ | | | | | | fix old Japanese language code redirection
| * | fix old Japanese language code redirectionVolkan Gezer2014-08-091-1/+1
| | | | | | | | | | | | | | | | | | ja_JP has not been updated since March and the reference to this language should be removed. It also exists as *ja* on Transifex
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-111-0/+62
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2014-08-071-14/+14
| |
* | Merge pull request #9520 from owncloud/theme_urlsBjörn Schießle2014-08-051-2/+2
|\ \ | | | | | | Add ability to theme iOS and Android client URLs just like desktop URLs.
| * | Added to personal settings page.scolebrook2014-08-051-2/+2
| | |
* | | Merge pull request #10176 from owncloud/fix-install-icon-sizeMorris Jobke2014-08-051-1/+1
|\ \ \ | | | | | | | | use correct app-icon class for new apps as well, fix icon size
| * | | use correct app-icon class for new apps as well, fix icon sizeJan-Christoph Borchardt2014-08-051-1/+1
| |/ /
* | | Merge pull request #10154 from owncloud/uninstall-undefined-appitemMorris Jobke2014-08-051-1/+2
|\ \ \ | |/ / |/| | Fix undefined variable when uninstalling an app
| * | Fix undefined variable when uninstalling an appRobin Appelman2014-08-041-1/+2
| | |
* | | Set group usercount to 0, not '', fixes #9782tomneedham2014-08-041-1/+3
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2014-08-041-1/+1
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2014-08-022-0/+32
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2014-07-311-0/+5
| |
* | Fixed wrong brackets in apps settingsDer-Jan2014-07-301-1/+1
| |
* | only call exec() if allowed toThomas Müller2014-07-291-3/+5
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2014-07-292-1/+22
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2014-07-283-0/+7
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2014-07-274-1/+19
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2014-07-263-5/+7
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-07-251-0/+2
|
* [tx-robot] updated from transifexJenkins for ownCloud2014-07-241-0/+13
|
* [tx-robot] updated from transifexJenkins for ownCloud2014-07-221-0/+1
|
* Merge pull request #9750 from owncloud/issue/9745Vincent Petry2014-07-211-7/+9
|\ | | | | Correctly use groups parameter only when its not empty
| * Correctly use groups parameter only when its not emptyJoas Schilling2014-07-211-7/+9
| | | | | | | | Fix #9745
* | Do not force isAdmin as true and so the list is filtered correctlyJoas Schilling2014-07-211-3/+1
| |
* | Fix username for subadmins and only send subadmin groupsJoas Schilling2014-07-211-2/+5
|/ | | | Fix #9748
* [tx-robot] updated from transifexJenkins for ownCloud2014-07-211-0/+7
|
* Merge pull request #9732 from owncloud/fix-9716Morris Jobke2014-07-201-1/+3
|\ | | | | do not show selected groups twice after user creation
| * $.unique works only for DOM elementsArthur Schiwon2014-07-181-1/+3
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2014-07-201-0/+1
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2014-07-191-1/+6
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-07-181-1/+115
|
* Merge pull request #9705 from owncloud/ie8-userspagefixblizzz2014-07-175-6/+11
|\ | | | | Fixed JS and CSS issues in users page
| * Fixed JS and CSS issues in users pageVincent Petry2014-07-175-6/+11
| | | | | | | | | | | | - 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
* | [tx-robot] updated from transifexJenkins for ownCloud2014-07-172-22/+75
|/
* Port of #9584Stephan Peijnik2014-07-161-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* [tx-robot] updated from transifexJenkins for ownCloud2014-07-161-3/+4
|
* Merge pull request #9628 from edozzo/masterblizzz2014-07-151-2/+12
|\ | | | | Userlist: async load doesnt fill checked group/subadmin array
| * Strinct comparsion fixDeLtAfOx2014-07-151-2/+2
| |
| * Userlist: async load doesnt fill checked group/subadmin arrayDeLtAfOx2014-07-151-2/+12
| |
* | remove dead codeArthur Schiwon2014-07-143-9/+16
|/ | | | | | | | | | do not filter groups. but update the user count according to the filter improve phpdoc improve metadata runtime cache add metadata tests
* [tx-robot] updated from transifexJenkins for ownCloud2014-07-142-0/+2
|