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
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
Tom Needham
1f409ec524
Protect the help page
2012-06-07 17:43:26 +00:00
Robin Appelman
f7d221f5f0
update translations
2012-06-06 00:29:28 +02:00
Thomas Tanghus
6c4231b3d3
Per user quota didn't show in FF (and possibly IE) http://forum.owncloud.org/viewtopic.php?f=4&t=2716&p=5373#p5324 .
2012-06-05 14:17:38 +02:00
Bart Visscher
786325a4bb
Fix newline in code
2012-06-04 22:24:17 +02:00
Tom Needham
cf85a1e264
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-04 18:43:22 +00:00
Tom Needham
55e88120cd
Validate email on save
2012-06-04 18:42:25 +00:00
Michael Gapczynski
adc200c1f3
Hide app page link for internal apps, fixes bug oc-913
2012-06-04 14:26:30 -04:00
Frank Karlitschek
f3c1d1eded
link to apps.owncloud.com
...
thanks to guillaume for the patch
2012-06-03 23:48:59 +02:00
Frank Karlitschek
e6b0eb3423
prevend a division by zero problem
2012-06-01 16:48:42 +02:00
Bart Visscher
a33f580db1
Remove OC_App::register function
...
The data supplied is never used in OwnCloud. Removed the call from all the apps, and made the public API function empty.
2012-05-31 13:01:30 +02:00
Frank Karlitschek
982cde0bb1
check during ownCloud upgrade if all the installed apps are compatible with the new ownCloud version. Disable them if not
2012-05-26 20:37:10 +02:00
Frank Karlitschek
a945fa10a6
update copyright
2012-05-26 19:14:24 +02:00
Frank Karlitschek
fdbe0c9734
don´t claim that already downloaded 3rd party apps are internal apps
2012-05-18 21:14:07 +02:00
Robin Appelman
ac8bfc218e
update translations
2012-05-17 00:36:21 +02:00
Brice Maron
97e8ff6801
Switch enable button only when app is really installed or uninstalled
2012-05-14 21:52:40 +00:00
Robin Appelman
1a2ab2ef68
prevent user creation with empty password
2012-05-13 20:53:56 +02:00
Robin Appelman
ee0294bbb1
update translations
2012-05-13 20:00:34 +02:00
Bart Visscher
a9d7c67bf2
The log message is not always shown in html
...
The log message can also be logged with syslog, here we don't want to have html-entities. Also the log messages through json are displayed as text not html.
2012-05-10 09:13:09 +02:00
Michael Gapczynski
63cc1ccacd
Sanitize group in togglegroups
2012-05-09 09:23:19 -04:00
Robin Appelman
588b51d88a
update translations
2012-05-09 12:41:01 +02:00
Brice Maron
5962a0d4ac
Enhance user creation (avoid create+delete row), clear create user form after action
2012-05-07 21:27:03 +00:00
Bart Visscher
4dbc2093c6
Create a function for linking to remote.php
2012-05-07 21:47:14 +02:00
Brice Maron
da4688d804
Reorder code to avoid race condition in user creation
2012-05-07 16:08:35 +00:00
Georg Ehrke
e33b12a375
fix path of webdav
2012-05-07 12:07:39 +02:00
Michael Gapczynski
e0db22cc07
Provide feedback when user creation fails
2012-05-06 18:04:48 -04:00
Georg Ehrke
6330fdad08
fix path of webdav
2012-05-05 19:02:13 +02:00
Thomas Tanghus
d9592ddcb0
Tried to make settings/apps more keyboard/screenreader friendly.
2012-05-04 17:56:00 +02:00
Michael Gapczynski
31d623f426
Fix log viewing bug
2012-05-02 15:26:42 -04:00
Thomas Mueller
07f2e316e4
removing executable bit from various files
2012-04-30 12:05:57 +02:00
Frank Karlitschek
b5db852438
add files to blacklist. Should be always on
2012-04-29 21:16:41 +02:00
Frank Karlitschek
1277962183
a lot of users have problems with big files. So add an explicit button to the documentation
2012-04-26 16:53:18 +02:00
Jan-Christoph Borchardt
3ba9a9e6a8
adding proper copyright and license notice to the style files
2012-04-23 14:19:03 +02:00
Thomas Tanghus
f08cfcecec
Personal settings: Emphasized labels etc, mono-spaced generated paths and moved text formatting to style sheet.
2012-04-22 03:59:28 +02:00
Frank Karlitschek
6bfe2289be
improve the app installer.
...
show a label if an app is an internal app or a third party app from the app store.
show a preview image of the app if available
2012-04-21 15:30:58 +02:00
Frank Karlitschek
ef80ad1d48
add a link to the desktop and mobile clients download.
2012-04-21 00:33:24 +02:00
Frank Karlitschek
d1fe3c2314
add a button to open the online documentation
2012-04-21 00:18:47 +02:00
Robin Appelman
e59c87ee36
reload log after changing log level
2012-04-16 12:27:21 +02:00
Robin Appelman
5720bd296d
merge log into admin
2012-04-16 12:21:48 +02:00
Bart Visscher
74ba09f95c
Fix password is being saved even if not changed
...
Fixes: http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-303
2012-04-15 17:11:03 +02:00
Robin Appelman
b3bd4bc384
sanity check on language selection
2012-04-15 15:35:20 +02:00
Jan-Christoph Borchardt
fbb314ef4b
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-04-14 18:56:55 +02:00
Jan-Christoph Borchardt
85cb171cb8
improved updater wording
2012-04-14 18:41:09 +02:00
Robin Appelman
8113a43252
typo
2012-04-14 18:09:42 +02:00
Robin Appelman
b1bcc60d83
reuse OC_L10N objects
2012-04-14 16:44:15 +02:00
Robin Appelman
386663ddb6
swap enable and dissable error messages
2012-04-14 13:16:37 +02:00
Robin Appelman
d8864d4f4b
show error when installing an app has failed
2012-04-14 12:57:10 +02:00
Tom Needham
42e110b49c
Update url
2012-04-07 13:07:44 +00:00