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

923 commits

Author SHA1 Message Date
blizzz
6a747106db Merge pull request #6150 from owncloud/backgroundjob-log-exception 
Remove background jobs that are giving errors
 2013-12-06 11:56:53 -08:00
Robin Appelman
e888bdda30 get rid of failing test that don't cause additional downloads 2013-12-06 18:26:38 +01:00
Robin Appelman
cf9b7e343a extend test case for etag preservation 2013-12-06 13:00:58 +01:00
Robin Appelman
01ab15a2b0 reuse etags when doing a background scan 2013-12-05 15:23:34 +01:00
Robin Appelman
2ff1bdaba3 add test case for removing background jobs that are throwing exceptions 2013-12-05 13:29:35 +01:00
Robin Appelman
3fa11bd426 Dont use exceptions for the backgroundjob test cases 2013-12-04 16:28:27 +01:00
Vincent Petry
6cf9844e9c Added unit test for the test() method 
This is to make sure that method isn't broken
 2013-12-03 14:35:53 +01:00
Thomas Müller
832be7c908 Merge pull request #6052 from owncloud/datetime-doctrine 
Get rid of date strings for DB. Completely use Doctrine and DateTime.
 2013-12-01 01:29:35 -08:00
Vincent Petry
d69243ee51 Fixed FTP and SMB to use rmdir() when deleting folders 
Some storages need to use different calls for deleting files or folders,
usually unlink() and rmdir().

Fixes #4532 (SMB dir deletion)
Fixes #5941 (FTP dir deletion)

Note that the extra is_dir() should be fast because it's read from the
stat cache.
 2013-11-29 13:01:01 +01:00
Vincent Petry
43b1cf7988 Redetect mime type whenever extension is renamed 2013-11-27 21:34:51 +01:00
blizzz
4f15282bc9 Merge pull request #6058 from owncloud/ldap2avatar 
Set Avatar for LDAP users automatically (if a picture is available)
 2013-11-26 12:05:32 -08:00
Björn Schießle
1fef97f6a5 Merge pull request #6060 from owncloud/fix-6050-oc6 
fixing getRawPathInfo() once more
 2013-11-26 10:13:58 -08:00
Vincent Petry
2653d914d9 Merge pull request #6008 from owncloud/extstorage-smb-webdav-renamefix 
Fixed SMB rename function to overwrite target file
 2013-11-26 06:42:36 -08:00
Thomas Müller
2a93720f3f fixes #6050 2013-11-26 14:13:33 +01:00
Vincent Petry
712b47757a Updated unit tests for SMB 
- coverage for touch return value
- fixed directory provider to exclude unsupported cases
 2013-11-26 12:53:03 +01:00
Andreas Fischer
06df3822a0 Timestamp test is no longer necessary as we rely on Doctrine and DateTime. 2013-11-26 12:22:08 +01:00
Vincent Petry
c3e34676ba Improved unit test for "overwrite on move" 
Now using a different content to make sure the file was overwritten.
 2013-11-25 18:54:58 +01:00
Vincent Petry
af7118aa5d Added unit test for "overwrite file on rename/move" 
Also fixed "rename" unit test that was ready the result out of the wrong
file.
 2013-11-25 18:52:14 +01:00
Thomas Müller
b9fed935b4 in case uri and script name don't match we better throw an exception 2013-11-25 14:42:34 +01:00
Thomas Müller
a0a665ea45 handle duplicate slashes in case of reverse proxy configuration 2013-11-25 14:21:51 +01:00
Thomas Mueller
229630f14c adding simple unit test to test scriptName() under overwrite condition 2013-11-24 21:19:06 +01:00
Arthur Schiwon
8ccac86c98 Enable user backends to provide avatar images 2013-11-22 13:25:20 +01:00
blizzz
2f73db12bb Merge pull request #5040 from owncloud/public_api_avatar_master 
Add public API for \OC\Avatar
 2013-11-22 03:42:28 -08:00
Arthur Schiwon
00071401d7 Round out Avatar Public API 2013-11-21 23:40:25 +01:00
Vincent Petry
356eef0739 Quota storage wrapper is now used for all users in sharing mode 
When accessing a shared folder, the folder's owner appears as mountpoint
but wasn't wrapped by a quota storage wrapper.

