wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
13695 commits 157 branches 562 tags 714 MiB
Commit graph

604 commits

Author SHA1 Message Date
Robin Appelman
bf9045f585 test case for hooks send from a non-default view 2013-08-29 15:25:38 +02:00
Georg Ehrke
b7758d0f8d Merge master into oc_preview 2013-08-29 10:50:55 +02:00
kondou
67c5be9f19 Merge branch 'master' into oc_avatars 
Conflicts:
	3rdparty
 2013-08-28 16:44:11 +02:00
kondou
8d8a57de7f Continue work on cropper 2013-08-28 16:39:00 +02:00
Jörn Friedrich Dreyer
13514fd1ad Merge pull request #4348 from owncloud/fixing-4343-master 
fixes #4343
 2013-08-27 04:26:51 -07:00
blizzz
163269805a Merge pull request #4507 from owncloud/existingusersfromgroup 
return only existing users in group
 2013-08-27 03:47:56 -07:00
Arthur Schiwon
1f5a55ddff consolidate validity check for users in group class 2013-08-26 17:46:31 +02:00
Bart Visscher
29c28a45ca Merge pull request #4292 from owncloud/add_appconfig_unittest 
Add \OC_Appconfig Unittest
 2013-08-26 04:07:18 -07:00
kondou
f19f8d1088 Fix avatar-unittest 2013-08-25 21:06:02 +02:00
kondou
5eb17aadb3 Fix spacing, have remove() and return JSON for custom-default-avatars 2013-08-25 21:06:02 +02:00
kondou
81cadd5ea3 Remove gravatar and no-avatar functionality, prepare for default avatars even more and reword some stuff 2013-08-25 21:06:02 +02:00
kondou
960262bbb4 Fix testDefaultAvatar 2013-08-25 21:06:01 +02:00
kondou
4521b54c67 Have /avatar.php as a central avatar-point 2013-08-25 21:04:49 +02:00
kondou
252548c62c Improve styling & enable avatar-upload at personal page 2013-08-25 21:04:45 +02:00
kondou
2bfe662235 Add unittests & check filetype in setLocalAvatar() 
TODO: Fix OC_Image->mimetype(), it always returns "image/png"
 2013-08-25 21:04:09 +02:00
Georg Ehrke
6ffa2a28d0 Merge branch 'master' into oc_preview 2013-08-23 23:10:37 +02:00
Thomas Müller
9e1016f7d2 Merge branch 'master' into fixing-4343-master 
Conflicts:
	lib/connector/sabre/quotaplugin.php
 2013-08-22 17:59:39 +02:00
kondou
f1518a54df Merge branch 'master' into clean_up_util 
Conflicts:
	lib/util.php
 2013-08-20 17:20:30 +02:00
icewind1991
d7dde3cfbc Merge pull request #4467 from owncloud/storage-wrapper-quota 
Move quota logic from filesystem proxy to storage wrapper
 2013-08-19 03:38:55 -07:00
Georg Ehrke
f2702ff1ca Merge master into oc_preview 2013-08-19 11:24:17 +02:00
Robin Appelman
d8c71ba734 merge master in storage-wrapper-quota 2013-08-18 11:34:56 +02:00
kondou
9e8a6b704d Add _many_ newlines at the end of files 2013-08-18 11:06:59 +02:00
kondou
9c5416fe4a Clean up \OC\Util 
- Use camelCase

 - Add some phpdoc

 - Fix some indents

 - Use some more spacing
 2013-08-15 15:57:32 +02:00
Georg Ehrke
4b5fb08c2c Merge master into oc_preview 2013-08-14 20:56:44 +02:00
Robin Appelman
1877a42a0d Scanner: additional tests for reusing etags during scanning 2013-08-12 15:37:15 +02:00
Thomas Müller
0e3dea7111 adding test case for a numeric value 2013-08-09 23:36:23 +02:00
Andreas Fischer
b6b1bc5d09 Add datetime test for numeric string. 2013-08-09 22:32:38 +02:00
Owen Winkler
a2ac5e0163 Merge pull request #4271 from owncloud/plural_translations 
Plural translations
 2013-08-08 10:34:28 -07:00
Jörn Friedrich Dreyer
e38025ba67 Merge pull request #4151 from owncloud/doctrine-object 
Move dbtype depending logic into object per type
 2013-08-08 08:46:30 -07:00
Thomas Müller
fed1792510 adding unit tests for quota checks 2013-08-08 13:33:00 +02:00
Thomas Müller
d3a69bf4c6 adding unit tests to determine length 2013-08-08 11:04:40 +02:00
kondou
6c78152564 Proper WHERE – the table is called userid not user 2013-08-06 17:31:50 +02:00
kondou
d70a4a960d Use setUpBeforeClass() and tearDownAfterClass() 2013-08-06 17:30:58 +02:00
kondou
b8bfebe51e Use setUpBeforeClass() and tearDownAfterClass() 2013-08-06 17:26:12 +02:00
kondou
b560bb21f0 Clean up DB, after we're done with testing 2013-08-06 17:01:01 +02:00
Robin Appelman
3e7a86c6ec remove deleted files while scanning 2013-08-06 15:59:06 +02:00
Robin Appelman
95a959b10b merge master into doctrine-object 2013-08-06 15:43:58 +02:00
Morris Jobke
057d7aa108 Merge pull request #4321 from owncloud/add_unittests_kondou 
Add unittests
 2013-08-06 04:39:20 -07:00
kondou
87ad677151 Remove pointless unittest (search/result) 2013-08-05 19:38:52 +02:00
kondou
a51af39595 Add unittests 
Unittests for:

- search/result

- util

- preferences
 2013-08-05 14:47:14 +02:00
Georg Ehrke
af983b843d fix merge conflicts 2013-08-05 14:27:38 +02:00
Thomas Müller
19e3780ef2 remove unneeded vars from unit test 2013-08-05 10:21:51 +02:00
Thomas Müller
e04bf0aaeb unit tests for plural translations added 2013-08-02 23:08:41 +02:00
kondou
56549dafce Revert "Add null and emptystring tests to check NOT NULL" 
This reverts commit c74f3d0b90.
 2013-08-02 21:27:33 +02:00
Robin Appelman
ed054e67d6 DB: remove invalid asserts 2013-08-02 20:10:26 +02:00
kondou
c74f3d0b90 Add null and emptystring tests to check NOT NULL 2013-08-02 15:59:33 +02:00
kondou
de0dc30d89 Update skipped tests messages 2013-08-02 15:00:12 +02:00
kondou
670242c731 Add \OC_Appconfig Unittest 2013-08-02 13:22:12 +02:00
kondou
20b688d4be Optimize image and skip mimetype test 2013-08-01 20:17:43 +02:00
kondou
415e38fc50 Cover more cases 
Use file_get_contents() and base64_encode(file_get_contents()),
to load from data and base64, to cover more cases
 2013-08-01 20:17:43 +02:00
kondou
71f43c5fa1 Add OC_Image Unit Test 
data() somehow does not return, what file_get_contents() returns,
so I skipped related tests.
 2013-08-01 20:17:43 +02:00
Jörn Friedrich Dreyer
eed63ae512 Merge pull request #4221 from owncloud/fix-3698 
Fix calculating size for empty folders
 2013-08-01 08:05:19 -07:00
Morris Jobke
30963d60bc Merge pull request #4155 from owncloud/mdb2schemareader-booleans 
Fix boolean support for xml schema definitions
 2013-08-01 02:09:01 -07:00
Morris Jobke
50101a85a6 Merge pull request #3982 from owncloud/test_lastinsertid 
test lastinsertid
 2013-07-31 00:03:29 -07:00
Thomas Müller
409268f322 adding test case with no / 2013-07-30 08:54:39 +02:00
Thomas Müller
f658852276 Merge branch 'master' into fixing-testGetById-master 2013-07-30 00:37:05 +02:00
Thomas Müller
7425efade7 Merge branch 'master' into oc_preview 
Conflicts:
	3rdparty
	lib/template.php
 2013-07-30 00:34:36 +02:00
Thomas Müller
085fdfec2f adding unit tests for OC_Util::basename 2013-07-29 23:32:03 +02:00
Robin Appelman
a4df982dc3 add tests for MDB2SchemaReader 2013-07-29 16:33:27 +02:00
Michael Gapczynski
afff750011 Add test for calculating size of newly empty folder 2013-07-29 10:23:14 -04:00
Jörn Friedrich Dreyer
b8bd1e5a81 check type, assertgreaterthan 2013-07-29 02:17:09 +02:00
Jörn Friedrich Dreyer
7e5ae8d780 test lastinsertid 2013-07-29 01:57:30 +02:00
Bart Visscher
e4132a61c9 Merge pull request #4093 from owncloud/storage-test-cleanup 
Remove outdated unit tests for storage backend
 2013-07-26 03:18:39 -07:00
Jörn Friedrich Dreyer
9762a4dd95 Merge pull request #4191 from owncloud/autotest-show-skipped-tests 
Add verbose to autotest phpunit, so we see skipped and incomplete tests.
 2013-07-25 03:14:43 -07:00
Andreas Fischer
763afa5064 Add verbose to autotest phpunit, so we see skipped and incomplete tests. 2013-07-25 02:43:50 +02:00
Robin Appelman
cd8f0c21ce add quota storage wrapper 2013-07-25 00:31:51 +02:00
Robin Appelman
a853968f7d move storage wrapper test to new namespace 2013-07-25 00:31:51 +02:00
Robin Appelman
10d3e63ce5 add quota streamwrapper that limits the amount of data that can be written to a stream 2013-07-25 00:31:51 +02:00
Bart Visscher
25003fb213 Add ACPu memory cache 2013-07-24 21:50:15 +02:00
icewind1991
98858e6f00 Merge pull request #3995 from owncloud/groups 
Refactoring of group management code
 2013-07-24 06:13:05 -07:00
