Thomas Tanghus
|
f17876d093
|
Remove unused code.
|
2012-08-04 21:25:41 +02:00 |
Alessandro Cosentino
|
95fc7f4cb7
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2012-08-04 14:35:27 -04:00 |
|
Alessandro Cosentino
|
84aa7c7b54
|
link of Add your app was broken
|
2012-08-04 14:34:57 -04:00 |
|
Thomas Tanghus
|
e1d4f85102
|
Wait with csrf check for now.
|
2012-08-04 20:26:28 +02:00 |
|
Thomas Tanghus
|
d19803654f
|
And add the file goddammit
|
2012-08-04 20:25:20 +02:00 |
|
Thomas Tanghus
|
24af2e8078
|
Load OCS apps in an ajax call to avoid blocking the WUI.
|
2012-08-04 20:16:32 +02:00 |
|
Alessandro Cosentino
|
226af11f33
|
reset version number when not specified - again bug oc-1433
|
2012-08-04 13:08:55 -04:00 |
|
Alessandro Cosentino
|
627ea9efe4
|
fixes bug oc-1433
|
2012-08-04 12:39:23 -04:00 |
Georg Ehrke
|
1bccc80996
|
hide morelog button if there are no more log entries - bugfix for oc-1398
|
2012-08-04 17:38:31 +02:00 |
Jenkins for ownCloud
|
d7e77f6426
|
[tx-robot] updated from transifex
|
2012-08-04 02:04:21 +02:00 |
|
Jenkins for ownCloud
|
91e828c6ce
|
[tx-robot] updated from transifex
|
2012-08-02 02:06:16 +02:00 |
|
Georg Ehrke
|
47e4793c30
|
little fix for previous commit
|
2012-08-01 18:04:06 +02:00 |
|
Georg Ehrke
|
8766b3286b
|
fix a subadmin UI bug
|
2012-08-01 18:03:08 +02:00 |
|
Jenkins for ownCloud
|
36ccaf51ed
|
[tx-robot] updated from transifex
|
2012-07-31 22:57:24 +02:00 |
|
Jenkins for ownCloud
|
3430dcd367
|
[tx-robot] updated from transifex
|
2012-07-30 02:05:41 +02:00 |
|
Jenkins for ownCloud
|
18f6552a08
|
[tx-robot] updated from transifex
|
2012-07-29 02:06:29 +02:00 |
|
Jenkins for ownCloud
|
fa4052d6f1
|
[tx-robot] updated from transifex
|
2012-07-28 02:05:38 +02:00 |
Michael Gapczynski
|
7050f0fa67
|
Cast groups as string, fixes bug oc-1309. Thanks to nderambure.
|
2012-07-26 23:54:25 -04:00 |
|
Michael Gapczynski
|
d1dee28437
|
Check if size isset, try to fix used space calculation again, fixs bug oc-1331
|
2012-07-26 20:45:58 -04:00 |
|
Jenkins for ownCloud
|
0a9c33e151
|
[tx-robot] updated from transifex
|
2012-07-27 02:04:26 +02:00 |
|
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 |