This fix makes sure that all home storages are wrapped by a quota
storage wrapper, if applicable, to make sure quotas are respected when
uploading into shared folders.
 2013-11-21 12:04:54 +01:00
Vincent Petry
5b6d1d79d0 Fixed SMB file deletion success detection 
Since unlink() smb4php doesn't return true on deletion success, we need
to check whether the file was deleted to confirm success.

Fixes #5866
 2013-11-19 15:05:11 +01:00
Morris Jobke
4a0d295e4a Merge pull request #5927 from owncloud/quota-excludeextstorage 
External storage space is now not counted in total space
 2013-11-18 14:42:40 -08:00
Vincent Petry
3e2fd9942b Root size for home storage is now size of "files" subdir 
Fixes #4593
 2013-11-18 18:17:25 +01:00
Vincent Petry
614e4d485c External storage space is now not counted in total space 
Added argument to getFileInfo() to disable adding the size of
mountpoints to a directory's size.

Fixes #5924
 2013-11-18 18:09:01 +01:00
Bart Visscher
630e46f60a Merge pull request #5789 from ogasser/db_fix_default_for_numeric 
DB: Set correct default value for numeric types
 2013-11-15 04:19:33 -08:00
Thomas Müller
49e9f771ff Merge pull request #5813 from owncloud/fix-4736-master 
Don't set a default value when there isn't a default specified
 2013-11-15 01:06:38 -08:00
Thomas Müller
2bb4c266a6 Merge pull request #5862 from owncloud/files-singledotdirs 
Files singledotdirs
 2013-11-14 11:40:21 -08:00
Thomas Müller
7e63722534 make use of data providers 2013-11-14 15:37:30 +01:00
Vincent Petry
d9ab964ff9 Added missing test with leading backslash 2013-11-14 15:36:03 +01:00
Vincent Petry
c06d8bb007 Fixed normalizePath() to strip out single dot dirs 
Now removing "/./" and trailing "/." from the paths when normalizing.
 2013-11-14 13:15:03 +01:00
tomneedham
5a2d700866 Fix type in unit test 2013-11-14 01:11:22 +00:00
tomneedham
00944a376a Merge branch 'master' into oc_api_tests 2013-11-14 00:40:57 +00:00
tomneedham
959513fdc8 Add tests for OC_API::mergeResponses() 2013-11-14 00:40:09 +00:00
Vincent Petry
34c92f6656 Now using HomeStorage for legacy home storage ids 
Legacy home storage ids with the format "local://path/to/datadir/user1"
are now also wrapped by the HomeStorage.
 2013-11-12 18:01:02 +01:00
Robin Appelman
32a703ab36 Do not use -1 as the size for the root folder of the home storage 2013-11-12 16:15:43 +01:00
Morris Jobke
9c1c8d57f0 fix DB schema test - no default value 2013-11-12 13:45:28 +01:00
Oliver Gasser
95b3eb2c75 Add DB tests for default numeric 
Add a table with a numeric column and an empty default directive.
 2013-11-12 11:27:57 +01:00
Morris Jobke
da20fb7922 Merge pull request #5707 from owncloud/fixwrongfilesizeintests 
Fixed filesize issue in watchr test
 2013-11-11 06:26:38 -08:00
Vincent Petry
7ff6a642b4 Fixed filesize issue in watchr test 
Added clearstatcache to make sure we get the correct file size after
re-writing into the same file.

This failed on openSUSE 12.3 x86_64
 2013-11-05 17:01:02 +01:00
Thomas Müller
f91fe8d595 Merge pull request #5673 from owncloud/oc6-windows-server-mssql-master 
Oc6 windows server mssql master
 2013-11-05 00:41:11 -08:00
