summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Collapse)AuthorAgeFilesLines
* merge master into mobile-styleJan-Christoph Borchardt2014-01-292-27/+48
|\
| * Merge pull request #6927 from owncloud/enc_dont_reload_page_on_decryptMorris Jobke2014-01-272-25/+27
| |\ | | | | | | remove the form, it isn't needed here
| | * disable button and input field during decryptionBjoern Schiessle2014-01-241-0/+5
| | |
| | * remove the form, it isn't needed hereBjoern Schiessle2014-01-242-25/+22
| | |
| * | prevent autofill for password change settings, prevent leak of existing ↵Jan-Christoph Borchardt2014-01-241-2/+4
| |/ | | | | | | password, fix #6552
| * Merge pull request #6234 from owncloud/change-email-by-enterJan-Christoph Borchardt2014-01-231-0/+17
| |\ | | | | | | change mail address by pressing enter - fixes #6179
| | * fix double call of changeEmailAddress()Morris Jobke2014-01-181-0/+5
| | |
| | * fix typoMorris Jobke2013-12-091-1/+1
| | |
| | * change mail address by pressing enter - fixes #6179Morris Jobke2013-12-071-0/+12
| | |
* | | Merge branch 'master' into mobile-styleThomas Müller2014-01-238-15/+73
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/files.js apps/files_sharing/css/public.css apps/files_sharing/js/public.js apps/files_sharing/templates/public.php
| * | added website fieldBjoern Schiessle2014-01-173-18/+25
| | |
| * | distinguish app links from doc linksBjoern Schiessle2014-01-173-3/+4
| | |
| * | show link to app documentationBjoern Schiessle2014-01-173-1/+30
| | |
| * | Merge pull request #6786 from wakeup/masterBjörn Schießle2014-01-161-1/+1
| |\ \ | | | | | | | | Fix untranslated text when deleting user
| | * | Fix untranslated text when deleting userVolkan Gezer2014-01-151-1/+1
| | | | | | | | | | | | | | | | This should fix issue #6728
| * | | Indicate password strength using strengthifyMorris Jobke2014-01-154-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * uses zxcvbn * outsourced to separate jquery plugin * async loading * hide strength meter if input is empty * feedback if user enters weakest password * fade in and out * show tipsy with strength * Opera 12, IE8-10, FF 23, Chromium 29
| * | | remove ru_RU - it has bee removed from transifexThomas Müller2014-01-131-10/+0
| | | |
* | | | remove unused log iconJan-Christoph Borchardt2014-01-153-12/+0
|/ / /
* / / [tx-robot] updated from transifexJenkins for ownCloud2014-01-063-4/+11
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2014-01-051-0/+6
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2014-01-041-1/+1
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2014-01-021-0/+153
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-12-291-14/+47
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-12-244-7/+18
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-12-221-0/+22
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-12-211-0/+3
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-12-191-0/+2
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-12-171-0/+6
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-12-173-3/+12
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-12-132-0/+4
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-12-115-1/+60
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-12-072-0/+28
|/
* Merge pull request #6213 from owncloud/fix-full-name-editVincent Petry2013-12-061-1/+4
|\ | | | | Fix full name edit for repetitive edit
| * parent().parent() -> closest()Morris Jobke2013-12-061-1/+1
| |
| * Fix full name edit for repetive editMorris Jobke2013-12-051-1/+4
| | | | | | | | | | | | | | fixes #6212 fixes the data attributes after edit fixes markup to successfully re-edit display name
* | [tx-robot] updated from transifexJenkins for ownCloud2013-12-0510-0/+21
|/
* [tx-robot] updated from transifexJenkins for ownCloud2013-12-043-2/+26
|
* lower required php version to 5.3.3Frank Karlitschek2013-12-042-0/+15
|
* [tx-robot] updated from transifexJenkins for ownCloud2013-12-026-18/+47
|
* [tx-robot] updated from transifexJenkins for ownCloud2013-11-2910-0/+31
|
* [tx-robot] updated from transifexJenkins for ownCloud2013-11-272-0/+5
|
* 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-262-0/+5
|\ | | | | Set Avatar for LDAP users automatically (if a picture is available)
| * Enable user backends to provide avatar imagesArthur Schiwon2013-11-222-0/+5
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-11-267-0/+17
| |
* | check if user is logged inBjoern Schiessle2013-11-261-0/+3
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-11-2630-29/+29
| |
* | Merge pull request #5960 from owncloud/enc_small_visual_improvementsVincent Petry2013-11-251-5/+5
|\ \ | | | | | | [encryption] some small visual improvements
| * | - show a spinner while decrypting files if the encryption app was disabledBjoern Schiessle2013-11-201-5/+5
| | | | | | | | | | | | - don't fade-out the decryption result