summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fixes two issues if you using IE8. IE8 has problems with .bind actions and si...libasys2012-11-141-11/+20
* Merge pull request #402 from zimba12/masterThomas Müller2012-11-142-9/+10
|\
| * fix translation issues with previous commitAlessandro Cosentino2012-11-132-6/+6
| * uncomment hours entries in relative date functionsAlessandro Cosentino2012-11-132-8/+9
* | Fixing syntax error - closes #406Thomas Müller2012-11-141-1/+1
* | Fixing syntax error - closes #406Thomas Müller2012-11-141-1/+1
|/
* Merge pull request #41 from owncloud/vcategories_dbThomas Tanghus2012-11-1317-115/+1316
|\
| * Bump version to trigger update.Thomas Tanghus2012-11-131-1/+1
| * Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-11-1393-1651/+1941
| |\
| * \ Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-11-127-60/+108
| |\ \
| * | | Don't use indexes in test data as postgres complains over duplicate keys.Thomas Tanghus2012-11-121-41/+0
| * | | Change insertIfNotExist() for sqlite. Not fast, but more reliable than previo...Thomas Tanghus2012-11-121-12/+36
| * | | Correct SQL syntax.Thomas Tanghus2012-11-121-1/+1
| * | | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-11-1237-185/+268
| |\ \ \
| * \ \ \ Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-11-11442-12444/+8896
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-11-0723-73/+91
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-11-0627-59/+1675
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-11-054-3/+45
| |\ \ \ \ \ \ \
| * | | | | | | | VCategories: Closing brace must be on a line by itself.Thomas Tanghus2012-11-051-2/+2
| * | | | | | | | VCategories: Line too long.Thomas Tanghus2012-11-051-1/+4
| * | | | | | | | VCategories: Line too long.Thomas Tanghus2012-11-051-1/+3
| * | | | | | | | Remove unused variable.Thomas Tanghus2012-11-051-1/+1
| * | | | | | | | Check DB result.Thomas Tanghus2012-11-051-1/+7
| * | | | | | | | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-11-055-26/+23
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-11-05135-1069/+950
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Swap expected and actual.Thomas Tanghus2012-11-041-1/+1
| * | | | | | | | | | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-11-04239-3281/+3444
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | VCategories: Make $categories non-static again.Thomas Tanghus2012-11-041-27/+27
| * | | | | | | | | | | VCategories: Swap expected and actual in unit tests.Thomas Tanghus2012-11-041-4/+4
| * | | | | | | | | | | VCategories: Use correct variable.Thomas Tanghus2012-11-041-1/+1
| * | | | | | | | | | | Update vcategories ajax scripts.Thomas Tanghus2012-11-013-9/+2
| * | | | | | | | | | | Add routes for vcategory favorites.Thomas Tanghus2012-11-011-0/+6
| * | | | | | | | | | | Switch expectation and result in unit tests.Thomas Tanghus2012-10-311-9/+12
| * | | | | | | | | | | Added some more error checking on db queries.Thomas Tanghus2012-10-311-5/+37
| * | | | | | | | | | | Added unit tests for OC_VCategories.Thomas Tanghus2012-10-311-0/+114
| * | | | | | | | | | | Cast object ids to integers.Thomas Tanghus2012-10-311-2/+2
| * | | | | | | | | | | Added unit test testinsertIfNotExistDontOverwrite.Thomas Tanghus2012-10-311-0/+37
| * | | | | | | | | | | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-3143-321/+578
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-30872-197275/+6969
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-25245-963/+1701
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Also delete category/object relations when deleting a category.Thomas Tanghus2012-10-241-1/+15
| * | | | | | | | | | | | | | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-24263-5641/+8384
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-2381-834/+1395
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-22139-837/+2880
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Added missing backtick to sql query.Thomas Tanghus2012-10-221-1/+1
| * | | | | | | | | | | | | | | | | Added type and callback arguments to most methods.Thomas Tanghus2012-10-221-46/+95
| * | | | | | | | | | | | | | | | | Fix accidentally creating new categories with the id as name.Thomas Tanghus2012-10-201-6/+9
| * | | | | | | | | | | | | | | | | Filter out special Favorites category.Thomas Tanghus2012-10-201-5/+14
| * | | | | | | | | | | | | | | | | Clean indentation.Thomas Tanghus2012-10-191-120/+120
| * | | | | | | | | | | | | | | | | Remove redundant class wrapping.Thomas Tanghus2012-10-191-1/+0