Thomas Mueller
665b7571f4 adding test for binary file to test \OC_Helper::streamCopy() 2013-11-04 17:19:04 +01:00
Andreas Fischer
8872b881cc Add tests for OCP\Share::unshareAll(). 2013-11-03 12:31:53 +01:00
Thomas Mueller
998211f7a3 WIN: fixing unit test for testStreamCopy() 2013-11-02 20:31:29 +01:00
Thomas Müller
d25c8b43e6 Merge pull request #5652 from owncloud/front-port-5647-master 
[WIP] extend unit test to directories starting or ending in whitespace
 2013-11-01 23:11:33 -07:00
Jörn Friedrich Dreyer
ae469b67a0 Merge pull request #5637 from owncloud/fix_privatedata 
Fix privatedata
 2013-10-31 10:26:47 -07:00
Jörn Friedrich Dreyer
10b2d649af extend unit test to directories starting or ending in whitespace 2013-10-31 14:24:43 +01:00
Thomas Müller
43d71aada8 testing update and delete 2013-10-31 11:09:52 +01:00
Thomas Müller
bd5663bc3d adding unit tests for delete 2013-10-31 10:21:42 +01:00
Thomas Müller
8362afa94d unit tests for set added 2013-10-31 10:14:31 +01:00
Thomas Müller
7f64d858dd first two tests 2013-10-31 10:01:04 +01:00
Thomas Müller
261cd87efa Merge branch 'master' into home-storage 2013-10-30 22:11:19 +01:00
Jörn Friedrich Dreyer
7ba803919b Merge pull request #5625 from owncloud/fix-test-master 
fix failing preview test on master
 2013-10-30 09:07:07 -07:00
Morris Jobke
b65b7965ae fix failing preview test on master 2013-10-30 15:39:55 +01:00
Robin Appelman
c9f3f2874f Merge branch 'master' into update-parent-storage-mtime 
Conflicts:
	lib/private/files/cache/updater.php
 2013-10-30 13:41:10 +01:00
Bjoern Schiessle
fcfac51aa1 backport of https://github.com/owncloud/core/pull/5513 2013-10-29 15:08:12 +01:00
Robin Appelman
654b0daf01 update touch tests for updated behaviour 2013-10-29 14:22:13 +01:00
Robin Appelman
b3626f34cd Update the parent folders storage_mtime on write and delete to prevent rescans 2013-10-29 14:18:57 +01:00
Thomas Müller
aaefb64306 Merge pull request #5493 from owncloud/fix-language-detection 
Fix HTTP language detection
 2013-10-28 16:37:12 -07:00
Robin Appelman
f1e6e80eb1 add specialized storage backend for home folders 2013-10-29 00:14:23 +01:00
Vincent Petry
c8df27de73 Fixed quota stream to not wrap read-only fopen calls 2013-10-25 12:33:16 +02:00
Vincent Petry
d8b245490b Fixed quota stream's fseek method 
- Added missing return statement
- Added missing support for SEEK_END
- Fixes #5524
 2013-10-25 12:09:46 +02:00
Thomas Müller
66813e9df6 Merge branch 'master' into fix-language-detection 2013-10-24 19:27:33 +02:00
Thomas Müller
caa3a8d784 Merge pull request #5464 from owncloud/fixing-5456-master 
Fixing 5456 master
 2013-10-23 10:50:36 -07:00
Andreas Fischer
8166aaf82c Some tests for OC_L10N::findLanguage() 2013-10-23 15:41:15 +02:00
Thomas Tanghus
ad017285e1 Fix namespace for OCP\Appframework\Http 
To avoid having to use OCP\Appframework\Http\Http in the public - and stable
- API OCP\Appframework\Http is now both a class and a namespace.
 2013-10-23 05:57:34 +02:00
Thomas Müller
f62c4eafa5 test cases added for create/remove Shared folder and file 2013-10-22 11:22:06 +02:00
Arthur Schiwon
adbaaf85ea Test that dispayNamesInGroup(s) always returns uid as key in the result array 2013-10-20 20:56:25 +02:00
Thomas Müller
b70d67d49a Merge pull request #5237 from owncloud/coverage-on-windows-master 
PHP Code Coverage on windows master
 2013-10-17 02:23:15 -07:00
Thomas Müller
cdaa1db0d1 re-enable test in SecurityMiddlewareTest 2013-10-16 16:33:56 +02:00
Thomas Müller
fdeef5e874 Merge branch 'master' into fixing-appframework-master 
Conflicts:
	lib/private/appframework/middleware/security/securitymiddleware.php
	tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
 2013-10-16 15:45:55 +02:00
