Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #7652 from owncloud/localStorage_remove | Vincent Petry | 2014-03-11 | 1 | -0/+3 |
|\ | | | | | Add OC.localStorage.removeItem() | ||||
| * | Fix copy/paste error | Thomas Tanghus | 2014-03-10 | 1 | -1/+1 |
| | | |||||
| * | Add function remove() to OC.localeStorage | Thomas Tanghus | 2014-03-10 | 1 | -0/+3 |
| | | |||||
* | | Merge pull request #7659 from owncloud/fix-7596 | Vincent Petry | 2014-03-11 | 1 | -2/+9 |
|\ \ | | | | | | | Fix 7596 | ||||
| * | | send an individual email to each recipient | Thomas Müller | 2014-03-10 | 1 | -2/+9 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-11 | 77 | -216/+575 |
|/ / | |||||
* | | Merge pull request #7600 from ideaship/fix_escaped_html | Vincent Petry | 2014-03-10 | 1 | -1/+1 |
|\ \ | |/ |/| | fix: use print_escaped for radio button "checked" | ||||
| * | fix: use print_escaped for radio button "checked" | ideaship | 2014-03-06 | 1 | -1/+1 |
| | | | | | | | | | | use of p() results in escaped HTML code: checked="checked" where it should be: checked="checked" | ||||
* | | Merge pull request #7567 from owncloud/apps-scroll-settings | Jan-Christoph Borchardt | 2014-03-09 | 1 | -0/+3 |
|\ \ | | | | | | | restrict height of settings and make scrollable | ||||
| * | | restrict height of settings and make scrollable | Jan-Christoph Borchardt | 2014-03-05 | 1 | -0/+3 |
| | | | |||||
* | | | Merge pull request #7592 from owncloud/fixstoragefreespace | Vincent Petry | 2014-03-06 | 1 | -0/+7 |
|\ \ \ | | | | | | | | | Fixed upload issue when free space is not known (ex: FTP) | ||||
| * | | | Added testArea for JS Unit tests | Vincent Petry | 2014-03-06 | 1 | -0/+7 |
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Added a testArea that is outside the viewport but still considered as visible from the jQuery code. The testArea is useful when: - tested code tries to access DOM elements using global ids - tested code is requiring some UI elements to be visible to activate themselves | ||||
* | | | Revert "adding new javascript function OC.generateUrl(url, params)" | Morris Jobke | 2014-03-06 | 1 | -24/+0 |
| | | | | | | | | | | | | This reverts commit 8e667d1934d6bd9b4344ac624fdd2846c89abb0a. | ||||
* | | | Merge pull request #7579 from owncloud/introduce-generateUrl-master | Morris Jobke | 2014-03-06 | 2 | -0/+33 |
|\ \ \ | | | | | | | | | Introduce OC.generateUrl() in master | ||||
| * | | | adding js unit tests for OC.generateUrl() | Thomas Müller | 2014-03-06 | 1 | -0/+9 |
| | | | | |||||
| * | | | adding new javascript function OC.generateUrl(url, params) | Thomas Müller | 2014-03-06 | 1 | -0/+24 |
| |/ / | |||||
* | | | Merge pull request #7494 from owncloud/fix-7307 | Vincent Petry | 2014-03-06 | 8 | -138/+62 |
|\ \ \ | | | | | | | | | Replace OC.Router.generate() with OC.generateUrl() | ||||
| * | | | Merge branch 'master' into fix-7307 | Thomas Müller | 2014-03-06 | 7 | -21/+30 |
| |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: core/js/router.js settings/js/admin.js | ||||
| * | | | Removed obsolete OC.Router stubs in specHelper | Vincent Petry | 2014-03-05 | 1 | -10/+0 |
| | | | | |||||
| * | | | fixing js unit tests | Thomas Müller | 2014-03-05 | 3 | -11/+5 |
| | | | | |||||
| * | | | adding JSDoc + remove unused function | Thomas Müller | 2014-03-02 | 1 | -5/+8 |
| | | | | |||||
| * | | | Replace OC.Router.generate() with OC.generateUrl() | Thomas Müller | 2014-03-02 | 5 | -118/+55 |
| | | | | |||||
* | | | | fix noise not repeating | Jan-Christoph Borchardt | 2014-03-06 | 1 | -1/+1 |
| |/ / |/| | | |||||
* | | | Merge pull request #7569 from owncloud/scrutinizer-tabs | Jan-Christoph Borchardt | 2014-03-05 | 2 | -15/+15 |
|\ \ \ | | | | | | | | | fix some spaces to tabs issues reported by Scrutinizer | ||||
| * | | | fix some spaces to tabs issues reported by Scrutinizer | Jan-Christoph Borchardt | 2014-03-05 | 2 | -15/+15 |
| | |/ | |/| | |||||
* | | | Merge pull request #7566 from owncloud/button-outlines | Morris Jobke | 2014-03-05 | 1 | -0/+1 |
|\ \ \ | |/ / |/| | | Adds 0 Outlines to Buttons | ||||
| * | | Adds 0 Outlines to Buttons | raghunayyar | 2014-03-05 | 1 | -0/+1 |
| | | | |||||
* | | | add hover/focus states for star icons to hint at action | Jan-Christoph Borchardt | 2014-03-05 | 1 | -2/+6 |
|/ / | |||||
* | | Merge pull request #7554 from owncloud/issue/7304 | Morris Jobke | 2014-03-05 | 2 | -2/+6 |
|\ \ | | | | | | | Fix position of eye icon on database password field | ||||
| * | | Fix position of eye icon on database password field | Joas Schilling | 2014-03-05 | 2 | -2/+6 |
| | | | | | | | | | | | | Fix #7304 | ||||
* | | | Fix mail template to use p() for colors | Vincent Petry | 2014-03-03 | 1 | -4/+4 |
| | | | | | | | | | | | | Now using p() instead of print_unescaped() for colors. | ||||
* | | | Merge pull request #7500 from owncloud/theme-mailtemplate | Frank Karlitschek | 2014-03-03 | 2 | -9/+9 |
|\ \ \ | | | | | | | | | Enable theming of the mail template header | ||||
| * | | | 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 ↵ | Jan-Christoph Borchardt | 2014-03-03 | 1 | -7/+7 |
| | |/ | |/| | | | | | | | client | ||||
* / | | 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 | ||||
| * | | Remove necessity of icon class | jbtbnl | 2014-02-24 | 1 | -1/+1 |
| | | | | | | | | | Only the icon specific class is needed | ||||
* | | | 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 | ||||
| * | | | 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 | ||||
| * | | | | 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 |
| |/ |/| | | | | | Fix #7423 | ||||
* | | Merge pull request #7409 from owncloud/issue/5361 | Thomas Müller | 2014-02-26 | 1 | -2/+4 |
|\ \ | | | | | | | Add owncloud version to JS scope | ||||
| * | | Add owncloud version to JS scope | Joas Schilling | 2014-02-26 | 1 | -2/+4 |
| |/ | | | | | | | Fix #5361 | ||||
* | | Merge pull request #7174 from owncloud/issue/7166 | Jan-Christoph Borchardt | 2014-02-26 | 1 | -0/+28 |
|\ \ | |/ |/| | Add option to change email settings in admin section | ||||
| * | Remove unused variables, add doc blocks and break lines | Joas Schilling | 2014-02-26 | 1 | -2/+2 |
| | | | | | | | | Fix #7166 | ||||
| * | Remove duplicated definition and move OC.msg to js/js.js | Joas Schilling | 2014-02-19 | 1 | -0/+28 |
| | | | | | | | | Fix issue #7166 | ||||
* | | Merge pull request #7285 from owncloud/mimeicons-svg | Morris Jobke | 2014-02-24 | 1 | -13/+18 |
|\ \ | | | | | | | Show svg mime icons when no preview is available |