wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
27858 commits 157 branches 562 tags 714 MiB
Commit graph

2698 commits

Author SHA1 Message Date
Michael Gapczynski
651245effa Use limit and offset for subadmin users 2012-08-11 16:25:28 -04:00
Michael Gapczynski
400533af2c Start with 30 users, this fills my screen 2012-08-11 16:25:27 -04:00
Michael Gapczynski
9d2ae5fa1f Add infinite scrolling to Settings -> Users, still a little buggy 2012-08-11 16:25:27 -04:00
Michael Gapczynski
baa0b4d530 Cast subadmin groups as strings 2012-08-11 16:25:27 -04:00
Jakob Sack
bd90b7eaca Backgroundjobs: Fix bug in admin interface 2012-08-11 17:37:53 +02:00
Jenkins for ownCloud
39b9052c2f [tx-robot] updated from transifex 2012-08-11 02:05:58 +02:00
Jakob Sack
9ad31e5f81 Backgroundjobs: use correct var name in template 2012-08-10 01:44:38 +02:00
Jakob Sack
7c766cdfe0 Backgroundjobs: fix bugs in template 2012-08-10 01:42:30 +02:00
Jakob Sack
7055d2aa2b Backgroundjobs: improve admin form 2012-08-10 01:36:33 +02:00
Jakob Sack
2b5f005547 Backgroundjobs: Forgot to require lib/base.php 2012-08-09 21:29:45 +02:00
Jakob Sack
1ce2cd73ff Add first version of backgroundjobs settings 2012-08-09 10:41:10 +02:00
Jenkins for ownCloud
a9f894ce11 [tx-robot] updated from transifex 2012-08-07 02:07:50 +02:00
Jenkins for ownCloud
9ca8d20a99 [tx-robot] updated from transifex 2012-08-06 02:02:50 +02:00
Jenkins for ownCloud
6fbc4f712a [tx-robot] updated from transifex 2012-08-05 19:02:23 +02:00
Thomas Tanghus
07fd517fda Make 3rd party label a bit smaller. 2012-08-05 02:54:18 +02:00
Thomas Tanghus
a138b4d04e Some more pixel pushing. 2012-08-05 01:57:13 +02:00
Thomas Tanghus
ce866a5bdb CSS tweaks for app settings. 2012-08-05 01:42:17 +02:00
Thomas Tanghus
c6b337c3dd Return possibly changed appid. 2012-08-05 01:42:17 +02:00
Thomas Tanghus
97853a1ae5 Restructure JS code and small fixes. 2012-08-04 23:48:36 +02:00
Michael Gapczynski
f95ca36b49 Listen to correct undo click for undoing deleting users 2012-08-04 17:03:36 -04:00
Michael Gapczynski
1ec27399a7 Show delete tipsy for users 2012-08-04 17:00:16 -04:00
Michael Gapczynski
002ad4ba16 Tweak users delete notification 2012-08-04 16:44:26 -04:00
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
Tom Needham
21f8646ffc API: Fix merging of responses. Return 400 error when no OAuth operation sent. 2012-08-03 15:20:01 +00:00
Tom Needham
a7906d813a Move OAuth classes into lib/oauth 2012-08-03 11:47:05 +00:00
Tom Needham
88c6928bad API: Use OC_API::checkLoggedIn() and OAuth scopes are app_$appname 2012-08-03 11:36:01 +00:00
Michael Gapczynski
e3d88270cc OAuth server implementation using oauth library 2012-08-02 20:02:31 -04: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
Tom Needham
91daf54d7c Check if required apps are installed 2012-07-30 16:41:07 +00:00
Michael Gapczynski
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
Michael Gapczynski
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
Tom Needham
e47a8a9f09 Authorisation requires you to be logged in 2012-07-30 13:14:29 +00:00
Tom Needham
cbc0f0c1c5 Include the css for the OAuth page 2012-07-30 10:51:48 +00:00
Tom Needham
138c66a2ba Improve styling of permission request page 2012-07-30 10:51:00 +00:00
Tom Needham
5933d43901 Basic template for authorising exernal apps with OAuth 2012-07-30 10:25:41 +00: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
Lukas Reschke
93579d88dc CSRF checks 2012-07-20 20:39:20 +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
ffadbfcef3 Prevent duplicate group showing in multiselect that added the group 2012-07-01 11:36:57 -04:00
Michael Gapczynski
949cab7ea1 Add new group to other user's group select forms 2012-07-01 11:36:31 -04:00
Michael Gapczynski
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
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
Michael Gapczynski
9c083d3519 Fix setting custom quota size for users, bug fix for oc-1128 2012-06-28 21:26:39 -04:00
Bjoern Schiessle
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
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
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
Bjoern Schiessle
1338279ca0 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-21 16:42:16 +02:00
Frank Karlitschek
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
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
902c649dad use new sanitize HTML function backported 
Conflicts:

	lib/template.php
 2012-06-20 16:59:51 +02:00