Thomas Müller
c3f7d22adc Merge pull request #5067 from owncloud/urlParams_fix 
Get urlParams registered before Request is instantiated
 2013-10-16 06:42:09 -07:00
kondou
e2cc7e7bf9 Fix avatar unittest 2013-10-15 17:23:47 +02:00
Bjoern Schiessle
25320f19df Merge branch 'master' into avater_with_encryption 2013-10-15 11:53:51 +02:00
Bjoern Schiessle
0b8273c768 test should work now 2013-10-15 11:53:32 +02:00
Thomas Müller
7caf011b9a fixing syntax for openssl config 2013-10-15 00:44:55 +02:00
Thomas Müller
bf99d9233c on windows we supply an openssl.cnf file in order to execute the unit tests properly 2013-10-15 00:29:47 +02:00
Thomas Müller
86f6f0ca92 Merge branch 'master' into coverage-on-windows-master 2013-10-15 00:09:00 +02:00
Thomas Müller
6df5c7ebd5 streamCopy() should return proper structure. 
Callers of streamCopy() expect an array to be returned containing count and result.
 2013-10-14 21:33:23 +02:00
Thomas Tanghus
d75d80ba13 OCP\AppFramework\Controller\Controller => OCP\AppFramework\Controller 2013-10-11 10:07:57 +02:00
VicDeo
26c0007a5f Merge pull request #5263 from owncloud/fixing-5255-master 
Proper behavior of resolvePath()
 2013-10-10 09:27:45 -07:00
Thomas Müller
bc6e352ccd the path need to be normalized before putting it into resolvePath() 
otherwise the returned internalPath will not match followup calls to e.g. Cache::getID()
 2013-10-10 16:06:26 +02:00
Robin Appelman
1378af838c merge master into hooks-view-same-start 2013-10-10 11:34:30 +02:00
Robin Appelman
7f8eeb0474 ensure the view's root is a subfolder of the the default root, not only starting the same 2013-10-09 20:46:43 +02:00
Robin Appelman
38c563dcdc don't trigger the create hooks when if the file already exists for file_put_contents 2013-10-09 20:34:18 +02:00
Thomas Müller
44ece73c23 win32-phpunit.php is no longer required 2013-10-09 16:54:41 +02:00
Andreas Fischer
fe64f7b900 Merge pull request #5032 from owncloud/fixing-5006-master 
Test OC_User_Database in Test_User_Database instead of OC_User_Dummy.

* owncloud/fixing-5006-master:
  Use strict comparison === instead of ==.
  Adjust return value tests for checkPassword() to what OC_User_Example says.
  Make OC_User_Dummy::checkPassword() compatible with OC_User_Example.
  Use parent:: in Test_User_Database::getUser().
  Test_User_Backend::getUser() does not return an array, it returns a string.
  Test OC_User_Database in Test_User_Database instead of OC_User_Dummy.
 2013-10-08 23:17:51 +02:00
Thomas Müller
24e99016a9 Merge pull request #5188 from owncloud/master-delete-user 
User::delete should return bool
 2013-10-08 13:28:19 -07:00
Andreas Fischer
114e9d4403 Adjust return value tests for checkPassword() to what OC_User_Example says. 2013-10-08 19:57:37 +02:00
Andreas Fischer
1f11dc7200 Use parent:: in Test_User_Database::getUser(). 2013-10-08 19:36:37 +02:00
Andreas Fischer
46cd3082b0 Test_User_Backend::getUser() does not return an array, it returns a string. 2013-10-08 19:36:37 +02:00
Andreas Fischer
00a0588807 Test OC_User_Database in Test_User_Database instead of OC_User_Dummy. 2013-10-08 19:36:37 +02:00
Victor Dubiniuk
176c2f1502 Add unit tests 2013-10-08 16:33:56 +03:00
Thomas Müller
053b55721d Merge branch 'master' into fixing-appframework-master 2013-10-08 12:13:24 +02:00
Thomas Müller
c77f74e1de adding check isDeletable() on $sourcePath 2013-10-08 11:43:44 +02:00
Thomas Müller
1e47468c53 Merge pull request #4974 from owncloud/fixing-4011-master 
error handling added in case file_put_contents is failing
 2013-10-07 02:58:00 -07:00
