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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #4712 from owncloud/fileapi-foreward	Thomas Müller	2013-09-13	5	-0/+1701
\|\ \| \| \| \|	Provide an implementation of the fileapi for oc6 build on top of the old api
\| *	- giving the user a new id for each test run in order to prevent reuse of ↵	Thomas Müller	2013-09-13	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \|	e.g. permissions data in the database - setting the current user id because \OC\FilesView relies on \OC_User::getUser()
\| *	Merge branch 'master' into fileapi-foreward	Robin Appelman	2013-09-12	5	-14/+61
\| \|\
\| * \|	adjust test cases to namespace changes	Robin Appelman	2013-09-10	5	-26/+26
\| \| \|
\| * \|	Provide an implementation of the fileapi for oc6 build on top of the old api	Robin Appelman	2013-09-01	5	-0/+1700
\| \| \|
* \| \|	adding TB and GB to OC_Helper::humanFileSize	Thomas Müller	2013-09-13	1	-30/+32
\| \|/ \|/\|
* \|	Merge pull request #4477 from owncloud/hooks-view	Bernhard Posselt	2013-09-04	1	-1/+30
\|\ \ \| \| \| \| \| \|	also emit hooks for views that are a subfolder of the user folder
\| * \|	test case for hooks send from a non-default view	Robin Appelman	2013-08-29	1	-1/+30
\| \| \|
* \| \|	Merge branch 'master' into clean_up_util	kondou	2013-09-02	5	-14/+373
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: lib/base.php
\| * \| \|	Check for $this->fileInfo and @depend on testData()	kondou	2013-09-01	1	-0/+3
\| \| \| \|
\| * \| \|	Merge branch 'master' into fix_4258	kondou	2013-08-31	1	-0/+108
\| \|\ \ \ \| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \|	Conflicts: lib/image.php
\| \| * \|	Merge master into oc_preview	Georg Ehrke	2013-08-29	3	-5/+238
\| \| \|\ \
\| \| * \ \	Merge branch 'master' into oc_preview	Georg Ehrke	2013-08-23	3	-2/+141
\| \| \|\ \ \
\| \| * \ \ \	Merge master into oc_preview	Georg Ehrke	2013-08-19	4	-4/+4
\| \| \|\ \ \ \
\| \| * \ \ \ \	Merge master into oc_preview	Georg Ehrke	2013-08-14	6	-2/+315
\| \| \|\ \ \ \ \ \| \| \| \| \|_\|_\|/ \| \| \| \|/\| \| \|
\| \| * \| \| \| \|	fix merge conflicts	Georg Ehrke	2013-08-05	6	-9/+423
\| \| \|\ \ \ \ \
\| \| * \ \ \ \ \	Merge branch 'master' into oc_preview	Thomas Müller	2013-07-30	17	-168/+1139
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: 3rdparty lib/template.php
\| \| * \| \| \| \| \| \|	remove debug code ...	Georg Ehrke	2013-07-11	1	-4/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	it's setValue not getValue, damn type	Georg Ehrke	2013-07-11	1	-3/+6
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	merge conflicts ...	Georg Ehrke	2013-07-10	15	-80/+416
\| \| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \|	add unit tests for preview lib to make @DeepDiver1975 happy	Georg Ehrke	2013-06-26	1	-0/+108
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix #4258, clean up \OC_Image and improve its unittest	kondou	2013-08-30	1	-9/+24
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge pull request #4348 from owncloud/fixing-4343-master	Jörn Friedrich Dreyer	2013-08-27	1	-0/+101
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixes #4343
\| \| * \ \ \ \ \ \ \	Merge branch 'master' into fixing-4343-master	Thomas Müller	2013-08-22	12	-11/+312
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|_\|_\|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: lib/connector/sabre/quotaplugin.php
\| \| * \| \| \| \| \| \| \|	adding unit tests for quota checks	Thomas Müller	2013-08-08	1	-1/+55
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	adding unit tests to determine length	Thomas Müller	2013-08-08	1	-0/+47
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge pull request #4507 from owncloud/existingusersfromgroup	blizzz	2013-08-27	1	-5/+5
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	return only existing users in group
\| \| * \| \| \| \| \| \| \| \|	consolidate validity check for users in group class	Arthur Schiwon	2013-08-26	1	-5/+5
\| \| \| \|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge pull request #4292 from owncloud/add_appconfig_unittest	Bart Visscher	2013-08-26	1	-0/+132
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \|	Add \OC_Appconfig Unittest
\| \| * \| \| \| \| \| \| \|	Use setUpBeforeClass() and tearDownAfterClass()	kondou	2013-08-06	1	-3/+9
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Revert "Add null and emptystring tests to check NOT NULL"	kondou	2013-08-02	1	-14/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit c74f3d0b90227f95c1b6d21bbb7ee28561b67446.
\| \| * \| \| \| \| \| \| \|	Add null and emptystring tests to check NOT NULL	kondou	2013-08-02	1	-0/+14
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Add \OC_Appconfig Unittest	kondou	2013-08-02	1	-0/+126
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'master' into clean_up_util	kondou	2013-08-20	7	-6/+145
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: lib/util.php
\| * \| \| \| \| \| \| \| \|	Merge pull request #4467 from owncloud/storage-wrapper-quota	icewind1991	2013-08-19	3	-2/+141
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \|	Move quota logic from filesystem proxy to storage wrapper
\| \| * \| \| \| \| \| \| \|	merge master in storage-wrapper-quota	Robin Appelman	2013-08-18	13	-58/+762
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|_\|_\|/ \| \| \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	add quota storage wrapper	Robin Appelman	2013-07-25	1	-0/+61
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	move storage wrapper test to new namespace	Robin Appelman	2013-07-25	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	add quota streamwrapper that limits the amount of data that can be written ↵	Robin Appelman	2013-07-25	1	-0/+78
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to a stream
\| * \| \| \| \| \| \| \| \|	Add _many_ newlines at the end of files	kondou	2013-08-18	4	-4/+4
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
* / \| \| \| \| \| \| \|	Clean up \OC\Util	kondou	2013-08-15	3	-4/+4
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Use camelCase - Add some phpdoc - Fix some indents - Use some more spacing
* \| \| \| \| \| \| \|	Scanner: additional tests for reusing etags during scanning	Robin Appelman	2013-08-12	2	-0/+92
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	adding test case for a numeric value	Thomas Müller	2013-08-09	1	-2/+7
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Add datetime test for numeric string.	Andreas Fischer	2013-08-09	1	-0/+7
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #4271 from owncloud/plural_translations	Owen Winkler	2013-08-08	1	-0/+55
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Plural translations
\| * \| \| \| \| \| \| \|	remove unneeded vars from unit test	Thomas Müller	2013-08-05	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	unit tests for plural translations added	Thomas Müller	2013-08-02	1	-0/+55
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #4151 from owncloud/doctrine-object	Jörn Friedrich Dreyer	2013-08-08	1	-2/+0
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move dbtype depending logic into object per type
\| * \ \ \ \ \ \ \ \	merge master into doctrine-object	Robin Appelman	2013-08-06	2	-0/+151
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|/ / / / / \| \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	DB: remove invalid asserts	Robin Appelman	2013-08-02	1	-2/+0
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \|