Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-22 | 1 | -1/+1 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-21 | 2 | -0/+2 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-20 | 2 | -0/+15 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-19 | 2 | -0/+46 |
| | |||||
* | Display admin option for public upload with encryption enabled | Vincent Petry | 2014-03-18 | 1 | -2/+0 |
| | | | | | Now that public upload works with encryption, the admin option to toggle it must be made visible. | ||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-17 | 1 | -1/+18 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-16 | 2 | -0/+41 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-15 | 3 | -0/+57 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-13 | 5 | -0/+247 |
| | |||||
* | Merge pull request #7340 from owncloud/hide_remove_image_avatar | Morris Jobke | 2014-03-13 | 1 | -0/+15 |
|\ | | | | | Hide remove image, if there's no custom avatar | ||||
| * | 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 | 80 | -363/+1213 |
| |\ | |||||
| * \ | Merge branch 'master' into hide_remove_image_avatar | kondou | 2014-02-28 | 10 | -29/+281 |
| |\ \ | |||||
| * | | | 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 | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-13 | 10 | -0/+45 |
| | | | | |||||
* | | | | Merge pull request #7564 from owncloud/issue/7559 | Vincent Petry | 2014-03-12 | 2 | -3/+26 |
|\ \ \ \ | |_|_|/ |/| | | | Hide QMail when not selected and hide SendMail when not available on the server | ||||
| * | | | Use command -v to check for sendmail | Joas Schilling | 2014-03-12 | 1 | -1/+15 |
| | | | | | | | | | | | | | | | | Fix #7559 | ||||
| * | | | Hide QMail when not selected and hide sendmail when not available on the server | Joas Schilling | 2014-03-05 | 2 | -3/+12 |
| | | | | | | | | | | | | | | | | Fix #7559 | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-12 | 73 | -11/+672 |
| | | | | |||||
* | | | | Authentification -> Authentication | Thomas Müller | 2014-03-11 | 2 | -2/+2 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-11 | 67 | -336/+479 |
| | | | | |||||
* | | | | Merge branch 'master' into fix-7307 | Thomas Müller | 2014-03-06 | 5 | -3/+48 |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: core/js/router.js settings/js/admin.js | ||||
| * | | | Merge pull request #7412 from owncloud/issue/7175 | Joas Schilling | 2014-03-05 | 4 | -3/+48 |
| |\ \ \ | | | | | | | | | | | Add button to send a test mail after changing the email settings | ||||
| | * | | | Add button to send a test mail after changing the email settings | Joas Schilling | 2014-03-05 | 4 | -3/+48 |
| | | | | | | | | | | | | | | | | | | | | Fix #7175 | ||||
| * | | | | update wording of email field | Morris Jobke | 2014-03-04 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
* | | | | 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 | 4 | -8/+11 |
|/ / / | |||||
* | | | profile image: relabel technical 'Abort' to more widely used 'Cancel' | Jan-Christoph Borchardt | 2014-02-28 | 1 | -1/+1 |
| | | | |||||
* | | | close encryption session after decryption was finished | Bjoern Schiessle | 2014-02-26 | 1 | -0/+2 |
|/ / | |||||
* | | 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 |