Thomas Müller
3ea2dfa5f9 remove getTrans() from API class 2013-10-07 11:36:38 +02:00
Thomas Müller
1e5012fc1d fixing all appframework unit tests 2013-10-07 11:25:50 +02:00
Thomas Tanghus
c85621a897 Make abstract Middleware class public 
It doesn't make sense for subclasses to have to implement
all methods.
 2013-10-05 16:59:06 +02:00
Frank Karlitschek
a82211220c Merge pull request #5125 from owncloud/fixing-5122-master 
upload abortion detection only for PUT
 2013-10-05 02:25:45 -07:00
Thomas Müller
414b2eb4b6 upload abortion detection only for PUT 
e.g. LOCK would break with this approach
 2013-10-04 20:20:33 +02:00
Bart Visscher
bae121b16d Merge pull request #5068 from owncloud/improved_request 
Improved request
 2013-10-04 09:05:20 -07:00
Björn Schießle
2cdf54b77d Merge pull request #4877 from owncloud/ocs_share_api 
OCS Share API
 2013-10-04 07:10:21 -07:00
Thomas Müller
aebc330f26 Merge branch 'master' into fixing-4011-master 2013-10-04 14:06:42 +02:00
Vincent Petry
b0bb64c3ee Added unit tests for relative_modified_date, changed method signature 
Changed method signature of relative_modified_date template method to
make it possible to add a fromTime to compare with, mostly to make it
possible to test it.

Added unit test for date and time cases.
 2013-10-03 13:55:05 +02:00
Thomas Tanghus
aedc427ffd Fix fix of POST :P 2013-10-03 03:56:37 +02:00
Thomas Tanghus
965ce5719f Modified PUT behaviour 
Now only non-parable PUT requests return a stream resource.
 2013-10-02 22:13:40 +02:00
Morris Jobke
ceeb22aa5f fix unit tests 2013-10-02 11:25:44 +02:00
Bart Visscher
46b5202f4a Merge branch 'master' into convert-oc_appconfig 2013-10-02 07:42:06 +02:00
Thomas Tanghus
7cd8088845 Add assertions for ->params and array access with json 2013-10-01 20:15:03 +02:00
Thomas Tanghus
973bcccd7c Implement PUT an PATCH support 2013-10-01 20:13:13 +02:00
Thomas Tanghus
bdad7697ac Check if accessor matched request method. 
It's easier to find errors in the code if an exception is thrown.
 2013-10-01 20:13:13 +02:00
Thomas Tanghus
8603f956ab Get urlParams registered before Request is instantiated 2013-10-01 19:03:34 +02:00
Thomas Müller
9c9dc276b7 move the private namespace OC into lib/private - OCP will stay in lib/public 
Conflicts:
	lib/private/vcategories.php
 2013-09-30 16:36:59 +02:00
Thomas Müller
480aeb804f Merge pull request #4459 from owncloud/appframework-master 
Public API for OC6+ (includes AppFramework)
 2013-09-30 04:11:28 -07:00
Thomas Müller
c62dc4fa80 Merge branch 'master' into fixing-4011-master 
Conflicts:
	lib/connector/sabre/directory.php
 2013-09-30 11:36:08 +02:00
Thomas Müller
fdc87eaeb3 adding test testSimplePutFailsOnRename() 2013-09-30 11:30:34 +02:00
Thomas Müller
e3dee63339 Merge branch 'master' into fixing-4011-master 
Conflicts:
	lib/connector/sabre/directory.php
	lib/connector/sabre/file.php
 2013-09-30 10:46:50 +02:00
Thomas Müller
629faf6d34 Merge branch 'master' into appframework-master 2013-09-30 10:42:05 +02:00
Thomas Müller
952433eae6 Merge branch 'master' into move-aborted-upload-detection-into-plugin-master 2013-09-30 09:21:37 +02:00
Thomas Müller
5899485ca1 Merge pull request #4969 from owncloud/fixing-4043-master 
adding privilege check on move and rename operations
 2013-09-30 00:20:34 -07:00
