summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #7174 from owncloud/issue/7166Jan-Christoph Borchardt2014-02-267-22/+251
|\ | | | | Add option to change email settings in admin section
| * Remove unused variables, add doc blocks and break linesJoas Schilling2014-02-263-14/+35
| | | | | | | | Fix #7166
| * Hide SMTP options based on selected send modeJoas Schilling2014-02-262-18/+36
| | | | | | | | Fix #7166
| * Remove duplicated definition and move OC.msg to js/js.jsJoas Schilling2014-02-192-44/+0
| | | | | | | | Fix issue #7166
| * Add option to change email settings in admin sectionJoas Schilling2014-02-186-0/+234
| | | | | | | | Fix issue #7166
* | Merge pull request #7406 from owncloud/settings-apps.js-styleJan-Christoph Borchardt2014-02-261-5/+17
|\ \ | | | | | | coding style fixes: cut long lines, whitespace
| * | coding style fixes: cut long lines, whitespaceJan-Christoph Borchardt2014-02-261-5/+17
| | |
* | | Fix scrutinizer issue in settings/js/apps.jskondou2014-02-261-2/+2
| | |
* | | Merge pull request #7401 from owncloud/highlight_selected_app_settingsVincent Petry2014-02-262-1/+8
|\ \ \ | |/ / |/| | Highlight the selected app in app-settings
| * | fix for coding styleJan-Christoph Borchardt2014-02-261-1/+6
| | |
| * | Highlight the selected app in app-settingskondou2014-02-262-1/+3
| | |
* | | Merge branch 'master' into mobile-headerRobin Appelman2014-02-214-50/+59
|\| |
| * | Merge pull request #7291 from owncloud/adminess-raghuLukas Reschke2014-02-204-26/+2
| |\ \ | | | | | | | | Move isadmin to template and rename it to oc_isadmin
| | * | Move isadmin to template and rename it to oc_isadminLukas Reschke2014-02-194-26/+2
| | | |
| * | | Merge pull request #7056 from owncloud/users-scrollperformanceJan-Christoph Borchardt2014-02-201-24/+57
| |\ \ \ | | |/ / | |/| | Improve users list scrolling performance
| | * | Added loading spinner to users list on scrollVincent Petry2014-02-181-0/+4
| | | |
| | * | Improve users list scrolling performanceVincent Petry2014-02-171-24/+53
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | - fixed JS error when avatar mode is disabled - added spinner at the bottom of the table - scroll detection now happens earlier - single/multiselect init is deferred so that the new rows are first appended into the list (more responsive) and initialized afterwards - disabled users sorting after add (assuming they are always sorted on the server side)
* | / do not show display name on mobile when profile picture is presentJan-Christoph Borchardt2014-02-201-0/+2
|/ /
* | Add event parameter to keyup eventJoas Schilling2014-02-191-1/+1
| | | | | | | | Fix issue #7277
* | do not autocapitalize fields on mobile, fix user name input. Also disable ↵Jan-Christoph Borchardt2014-02-181-4/+10
| | | | | | | | autocorrect and specify autocomplete
* | catch errors during decryptionBjoern Schiessle2014-02-171-1/+8
|/
* Fix implied evals and doubled definition of variableMorris Jobke2014-02-071-2/+2
| | | | | | | fixes #7119 fixes #7120 fixes #7121 fixes #7122
* Merge pull request #6490 from owncloud/theming-for-appstemplateJan-Christoph Borchardt2014-02-051-0/+4
|\ | | | | do not show 'Add app' and 'More apps' for themed ownCloud
| * use appstoreenabled config switchBjoern Schiessle2014-01-161-2/+2
| |
| * do not show 'Add app' and 'More apps' for themed ownCloudJan-Christoph Borchardt2013-12-181-0/+4
| |
* | 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
| | |