kondou
|
ab70b8c26e
|
Merge branch 'master' into oc_avatars
|
2013-09-01 17:52:13 +02:00 |
kondou
|
2d6a400381
|
Check for $this->fileInfo and @depend on testData()
|
2013-09-01 15:50:58 +02:00 |
kondou
|
235638e5ab
|
Merge branch 'master' into fix_4258
Conflicts:
lib/image.php
|
2013-08-31 23:48:23 +02:00 |
kondou
|
5d653753bd
|
Merge branch 'master' into oc_avatars
|
2013-08-31 12:56:36 +02:00 |
kondou
|
0869f9b655
|
Fix #4258, clean up \OC_Image and improve its unittest
|
2013-08-30 21:08:37 +02:00 |
kondou
|
ecf187393b
|
Finish cropper, Get rid of TODOs, Improve \OCP\Avatar and "fix" unitests
|
2013-08-30 09:00:37 +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 |
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 |
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
|
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 |