Andreas Fischer
9ba0edcadb Merge pull request #4966 from owncloud/text_preview_blacklist 
add blacklist to txt preview backend

* owncloud/text_preview_blacklist:
  rename variable in testIsTransparent
  rename testTxtBlacklist to txtBlacklist
  move fileView object initialization to testIsTransparent
  use dataProvider for txt blacklist test
  add test for txt blacklist
  add test data for cal and contact preview
  add blacklist to txt preview backend
 2013-09-29 23:20:34 +02:00
Thomas Müller
6979fd343b Merge branch 'master' into appframework-master 2013-09-28 20:39:19 +02:00
Georg Ehrke
c5bcefe4db rename variable in testIsTransparent 2013-09-27 14:55:37 +02:00
Thomas Müller
687ba053b7 Merge branch 'master' into appframework-master 2013-09-27 14:25:47 +02:00
Thomas Müller
79da35b698 code cleanup 2013-09-27 13:41:23 +02:00
Thomas Müller
1ec7dff2fe remove unused setUp() 2013-09-27 13:30:09 +02:00
Georg Ehrke
4e9296a484 rename testTxtBlacklist to txtBlacklist 2013-09-27 11:33:37 +02:00
Georg Ehrke
1b13101096 move fileView object initialization to testIsTransparent 2013-09-27 11:01:47 +02:00
Georg Ehrke
aa8a145ba8 use dataProvider for txt blacklist test 2013-09-27 09:59:04 +02:00
Andreas Fischer
1a398fba67 phpunit.xml: Port code coverage excludes from autotest to dist. 2013-09-26 19:05:47 +02:00
Morris Jobke
3dd19c7758 Merge pull request #4999 from owncloud/run-unit-tests-for-apps-master 
run unit tests for apps as well
 2013-09-26 07:09:32 -07:00
Thomas Müller
f8933eaf92 Remove $RUNTIME_NOAPPS - setting to false was not enough 2013-09-26 14:03:04 +02:00
Bjoern Schiessle
b9d6539d76 Merge branch 'master' into ocs_share_api 2013-09-26 13:02:39 +02:00
Thomas Müller
d1b5d65622 run unit tests for apps as well 2013-09-26 12:02:06 +02:00
Thomas Müller
b11d8799c1 adding unit tests for ObjectTree::move() 2013-09-26 10:50:15 +02:00
Thomas Müller
469b309b21 Merge pull request #4892 from owncloud/vcategories_public 
OC_VCategories => OC\Tags. Public interface and getter in server container
 2013-09-25 14:24:37 -07:00
Arthur Schiwon
b5ac672864 Missing Test for the previous commit 2013-09-25 19:15:27 +02:00
Thomas Müller
826c6bec8f expect unlinkto be called 2013-09-25 17:41:16 +02:00
Thomas Müller
3fa5271f10 adding unit tests 2013-09-25 17:34:28 +02:00
Georg Ehrke
9e4fe10329 add test for txt blacklist 2013-09-25 10:20:40 +02:00
Thomas Müller
db39fede97 Merge branch 'master' into appframework-master 
Conflicts:
	apps/files/lib/helper.php
	apps/files_trashbin/lib/helper.php
 2013-09-25 09:52:12 +02:00