Bjoern Schiessle
089ae980c4 use new sanitize HTML function 2012-06-19 17:24:55 +02:00
Brice Maron
b31962fdc2 Hide image with no source (avoid placeholder img) 2012-06-18 20:15:20 +00:00
Bjoern Schiessle
ca41f2e96a don't add the "Shared"-directory size to users quota 2012-06-18 15:38:38 +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
9d0cfacd67 escape log messages to avoid possible js execution 2012-06-18 09:43:56 +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
107c2de25d applied patch provided by bug #966 to fix broken user specific quota settings 2012-06-12 11:22:25 +02: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
689c8f5f09 paging not yet implemented. increasing pagesize to 100 as a temporary quickfix 2012-06-09 22:02:29 +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
4a15cf28a9 fixed broken lines in user table 
Conflicts:

	settings/css/settings.css
 2012-06-08 11:44:04 +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
f1b10fcc93 update translations 2012-06-06 00:29:44 +02: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
daa4d2cd84 Validate email on save 2012-06-04 18:44:55 +00: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
60b8e172d5 prevent a division by zero problem 2012-06-01 16:49:14 +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
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
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
Frank Karlitschek
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
Bart Visscher
3a4521a012 Add support for logging to syslog 2012-03-30 23:41:53 +02:00
Robin Appelman
128d446f39 fix timestamps when viewing logs 2012-03-27 00:21:31 +02:00
Tom Needham
7ba8dbb920 Don't truncate users email 2012-03-17 12:51:11 +00:00
Robin Appelman
797e921b9a improve log browsing 2012-02-26 03:10:29 +01:00
Robin Appelman
11cb45bd43 slight change to select style 2012-02-24 23:54:38 +01:00
Robin Appelman
9dcf29ff51 fix bug in group mangement 2012-02-24 23:54:38 +01:00
Robin Appelman
0d3181b6d1 add configure option for default quota 2012-02-24 23:54:38 +01:00
Robin Appelman
4230e217af new config widget for user quota 2012-02-24 23:54:38 +01:00
Robin Appelman
9f5bce81b0 add a default user quota 2012-02-24 23:54:38 +01:00
Marvin Thomas Rabe
3988ec2813 Updated bookmark form 2012-02-22 23:22:17 +01:00
Marvin Thomas Rabe
b3f3b8c23f UI problems solved. Bookmarks app updated. 2012-02-22 16:04:31 +01:00
Bart Visscher
f47444e1f7 Use separate function to make absolute urls 2012-02-17 22:07:14 +01:00
Robin Appelman
d514b1d92d Merge branch 'master' into filesystem 2012-02-01 15:57:32 +01:00
Thomas Schmidt
4145e3b265 pre-select current language, sort available languages 2012-02-01 12:00:38 +01:00
Robin Appelman
4522d19b4c merge master into filesystem 2012-01-30 20:29:33 +01:00
Frank Karlitschek
927bf56940 add a link to the credits page. fame for all our awesome contributors 2012-01-29 14:45:38 +01:00
Robin Appelman
57f2bf5969 add more language names 2012-01-28 15:13:37 +01:00
Frank Karlitschek
05f1fffddc fix appstore download. 2012-01-27 17:34:47 +01:00
Robin Appelman
ad4e305c96 update translations 2012-01-27 00:59:24 +01:00
Robin Appelman
6fccf12299 update translations 2012-01-24 00:42:08 +01:00
Robin Appelman
cdfb252ced Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-01-24 00:24:09 +01:00
Robin Appelman
c2183427c3 dont try to create a user with an already existing username 2012-01-23 17:34:23 +01:00
Robin Appelman
76ce8c6c6a dont show new user when an error occured 2012-01-23 17:33:12 +01:00
Robin Appelman
7ea2923fa8 translation updates 2012-01-20 18:53:45 +01:00
Robin Appelman
3552626358 Merge branch 'master' into filesystem 2012-01-20 00:48:03 +01:00
Robin Appelman
965ea96439 update translations 2012-01-16 17:34:53 +01:00
Robin Appelman
96e2f15d8a merge master into filesystem 2012-01-16 03:06:11 +01:00
Robin Appelman
63d9c1a817 read language name from the right resource 2012-01-15 15:30:08 +01:00
Robin Appelman
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
Robin Appelman
7cd809b286 update translations 2012-01-15 15:12:58 +01:00
Georg Ehrke
0c76884f98 add icon for log app 2012-01-14 23:39:05 +01:00
Robin Appelman
2d25bb3b01 add min width to multiselect in user management 2012-01-14 23:10:38 +01:00
Frank Karlitschek
34a4784077 don´t show warnings for missing language name definitions 2012-01-14 15:41:02 +01:00
Robin Appelman
f67e5d18e7 update translations 2012-01-11 01:06:59 +01:00
Robin Appelman
d1edc360d9 merge master into filesystem 2012-01-08 01:53:40 +01:00
Frank Karlitschek
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
Georg Ehrke
534b6f3a09 Fix whitespace username 2012-01-02 11:49:53 +01:00
Robin Appelman
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
Robin Appelman
a9e94a34c9 use fscache for getting used space 2011-12-14 01:15:07 +01:00
Robin Appelman
9c6d3a83fd also update the data attribute holding the quota 2011-12-11 23:34:20 +01:00
Robin Appelman
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
Bart Visscher
9ba59aee36 Sort apps on name and enabled status 2011-12-07 20:41:00 +01:00
Frank Karlitschek
7df9d934ca second half of the updating stuff 2011-11-19 12:02:34 +01:00
Brice Maron
3940ca3df1 Display correctly the error message when nothing is retrieved from OCS servers 2011-11-06 16:48:26 +01:00
Jan-Christoph Borchardt
8d203531fb corrected link for app dev instructions 2011-10-23 12:38:36 +02:00
Michael Gapczynski
da4a1e6118 Change 'Help translating' to 'Help translate' 2011-10-22 18:03:57 -04:00
Brice Maron
59eac3bc29 Correct little typo/bug in log display and remove ending php tag 2011-10-18 20:10:17 +02:00
Brice Maron
7358d9ebb4 Fix quota onBlur In Settings, Take from right attribute 2011-10-17 20:50:41 +02:00
Robin Appelman
d9372ac766 make log level configurable 2011-10-16 21:11:03 +02:00
Robin Appelman
820cd0fb75 provide a logging mechanism 2011-10-16 21:11:03 +02:00
Robin Appelman
f29dc0c0fb correct language name 2011-10-14 20:50:55 +02:00
Marvin Thomas Rabe
590ff0ced9 moved bookmarklet to personal. username must be provided when adding a new user. 2011-10-08 13:10:49 +02:00
Jan-Christoph Borchardt
71caa4a20c added code and license links next to version number 2011-10-08 10:10:29 +02:00
Marvin Thomas Rabe
d1518f2901 updated calendar settings 2011-10-04 19:37:26 +02:00
Marvin Thomas Rabe
590b006d5c Removed unused javascript 2011-10-02 15:56:51 +02:00
Marvin Thomas Rabe
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
Bart Visscher
21a88613a1 Merge branch 'lostpassword' 
Conflicts:
	core/templates/login.php
	index.php
	lib/util.php
 2011-09-30 23:48:20 +02:00
