summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* little fix for previous commitGeorg Ehrke2012-08-011-1/+1
* fix a subadmin UI bugGeorg Ehrke2012-08-012-1/+11
* [tx-robot] updated from transifexJenkins for ownCloud2012-07-315-3/+45
* [tx-robot] updated from transifexJenkins for ownCloud2012-07-304-1/+9
* [tx-robot] updated from transifexJenkins for ownCloud2012-07-294-4/+12
* [tx-robot] updated from transifexJenkins for ownCloud2012-07-284-0/+12
* Cast groups as string, fixes bug oc-1309. Thanks to nderambure.Michael Gapczynski2012-07-261-1/+1
* Check if size isset, try to fix used space calculation again, fixs bug oc-1331Michael Gapczynski2012-07-261-1/+1
* [tx-robot] updated from transifexJenkins for ownCloud2012-07-2733-1/+259
* Merge branch 'subadmin'Georg Ehrke2012-07-269-41/+202
|\
| * Merge branch 'master' into subadminGeorg Ehrke2012-07-263-0/+62
| |\
| * | some js improvements for subadminsGeorg Ehrke2012-07-211-0/+3
| * | don't show label 'add group' for subadmins and remove some debug codeGeorg Ehrke2012-07-201-5/+7
| * | improve default qouta for subadminsGeorg Ehrke2012-07-202-3/+14
| * | fix tooglegroup for subadminsGeorg Ehrke2012-07-201-1/+7
| * | simplify code of createuser.phpGeorg Ehrke2012-07-201-7/+4
| * | simplify code of changepassword.phpGeorg Ehrke2012-07-191-12/+2
| * | fix copy&paste fail and deny subadmins to set the default qoutaGeorg Ehrke2012-07-193-4/+4
| * | fix setqouta for subadminsGeorg Ehrke2012-07-191-1/+7
| * | simplify code of remoteuser.phpGeorg Ehrke2012-07-191-14/+4
| * | fix removeuser.php for subadminsGeorg Ehrke2012-07-181-1/+17
| * | remove unused code from togglesubadmins.phpGeorg Ehrke2012-07-181-4/+0
| * | fix changepassword.php for subadminsGeorg Ehrke2012-07-181-1/+22
| * | Merge branch 'master' into subadminGeorg Ehrke2012-07-151-18/+17
| |\ \
| * | | add another file which was missing in the previous commitGeorg Ehrke2012-07-151-0/+23
| * | | subadmins can now add usersGeorg Ehrke2012-07-154-40/+110
| * | | fix merge conflictsGeorg Ehrke2012-07-1117-28/+17
| |\ \ \
| * | | | some work on subadminsGeorg Ehrke2012-07-092-10/+37
* | | | | Fix used space calculation if shared folder does not exist, fixes bug oc-1331Michael Gapczynski2012-07-261-1/+6
| |_|_|/ |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2012-07-261-0/+48
* | | | [tx-robot] updated from transifexJenkins for ownCloud2012-07-262-0/+14
| |_|/ |/| |
* | | Fix undo delete userMichael Gapczynski2012-07-141-17/+16
* | | Fix setting custom quota size for users, bug fix for oc-1128Michael Gapczynski2012-07-111-1/+1
| |/ |/|
* | remove superfluous ?> at the end of .php files (left out apps/*/templates)Jörn Friedrich Dreyer2012-07-0914-29/+1
* | CSRF check in the settingsLukas Reschke2012-07-0713-1/+15
|/
* Added undo functionality to delete user procedure on user settings pageSam Tuke2012-07-042-9/+89
* Revert "bugfix for #1098 (assigning a group to a user, the group appears incr...Michael Gapczynski2012-07-011-1/+0
* Prevent duplicate group showing in multiselect that added the groupMichael Gapczynski2012-06-291-1/+3
* Add new group to other user's group select formsMichael Gapczynski2012-06-291-0/+6
* move the ownCloud version to admin which makes more sense. A normal user canÂ...Frank Karlitschek2012-06-292-5/+7
* bugfix for #1098 (assigning a group to a user, the group appears incrementall...Bjoern Schiessle2012-06-261-0/+1
* Added text ACS warning to admin's user settings page, and corresponding CSS s...Sam Tuke2012-06-253-0/+16
* XSS fix.Thomas Tanghus2012-06-251-1/+1
* Allow direct link to app.Thomas Tanghus2012-06-253-1/+14
* log messages are looking nicer if html code gets interpreted. (xss prevention...Bjoern Schiessle2012-06-221-1/+1
* Merge branch 'master' of gitorious.org:owncloud/owncloudBjoern Schiessle2012-06-213-1/+21
|\
| * check if the data directory is accessible via http. Show a big security warni...Frank Karlitschek2012-06-213-1/+21
* | use new sanitizeHTML() functionBjoern Schiessle2012-06-211-1/+1
|/
* use new sanitize HTML functionBjoern Schiessle2012-06-193-3/+3
* don't add the "Shared"-directory size to users quotaBjoern Schiessle2012-06-181-1/+2