Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-11-21 | 4 | -14/+36 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-11-20 | 4 | -23/+125 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-11-19 | 2 | -0/+15 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-11-18 | 3 | -0/+33 |
| | |||||
* | Merge pull request #420 from libasys/bugfix-share | Thomas Müller | 2012-11-17 | 1 | -1/+3 |
|\ | | | | | If you using the sharing by link the array monthNames don't exist and ca... | ||||
| * | If you using the sharing by link the array monthNames don't exist and causes ↵ | libasys | 2012-11-14 | 1 | -1/+3 |
| | | | | | | | | errors in all browsers! so we check if the type of the variable isn't undefined! | ||||
* | | Merge pull request #495 from owncloud/fix_issue_262 | Thomas Müller | 2012-11-17 | 1 | -1/+1 |
|\ \ | | | | | | | Fix lostpassword url generation | ||||
| * | | Fix lostpassword url generation | Bart Visscher | 2012-11-16 | 1 | -1/+1 |
| | | | | | | | | | | | | Fixes issue #262 | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-11-17 | 5 | -17/+66 |
|/ / | |||||
* | | Merge pull request #454 from Raydiation/master | Thomas Müller | 2012-11-15 | 1 | -2/+7 |
|\ \ | | | | | | | Routing fixes | ||||
| * | | removed unneeded callback checks in routes_request that could potentially fail | Bernhard Posselt | 2012-11-15 | 1 | -4/+0 |
| | | | |||||
| * | | fixed: this.routes_request is a deferred/promise | Bernhard Posselt | 2012-11-15 | 1 | -5/+1 |
| | | | |||||
| * | | instead of warning via popup, write to console.warn | Bernhard Posselt | 2012-11-15 | 1 | -1/+1 |
| | | | |||||
| * | | Prevent ajax race conditions when using routes by offering a callback that ↵ | Bernhard Posselt | 2012-11-15 | 1 | -2/+15 |
| | | | | | | | | | | | | is run after the the routes have finished loading | ||||
* | | | Merge pull request #458 from owncloud/js_console_switch | Thomas Tanghus | 2012-11-15 | 4 | -0/+19 |
|\ \ \ | | | | | | | | | Very simple js console switcher. | ||||
| * | | | Very simple js console switcher. | Thomas Tanghus | 2012-11-15 | 4 | -0/+19 |
| |/ / | |||||
* / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-11-16 | 8 | -0/+64 |
|/ / | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-11-15 | 49 | -97/+50 |
| | | |||||
* | | Revert "Prevent ajax race conditions when using routes by offering a ↵ | Bernhard Posselt | 2012-11-14 | 1 | -15/+2 |
| | | | | | | | | | | | | callback that is run after the the routes have finished loading" This reverts commit 9b8375cf2c328cfcb66dae8283cfcacdaeb242c2. | ||||
* | | Prevent ajax race conditions when using routes by offering a callback that ↵ | Bernhard Posselt | 2012-11-14 | 1 | -2/+15 |
|/ | | | | is run after the the routes have finished loading | ||||
* | Merge pull request #402 from zimba12/master | Thomas Müller | 2012-11-14 | 1 | -6/+7 |
|\ | | | | | Uncomment hours entries in relative date functions | ||||
| * | fix translation issues with previous commit | Alessandro Cosentino | 2012-11-13 | 1 | -3/+3 |
| | | |||||
| * | uncomment hours entries in relative date functions | Alessandro Cosentino | 2012-11-13 | 1 | -6/+7 |
| | | |||||
* | | Fixing syntax error - closes #406 | Thomas Müller | 2012-11-14 | 1 | -1/+1 |
| | | |||||
* | | Fixing syntax error - closes #406 | Thomas Müller | 2012-11-14 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #41 from owncloud/vcategories_db | Thomas Tanghus | 2012-11-13 | 9 | -67/+293 |
|\ | | | | | OC_VCategories - this time actually usable ;) | ||||
| * | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-11-13 | 2 | -4/+4 |
| |\ | |||||
| * \ | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-11-12 | 1 | -0/+53 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-11-11 | 45 | -5/+487 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-11-07 | 2 | -1/+26 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-11-06 | 1 | -0/+2 |
| |\ \ \ \ \ | |||||
| * | | | | | | VCategories: Closing brace must be on a line by itself. | Thomas Tanghus | 2012-11-05 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | VCategories: Line too long. | Thomas Tanghus | 2012-11-05 | 1 | -1/+4 |
| | | | | | | | |||||
| * | | | | | | VCategories: Line too long. | Thomas Tanghus | 2012-11-05 | 1 | -1/+3 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-11-05 | 8 | -105/+11 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/vcategories.php | ||||
| * \ \ \ \ \ \ | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-11-04 | 8 | -4/+31 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/vcategories.php | ||||
| * | | | | | | | | VCategories: Use correct variable. | Thomas Tanghus | 2012-11-04 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Update vcategories ajax scripts. | Thomas Tanghus | 2012-11-01 | 3 | -9/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Add routes for vcategory favorites. | Thomas Tanghus | 2012-11-01 | 1 | -0/+6 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-10-31 | 5 | -18/+71 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-10-30 | 77 | -424/+438 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix conflicts: core/ajax/vcategories/add.php core/ajax/vcategories/delete.php | ||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-10-25 | 58 | -0/+518 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-10-24 | 61 | -646/+820 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/vcategories.php | ||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-10-23 | 4 | -2/+141 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-10-22 | 15 | -35/+169 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Added type and callback arguments to most methods. | Thomas Tanghus | 2012-10-22 | 1 | -46/+95 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-10-19 | 12 | -3/+102 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Add wait state to category dialog while processing. | Thomas Tanghus | 2012-10-19 | 1 | -11/+39 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | app !== type | Thomas Tanghus | 2012-10-19 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | More js updates for app/type in OCCategories | Thomas Tanghus | 2012-10-19 | 1 | -11/+11 |
| | | | | | | | | | | | | | | | |