aboutsummaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8911 from owncloud/common-langJan-Christoph Borchardt2014-06-061-1/+1
|\
| * Add Turkish to common languagesVolkan Gezer2014-06-051-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2014-06-0653-309/+98
|/
* unify share settingsBjoern Schiessle2014-06-052-7/+4
* This settings doesn't belong togetherBjoern Schiessle2014-06-052-11/+10
* improve share settings workingBjoern Schiessle2014-06-051-5/+2
* Merge pull request #8620 from owncloud/design-navigation-twoThomas Müller2014-06-053-10/+15
|\
| * fix leading decimal Scrutinizer coding style issueJan-Christoph Borchardt2014-06-051-3/+3
| * add to app navigation after enablingMorris Jobke2014-06-041-8/+10
| * fix related layout issues in user managementJan-Christoph Borchardt2014-06-042-2/+5
* | [tx-robot] updated from transifexJenkins for ownCloud2014-06-0565-10/+359
* | Merge pull request #8882 from owncloud/remove-placeholdercallMorris Jobke2014-06-051-2/+0
|\ \
| * | remove obsolete placeholder call, fix #8881Jan-Christoph Borchardt2014-06-041-2/+0
| |/
* / personal settings: unbold clients header and remove obsolete CSSJan-Christoph Borchardt2014-06-041-4/+7
|/
* Merge pull request #8468 from owncloud/remove-infieldlabelsJan-Christoph Borchardt2014-06-041-0/+2
|\
| * add missing placeholder shim for change password fields in IE8/9Jan-Christoph Borchardt2014-06-031-0/+2
* | [tx-robot] updated from transifexJenkins for ownCloud2014-06-0454-197/+4
* | Merge pull request #8264 from owncloud/app-enable-by-groupicewind19912014-06-034-7/+102
|\ \
| * | bring back the line breaksThomas Müller2014-06-031-1/+2
| * | Apps: fix wording and layout for 'enable only for specific groups'Jan-Christoph Borchardt2014-06-031-3/+3
| * | Fix syntax errorBart Visscher2014-06-031-1/+1
| * | Preserve changed groups when switching between appsRobin Appelman2014-06-031-0/+5
| * | Dont show group settings for login, filesystem, etc apps after enabling themRobin Appelman2014-06-031-5/+15
| * | Remove debug statementsRobin Appelman2014-06-031-3/+0
| * | Disable enabling apps by groups for filesystem, authentication and loggin appsRobin Appelman2014-06-031-17/+28
| * | adding some line breaksThomas Müller2014-06-031-0/+2
| * | Prevent js errorRobin Appelman2014-06-031-1/+3
| * | Add option to enable app for specific groupsRobin Appelman2014-06-034-5/+72
* | | Merge pull request #8840 from owncloud/share_settingsThomas Müller2014-06-032-3/+2
|\ \ \ | |_|/ |/| |
| * | improve settings nameBjoern Schiessle2014-06-031-2/+1
| * | set "allow users to send mail notification for shared files default" setting ...Bjoern Schiessle2014-06-031-1/+1
* | | Merge pull request #8827 from owncloud/add-sqlite-infoThomas Müller2014-06-032-0/+18
|\ \ \
| * | | simplify SQLite warningMorris Jobke2014-06-032-25/+5
| * | | check for user count and files countMorris Jobke2014-06-031-3/+22
| * | | add notification on admin pageMorris Jobke2014-06-032-0/+19
| | |/ | |/|
* | | Merge pull request #7151 from owncloud/user-jqueryThomas Müller2014-06-0318-756/+1595
|\ \ \ | |_|/ |/| |
| * | fix grouplist behaviour (blank after filtering)Arthur Schiwon2014-06-022-2/+5
| * | remove debug outputArthur Schiwon2014-06-021-1/+0
| * | polish JSDocArthur Schiwon2014-06-021-20/+42
| * | replace setTimeout and clearTimeout handling by _.debounceArthur Schiwon2014-06-021-14/+12
| * | remove group rename stuff, there is not support in the backends yet. to do fo...Arthur Schiwon2014-06-023-61/+1
| * | cleanupArthur Schiwon2014-06-023-6/+0
| * | bind undo to current deleteHandlerArthur Schiwon2014-06-021-1/+1
| * | user mgmt: hide group rename function because it’s not supported in the bac...Jan-Christoph Borchardt2014-06-021-2/+5
| * | Fix UserList.empty(), use _.defer() instead of setTimeout()ringmaster2014-06-021-4/+4
| * | Javascript cleanup for groups.ringmaster2014-06-022-141/+148
| * | Rebase cleanup.ringmaster2014-06-022-2/+0
| * | Revisions from review.ringmaster2014-06-021-47/+54
| * | Fix broken span.ringmaster2014-06-021-0/+1
| * | Add the admin group to the group list data.ringmaster2014-06-021-0/+3