Thomas Tanghus
aaed871cee Add factory class for the server container. 2013-09-24 17:10:01 +02:00
Arthur Schiwon
14a160e176 Adjust Tests and satisfy them 2013-09-24 17:10:01 +02:00
Thomas Müller
ee75a5b134 adding basic unit test for failing file_put_content operation 2013-09-24 15:44:02 +02:00
Arthur Schiwon
d101ff42f1 User: move checkPassword from User to Manager to not break API 2013-09-24 13:46:30 +02:00
Georg Ehrke
52f1d5856d add test data for cal and contact preview 2013-09-24 13:26:51 +02:00
Robin Appelman
235517f111 clear permissions cache when scanning a file 2013-09-24 00:57:58 +02:00
Thomas Tanghus
f022ea752d Moar tests. 2013-09-23 23:39:36 +02:00
Thomas Tanghus
8fab9eef28 Add another test. 2013-09-23 23:39:36 +02:00
Thomas Tanghus
1bbeb12e2e Updated method names and added a few more tests. 2013-09-23 23:39:36 +02:00
Thomas Tanghus
45f73feb69 OC_VCategories=>OC\Tags. Public interface + getter in server container 2013-09-23 23:39:36 +02:00
Thomas Müller
5d671a84b2 Merge pull request #4869 from owncloud/fixing-4866-master 
recreate an etag within the scanner if the cache contains an empty etag
 2013-09-23 07:13:12 -07:00
Andreas Fischer
437858852c Merge pull request #4856 from owncloud/fix-link-expiration 
Fix Sharing "Expiration Date" for Shares of type Link (i.e. Token)

* owncloud/fix-link-expiration:
  Perform expiration date checking before returning share data for token.
  Tests whether expired/valid link share is still accessible.
 2013-09-23 15:12:38 +02:00
Andreas Fischer
d9a36ee82e Move setUp() and tearDown() up in tests/lib/files/cache/scanner.php. 2013-09-23 12:45:02 +02:00
Andreas Fischer
4a9f1cc74d Merge remote-tracking branch 'owncloud/master' into fixing-4866-master 
* owncloud/master: (98 commits)
  [tx-robot] updated from transifex
  files: when filtering search results, ensure results are children of the fakeroot not just path starting the same
  setting a default on filecache column unencrypted_size
  [tx-robot] updated from transifex
  remove unneccessary lib in namespace
  namespaces use upcasefirst parts when _ is left in namespace and files are named after their classes the autoloader will also find classes in the lib folder of an app its magic!
  initialize variable
  calculate correct permissions while toggle the password protection
  make sure that both $permissions and $oldPermissions have the same type
  Add copyright, remove starting blank line
  update inherit docs comment
  Fix insert/update/delete helper functions for oracle
  Add missing return true statements to legacy preferences functions
  Add missing static
  Convert OC_Preference to object interface
  fix race condition in lazy preview loading
  use {count} instead of 'One' for more versatile translation
  fix double translation of error message
  use n to translate title
  fixing typos and l10n
  ...

Conflicts:
	tests/lib/files/cache/scanner.php
 2013-09-23 12:44:11 +02:00
Thomas Müller
03eedb58fc Merge pull request #4327 from owncloud/scanfile-remove 
remove deleted files while scanning
 2013-09-22 22:40:13 -07:00
Bart Visscher
811f680457 Merge pull request #4623 from owncloud/convert-oc_preferences 
Convert OC_Preference to object interface
 2013-09-22 10:45:56 -07:00
Robin Appelman
a1d4eb1f95 files: when filtering search results, ensure results are children of the fakeroot not just path starting the same 2013-09-22 01:24:12 +02:00
Andreas Fischer
de2e6e137b Do not convert boolean to integer in tests. put() already does this. 2013-09-21 00:12:13 +02:00
Thomas Müller
d84d548618 when storing back the data field 'encrypted' it is necessary to cast the boolean to an integer to make pg happy 2013-09-20 20:34:17 +02:00
Bart Visscher
6619d8273a Enable appconfig asserts 2013-09-19 18:14:28 +02:00
Bart Visscher
c546874159 Convert OC_Appconfig to object interface 
Implemented unittest for OC\AppConfig
 2013-09-19 18:14:27 +02:00
Bart Visscher
445d34a2a9 Convert OC_Preference to object interface 2013-09-19 18:13:06 +02:00
Bjoern Schiessle
b947aab802 some unit test for the new ocs share api 2013-09-19 14:39:51 +02:00
Thomas Müller
1274d6116d updating php docs 2013-09-18 22:22:51 +02:00
Thomas Tanghus
dd62ccdb4e Merge branch 'appframework-master' into public_cache 
Conflicts:
	lib/public/iservercontainer.php
	lib/server.php
 2013-09-18 13:20:07 +02:00
