summaryrefslogtreecommitdiffstats
path: root/settings/js
Commit message (Collapse)AuthorAgeFilesLines
* Use JS as content-type due to mimesniffingLukas Reschke2014-04-171-2/+2
|
* Merge pull request #8069 from ↵Björn Schießle2014-04-111-1/+1
|\ | | | | | | | | owncloud/fix-localization-issues-with-file-encrypt-app Fix some localization issues with file encryption/decryption strings
| * Fix some localization issues with file encryption/decription stringsVolkan Gezer2014-04-051-1/+1
| |
* | reduce code duplication, fix parse error, prevent page reload on hitting ↵Thomas Müller2014-04-071-50/+47
|/ | | | enter while changing the display name - refs #8085
* Merge pull request #7817 from owncloud/app-navigation-for-appsMorris Jobke2014-04-011-13/+13
|\ | | | | Makes #app-navigation a part of app management.
| * Adds Style changes to app-navigation in core/css/apps.cssraghunayyar2014-03-241-2/+2
| |
| * Makes #app-navigation a part of app management.raghunayyar2014-03-201-13/+13
| |
* | Fixed user list offset callVincent Petry2014-03-281-1/+1
|/
* Use $.hide() instead of .hidden for nowkondou2014-03-121-3/+3
| | | | .inlineblock ranks higher than .hidden
* Remove OC.Router usagekondou2014-03-121-7/+8
|
* Merge branch 'master' into hide_remove_image_avatarkondou2014-03-123-12/+19
|\
| * Merge branch 'master' into fix-7307Thomas Müller2014-03-061-1/+9
| |\ | | | | | | | | | | | | | | | Conflicts: core/js/router.js settings/js/admin.js
| | * Add button to send a test mail after changing the email settingsJoas Schilling2014-03-051-2/+10
| | | | | | | | | | | | Fix #7175
| * | remove OC.Router.registerLoadedCallback()Thomas Müller2014-03-021-3/+1
| | |
| * | Replace OC.Router.generate() with OC.generateUrl()Thomas Müller2014-03-023-8/+9
| |/
* | Merge branch 'master' into hide_remove_image_avatarkondou2014-02-283-27/+55
|\|
| * Merge pull request #7174 from owncloud/issue/7166Jan-Christoph Borchardt2014-02-262-22/+34
| |\ | | | | | | Add option to change email settings in admin section
| | * Remove unused variables, add doc blocks and break linesJoas Schilling2014-02-261-1/+1
| | | | | | | | | | | | Fix #7166
| | * Hide SMTP options based on selected send modeJoas Schilling2014-02-261-2/+20
| | | | | | | | | | | | 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-181-0/+38
| | | | | | | | | | | | 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-261-0/+2
| |\ \ \ | | |/ / | |/| | Highlight the selected app in app-settings
| | * | Highlight the selected app in app-settingskondou2014-02-261-0/+2
| | | |
| * | | Merge branch 'master' into mobile-headerRobin Appelman2014-02-212-46/+59
| |\| |
| * | | do not show display name on mobile when profile picture is presentJan-Christoph Borchardt2014-02-201-0/+2
| | | |
* | | | Use addClass('hidden') and removeClass('hidden')kondou2014-02-211-3/+3
| | | |
* | | | Hide remove image, if there's no custom avatarkondou2014-02-201-0/+14
| |/ / |/| | | | | | | | Fix #7308
* | | Merge pull request #7291 from owncloud/adminess-raghuLukas Reschke2014-02-202-22/+2
|\ \ \ | | | | | | | | Move isadmin to template and rename it to oc_isadmin
| * | | Move isadmin to template and rename it to oc_isadminLukas Reschke2014-02-192-22/+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)
* / Add event parameter to keyup eventJoas Schilling2014-02-191-1/+1
|/ | | | Fix issue #7277
* Fix implied evals and doubled definition of variableMorris Jobke2014-02-071-2/+2
| | | | | | | fixes #7119 fixes #7120 fixes #7121 fixes #7122
* disable button and input field during decryptionBjoern Schiessle2014-01-241-0/+5
|
* remove the form, it isn't needed hereBjoern Schiessle2014-01-241-3/+2
|
* 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
| |
* | added website fieldBjoern Schiessle2014-01-171-14/+20
| |
* | distinguish app links from doc linksBjoern Schiessle2014-01-171-1/+1
| |
* | show link to app documentationBjoern Schiessle2014-01-171-1/+19
| |
* | 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-151-0/+12
|/ | | | | | | | | | | * 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
* parent().parent() -> closest()Morris Jobke2013-12-061-1/+1
|