aboutsummaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* [tx-robot] updated from transifexJenkins for ownCloud2014-07-132-0/+33
|
* [tx-robot] updated from transifexJenkins for ownCloud2014-07-122-0/+3
|
* Merge pull request #9525 from owncloud/incrementuser2Vincent Petry2014-07-104-37/+109
|\ | | | | increment/decrement group and user counts when necessary
| * use .filterAttr()Thomas Müller2014-07-091-4/+4
| |
| * use .filterAttr()Thomas Müller2014-07-091-7/+8
| |
| * some more cleanupThomas Müller2014-07-091-38/+36
| |
| * magic strings - bad kungfuThomas Müller2014-07-091-0/+3
| |
| * remove the group in case the last user has removed from that groupThomas Müller2014-07-091-0/+12
| |
| * fixing JS synatx errorsThomas Müller2014-07-092-5/+5
| |
| * avoid global selectorArthur Schiwon2014-07-091-1/+1
| |
| * increase/decrease everyone count on user creation/deletionArthur Schiwon2014-07-093-8/+42
| |
| * decrease user count in affected groups after user deleteArthur Schiwon2014-07-091-0/+14
| |
| * increment group counters when a user is createdArthur Schiwon2014-07-093-3/+13
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2014-07-1010-2/+12
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-07-0936-36/+1
|
* fix apostrophe fixes #9486Volkan Gezer2014-07-081-1/+1
|
* [tx-robot] updated from transifexJenkins for ownCloud2014-07-082-4/+5
|
* Merge pull request #9505 from stephane84/fix-9497Vincent Petry2014-07-071-0/+1
|\ | | | | Refocus input field after user creation
| * Fixes #9497Stephane V2014-07-071-0/+1
| |
* | Merge pull request #9479 from stephane84/fix-9147Morris Jobke2014-07-071-0/+1
|\ \ | | | | | | Log table design glitch in date field
| * | Bug 9147 owncloud/coreStephane V2014-07-061-0/+1
| |/ | | | | | | Added class="date" in the latest column of the log table to get everything on one line (in the ajax request).
* | [tx-robot] updated from transifexJenkins for ownCloud2014-07-071-0/+1
| |
* | Merge pull request #9469 from owncloud/replace_uninstall_button_with_linkMorris Jobke2014-07-062-7/+7
|\ \ | |/ |/| improvements for uninstall button
| * improvements for uninstall buttonGeorg Ehrke2014-07-052-7/+7
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2014-07-062-3/+3
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2014-07-051-0/+37
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-07-0414-0/+14
|
* Merge pull request #9390 from owncloud/fix-9368Jan-Christoph Borchardt2014-07-031-2/+0
|\ | | | | Revert 'hides table header while users load.'
| * Revert "hides table header while users load."Arthur Schiwon2014-07-021-2/+0
| | | | | | | | This reverts commit 0dc12a3737127aad28be12f9417d2a63601a88ff.
* | [tx-robot] updated from transifexJenkins for ownCloud2014-07-031-0/+13
| |
* | Merge pull request #9374 from owncloud/link-contribute-promoteJan-Christoph Borchardt2014-07-022-0/+15
|\ \ | |/ |/| add link to contribute and promote pages in personal settings
| * personal: link straight to /promote as @tomneedham saidJan-Christoph Borchardt2014-07-021-1/+1
| |
| * add link to contribute and promote pages in personal settingsJan-Christoph Borchardt2014-07-022-0/+15
| |
* | remove shadow effects from settings icons, reduce sizeJan-Christoph Borchardt2014-07-0210-35/+11
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-07-022-1/+5
|