80e10f01c4
Clean up
2013-08-30 13:16:13 +02:00
0c708be76b
Use defaultavatars
2013-08-29 14:26:11 +02:00
e66113f50d
Include placeholder.js
2013-08-28 23:23:17 +02:00
bdf48a6daa
Use OC.Router.generate, TODO use cache, prepare for defaultavatars
2013-08-28 21:20:28 +02:00
67c5be9f19
Merge branch 'master' into oc_avatars
...
Conflicts:
3rdparty
2013-08-28 16:44:11 +02:00
8cf9336bcb
storage information is path specific
2013-08-27 00:59:58 +02:00
9a8908b643
Use Jcrop, have inline errormsg, work on cropping, clean up, WIP
2013-08-25 21:06:44 +02:00
81cadd5ea3
Remove gravatar and no-avatar functionality, prepare for default avatars even more and reword some stuff
2013-08-25 21:06:02 +02:00
252548c62c
Improve styling & enable avatar-upload at personal page
2013-08-25 21:04:45 +02:00
4a08f7d710
Add basic avatars and gravatar
2013-08-25 21:02:43 +02:00
53bb89824d
check if some encrypted files are left after the app was disabled and warn the user
2013-08-12 17:25:27 +02:00
c7eba69aea
only show decrypt all files option if encrypted files are available
2013-07-30 12:26:07 +02:00
b6fa0e4eef
working decrypt files method
2013-07-29 17:06:05 +02:00
e15e394fcc
add ajax call to decrypt all files
...
Conflicts:
apps/files_encryption/lib/crypt.php
2013-07-29 13:39:05 +02:00
2c8e5ec84f
user interface to allow user to decrypt all his files once the encryption app was disabled
...
Conflicts:
settings/templates/personal.php
2013-07-29 13:36:06 +02:00
05084e03a0
Use !== and === in settings.
2013-07-21 13:55:25 +02:00
3c691c9ec9
move to non-static OC_Defaults
...
Conflicts:
lib/mail.php
2013-07-04 10:11:16 +02:00
d46e62886a
Add init funtion to OC_Defaults to be able to wrap translatable strings
2013-07-04 10:09:28 +02:00
e1e798c623
make footer and urls aware of ownCloud editions
2013-06-12 15:44:11 +02:00
ee1ce055fc
Fix #3251
...
Using ksort now, instead of prefilling the commonlanguages array.
2013-05-09 23:19:37 +02:00
d8e6db5608
Sort priorized languages as defined in the array
...
Also add russian and arabic to the common languages.
2013-05-01 00:34:13 +02:00
79218be1d2
Priorize common languages.
2013-04-18 15:14:42 +02:00
d2f34183a6
sort languages based on display name not the iso code
2013-02-14 21:34:15 +01:00
0a16d25724
make it possible to modify the links to the clients
2013-02-06 15:20:43 +01:00
9d73e7eb1e
let the user change his display name, if supported by the back-end
2013-02-06 11:38:03 +01:00
5221ee0c5a
offer change password only when the action is supported by the user backend
2013-02-05 19:26:00 +01:00
2d36a20a1d
moving storage calculation code to OC_Helper::getStorageInfo()
2013-01-02 14:35:45 +01:00
30d7993e01
Checkstyle fixes: NoSpaceAfterComma
2012-11-04 11:10:46 +01:00
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
7e2d4e2a8e
Remove verify user from personal.php
2012-10-15 23:51:22 +02:00
6b39b80648
Change auth checks
2012-10-15 17:44:44 +02:00
4c4fd36bdd
the Shared folder is no longer in the cache
2012-10-13 14:52:49 +02:00
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
d0bd2bbf27
Convert menu entries of settings pages to use router
2012-09-28 23:20:17 +02:00
3829460ab8
adding space between) and {
2012-09-07 15:22:01 +02:00
7ab5256922
Update settings/personal.php
...
respect coding style
2012-09-04 12:29:41 +03:00
dc2648b14c
Update settings/personal.php
...
respect coding style
2012-09-04 12:16:24 +03: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
0810f92894
Fix used space calculation if shared folder does not exist, fixes bug oc-1331
2012-07-26 10:30:33 -04:00
e59a1806cf
remove superfluous ?> at the end of .php files (left out apps/*/templates)
2012-07-09 16:51:16 +02:00
2fd7df57d9
don't add the "Shared"-directory size to users quota
2012-06-18 15:35:22 +02:00
e6b0eb3423
prevend a division by zero problem
2012-06-01 16:48:42 +02:00
07f2e316e4
removing executable bit from various files
2012-04-30 12:05:57 +02:00
b1bcc60d83
reuse OC_L10N objects
2012-04-14 16:44:15 +02: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
57f2bf5969
add more language names
2012-01-28 15:13:37 +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
34a4784077
don´t show warnings for missing language name definitions
2012-01-14 15:41:02 +01:00
a9e94a34c9
use fscache for getting used space
2011-12-14 01:15:07 +01: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
f149303895
Add email field to personal preferences
2011-09-26 21:17:26 +02:00
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
e990ef3542
Move some common code to OC_Util
...
Created the following function:
- checkLoggedIn
- checkAdminUser
- redirectToDefaultPage
2011-09-18 21:31:56 +02:00
391e064e67
allow apps to register form for the settings and admin pages
2011-08-23 01:41:18 +02:00
df532e3f82
Show language names in Personal
2011-08-14 15:30:30 +02:00
4a5ee765cf
merged admin, help and settings to settings
2011-08-13 05:13:34 +02:00
kondou
Thomas Müller
Bjoern Schiessle
Georg Ehrke
Arthur Schiwon
Felix Moeller
Bart Visscher
Lukas Reschke
Robin Appelman
Frank Karlitschek
Michael Gapczynski
Jörn Friedrich Dreyer
Thomas Schmidt
Frank Karlitschek
Robin Appelman
Marvin Thomas Rabe
Florian Pritz
Bart Visscher
Jan-Christoph Borchardt