Bart Visscher
9a5d517ec2 Add more checks for admin user 2011-09-30 23:17:30 +02:00
Bart Visscher
f4782a7690 Check if the application is actually enabled 2011-09-30 23:17:18 +02:00
Marvin Thomas Rabe
2740491f18 quota good cleand up 2011-09-30 19:47:48 +02:00
Marvin Thomas Rabe
5775421f78 user list has descriptions now 2011-09-30 19:35:25 +02:00
Marvin Thomas Rabe
301d7bd3a9 action image for quota is now invisble when user does not hover over 2011-09-30 19:16:19 +02:00
Robin Appelman
3ebf1a5a3b dissable app instalation from apps.owncloud.org interface 2011-09-28 22:39:41 +02:00
Frank Karlitschek
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
Bart Visscher
f149303895 Add email field to personal preferences 2011-09-26 21:17:26 +02:00
Robin Appelman
bcf92badd1 dont set content type to json for Apps 2011-09-26 00:19:34 +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
Robin Appelman
fb01a72693 fix creating users 2011-09-25 15:58:10 +02:00
Robin Appelman
c16a9a83ba actually check the correct password when changing the password 2011-09-25 01:06:00 +02:00
Robin Appelman
09092dd2d2 check for old password when changing passwords 2011-09-25 01:02:22 +02:00
Jan-Christoph Borchardt
ce2c7bad44 widened inputs for language and timezone 2011-09-24 22:14:41 +02:00
Florian Pritz
b23d030925 settings/personal: calculate the relative usage with 2 decimals 
Normally a browser window will be large enough that the bar is wider
than 100px so we can use decimals to display the real usage more
closely.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
 2011-09-24 18:42:04 +02:00
Florian Pritz
e0d013b25e settings/personal: remove padding from quota bar 
The text will stay in it's place, but 0% usage will lead to an empty
bar.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
 2011-09-24 18:42:02 +02:00
Jan-Christoph Borchardt
5559a0dede updated translations 2011-09-23 19:08:02 +02:00
Bart Visscher
e990ef3542 Move some common code to OC_Util 
Created the following function:
 - checkLoggedIn
 - checkAdminUser
 - redirectToDefaultPage
 2011-09-18 21:31:56 +02:00
Bart Visscher
cd44dff5af Better feedback for saving calendar and openid settings 2011-09-11 20:38:52 +02:00
Bart Visscher
760b47a62f Use OC_Helper::linkTo also for absolute urls. 
One central place to check for https.
 2011-09-09 22:19:15 +02:00
Jan-Christoph Borchardt
14bbd6f976 updated translations 2011-09-04 18:12:58 +02:00
Jan-Christoph Borchardt
f4b9895cbf having non-editable stuff as input fields is really confusing. You were right Robin ;) 2011-09-04 10:34:57 +02:00
Jan-Christoph Borchardt
471b543c8f updated translations again 2011-09-03 15:45:45 +02:00
Jan-Christoph Borchardt
5536579e1a updated language codes 2011-09-03 15:20:27 +02:00
Jan-Christoph Borchardt
1bf215cd08 updated translations 2011-09-03 15:08:58 +02:00
Robin Appelman
9411d8bb08 fixed users not being able to change their password 2011-08-30 22:03:17 +02:00
Michael Gapczynski
1b6a77ce5e Use Chosen for language select form 2011-08-27 19:46:20 -04:00
Jan-Christoph Borchardt
0054197d02 updated translations 2011-08-28 01:14:32 +02:00
Michael Gapczynski
fba066341d Add locale for password change error 2011-08-27 19:12:10 -04:00
Michael Gapczynski
74c7890fbb Fix undefined index license in Apps 2011-08-27 17:56:22 -04:00
Michael Gapczynski
98ca6c4a16 Fix changing password in personal page (not complete) 2011-08-27 17:40:41 -04:00
Michael Gapczynski
eee7d8da50 Reload the personal page when a new language is set 2011-08-27 17:06:15 -04:00
Jan-Christoph Borchardt
3b10cddceb added icon for Admin 2011-08-23 11:37:29 +02:00
Jan-Christoph Borchardt
900382057d updated translations 2011-08-23 11:20:37 +02:00
Robin Appelman
391e064e67 allow apps to register form for the settings and admin pages 2011-08-23 01:41:18 +02:00
Jan-Christoph Borchardt
3f8e4e2a30 added controls bar for Apps and Help 2011-08-21 11:14:57 +02:00
Jan-Christoph Borchardt
389b2775c2 translation update 2011-08-20 05:12:16 +02:00
Jan-Christoph Borchardt
d9aae20003 more valid HTML, alt attributes, refactored pagenavi etc. 2011-08-20 05:07:58 +02:00
Jan-Christoph Borchardt
bb127a367d made translation link language-specific 2011-08-19 13:29:07 +02:00
Jan-Christoph Borchardt
df6517c72d updated translations 2011-08-19 13:12:22 +02:00
Jan-Christoph Borchardt
115a6c8785 added Settings navigation items to translations 2011-08-18 21:10:01 +02:00
Jan-Christoph Borchardt
4c49a81c8e language updates, optimization of Help HTML 2011-08-18 19:22:44 +02:00
Jan-Christoph Borchardt
2ee9e80afe Swedish translation, thanks to HakanS 2011-08-18 14:33:05 +02:00
Jan-Christoph Borchardt
6720a45d65 updated translations 2011-08-18 11:46:49 +02:00
Frank Karlitschek
cb9fc6d901 make the help section working and pretty. knowledge base entries are fetched via OCS from a different server. cool stuff 2011-08-17 00:24:50 +02:00
Robin Appelman
af55526164 fix enableing apps 2011-08-15 23:31:59 +02:00
Robin Appelman
523b0966d2 add option to set user quota 2011-08-15 21:09:13 +02:00
Robin Appelman
c08e85bf70 dont throw errors if we cant connect to the apps repository 2011-08-15 16:01:41 +02:00
Jan-Christoph Borchardt
0e25dd65c0 replaced some languages with their indigenous names 2011-08-14 16:29:22 +02:00
Jan-Christoph Borchardt
7bb261f810 more fixes for Personal and Tipsy 2011-08-14 16:12:31 +02:00
Robin Appelman
df532e3f82 Show language names in Personal 2011-08-14 15:30:30 +02:00
Robin Appelman
970888b92d fix some details in Personal 2011-08-14 15:06:16 +02:00
Jan-Christoph Borchardt
6e30ade0b3 updated tipsy, tooltips finally work everywhere, thanks icewind 2011-08-14 14:55:43 +02:00
Jan-Christoph Borchardt
f2a21398d7 more info in personal, WebDAV, OpenID 2011-08-14 11:09:51 +02:00
Robin Appelman
4f43b0a729 fix creating users 2011-08-13 23:56:53 +02:00
Jan-Christoph Borchardt
6b2862fcfe various CSS fixes 2011-08-13 16:00:10 +02:00
Jan-Christoph Borchardt
7474c907dc CSS update, Personal looks better now 2011-08-13 15:32:00 +02:00
Jan-Christoph Borchardt
2ba3793671 updated translations 2011-08-13 12:43:15 +02:00
Jan-Christoph Borchardt
7ece8ed314 added global action class for icons 2011-08-13 05:27:50 +02:00
Jan-Christoph Borchardt
b2768637d2 updated translations 2011-08-13 05:13:35 +02:00
Jan-Christoph Borchardt
4a5ee765cf merged admin, help and settings to settings 2011-08-13 05:13:34 +02:00
Robin Appelman
d47cdc3c18 fix changing passwords 2011-08-12 14:12:01 +02:00
Jan-Christoph Borchardt
99790d6805 lots of image changes, use svg EVERYWHERE POSSIBLE 2011-08-11 19:00:32 +02:00
Frank Karlitschek
aa582ec43a more work on encryption 2011-08-11 17:49:36 +02:00
Frank Karlitschek
c824572b91 fix the getlink calls 2011-08-11 16:15:55 +02:00
Robin Appelman
9059b55979 make more strings translatable 2011-08-10 14:03:54 +02:00
Jakob Sack
ae862ddf69 Improve l10n.pl 
o more information
 o drop l10n/xgettextfiles
 o read all php and js files inside a folder that has a "l10n" folder
 2011-08-10 12:34:49 +02:00