Thomas Tanghus
8b4f4a79e2 Still some session leftovers. 2013-09-17 19:46:08 +02:00
Thomas Tanghus
fe86182dac OC_Cache namespace changes and add UserCache to server container. 
Refs #4863
 2013-09-17 17:46:33 +02:00
Thomas Müller
4cd0ee47a8 Merge branch 'master' into appframework-master 2013-09-17 09:39:45 +02:00
Thomas Müller
c8f9efeb94 etag changes are now propagated up the file tree 2013-09-16 23:32:17 +02:00
Andreas Fischer
07714d9a72 Tests whether expired/valid link share is still accessible. 2013-09-16 21:24:16 +02:00
Bart Visscher
9d18e16c77 Merge pull request #4825 from owncloud/fix-sharing-expiration-oracle 
Fix Sharing "Expiration Date" on Oracle
 2013-09-16 12:16:44 -07:00
Thomas Müller
3c026b7cf6 recreate an etag within the scanner if the cache contains an empty etag 2013-09-16 12:09:15 +02:00
Thomas Müller
ad82a56f79 Merge branch 'master' into appframework-master 2013-09-15 21:18:59 +02:00
Bernhard Posselt
a58e176852 Merge pull request #4506 from owncloud/oc_avatars 
OC Avatars
 2013-09-14 16:00:36 -07:00
Thomas Müller
4480b0b164 Merge branch 'master' into appframework-master 2013-09-13 23:31:59 +02:00
Thomas Müller
6ff07f7681 Merge pull request #4712 from owncloud/fileapi-foreward 
Provide an implementation of the fileapi for oc6 build on top of the old api
 2013-09-13 14:31:11 -07:00
Thomas Müller
6eeb4d165c - giving the user a new id for each test run in order to prevent reuse of e.g. permissions data in the database 
- setting the current user id because \OC\FilesView relies on \OC_User::getUser()
 2013-09-13 21:44:31 +02:00
Thomas Müller
5b3388c7c4 Merge branch 'master' into appframework-master 2013-09-13 20:56:49 +02:00
Thomas Müller
8c9add4d32 adding TB and GB to OC_Helper::humanFileSize 2013-09-13 17:22:45 +02:00
Andreas Fischer
294f3632e0 Calculate dateInPast and dateInFuture. 2013-09-12 23:43:21 +02:00
Andreas Fischer
20b799b2b4 Compare objects directly. Also use $expected and $actual. 2013-09-12 23:43:21 +02:00
Andreas Fischer
bd1163b7d5 Add database tests for INSERT/SELECT date format. 2013-09-12 23:43:21 +02:00
Andreas Fischer
261766fe49 Add comment explaining how $dateInFuture was picked. 2013-09-12 23:43:20 +02:00
Andreas Fischer
f567bd1b8a Coding style: { for methods start are supposed to be on the same line. 2013-09-12 23:43:20 +02:00
Andreas Fischer
fb650deaf7 Expiration tests for sharing with groups. 2013-09-12 23:43:20 +02:00
Andreas Fischer
cf97eac401 Do not repeat shareUserOneTestFileWithUserTwo() code. 2013-09-12 23:43:20 +02:00
Andreas Fischer
e4b334c3f1 Make dates test class properties. 2013-09-12 23:43:20 +02:00
Andreas Fischer
924a7046dd Try to make Oracle happy by also specifying seconds. 2013-09-12 23:43:20 +02:00
Andreas Fischer
1358b0078a Test whether a still-valid user share is still accessible. 2013-09-12 23:43:20 +02:00
Andreas Fischer
05c970095d Test whether an expired user share is still accessible. 2013-09-12 23:43:20 +02:00
Robin Appelman
c9d2663159 Merge branch 'master' into fileapi-foreward 2013-09-12 21:43:35 +02:00
kondou
c9c5e1b97f Merge branch 'master' into oc_avatars 2013-09-12 07:41:44 +02:00
Robin Appelman
b9167196fb adjust test cases to namespace changes 2013-09-10 22:21:49 +02:00
kondou
1832eb8872 Pass view in \OC_Avatar to constructor and use $_ for enable_avatars 2013-09-09 16:57:46 +02:00