Commit Graph

133 Commits

Author SHA1 Message Date
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 7e2d4e2a8e Remove verify user from personal.php 2012-10-15 23:51:22 +02:00
Lukas Reschke 6b39b80648 Change auth checks 2012-10-15 17:44:44 +02:00
Robin Appelman 4c4fd36bdd the Shared folder is no longer in the cache 2012-10-13 14:52:49 +02:00
Frank Karlitschek 7efbdb52f6 don´t show negative numbers. this is only a quickfix. I still dont get why the Shared folder can be bigger than the root folder. Perhaps a inconsitency in the filecache? 2012-10-04 12:58:57 +02:00
Bart Visscher d0bd2bbf27 Convert menu entries of settings pages to use router 2012-09-28 23:20:17 +02:00
Thomas Mueller 3829460ab8 adding space between) and { 2012-09-07 15:22:01 +02:00
Thomas Müller 7ab5256922 Update settings/personal.php
respect coding style
2012-09-04 12:29:41 +03:00
Thomas Müller dc2648b14c Update settings/personal.php
respect coding style
2012-09-04 12:16:24 +03: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
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
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
Bjoern Schiessle 2fd7df57d9 don't add the "Shared"-directory size to users quota 2012-06-18 15:35:22 +02:00
Frank Karlitschek e6b0eb3423 prevend a division by zero problem 2012-06-01 16:48:42 +02:00
Thomas Mueller 07f2e316e4 removing executable bit from various files 2012-04-30 12:05:57 +02:00
Robin Appelman b1bcc60d83 reuse OC_L10N objects 2012-04-14 16:44:15 +02: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
Robin Appelman 57f2bf5969 add more language names 2012-01-28 15:13:37 +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
Frank Karlitschek 34a4784077 don´t show warnings for missing language name definitions 2012-01-14 15:41:02 +01:00
Robin Appelman a9e94a34c9 use fscache for getting used space 2011-12-14 01:15:07 +01: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 f149303895 Add email field to personal preferences 2011-09-26 21:17:26 +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
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
Robin Appelman 391e064e67 allow apps to register form for the settings and admin pages 2011-08-23 01:41:18 +02:00
Robin Appelman df532e3f82 Show language names in Personal 2011-08-14 15:30:30 +02:00
Jan-Christoph Borchardt 4a5ee765cf merged admin, help and settings to settings 2011-08-13 05:13:34 +02:00