nextcloud-server.git - Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server

	Commit message (Collapse)	Author	Age	Files	Lines
*	[tx-robot] updated from transifex	Jenkins for ownCloud	2012-11-15	227	-2333/+6028
\|
*	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 #271 from owncloud/239_webdav_999_files	Lukas Reschke	2012-11-14	1	-10/+16
\|\ \| \| \| \|	fixes #239 - query the database in chunks of 200
\| *	adding comments to explain what's going on here	Thomas Mueller	2012-11-06	1	-0/+4
\| \|
\| *	fixes #329: query the database in chunks of 200	Thomas Mueller	2012-11-05	1	-10/+12
\| \|
* \|	Merge pull request #402 from zimba12/master	Thomas Müller	2012-11-14	2	-9/+10
\|\ \ \| \| \| \| \| \|	Uncomment hours entries in relative date functions
\| * \|	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
\|\ \ \| \| \| \| \| \|	OC_VCategories - this time actually usable ;)
\| * \|	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 ↵	Thomas Tanghus	2012-11-12	1	-12/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	previous attempt.
\| * \| \| \|	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
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: lib/vcategories.php
\| * \| \| \| \| \| \| \| \| \|	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
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: lib/vcategories.php
\| * \| \| \| \| \| \| \| \| \| \|	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
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	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
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: lib/vcategories.php
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|