summaryrefslogtreecommitdiffstats
path: root/settings/templates
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6927 from owncloud/enc_dont_reload_page_on_decryptMorris Jobke2014-01-271-22/+20
|\
| * remove the form, it isn't needed hereBjoern Schiessle2014-01-241-22/+20
* | prevent autofill for password change settings, prevent leak of existing passw...Jan-Christoph Borchardt2014-01-241-2/+4
|/
* added website fieldBjoern Schiessle2014-01-171-3/+5
* distinguish app links from doc linksBjoern Schiessle2014-01-171-2/+2
* show link to app documentationBjoern Schiessle2014-01-171-0/+5
* Indicate password strength using strengthifyMorris Jobke2014-01-151-0/+2
* lower required php version to 5.3.3Frank Karlitschek2013-12-041-0/+14
* fix wordingMorris Jobke2013-11-271-1/+1
* add warning for HTTP connectionMorris Jobke2013-11-271-0/+14
* Merge pull request #6058 from owncloud/ldap2avatarblizzz2013-11-261-0/+4
|\
| * Enable user backends to provide avatar imagesArthur Schiwon2013-11-221-0/+4
* | fix typoBjoern Schiessle2013-11-251-1/+1
* | remove logic from template and fix syntax errorThomas Mueller2013-11-242-2/+2
* | replace echo with pFrank Karlitschek2013-11-242-2/+2
* | show the build number if on the daily build update channelFrank Karlitschek2013-11-242-2/+2
|/
* Fixing the warning notificationsThomas Müller2013-11-211-1/+9
* Update error messagesBart Visscher2013-11-151-2/+2
* change 'Display Name' to more understandable 'Full Name', fix #5612Jan-Christoph Borchardt2013-11-062-3/+3
* Merge pull request #5638 from owncloud/admin-quotafieldMorris Jobke2013-10-311-2/+2
|\
| * fix translation stringsMorris Jobke2013-10-311-2/+2
| * Improve quota input fieldVincent Petry2013-10-301-2/+2
* | Changed wording in log level dropdownVincent Petry2013-10-301-5/+5
* | Changed log level labels in log level dropdownVincent Petry2013-10-301-6/+14
|/
* introduce link_to_docs() and migrate linksThomas Müller2013-10-212-2/+2
* change the languageFrank Karlitschek2013-10-201-2/+2
* harmonize this with the documentation. Once every minute is way to often. Eve...Frank Karlitschek2013-10-191-2/+2
* show the channel. Also mark git as git channel so that someone can see where ...Frank Karlitschek2013-10-132-2/+2
* Merge pull request #5299 from owncloud/settings-ie8-tablegridstylesThomas Müller2013-10-122-5/+5
|\
| * Fixed table grid styles for IE8Vincent Petry2013-10-112-5/+5
* | Merge pull request #5272 from mrflix/masterThomas Müller2013-10-121-1/+1
|\ \
| * | fix checkbox <-> label bindingFelix Niklas2013-10-101-1/+1
* | | Includes <optgroup> tagraghunayyar2013-10-111-1/+1
* | | Puts the language divider in place. thanks @Kondou-ger ;)raghunayyar2013-10-111-0/+1
* | | Removes the Bogus Labelraghunayyar2013-10-111-3/+0
| |/ |/|
* | Uniform Styles and Indentation Fixes for Personal Blockraghunayyar2013-10-111-10/+20
|/
* more elegant style for Personal and Admin settingsJan-Christoph Borchardt2013-10-052-19/+19
* Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-09-162-0/+27
|\
| * 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
| |\
| * | 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