b819aa33f7
[tx-robot] updated from transifex
2012-08-21 02:09:12 +02:00
f893d21660
[tx-robot] updated from transifex
2012-08-20 02:03:51 +02:00
36474e5681
[tx-robot] updated from transifex
2012-08-20 02:01:32 +02:00
eb42148210
fix error in check if app is installed
2012-08-18 23:15:38 +02:00
d54390b1a0
Optimized image size
2012-08-18 13:56:04 +02:00
f1cabdd8e0
[tx-robot] updated from transifex
2012-08-18 02:04:07 +02:00
ced234a81a
rename subadmin to group admin
2012-08-17 16:00:24 +02:00
1e6dc67517
[tx-robot] updated from transifex
2012-08-16 02:09:15 +02:00
da3896808a
[tx-robot] updated from transifex
2012-08-15 02:07:20 +02:00
355a1adb3a
[tx-robot] updated from transifex
2012-08-12 02:04:58 +02:00
0c69e64b86
Backgroundjobs: Fix template
2012-08-12 00:44:25 +02:00
2bc8d3e5d6
Backgroundjobs: interface improvements
2012-08-12 00:37:14 +02:00
a5a5ab2318
Add type text to new user, fixes display issue
2012-08-11 16:29:41 -04:00
651245effa
Use limit and offset for subadmin users
2012-08-11 16:25:28 -04:00
400533af2c
Start with 30 users, this fills my screen
2012-08-11 16:25:27 -04:00
9d2ae5fa1f
Add infinite scrolling to Settings -> Users, still a little buggy
2012-08-11 16:25:27 -04:00
baa0b4d530
Cast subadmin groups as strings
2012-08-11 16:25:27 -04:00
bd90b7eaca
Backgroundjobs: Fix bug in admin interface
2012-08-11 17:37:53 +02:00
39b9052c2f
[tx-robot] updated from transifex
2012-08-11 02:05:58 +02:00
9ad31e5f81
Backgroundjobs: use correct var name in template
2012-08-10 01:44:38 +02:00
7c766cdfe0
Backgroundjobs: fix bugs in template
2012-08-10 01:42:30 +02:00
7055d2aa2b
Backgroundjobs: improve admin form
2012-08-10 01:36:33 +02:00
2b5f005547
Backgroundjobs: Forgot to require lib/base.php
2012-08-09 21:29:45 +02:00
1ce2cd73ff
Add first version of backgroundjobs settings
2012-08-09 10:41:10 +02:00
a9f894ce11
[tx-robot] updated from transifex
2012-08-07 02:07:50 +02:00
9ca8d20a99
[tx-robot] updated from transifex
2012-08-06 02:02:50 +02:00
6fbc4f712a
[tx-robot] updated from transifex
2012-08-05 19:02:23 +02:00
07fd517fda
Make 3rd party label a bit smaller.
2012-08-05 02:54:18 +02:00
a138b4d04e
Some more pixel pushing.
2012-08-05 01:57:13 +02:00
ce866a5bdb
CSS tweaks for app settings.
2012-08-05 01:42:17 +02:00
c6b337c3dd
Return possibly changed appid.
2012-08-05 01:42:17 +02:00
97853a1ae5
Restructure JS code and small fixes.
2012-08-04 23:48:36 +02:00
f95ca36b49
Listen to correct undo click for undoing deleting users
2012-08-04 17:03:36 -04:00
1ec27399a7
Show delete tipsy for users
2012-08-04 17:00:16 -04:00
002ad4ba16
Tweak users delete notification
2012-08-04 16:44:26 -04:00
f17876d093
Remove unused code.
2012-08-04 21:25:41 +02:00
95fc7f4cb7
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-08-04 14:35:27 -04:00
84aa7c7b54
link of Add your app was broken
2012-08-04 14:34:57 -04:00
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
Jenkins for ownCloud
Robin Appelman
Lukas Reschke
Georg Ehrke
Jakob Sack
Michael Gapczynski
Thomas Tanghus
Alessandro Cosentino
Jörn Friedrich Dreyer
Sam Tuke
Frank Karlitschek
Bjoern Schiessle
Brice Maron
Michael Gapczynski
Bjoern Schiessle
Tom Needham
Bart Visscher