summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | 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
| * | | | | | | | | | | | | | | | | | | Remove index that might cause problems.Thomas Tanghus2012-10-191-17/+0
| * | | | | | | | | | | | | | | | | | | Use self::prepare() instead of self::$connection->prepare.Thomas Tanghus2012-10-191-1/+1
| * | | | | | | | | | | | | | | | | | | Removed useless ORDER BY from query.Thomas Tanghus2012-10-191-1/+1
| * | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-191-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Renamed OC_VCategories::add() to addMulti() and let the add() method return t...Thomas Tanghus2012-10-191-4/+28
| * | | | | | | | | | | | | | | | | | | | Return result from OC_DB::insertIfNotExist().Thomas Tanghus2012-10-191-1/+1
| * | | | | | | | | | | | | | | | | | | | Added unit tests for OC_DB::insertIfNotExist()Thomas Tanghus2012-10-192-0/+110
| * | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-19129-1995/+2122
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Make categories var static.Thomas Tanghus2012-10-191-27/+29
| * | | | | | | | | | | | | | | | | | | | | Add wait state to category dialog while processing.Thomas Tanghus2012-10-191-11/+39
| * | | | | | | | | | | | | | | | | | | | | app !== typeThomas Tanghus2012-10-191-1/+0
| * | | | | | | | | | | | | | | | | | | | | More js updates for app/type in OCCategoriesThomas Tanghus2012-10-191-11/+11
| * | | | | | | | | | | | | | | | | | | | | Use get for loading dialog.Thomas Tanghus2012-10-191-1/+1
| * | | | | | | | | | | | | | | | | | | | | White space fix.Thomas Tanghus2012-10-191-69/+69
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-19234-4855/+3893
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | FormattingThomas Tanghus2012-10-191-3/+1
| * | | | | | | | | | | | | | | | | | | | | | Add favorite handling methods to OC_VCategories.Thomas Tanghus2012-10-191-1/+98
| * | | | | | | | | | | | | | | | | | | | | | Use consts all places and rename some daft method names.Thomas Tanghus2012-10-191-22/+28
| * | | | | | | | | | | | | | | | | | | | | | Updated category js for handling favorites and use post instead of get.Thomas Tanghus2012-10-191-18/+43
| * | | | | | | | | | | | | | | | | | | | | | Added ajax files for favorite category handling.Thomas Tanghus2012-10-193-0/+113
| * | | | | | | | | | | | | | | | | | | | | | Updated category ajax files to use type instead of app and add callCheck.Thomas Tanghus2012-10-193-25/+35
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-173-17/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \