Bart Visscher
|
6081bfa2bc
|
Merge branch 'master' into routing
Conflicts:
lib/search/provider/file.php
settings/ajax/changepassword.php
settings/settings.php
|
2012-10-17 16:38:11 +02:00 |
Lukas Reschke
|
2f4b1b0e4c
|
Disallow users to delete their own accounts
|
2012-10-10 18:05:34 +02:00 |
|
Bart Visscher
|
bb136b9adf
|
Make the settings ajax calls use the router
|
2012-10-02 18:00:23 +02:00 |
Thomas Müller
|
93496a32cc
|
Update settings/ajax/removeuser.php
$l->t added for error message
|
2012-09-04 12:54:04 +03:00 |
|
Thomas Müller
|
de987b475d
|
Update settings/ajax/removeuser.php
respect coding style
|
2012-09-04 12:51:04 +03: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
|
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 |
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 |
|
Bart Visscher
|
17e631bc5e
|
Use OC_JSON for json responses
Create OC_JSON class, for single point of creating json responses.
No real logic change, this just cleans up the code a bit.
|
2011-09-25 22:19:28 +02:00 |
Jan-Christoph Borchardt
|
4a5ee765cf
|
merged admin, help and settings to settings
|
2011-08-13 05:13:34 +02:00 |