Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #7174 from owncloud/issue/7166 | Jan-Christoph Borchardt | 2014-02-26 | 7 | -22/+251 |
|\ | | | | | Add option to change email settings in admin section | ||||
| * | Remove unused variables, add doc blocks and break lines | Joas Schilling | 2014-02-26 | 3 | -14/+35 |
| | | | | | | | | Fix #7166 | ||||
| * | Hide SMTP options based on selected send mode | Joas Schilling | 2014-02-26 | 2 | -18/+36 |
| | | | | | | | | 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 | 6 | -0/+234 |
| | | | | | | | | 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 | 2 | -1/+8 |
|\ \ \ | |/ / |/| | | Highlight the selected app in app-settings | ||||
| * | | fix for coding style | Jan-Christoph Borchardt | 2014-02-26 | 1 | -1/+6 |
| | | | |||||
| * | | Highlight the selected app in app-settings | kondou | 2014-02-26 | 2 | -1/+3 |
| | | | |||||
* | | | Merge branch 'master' into mobile-header | Robin Appelman | 2014-02-21 | 4 | -50/+59 |
|\| | | |||||
| * | | Merge pull request #7291 from owncloud/adminess-raghu | Lukas Reschke | 2014-02-20 | 4 | -26/+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 | 4 | -26/+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) | ||||
* | / | do not show display name on mobile when profile picture is present | Jan-Christoph Borchardt | 2014-02-20 | 1 | -0/+2 |
|/ / | |||||
* | | Add event parameter to keyup event | Joas Schilling | 2014-02-19 | 1 | -1/+1 |
| | | | | | | | | Fix issue #7277 | ||||
* | | do not autocapitalize fields on mobile, fix user name input. Also disable ↵ | Jan-Christoph Borchardt | 2014-02-18 | 1 | -4/+10 |
| | | | | | | | | autocorrect and specify autocomplete | ||||
* | | catch errors during decryption | Bjoern Schiessle | 2014-02-17 | 1 | -1/+8 |
|/ | |||||
* | Fix implied evals and doubled definition of variable | Morris Jobke | 2014-02-07 | 1 | -2/+2 |
| | | | | | | | fixes #7119 fixes #7120 fixes #7121 fixes #7122 | ||||
* | Merge pull request #6490 from owncloud/theming-for-appstemplate | Jan-Christoph Borchardt | 2014-02-05 | 1 | -0/+4 |
|\ | | | | | do not show 'Add app' and 'More apps' for themed ownCloud | ||||
| * | use appstoreenabled config switch | Bjoern Schiessle | 2014-01-16 | 1 | -2/+2 |
| | | |||||
| * | do not show 'Add app' and 'More apps' for themed ownCloud | Jan-Christoph Borchardt | 2013-12-18 | 1 | -0/+4 |
| | | |||||
* | | merge master into mobile-style | Jan-Christoph Borchardt | 2014-01-29 | 2 | -27/+48 |
|\ \ | |||||
| * \ | Merge pull request #6927 from owncloud/enc_dont_reload_page_on_decrypt | Morris Jobke | 2014-01-27 | 2 | -25/+27 |
| |\ \ | | | | | | | | | remove the form, it isn't needed here | ||||
| | * | | 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 | 2 | -25/+22 |
| | | | | |||||
| * | | | prevent autofill for password change settings, prevent leak of existing ↵ | Jan-Christoph Borchardt | 2014-01-24 | 1 | -2/+4 |
| |/ / | | | | | | | | | | password, fix #6552 | ||||
| * | | 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 |
| | | | | |||||
* | | | | Merge branch 'master' into mobile-style | Thomas Müller | 2014-01-23 | 8 | -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 field | Bjoern Schiessle | 2014-01-17 | 3 | -18/+25 |
| | | | | |||||
| * | | | distinguish app links from doc links | Bjoern Schiessle | 2014-01-17 | 3 | -3/+4 |
| | | | | |||||
| * | | | show link to app documentation | Bjoern Schiessle | 2014-01-17 | 3 | -1/+30 |
| | | | | |||||
| * | | | 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 | 4 | -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 transifex | Thomas Müller | 2014-01-13 | 1 | -10/+0 |
| | | | | | |||||
* | | | | | remove unused log icon | Jan-Christoph Borchardt | 2014-01-15 | 3 | -12/+0 |
|/ / / / | |||||
* / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-01-06 | 3 | -4/+11 |
|/ / / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-01-05 | 1 | -0/+6 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-01-04 | 1 | -1/+1 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-01-02 | 1 | -0/+153 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-29 | 1 | -14/+47 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-24 | 4 | -7/+18 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-22 | 1 | -0/+22 |
| | | |