e1d4f85102
Wait with csrf check for now.
2012-08-04 20:26:28 +02:00
d19803654f
And add the file goddammit
2012-08-04 20:25:20 +02:00
24af2e8078
Load OCS apps in an ajax call to avoid blocking the WUI.
2012-08-04 20:16:32 +02:00
226af11f33
reset version number when not specified - again bug oc-1433
2012-08-04 13:08:55 -04:00
627ea9efe4
fixes bug oc-1433
2012-08-04 12:39:23 -04:00
1bccc80996
hide morelog button if there are no more log entries - bugfix for oc-1398
2012-08-04 17:38:31 +02:00
d7e77f6426
[tx-robot] updated from transifex
2012-08-04 02:04:21 +02:00
91e828c6ce
[tx-robot] updated from transifex
2012-08-02 02:06:16 +02:00
47e4793c30
little fix for previous commit
2012-08-01 18:04:06 +02:00
8766b3286b
fix a subadmin UI bug
2012-08-01 18:03:08 +02:00
36ccaf51ed
[tx-robot] updated from transifex
2012-07-31 22:57:24 +02:00
41a74e3dd2
Check if size isset, try to fix used space calculation again, fixs bug oc-1331
...
Conflicts:
settings/personal.php
2012-07-30 10:07:19 -04:00
164fc1c981
Fix used space calculation if shared folder does not exist, fixes bug oc-1331
...
Conflicts:
settings/personal.php
2012-07-30 10:07:19 -04:00
3430dcd367
[tx-robot] updated from transifex
2012-07-30 02:05:41 +02:00
18f6552a08
[tx-robot] updated from transifex
2012-07-29 02:06:29 +02:00
fa4052d6f1
[tx-robot] updated from transifex
2012-07-28 02:05:38 +02:00
7050f0fa67
Cast groups as string, fixes bug oc-1309. Thanks to nderambure.
2012-07-26 23:54:25 -04:00
d1dee28437
Check if size isset, try to fix used space calculation again, fixs bug oc-1331
2012-07-26 20:45:58 -04:00
0a9c33e151
[tx-robot] updated from transifex
2012-07-27 02:04:26 +02:00
ebe4d1f0ee
Merge branch 'subadmin'
2012-07-26 16:50:02 +02:00
e1d14ab461
Merge branch 'master' into subadmin
2012-07-26 16:47:05 +02:00
0810f92894
Fix used space calculation if shared folder does not exist, fixes bug oc-1331
2012-07-26 10:30:33 -04:00
ba0ea21074
[tx-robot] updated from transifex
2012-07-26 08:04:12 +02:00
42c22bee36
[tx-robot] updated from transifex
2012-07-26 08:03:10 +02:00
88f66460a3
some js improvements for subadmins
2012-07-21 13:10:51 +02:00
93579d88dc
CSRF checks
2012-07-20 20:39:20 +02:00
bf9b6e9ccc
don't show label 'add group' for subadmins and remove some debug code
2012-07-20 17:18:40 +02:00
c3bd30cc6b
improve default qouta for subadmins
2012-07-20 15:20:48 +02:00
7f08c84739
fix tooglegroup for subadmins
2012-07-20 15:13:51 +02:00
e42f765697
simplify code of createuser.php
2012-07-20 15:04:50 +02:00
9157888334
simplify code of changepassword.php
2012-07-19 19:32:59 +02:00
6cf418f2fa
fix copy&paste fail and deny subadmins to set the default qouta
2012-07-19 18:00:33 +02:00
2fc834230a
fix setqouta for subadmins
2012-07-19 16:37:41 +02:00
ffc55f3510
simplify code of remoteuser.php
2012-07-19 16:35:14 +02:00
fb6468936e
fix removeuser.php for subadmins
2012-07-18 17:23:40 +02:00
f503aea099
remove unused code from togglesubadmins.php
2012-07-18 15:28:12 +02:00
4490a88492
fix changepassword.php for subadmins
2012-07-18 15:27:31 +02:00
4700222ea9
Merge branch 'master' into subadmin
2012-07-15 16:33:17 +02:00
044134a289
add another file which was missing in the previous commit
2012-07-15 16:32:57 +02:00
e707e94857
subadmins can now add users
2012-07-15 16:31:28 +02:00
b455149bae
Fix undo delete user
2012-07-14 16:57:16 -04:00
8890a41280
Fix setting custom quota size for users, bug fix for oc-1128
2012-07-11 18:25:08 -04:00
0cb9f5e159
fix merge conflicts
2012-07-11 10:50:18 +02:00
d0b625352c
some work on subadmins
2012-07-09 21:51:19 +02:00
e59a1806cf
remove superfluous ?> at the end of .php files (left out apps/*/templates)
2012-07-09 16:51:16 +02:00
777eb1d8b1
CSRF check in the settings
2012-07-07 15:27:04 +02:00
825d92d59c
Added undo functionality to delete user procedure on user settings page
2012-07-04 14:30:42 +01:00
ffadbfcef3
Prevent duplicate group showing in multiselect that added the group
2012-07-01 11:36:57 -04:00
949cab7ea1
Add new group to other user's group select forms
2012-07-01 11:36:31 -04:00
5121c262e2
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:35:58 -04:00
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
c992482e92
Prevent duplicate group showing in multiselect that added the group
2012-06-29 17:52:44 -04:00
05cb94801a
Add new group to other user's group select forms
2012-06-29 16:29:58 -04:00
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
9c083d3519
Fix setting custom quota size for users, bug fix for oc-1128
2012-06-28 21:26:39 -04:00
265d7e50f5
bugfix for #1098 (assigning a group to a user, the group appears incrementally many times the more you assign it)
2012-06-26 12:54:09 +02:00
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
f374dae233
Added text ACS warning to admin's user settings page, and corresponding CSS styles
2012-06-25 18:04:10 +01:00
5ac4830e75
XSS fix.
2012-06-25 05:03:30 +02:00
c3130919c2
Allow direct link to app.
2012-06-25 05:02:01 +02:00
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
e943f6c0c8
log messages are looking nicer if they are not escaped. (xss prevention happens on another place)
2012-06-22 16:53:45 +02:00
1338279ca0
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-21 16:42:16 +02:00
5212fa3fa7
check if the data directory is accessible via http. Show a big security warning if yes
2012-06-21 14:18:43 +02:00
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
34739b7ec5
use new sanitizeHTML() function
2012-06-21 13:57:18 +02:00
902c649dad
use new sanitize HTML function backported
...
Conflicts:
lib/template.php
2012-06-20 16:59:51 +02:00
089ae980c4
use new sanitize HTML function
2012-06-19 17:24:55 +02:00
b31962fdc2
Hide image with no source (avoid placeholder img)
2012-06-18 20:15:20 +00:00
ca41f2e96a
don't add the "Shared"-directory size to users quota
2012-06-18 15:38:38 +02:00
2fd7df57d9
don't add the "Shared"-directory size to users quota
2012-06-18 15:35:22 +02:00
9d0cfacd67
escape log messages to avoid possible js execution
2012-06-18 09:43:56 +02:00
91f69858e4
escape log messages to avoid possible js execution
2012-06-18 09:42:31 +02:00
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
107c2de25d
applied patch provided by bug #966 to fix broken user specific quota settings
2012-06-12 11:22:25 +02:00
1b6dd6628a
applied patch provided by bug #966 to fix broken user specific quota settings
2012-06-12 11:18:34 +02:00
d2a34f4b35
Fixes a issue with the log
2012-06-11 19:33:16 +02:00
2b22c538c8
Make some apps compatible
2012-06-11 19:07:51 +02:00
c009bc4b87
Revert
2012-06-11 13:27:32 +02:00
ec4c373eaa
Settings...
2012-06-11 12:48:47 +02:00
689c8f5f09
paging not yet implemented. increasing pagesize to 100 as a temporary quickfix
2012-06-09 22:02:29 +02:00
3947aa3ef7
apps paging is not yet implemented. increase pagesize to 100 as a quickfix
2012-06-09 22:00:28 +02:00
4a15cf28a9
fixed broken lines in user table
...
Conflicts:
settings/css/settings.css
2012-06-08 11:44:04 +02:00
f91ad08613
fixed broken lines in user table
2012-06-08 11:37:04 +02:00
1f409ec524
Protect the help page
2012-06-07 17:43:26 +00:00
f1b10fcc93
update translations
2012-06-06 00:29:44 +02:00
f7d221f5f0
update translations
2012-06-06 00:29:28 +02:00
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
786325a4bb
Fix newline in code
2012-06-04 22:24:17 +02:00
daa4d2cd84
Validate email on save
2012-06-04 18:44:55 +00:00
cf85a1e264
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-04 18:43:22 +00:00
55e88120cd
Validate email on save
2012-06-04 18:42:25 +00:00
adc200c1f3
Hide app page link for internal apps, fixes bug oc-913
2012-06-04 14:26:30 -04:00
f3c1d1eded
link to apps.owncloud.com
...
thanks to guillaume for the patch
2012-06-03 23:48:59 +02:00
60b8e172d5
prevent a division by zero problem
2012-06-01 16:49:14 +02:00
e6b0eb3423
prevend a division by zero problem
2012-06-01 16:48:42 +02:00
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
54c421f384
check during ownCloud upgrade if all the installed apps are compatible with the new ownCloud version. Disable them if not
2012-05-26 20:40:12 +02:00
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
a945fa10a6
update copyright
2012-05-26 19:14:24 +02:00
fdbe0c9734
don´t claim that already downloaded 3rd party apps are internal apps
2012-05-18 21:14:07 +02:00
ac8bfc218e
update translations
2012-05-17 00:36:21 +02:00
97e8ff6801
Switch enable button only when app is really installed or uninstalled
2012-05-14 21:52:40 +00:00
1a2ab2ef68
prevent user creation with empty password
2012-05-13 20:53:56 +02:00
ee0294bbb1
update translations
2012-05-13 20:00:34 +02:00
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
63cc1ccacd
Sanitize group in togglegroups
2012-05-09 09:23:19 -04:00
588b51d88a
update translations
2012-05-09 12:41:01 +02:00
5962a0d4ac
Enhance user creation (avoid create+delete row), clear create user form after action
2012-05-07 21:27:03 +00:00
4dbc2093c6
Create a function for linking to remote.php
2012-05-07 21:47:14 +02:00
da4688d804
Reorder code to avoid race condition in user creation
2012-05-07 16:08:35 +00:00
e33b12a375
fix path of webdav
2012-05-07 12:07:39 +02:00
e0db22cc07
Provide feedback when user creation fails
2012-05-06 18:04:48 -04:00
6330fdad08
fix path of webdav
2012-05-05 19:02:13 +02:00
d9592ddcb0
Tried to make settings/apps more keyboard/screenreader friendly.
2012-05-04 17:56:00 +02:00
31d623f426
Fix log viewing bug
2012-05-02 15:26:42 -04:00
07f2e316e4
removing executable bit from various files
2012-04-30 12:05:57 +02:00
b5db852438
add files to blacklist. Should be always on
2012-04-29 21:16:41 +02:00
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
3ba9a9e6a8
adding proper copyright and license notice to the style files
2012-04-23 14:19:03 +02:00
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
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
ef80ad1d48
add a link to the desktop and mobile clients download.
2012-04-21 00:33:24 +02:00
d1fe3c2314
add a button to open the online documentation
2012-04-21 00:18:47 +02:00
e59c87ee36
reload log after changing log level
2012-04-16 12:27:21 +02:00
5720bd296d
merge log into admin
2012-04-16 12:21:48 +02:00
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
b3bd4bc384
sanity check on language selection
2012-04-15 15:35:20 +02:00
fbb314ef4b
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-04-14 18:56:55 +02:00
85cb171cb8
improved updater wording
2012-04-14 18:41:09 +02:00
8113a43252
typo
2012-04-14 18:09:42 +02:00
b1bcc60d83
reuse OC_L10N objects
2012-04-14 16:44:15 +02:00
386663ddb6
swap enable and dissable error messages
2012-04-14 13:16:37 +02:00
d8864d4f4b
show error when installing an app has failed
2012-04-14 12:57:10 +02:00
42e110b49c
Update url
2012-04-07 13:07:44 +00:00
6545e48787
Show the different editions to the user. Used in the status call, on the personal settings page and in the updater to update to the next available version from the same edition.
2012-04-01 11:20:12 +02:00
3a4521a012
Add support for logging to syslog
2012-03-30 23:41:53 +02:00
128d446f39
fix timestamps when viewing logs
2012-03-27 00:21:31 +02:00
7ba8dbb920
Don't truncate users email
2012-03-17 12:51:11 +00:00
797e921b9a
improve log browsing
2012-02-26 03:10:29 +01:00
11cb45bd43
slight change to select style
2012-02-24 23:54:38 +01:00
9dcf29ff51
fix bug in group mangement
2012-02-24 23:54:38 +01:00
0d3181b6d1
add configure option for default quota
2012-02-24 23:54:38 +01:00
4230e217af
new config widget for user quota
2012-02-24 23:54:38 +01:00
9f5bce81b0
add a default user quota
2012-02-24 23:54:38 +01:00
3988ec2813
Updated bookmark form
2012-02-22 23:22:17 +01:00
b3f3b8c23f
UI problems solved. Bookmarks app updated.
2012-02-22 16:04:31 +01:00
f47444e1f7
Use separate function to make absolute urls
2012-02-17 22:07:14 +01:00
d514b1d92d
Merge branch 'master' into filesystem
2012-02-01 15:57:32 +01:00
4145e3b265
pre-select current language, sort available languages
2012-02-01 12:00:38 +01:00
4522d19b4c
merge master into filesystem
2012-01-30 20:29:33 +01:00
927bf56940
add a link to the credits page. fame for all our awesome contributors
2012-01-29 14:45:38 +01:00
57f2bf5969
add more language names
2012-01-28 15:13:37 +01:00
05f1fffddc
fix appstore download.
2012-01-27 17:34:47 +01:00
ad4e305c96
update translations
2012-01-27 00:59:24 +01:00
6fccf12299
update translations
2012-01-24 00:42:08 +01:00
cdfb252ced
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-01-24 00:24:09 +01:00
c2183427c3
dont try to create a user with an already existing username
2012-01-23 17:34:23 +01:00
76ce8c6c6a
dont show new user when an error occured
2012-01-23 17:33:12 +01:00
7ea2923fa8
translation updates
2012-01-20 18:53:45 +01:00
3552626358
Merge branch 'master' into filesystem
2012-01-20 00:48:03 +01:00
965ea96439
update translations
2012-01-16 17:34:53 +01:00
96e2f15d8a
merge master into filesystem
2012-01-16 03:06:11 +01:00
63d9c1a817
read language name from the right resource
2012-01-15 15:30:08 +01:00
37c0b97b3c
make language name translatable and fallback to language code if we dont have the language name
2012-01-15 15:25:58 +01:00
7cd809b286
update translations
2012-01-15 15:12:58 +01:00
0c76884f98
add icon for log app
2012-01-14 23:39:05 +01:00
2d25bb3b01
add min width to multiselect in user management
2012-01-14 23:10:38 +01:00
34a4784077
don´t show warnings for missing language name definitions
2012-01-14 15:41:02 +01:00
f67e5d18e7
update translations
2012-01-11 01:06:59 +01:00
d1edc360d9
merge master into filesystem
2012-01-08 01:53:40 +01:00
d485a70e7d
finish the application store feature so that users can download and install ownCloud apps from our website. there is still a small problem with write permissions. will look into this later
2012-01-06 19:08:35 +01:00
534b6f3a09
Fix whitespace username
2012-01-02 11:49:53 +01:00
835d6a9b6e
save quota in human readable format (42 MB), should prevent some of the overflow related problems
2011-12-14 01:16:14 +01:00
a9e94a34c9
use fscache for getting used space
2011-12-14 01:15:07 +01:00
9c6d3a83fd
also update the data attribute holding the quota
2011-12-11 23:34:20 +01:00
ccd9b56609
after editing a user quota, set the value of the quota field to how the server parsed the input, not the user input
...
this way the user can see when an invalid input is given
2011-12-11 23:34:13 +01:00
9ba59aee36
Sort apps on name and enabled status
2011-12-07 20:41:00 +01:00
7df9d934ca
second half of the updating stuff
2011-11-19 12:02:34 +01:00
3940ca3df1
Display correctly the error message when nothing is retrieved from OCS servers
2011-11-06 16:48:26 +01:00
8d203531fb
corrected link for app dev instructions
2011-10-23 12:38:36 +02:00
da4a1e6118
Change 'Help translating' to 'Help translate'
2011-10-22 18:03:57 -04:00
59eac3bc29
Correct little typo/bug in log display and remove ending php tag
2011-10-18 20:10:17 +02:00
7358d9ebb4
Fix quota onBlur In Settings, Take from right attribute
2011-10-17 20:50:41 +02:00
d9372ac766
make log level configurable
2011-10-16 21:11:03 +02:00
820cd0fb75
provide a logging mechanism
2011-10-16 21:11:03 +02:00
f29dc0c0fb
correct language name
2011-10-14 20:50:55 +02:00
590ff0ced9
moved bookmarklet to personal. username must be provided when adding a new user.
2011-10-08 13:10:49 +02:00
71caa4a20c
added code and license links next to version number
2011-10-08 10:10:29 +02:00
d1518f2901
updated calendar settings
2011-10-04 19:37:26 +02:00
590b006d5c
Removed unused javascript
2011-10-02 15:56:51 +02:00
daee88fd26
Changed multiple select for days of weekend to 'chosen'. Cleaned up some code. Removed success message when changing timezone.
2011-10-02 15:51:24 +02:00
21a88613a1
Merge branch 'lostpassword'
...
Conflicts:
core/templates/login.php
index.php
lib/util.php
2011-09-30 23:48:20 +02:00
9a5d517ec2
Add more checks for admin user
2011-09-30 23:17:30 +02:00
f4782a7690
Check if the application is actually enabled
2011-09-30 23:17:18 +02:00
2740491f18
quota good cleand up
2011-09-30 19:47:48 +02:00
5775421f78
user list has descriptions now
2011-09-30 19:35:25 +02:00
301d7bd3a9
action image for quota is now invisble when user does not hover over
2011-09-30 19:16:19 +02:00
3ebf1a5a3b
dissable app instalation from apps.owncloud.org interface
2011-09-28 22:39:41 +02:00
f2a7f230f1
add status file. useful for external administration. show the ownClopud version at least in the config dialog.
2011-09-28 13:52:26 +02:00
Thomas Tanghus
Alessandro Cosentino
Georg Ehrke
Jenkins for ownCloud
Michael Gapczynski
Lukas Reschke
Jörn Friedrich Dreyer
Sam Tuke
Frank Karlitschek
Bjoern Schiessle
Brice Maron
Michael Gapczynski
Bjoern Schiessle
Tom Needham
Robin Appelman
Bart Visscher
Frank Karlitschek
Jan-Christoph Borchardt
Marvin Thomas Rabe
Thomas Schmidt
Robin Appelman
Georg Ehrke
Frank Karlitschek