Morris Jobke
2622839fcf Merge pull request #4171 from owncloud/fix-config 
Fix config
 2013-07-24 00:48:43 -07:00
Thomas Müller
60ce492fac Merge branch 'master' into groups 2013-07-24 01:11:12 +02:00
Thomas Müller
c517c845f6 Merge branch 'master' into storage-test-cleanup 
Conflicts:
	tests/lib/files/storage/storage.php
 2013-07-24 01:01:36 +02:00
Thomas Müller
5fc0535f1b Merge pull request #4090 from owncloud/cleanup-some-template-functions 
Cleanup some template functions
 2013-07-23 15:53:43 -07:00
Robin Appelman
fb40d9e1e6 Merge branch 'master' into groups 2013-07-23 22:06:03 +02:00
Bart Visscher
5caa7576d4 Revert "fix failing master branch - Test_Config::testWriteData" 
This reverts commit 8f93490ac4.
 2013-07-23 17:36:08 +02:00
Thomas Müller
a2cdf8b91e Merge pull request #3925 from berendt/reworking_OC_Files_Storage_AmazonS3 
reworking of \OC\Files\Storage\AmazonS3
 2013-07-22 02:19:27 -07:00
Bart Visscher
5965f3ecea Split locating JS and CSS files to their own class 2013-07-21 21:36:15 +02:00
Morris Jobke
8f93490ac4 fix failing master branch - Test_Config::testWriteData 2013-07-21 11:13:29 +02:00
Bart Visscher
084cf0c202 Merge pull request #2221 from owncloud/doctrine 
OC6: Implement Doctrine as the backend for OC_DB
 2013-07-18 14:24:27 -07:00
Robin Appelman
e3ea3ed3c5 group: only pass backends that hold that specific group to the group constructor 2013-07-18 12:15:34 +02:00
Thomas Müller
a3ff771567 Merge pull request #4067 from owncloud/fixing-tests-win32-master 
<<<EOL seems not to use proper end of lines on windows
 2013-07-17 00:37:02 -07:00
Robin Appelman
b2bcc9774b memcache: make base testcase abstract 2013-07-16 23:11:22 +02:00
Robin Appelman
cfac7fcd53 Storage: remove some unneeded strict tests of mtime behaviour 2013-07-16 23:07:35 +02:00
Robin Appelman
97f0bc1c4a Storage: remove tests for search 2013-07-16 23:05:23 +02:00
icewind1991
e09ffb6f57 Merge pull request #2395 from owncloud/cache 
Seperate the memory based cache and file based cache in OC_Cache
 2013-07-16 13:25:07 -07:00
Bart Visscher
285f288cf3 Merge pull request #3959 from owncloud/buildNotExistingFileNameForView 
Fix renaming using parenthesis
 2013-07-16 12:06:53 -07:00
Robin Appelman
504089940d mamcache: implement the ArrayAccess interface 2013-07-16 16:06:00 +02:00
Robin Appelman
8ad148feaf memcache: some additional unit tests 2013-07-16 15:46:27 +02:00
Robin Appelman
0ae8eb4f5e Merge branch 'master' into cache 2013-07-16 15:22:47 +02:00
Thomas Mueller
7ba4269c26 <<<EOL seems not to use proper end of lines on windows 2013-07-15 10:28:14 +02:00
Bart Visscher
5549c77ec5 Merge branch 'master' into doctrine 
Conflicts:
	3rdparty
	lib/db.php
	lib/setup.php
	tests/lib/db.php
	tests/lib/dbschema.php
 2013-07-13 12:01:14 +02:00
icewind1991
3abe68176f Merge pull request #3270 from owncloud/convert-oc_config 
Convert OC_Config to object so it can be used for DI
 2013-07-11 18:21:08 -07:00
Georg Ehrke
7f3dbb6936 remove debug code ... 2013-07-11 13:41:09 +02:00
Georg Ehrke
89554bd917 it's setValue not getValue, damn type 2013-07-11 13:39:10 +02:00
icewind1991
d134ba9a82 Merge pull request #3978 from owncloud/forwarding-emitter 
add forwarding emitter for agregating multiple emitters
 2013-07-10 10:38:28 -07:00
Georg Ehrke
a357e5b284 merge conflicts ... 2013-07-10 12:41:53 +02:00
Robin Appelman
065bc96b02 more consistent naming 2013-07-10 02:17:24 +02:00
Robin Appelman
2d9be541ea add test case for getting group after deleting it 2013-07-10 02:00:14 +02:00
Robin Appelman
912b151561 use new group api as backend for the old api 2013-07-10 00:07:46 +02:00