Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use $.hide() instead of .hidden for now | kondou | 2014-03-12 | 1 | -3/+3 |
| | | | | .inlineblock ranks higher than .hidden | ||||
* | Remove OC.Router usage | kondou | 2014-03-12 | 1 | -7/+8 |
| | |||||
* | Merge branch 'master' into hide_remove_image_avatar | kondou | 2014-03-12 | 3 | -12/+19 |
|\ | |||||
| * | Merge branch 'master' into fix-7307 | Thomas Müller | 2014-03-06 | 1 | -1/+9 |
| |\ | | | | | | | | | | | | | | | | Conflicts: core/js/router.js settings/js/admin.js | ||||
| | * | Add button to send a test mail after changing the email settings | Joas Schilling | 2014-03-05 | 1 | -2/+10 |
| | | | | | | | | | | | | Fix #7175 | ||||
| * | | remove OC.Router.registerLoadedCallback() | Thomas Müller | 2014-03-02 | 1 | -3/+1 |
| | | | |||||
| * | | Replace OC.Router.generate() with OC.generateUrl() | Thomas Müller | 2014-03-02 | 3 | -8/+9 |
| |/ | |||||
* | | Merge branch 'master' into hide_remove_image_avatar | kondou | 2014-02-28 | 3 | -27/+55 |
|\| | |||||
| * | Merge pull request #7174 from owncloud/issue/7166 | Jan-Christoph Borchardt | 2014-02-26 | 2 | -22/+34 |
| |\ | | | | | | | Add option to change email settings in admin section | ||||
| | * | Remove unused variables, add doc blocks and break lines | Joas Schilling | 2014-02-26 | 1 | -1/+1 |
| | | | | | | | | | | | | Fix #7166 | ||||
| | * | Hide SMTP options based on selected send mode | Joas Schilling | 2014-02-26 | 1 | -2/+20 |
| | | | | | | | | | | | | Fix #7166 | ||||
| | * | Remove duplicated definition and move OC.msg to js/js.js | Joas Schilling | 2014-02-19 | 2 | -44/+0 |
| | | | | | | | | | | | | Fix issue #7166 | ||||
| | * | Add option to change email settings in admin section | Joas Schilling | 2014-02-18 | 1 | -0/+38 |
| | | | | | | | | | | | | Fix issue #7166 | ||||
| * | | Merge pull request #7406 from owncloud/settings-apps.js-style | Jan-Christoph Borchardt | 2014-02-26 | 1 | -5/+17 |
| |\ \ | | | | | | | | | coding style fixes: cut long lines, whitespace | ||||
| | * | | coding style fixes: cut long lines, whitespace | Jan-Christoph Borchardt | 2014-02-26 | 1 | -5/+17 |
| | | | | |||||
| * | | | Fix scrutinizer issue in settings/js/apps.js | kondou | 2014-02-26 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge pull request #7401 from owncloud/highlight_selected_app_settings | Vincent Petry | 2014-02-26 | 1 | -0/+2 |
| |\ \ \ | | |/ / | |/| | | Highlight the selected app in app-settings | ||||
| | * | | Highlight the selected app in app-settings | kondou | 2014-02-26 | 1 | -0/+2 |
| | | | | |||||
| * | | | Merge branch 'master' into mobile-header | Robin Appelman | 2014-02-21 | 2 | -46/+59 |
| |\| | | |||||
| * | | | do not show display name on mobile when profile picture is present | Jan-Christoph Borchardt | 2014-02-20 | 1 | -0/+2 |
| | | | | |||||
* | | | | Use addClass('hidden') and removeClass('hidden') | kondou | 2014-02-21 | 1 | -3/+3 |
| | | | | |||||
* | | | | Hide remove image, if there's no custom avatar | kondou | 2014-02-20 | 1 | -0/+14 |
| |/ / |/| | | | | | | | | Fix #7308 | ||||
* | | | Merge pull request #7291 from owncloud/adminess-raghu | Lukas Reschke | 2014-02-20 | 2 | -22/+2 |
|\ \ \ | | | | | | | | | Move isadmin to template and rename it to oc_isadmin | ||||
| * | | | Move isadmin to template and rename it to oc_isadmin | Lukas Reschke | 2014-02-19 | 2 | -22/+2 |
| |/ / | |||||
* | | | Merge pull request #7056 from owncloud/users-scrollperformance | Jan-Christoph Borchardt | 2014-02-20 | 1 | -24/+57 |
|\ \ \ | |/ / |/| | | Improve users list scrolling performance | ||||
| * | | Added loading spinner to users list on scroll | Vincent Petry | 2014-02-18 | 1 | -0/+4 |
| | | | |||||
| * | | Improve users list scrolling performance | Vincent Petry | 2014-02-17 | 1 | -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 event | Joas Schilling | 2014-02-19 | 1 | -1/+1 |
|/ | | | | Fix issue #7277 | ||||
* | Fix implied evals and doubled definition of variable | Morris Jobke | 2014-02-07 | 1 | -2/+2 |
| | | | | | | | fixes #7119 fixes #7120 fixes #7121 fixes #7122 | ||||
* | disable button and input field during decryption | Bjoern Schiessle | 2014-01-24 | 1 | -0/+5 |
| | |||||
* | remove the form, it isn't needed here | Bjoern Schiessle | 2014-01-24 | 1 | -3/+2 |
| | |||||
* | Merge pull request #6234 from owncloud/change-email-by-enter | Jan-Christoph Borchardt | 2014-01-23 | 1 | -0/+17 |
|\ | | | | | change mail address by pressing enter - fixes #6179 | ||||
| * | fix double call of changeEmailAddress() | Morris Jobke | 2014-01-18 | 1 | -0/+5 |
| | | |||||
| * | fix typo | Morris Jobke | 2013-12-09 | 1 | -1/+1 |
| | | |||||
| * | change mail address by pressing enter - fixes #6179 | Morris Jobke | 2013-12-07 | 1 | -0/+12 |
| | | |||||
* | | added website field | Bjoern Schiessle | 2014-01-17 | 1 | -14/+20 |
| | | |||||
* | | distinguish app links from doc links | Bjoern Schiessle | 2014-01-17 | 1 | -1/+1 |
| | | |||||
* | | show link to app documentation | Bjoern Schiessle | 2014-01-17 | 1 | -1/+19 |
| | | |||||
* | | Merge pull request #6786 from wakeup/master | Björn Schießle | 2014-01-16 | 1 | -1/+1 |
|\ \ | | | | | | | Fix untranslated text when deleting user | ||||
| * | | Fix untranslated text when deleting user | Volkan Gezer | 2014-01-15 | 1 | -1/+1 |
| |/ | | | | | | | This should fix issue #6728 | ||||
* / | Indicate password strength using strengthify | Morris Jobke | 2014-01-15 | 1 | -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 Jobke | 2013-12-06 | 1 | -1/+1 |
| | |||||
* | Fix full name edit for repetive edit | Morris Jobke | 2013-12-05 | 1 | -1/+4 |
| | | | | | | | fixes #6212 fixes the data attributes after edit fixes markup to successfully re-edit display name | ||||
* | - show a spinner while decrypting files if the encryption app was disabled | Bjoern Schiessle | 2013-11-20 | 1 | -5/+5 |
| | | | | - don't fade-out the decryption result | ||||
* | Improve quota input field | Vincent Petry | 2013-10-30 | 1 | -2/+11 |
| | | | | | | - Added tooltip with examples - The quota value returned by the server is now displayed after update - Fixes #5346 | ||||
* | Fixed wrong id when reading checkbox value for force SSL setting | Vincent Petry | 2013-10-23 | 1 | -1/+1 |
| | | | | Fixes #5488 | ||||
* | Added warning notification when user home already exists | Vincent Petry | 2013-10-22 | 1 | -0/+12 |
| | | | | | | | When creating a user and the home already exists in the data dir, a warning notification will be displayed. Fixes #5161 | ||||
* | Puts the language divider in place. thanks @Kondou-ger ;) | raghunayyar | 2013-10-11 | 1 | -4/+0 |
| | |||||
* | Uniform Styles and Indentation Fixes for Personal Block | raghunayyar | 2013-10-11 | 1 | -1/+0 |
| | |||||
* | Fixed display name change for IE8 | Vincent Petry | 2013-10-11 | 1 | -1/+1 |
| | | | | | | | | After saving the display name, the oldDisplayName field's value was wrongly set with text(), which would append the text inside the input element which is considered as an invalid operation in IE8. This fix for #5054 correctly puts the old value into the field with a val() call. |