Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixes two issues if you using IE8. IE8 has problems with .bind actions and si... | libasys | 2012-11-14 | 1 | -11/+20 |
* | Merge pull request #402 from zimba12/master | Thomas Müller | 2012-11-14 | 2 | -9/+10 |
|\ | |||||
| * | fix translation issues with previous commit | Alessandro Cosentino | 2012-11-13 | 2 | -6/+6 |
| * | uncomment hours entries in relative date functions | Alessandro Cosentino | 2012-11-13 | 2 | -8/+9 |
* | | 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 | 17 | -115/+1316 |
|\ | |||||
| * | Bump version to trigger update. | Thomas Tanghus | 2012-11-13 | 1 | -1/+1 |
| * | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-11-13 | 93 | -1651/+1941 |
| |\ | |||||
| * \ | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-11-12 | 7 | -60/+108 |
| |\ \ | |||||
| * | | | Don't use indexes in test data as postgres complains over duplicate keys. | Thomas Tanghus | 2012-11-12 | 1 | -41/+0 |
| * | | | Change insertIfNotExist() for sqlite. Not fast, but more reliable than previo... | Thomas Tanghus | 2012-11-12 | 1 | -12/+36 |
| * | | | Correct SQL syntax. | Thomas Tanghus | 2012-11-12 | 1 | -1/+1 |
| * | | | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-11-12 | 37 | -185/+268 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-11-11 | 442 | -12444/+8896 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-11-07 | 23 | -73/+91 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-11-06 | 27 | -59/+1675 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-11-05 | 4 | -3/+45 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | 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 |
| * | | | | | | | | Remove unused variable. | Thomas Tanghus | 2012-11-05 | 1 | -1/+1 |
| * | | | | | | | | Check DB result. | Thomas Tanghus | 2012-11-05 | 1 | -1/+7 |
| * | | | | | | | | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-11-05 | 5 | -26/+23 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-11-05 | 135 | -1069/+950 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Swap expected and actual. | Thomas Tanghus | 2012-11-04 | 1 | -1/+1 |
| * | | | | | | | | | | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-11-04 | 239 | -3281/+3444 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | VCategories: Make $categories non-static again. | Thomas Tanghus | 2012-11-04 | 1 | -27/+27 |
| * | | | | | | | | | | | VCategories: Swap expected and actual in unit tests. | Thomas Tanghus | 2012-11-04 | 1 | -4/+4 |
| * | | | | | | | | | | | 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 |
| * | | | | | | | | | | | Switch expectation and result in unit tests. | Thomas Tanghus | 2012-10-31 | 1 | -9/+12 |
| * | | | | | | | | | | | Added some more error checking on db queries. | Thomas Tanghus | 2012-10-31 | 1 | -5/+37 |
| * | | | | | | | | | | | Added unit tests for OC_VCategories. | Thomas Tanghus | 2012-10-31 | 1 | -0/+114 |
| * | | | | | | | | | | | Cast object ids to integers. | Thomas Tanghus | 2012-10-31 | 1 | -2/+2 |
| * | | | | | | | | | | | Added unit test testinsertIfNotExistDontOverwrite. | Thomas Tanghus | 2012-10-31 | 1 | -0/+37 |
| * | | | | | | | | | | | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-10-31 | 43 | -321/+578 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-10-30 | 872 | -197275/+6969 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-10-25 | 245 | -963/+1701 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Also delete category/object relations when deleting a category. | Thomas Tanghus | 2012-10-24 | 1 | -1/+15 |
| * | | | | | | | | | | | | | | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-10-24 | 263 | -5641/+8384 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-10-23 | 81 | -834/+1395 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-10-22 | 139 | -837/+2880 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | Added missing backtick to sql query. | Thomas Tanghus | 2012-10-22 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | Added type and callback arguments to most methods. | Thomas Tanghus | 2012-10-22 | 1 | -46/+95 |
| * | | | | | | | | | | | | | | | | | Fix accidentally creating new categories with the id as name. | Thomas Tanghus | 2012-10-20 | 1 | -6/+9 |
| * | | | | | | | | | | | | | | | | | Filter out special Favorites category. | Thomas Tanghus | 2012-10-20 | 1 | -5/+14 |
| * | | | | | | | | | | | | | | | | | Clean indentation. | Thomas Tanghus | 2012-10-19 | 1 | -120/+120 |
| * | | | | | | | | | | | | | | | | | Remove redundant class wrapping. | Thomas Tanghus | 2012-10-19 | 1 | -1/+0 |