Robin Appelman
30d47732bd dont show an error if openid is dissabled 2011-08-09 00:12:20 +02:00
Robin Appelman
7b38e5d7c7 apps can now add their own forms to the Personal page 2011-08-08 23:46:52 +02:00
Robin Appelman
5ecdd26902 show settings page in the correct context 2011-08-08 21:51:10 +02:00
Robin Appelman
e6f6d3dabc dont use a different navigation page for settings stuff 2011-08-08 21:43:31 +02:00
Jan-Christoph Borchardt
3c01c36202 various style fixes 2011-08-08 14:13:11 +02:00
Jan-Christoph Borchardt
70a4cfd112 removed paragraphs in forms, added show password function 2011-08-08 11:07:44 +02:00
Robin Appelman
f039320a0b move openid settings to Personal 2011-08-06 10:08:26 +02:00
Jan-Christoph Borchardt
c78e41b2d3 forgot to generate the translation files 2011-07-30 23:43:22 +02:00
Jan-Christoph Borchardt
bb5e6c9823 Transifex connection, added French and part of Bulgarian 2011-07-30 10:21:55 +02:00
Jakob Sack
bafd684eb6 Renaming classes :-) 2011-07-29 21:36:03 +02:00
Jakob Sack
2f807a3c7f Delete requires in applications where possible 2011-07-27 19:25:49 +02:00
Hans Bakker
f989871501 More nl l10n improvements 2011-07-04 00:39:04 +02:00
Jakob Sack
481b7b25e2 Make Jans German translation usuable 2011-06-23 10:58:06 +02:00
Robin Appelman
83958ebd4b add oc_user::getUser to get the user id of the loggedin user 2011-06-22 12:50:57 +02:00
Kamil Domanski
4f6ea7e648 added polish translation 2011-06-22 03:59:30 +02:00
Jakob Sack
34de2cacd1 Updated danish translation 2011-06-21 16:01:47 +02:00
Jakob Sack
fb7f00edbc l10nlist.shuffle ;-) 2011-06-20 22:22:58 +02:00
Jakob Sack
ef3386c5f8 All translations should be in the new system 2011-06-20 22:08:44 +02:00
Jakob Sack
61993419ec New i18n-structure 2011-06-20 21:54:21 +02:00
Robin Appelman
ca849a4f0f dutch translations 2011-06-20 14:52:24 +02:00
Robin Appelman
4c1d3155a3 make personal settings translatable 2011-06-20 14:51:33 +02:00
Robin Appelman
76b12c4ae0 add settings option for language 2011-06-20 14:33:31 +02:00
Jakob Sack
b57823baa5 Made the "change password" thingie in settings working 2011-04-18 15:07:14 +02:00
Jan-Christoph Borchardt
5249f09f70 even shinier icons 2011-04-18 11:23:47 +02:00
Jan-Christoph Borchardt
8c5831d958 shiny new symbolic icons, yay 2011-04-17 20:11:28 +02:00
Jakob Sack
ee3d32b023 Everything nice and active now 2011-04-17 20:00:07 +02:00
Frank Karlitschek
f02884e294 user the prettybutton 2011-04-17 18:37:38 +02:00
Robin Appelman
225ad85e90 add free_space to OC_FILESYSTEM 2011-04-17 16:40:44 +02:00
Robin Appelman
542a0a2518 show real data in account information 2011-04-17 13:47:45 +02:00
Jan-Christoph Borchardt
7de3ecfe5f away with the h1, in with the good stuff 2011-04-17 00:45:22 +02:00
Jakob Sack
f2e37e0018 Completely removing personalMenu 2011-04-16 18:06:23 +02:00
Jakob Sack
af1e48df80 Changes in the user experience 2011-04-16 17:49:57 +02:00
Robin Appelman
232654cb60 get rid of the oc_require and friends 2011-04-16 10:12:53 +02:00
Robin Appelman
0f494970d1 Fix a couple of minor coding errors 2011-03-18 14:15:38 +01:00
Jakob Sack
f7f957abb9 Base for a more flexible navigation 2011-03-03 23:08:11 +01:00
Jakob Sack
ae5dc3efdf New classes for owncloud: OC_APP for applications, OC_PREFERENCES for user preferences 2011-03-03 21:55:32 +01:00
Jakob Sack
39279350eb Forgot to change some calls of linkTo 2011-03-02 23:58:46 +01:00
Jakob Sack
66ac355f78 Getting rid of Smarty, using our own template system 2011-03-02 11:56:48 +01:00
Jakob Sack
015ab0eb64 Say Smarty to only use one compile directory. Makes setup somewhat easier. 2011-03-02 00:16:43 +01:00
Jakob Sack
132695ceb1 Start of the refactoring. Commit is quite big because I forgot to use git right from the beginning. Sorry. 2011-03-01 23:20:16 +01:00
Jonathan Riddell
d294c2f6bd Fix licencing, make headers refer to intended AGPL, include copy of AGPL 2011-02-09 14:50:27 +00:00
Robin Appelman
59250ec6fd fix some typo's 2010-10-31 02:41:36 +02:00
Robin Appelman
a98dfbbf71 plugin manager and plugin installer 2010-10-15 23:42:58 +00:00
Robin Appelman
91acafe698 initial version for user managment tab in the settings page 2010-09-20 18:27:43 +00:00
Robin Appelman
b0dbb2ac9d fix wrong settings form being restricted to admin only 2010-09-06 22:34:29 +02:00
Robin Appelman
1e4432c5d5 new settings page that allows plugins to integrate their own settings dialogs more with the existing ones 2010-08-12 17:30:20 +02:00
Martin T. H. Sandsmark
64d4d57615 fix permissions, start to implement private data api 2010-07-16 11:36:03 +02:00
Robin
38bdf4083a same fixes, this time hopefully without merge conflict 2010-04-19 19:46:42 +02:00
Robin
bcd2b6f5f1 ask for current password when editing the settings 2010-03-18 21:37:25 +01:00
Robin
97270d5c63 moved the config functions to /inc/lib_config.php 2010-03-16 20:25:05 +01:00
root
6d57de7b32 cleanup autoconfiguration wizard, add settings page, make it run from subdirectories, huge cleanup 2010-03-16 08:48:36 +01:00
CharlyCoste
c921e5422d <br /> is not a valid strict xhtml1.0 tag. Not semantic. Replacing it by CSS instructions on semantic tags. 2010-03-14 02:03:29 +01:00
CharlyCoste
3984607ef5 center is not a valid strict xhtml1.0 tag (not semantic). At least, replacing it by a div with "center" class. 2010-03-14 01:33:49 +01:00
Frank Karlitschek
16f3bd4e23 commiting ownCloud 1.0 beta 1 2010-03-10 13:03:40 +01:00