Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Fix mail template to use p() for colors | Vincent Petry | 2014-03-03 | 1 | -4/+4 | |
* | | | Merge pull request #7500 from owncloud/theme-mailtemplate | Frank Karlitschek | 2014-03-03 | 2 | -9/+9 | |
|\ \ \ | ||||||
| * | | | make mail notification header color themable | Jan-Christoph Borchardt | 2014-03-03 | 1 | -2/+2 | |
| * | | | compress mail notification logo | Jan-Christoph Borchardt | 2014-03-03 | 1 | -0/+0 | |
| * | | | mail template: remove off-white background color to better blend into mail cl... | Jan-Christoph Borchardt | 2014-03-03 | 1 | -7/+7 | |
| | |/ | |/| | ||||||
* / | | Do not override button background image | jbtbnl | 2014-03-03 | 1 | -4/+4 | |
|/ / | ||||||
* | | Merge pull request #7382 from jbtbnl/master | Raghu Nayyar | 2014-02-27 | 1 | -1/+1 | |
|\ \ | ||||||
| * | | Remove necessity of icon class | jbtbnl | 2014-02-24 | 1 | -1/+1 | |
* | | | Merge pull request #7452 from owncloud/icon-delete-hover | Morris Jobke | 2014-02-27 | 1 | -1/+2 | |
|\ \ \ | ||||||
| * | | | icons: automatically show delete hover instead of using explicit class | Jan-Christoph Borchardt | 2014-02-27 | 1 | -1/+2 | |
* | | | | Merge pull request #7449 from owncloud/remove-input-border | Morris Jobke | 2014-02-27 | 1 | -5/+3 | |
|\ \ \ \ | ||||||
| * | | | | remove border from log in input fields, simpler and works better with themes | Jan-Christoph Borchardt | 2014-02-27 | 1 | -5/+3 | |
| |/ / / | ||||||
* / / / | Installation: relabel 'Advanced' to more descriptive 'Storage & database' | Jan-Christoph Borchardt | 2014-02-27 | 1 | -1/+1 | |
|/ / / | ||||||
* | / | Translate string when an error occured while sending a forgot password mail | Joas Schilling | 2014-02-26 | 1 | -1/+1 | |
| |/ |/| | ||||||
* | | Merge pull request #7409 from owncloud/issue/5361 | Thomas Müller | 2014-02-26 | 1 | -2/+4 | |
|\ \ | ||||||
| * | | Add owncloud version to JS scope | Joas Schilling | 2014-02-26 | 1 | -2/+4 | |
| |/ | ||||||
* | | Merge pull request #7174 from owncloud/issue/7166 | Jan-Christoph Borchardt | 2014-02-26 | 1 | -0/+28 | |
|\ \ | |/ |/| | ||||||
| * | Remove unused variables, add doc blocks and break lines | Joas Schilling | 2014-02-26 | 1 | -2/+2 | |
| * | Remove duplicated definition and move OC.msg to js/js.js | Joas Schilling | 2014-02-19 | 1 | -0/+28 | |
* | | Merge pull request #7285 from owncloud/mimeicons-svg | Morris Jobke | 2014-02-24 | 1 | -13/+18 | |
|\ \ | ||||||
| * | | rename url parameter | Robin Appelman | 2014-02-24 | 1 | -1/+1 | |
| * | | Add url parameter to control whether previews should return 404 when the mime... | Robin Appelman | 2014-02-21 | 1 | -1/+2 | |
| * | | Merge branch 'master' into mimeicons-svg | Robin Appelman | 2014-02-21 | 7 | -15/+62 | |
| |\ \ | ||||||
| * \ \ | Merge branch 'master' into mimeicons-svg | Robin Appelman | 2014-02-20 | 186 | -3152/+1264 | |
| |\ \ \ | ||||||
| * | | | | Show svg mime icons when no preview is available | Robin Appelman | 2014-02-19 | 1 | -13/+17 | |
* | | | | | Merge pull request #7320 from owncloud/GuillaumeAmat-patch-1 | Morris Jobke | 2014-02-24 | 2 | -0/+18 | |
|\ \ \ \ \ | ||||||
| * | | | | | Added oc_defaults stub in specHelper.js | Vincent Petry | 2014-02-24 | 1 | -0/+1 | |
| * | | | | | Merge branch 'master' into GuillaumeAmat-patch-1 | Robin Appelman | 2014-02-21 | 16 | -24/+109 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'patch-1' of github.com:GuillaumeAmat/core into GuillaumeAmat-pa... | Vincent Petry | 2014-02-20 | 1 | -0/+17 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Adds OC_Defaults values in javascript config | Guillaume AMAT | 2014-02-13 | 1 | -0/+17 | |
| | | |_|_|_|/ | | |/| | | | | ||||||
* | | | | | | | Merge pull request #7344 from owncloud/add-js-config-vars | icewind1991 | 2014-02-24 | 1 | -3/+6 | |
|\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch 'master' into add-js-config-vars | Robin Appelman | 2014-02-21 | 6 | -15/+67 | |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | ||||||
| * | | | | | | | Allow apps to add/modify config js output via hook. | ringmaster | 2014-02-20 | 1 | -3/+6 | |
* | | | | | | | | Merge pull request #7310 from owncloud/no-css-js-delivery-via-php | Morris Jobke | 2014-02-21 | 3 | -21/+3 | |
|\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into no-css-js-delivery-via-php | Thomas Müller | 2014-02-21 | 6 | -15/+56 | |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | ||||||
| * | | | | | | | | Merge branch 'master' into no-css-js-delivery-via-php | Thomas Müller | 2014-02-21 | 12 | -9/+42 | |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | ||||||
| * | | | | | | | | Merge branch 'master' into no-css-js-delivery-via-php | Thomas Müller | 2014-02-20 | 180 | -3081/+1159 | |
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | ||||||
| * | | | | | | | | kill references to core.js and core.css | Thomas Müller | 2014-02-20 | 1 | -15/+0 | |
| * | | | | | | | | kill old minimizer code | Thomas Müller | 2014-02-20 | 1 | -3/+0 | |
| * | | | | | | | | fixing js syntax error | Thomas Müller | 2014-02-20 | 1 | -3/+3 | |
* | | | | | | | | | Merge pull request #7355 from owncloud/new-menu-svg | icewind1991 | 2014-02-21 | 1 | -0/+6 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | use SVG icons from icons.css for New file menu | Jan-Christoph Borchardt | 2014-02-21 | 1 | -0/+6 | |
| | |_|_|/ / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #7351 from owncloud/fix_thumbnails_for_conflicts_in_subdirs | Morris Jobke | 2014-02-21 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | ||||||
| * | | | | | | | | use directory from original instead of current dir | Jörn Friedrich Dreyer | 2014-02-21 | 1 | -1/+1 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #7336 from owncloud/IE-wipho-viewport | icewind1991 | 2014-02-21 | 1 | -0/+11 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | fix viewport size on windows phone | Robin Appelman | 2014-02-20 | 1 | -0/+11 | |
* | | | | | | | | Merge branch 'master' into mobile-header | Robin Appelman | 2014-02-21 | 14 | -114/+76 | |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | ||||||
| * | | | | | | | Merge pull request #7291 from owncloud/adminess-raghu | Lukas Reschke | 2014-02-20 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||||
| | * | | | | | | Fix typo | Lukas Reschke | 2014-02-20 | 1 | -1/+1 | |
| | * | | | | | | Variable value is expected and not an echoed output | Lukas Reschke | 2014-02-20 | 1 | -1/+1 |