Georg Ehrke
|
ebe4d1f0ee
|
Merge branch 'subadmin'
|
2012-07-26 16:50:02 +02:00 |
|
Georg Ehrke
|
e1d14ab461
|
Merge branch 'master' into subadmin
|
2012-07-26 16:47:05 +02:00 |
Michael Gapczynski
|
0810f92894
|
Fix used space calculation if shared folder does not exist, fixes bug oc-1331
|
2012-07-26 10:30:33 -04:00 |
Jenkins for ownCloud
|
ba0ea21074
|
[tx-robot] updated from transifex
|
2012-07-26 08:04:12 +02:00 |
|
Jenkins for ownCloud
|
42c22bee36
|
[tx-robot] updated from transifex
|
2012-07-26 08:03:10 +02:00 |
|
Georg Ehrke
|
88f66460a3
|
some js improvements for subadmins
|
2012-07-21 13:10:51 +02:00 |
|
Georg Ehrke
|
bf9b6e9ccc
|
don't show label 'add group' for subadmins and remove some debug code
|
2012-07-20 17:18:40 +02:00 |
|
Georg Ehrke
|
c3bd30cc6b
|
improve default qouta for subadmins
|
2012-07-20 15:20:48 +02:00 |
|
Georg Ehrke
|
7f08c84739
|
fix tooglegroup for subadmins
|
2012-07-20 15:13:51 +02:00 |
|
Georg Ehrke
|
e42f765697
|
simplify code of createuser.php
|
2012-07-20 15:04:50 +02:00 |
|
Georg Ehrke
|
9157888334
|
simplify code of changepassword.php
|
2012-07-19 19:32:59 +02:00 |
|
Georg Ehrke
|
6cf418f2fa
|
fix copy&paste fail and deny subadmins to set the default qouta
|
2012-07-19 18:00:33 +02:00 |
|
Georg Ehrke
|
2fc834230a
|
fix setqouta for subadmins
|
2012-07-19 16:37:41 +02:00 |
|
Georg Ehrke
|
ffc55f3510
|
simplify code of remoteuser.php
|
2012-07-19 16:35:14 +02:00 |
|
Georg Ehrke
|
fb6468936e
|
fix removeuser.php for subadmins
|
2012-07-18 17:23:40 +02:00 |
|
Georg Ehrke
|
f503aea099
|
remove unused code from togglesubadmins.php
|
2012-07-18 15:28:12 +02:00 |
|
Georg Ehrke
|
4490a88492
|
fix changepassword.php for subadmins
|
2012-07-18 15:27:31 +02:00 |
|
Georg Ehrke
|
4700222ea9
|
Merge branch 'master' into subadmin
|
2012-07-15 16:33:17 +02:00 |
|
Georg Ehrke
|
044134a289
|
add another file which was missing in the previous commit
|
2012-07-15 16:32:57 +02:00 |
|
Georg Ehrke
|
e707e94857
|
subadmins can now add users
|
2012-07-15 16:31:28 +02:00 |
|
Michael Gapczynski
|
b455149bae
|
Fix undo delete user
|
2012-07-14 16:57:16 -04:00 |
|
Michael Gapczynski
|
8890a41280
|
Fix setting custom quota size for users, bug fix for oc-1128
|
2012-07-11 18:25:08 -04:00 |
|
Georg Ehrke
|
0cb9f5e159
|
fix merge conflicts
|
2012-07-11 10:50:18 +02:00 |
|
Georg Ehrke
|
d0b625352c
|
some work on subadmins
|
2012-07-09 21:51:19 +02:00 |
Jörn Friedrich Dreyer
|
e59a1806cf
|
remove superfluous ?> at the end of .php files (left out apps/*/templates)
|
2012-07-09 16:51:16 +02:00 |
Lukas Reschke
|
777eb1d8b1
|
CSRF check in the settings
|
2012-07-07 15:27:04 +02:00 |
Sam Tuke
|
825d92d59c
|
Added undo functionality to delete user procedure on user settings page
|
2012-07-04 14:30:42 +01:00 |
|
Michael Gapczynski
|
7ceba61413
|
Revert "bugfix for #1098 (assigning a group to a user, the group appears incrementally many times the more you assign it)"
This reverts commit 265d7e50f5.
|
2012-07-01 11:29:02 -04:00 |
|
Michael Gapczynski
|
c992482e92
|
Prevent duplicate group showing in multiselect that added the group
|
2012-06-29 17:52:44 -04:00 |
|
Michael Gapczynski
|
05cb94801a
|
Add new group to other user's group select forms
|
2012-06-29 16:29:58 -04:00 |
Frank Karlitschek
|
6917d74193
|
move the ownCloud version to admin which makes more sense. A normal user can´t update ownCloud anyways.
|
2012-06-29 11:07:41 +02:00 |
Bjoern Schiessle
|
72b365842f
|
bugfix for #1098 (assigning a group to a user, the group appears incrementally many times the more you assign it)
|
2012-06-26 12:51:32 +02:00 |
|
Sam Tuke
|
f374dae233
|
Added text ACS warning to admin's user settings page, and corresponding CSS styles
|
2012-06-25 18:04:10 +01:00 |
Thomas Tanghus
|
5ac4830e75
|
XSS fix.
|
2012-06-25 05:03:30 +02:00 |
|
Thomas Tanghus
|
c3130919c2
|
Allow direct link to app.
|
2012-06-25 05:02:01 +02:00 |
|
Bjoern Schiessle
|
036530b2fd
|
log messages are looking nicer if html code gets interpreted. (xss prevention happens on another place)
|
2012-06-22 17:00:56 +02:00 |
|
Bjoern Schiessle
|
1338279ca0
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2012-06-21 16:42:16 +02:00 |
|
Frank Karlitschek
|
e95055b2bd
|
check if the data directory is accessible via http. Show a big security warning if yes
|
2012-06-21 14:07:04 +02:00 |
|
Bjoern Schiessle
|
34739b7ec5
|
use new sanitizeHTML() function
|
2012-06-21 13:57:18 +02:00 |
|
Bjoern Schiessle
|
089ae980c4
|
use new sanitize HTML function
|
2012-06-19 17:24:55 +02:00 |
|
Bjoern Schiessle
|
2fd7df57d9
|
don't add the "Shared"-directory size to users quota
|
2012-06-18 15:35:22 +02:00 |
|
Bjoern Schiessle
|
91f69858e4
|
escape log messages to avoid possible js execution
|
2012-06-18 09:42:31 +02:00 |
Michael Gapczynski
|
b5889d6ffe
|
Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into merge-requests/127
Conflicts:
apps/files_external/templates/settings.php
lib/template.php
|
2012-06-13 15:17:46 -04:00 |
Bjoern Schiessle
|
1b6dd6628a
|
applied patch provided by bug #966 to fix broken user specific quota settings
|
2012-06-12 11:18:34 +02:00 |
|
Lukas Reschke
|
d2a34f4b35
|
Fixes a issue with the log
|
2012-06-11 19:33:16 +02:00 |
|
Lukas Reschke
|
2b22c538c8
|
Make some apps compatible
|
2012-06-11 19:07:51 +02:00 |
|
Lukas Reschke
|
c009bc4b87
|
Revert
|
2012-06-11 13:27:32 +02:00 |
|
Lukas Reschke
|
ec4c373eaa
|
Settings...
|
2012-06-11 12:48:47 +02:00 |
|
Frank Karlitschek
|
3947aa3ef7
|
apps paging is not yet implemented. increase pagesize to 100 as a quickfix
|
2012-06-09 22:00:28 +02:00 |
|
Bjoern Schiessle
|
f91ad08613
|
fixed broken lines in user table
|
2012-06-08 11:37:04 +02:00 |