summaryrefslogtreecommitdiffstats
path: root/settings/templates
Commit message (Expand)AuthorAgeFilesLines
* Pass view in \OC_Avatar to constructor and use $_ for enable_avatarskondou2013-09-092-3/+3
* Fix an IE8 bug with the avatarcropper.kondou2013-09-051-1/+0
* Partly fix cropper in IE8 and don't use a dialog for itkondou2013-09-031-7/+14
* Fix some of @jancborchardt's complaints in oc_avatarskondou2013-09-021-4/+4
* Provide 'enable_avatars' in config.php, to disable avatarskondou2013-09-012-0/+6
* Use defaultavatarskondou2013-08-292-2/+2
* Merge branch 'master' into oc_avatarskondou2013-08-281-1/+1
|\
| * Merge pull request #4563 from owncloud/use_personal-passwordJan-Christoph Borchardt2013-08-281-1/+1
| |\
| | * Use personal-password for the password name in personal.phpkondou2013-08-241-1/+1
* | | Clean up some cruftkondou2013-08-261-3/+0
* | | Have a controller instead ofo avatar.php and fix some cropper-designkondou2013-08-262-3/+3
* | | Use Jcrop, have inline errormsg, work on cropping, clean up, WIPkondou2013-08-251-0/+1
* | | Remove gravatar and no-avatar functionality, prepare for default avatars even...kondou2013-08-253-47/+7
* | | Integrate newavatar.php into avatar.php by using GET, POST & DELETEkondou2013-08-251-1/+1
* | | Deny access for non-users and add a (not-working) override buttonkondou2013-08-251-0/+1
* | | Several improvementskondou2013-08-253-40/+32
* | | Have a fancy uploadavatar buttonkondou2013-08-251-1/+2
* | | Use avatar.php in user-managementkondou2013-08-251-1/+1
* | | Show avatar on personal.php always (except if avatars are disabled)kondou2013-08-251-5/+11
* | | Have /avatar.php as a central avatar-pointkondou2013-08-251-2/+2
* | | Improve styling & enable avatar-upload at personal pagekondou2013-08-252-14/+9
* | | Modularize get(), async getAvatar, avatars @ usermgmtkondou2013-08-253-2/+14
* | | Add basic avatars and gravatarkondou2013-08-252-0/+50
|/ /
* | Merge branch 'master' into improve_app-managementkondou2013-08-212-3/+29
|\|
| * Merge pull request #4447 from owncloud/fix_4351_masterMorris Jobke2013-08-201-3/+3
| |\
| | * Use JSON to send/receive group data.Owen Winkler2013-08-151-3/+3
| * | Merge branch 'master' into decrypt_files_againBjoern Schiessle2013-08-172-16/+8
| |\ \
| * | | working decrypt files methodBjoern Schiessle2013-07-291-1/+9
| * | | user interface to allow user to decrypt all his files once the encryption app...Björn Schießle2013-07-291-0/+18
* | | | Move .errormsg from settings-css to .warning in core. Reusable!kondou2013-08-181-1/+1
* | | | Don't use an alert for displaying app-mgmt-errorskondou2013-08-181-0/+1
| |/ / |/| |
* | | merge master into css-fixesJan-Christoph Borchardt2013-08-161-2/+2
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' into css_cleanup_kondoukondou2013-07-243-33/+45
| |\|
| * | General CSS cleanupkondou2013-07-091-2/+2
* | | remove table layout for background jobsJan-Christoph Borchardt2013-07-311-14/+6
| |/ |/|
* | initialize OC_Defaults in template constructorXBjörn Schießle2013-07-242-12/+8
* | Merge branch 'master' into more-themable-stringsThomas Müller2013-07-243-16/+26
|\ \
| * \ Merge branch 'master' into disable-anon-upload-masterThomas Müller2013-07-222-16/+16
| |\ \
| | * | Use !== and === in settings.kondou2013-07-212-16/+16
| * | | Merge branch 'master' into disable-anon-upload-masterThomas Müller2013-07-221-1/+1
| |\| |
| | * | Use transifex.com on link to translationsrolandgeider2013-07-141-1/+1
| * | | Merge branch 'disable-anon-upload-master' of github.com:owncloud/core into di...Thomas Müller2013-07-141-2/+2
| |\ \ \
| | * | | change anonymous to publicThomas Mueller2013-07-121-2/+2
| * | | | No admin option to enable public upload in case encryption is enabledThomas Müller2013-07-141-0/+2
| |/ / /
| * / / new admin setting added which allows to turn off anonymous uploadsThomas Müller2013-07-121-1/+9
| |/ /
* / / use themable strings for admin page, simplify admin export, fix rest of #3791Jan-Christoph Borchardt2013-07-111-9/+15
|/ /
* / Merge https://github.com/owncloud/core/pull/3827Björn Schießle2013-07-081-1/+1
|/
* revert changes which where introduced by accident during merge https://github...Björn Schießle2013-07-041-2/+3
* move to non-static OC_DefaultsBjörn Schießle2013-07-042-6/+6
* Add init funtion to OC_Defaults to be able to wrap translatable stringsBjörn Schießle2013-07-042-0/+3