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

528 commits

Author SHA1 Message Date
Arthur Schiwon
14a160e176 Adjust Tests and satisfy them 2013-09-24 17:10:01 +02:00
Arthur Schiwon
d101ff42f1 User: move checkPassword from User to Manager to not break API 2013-09-24 13:46:30 +02:00
Robin Appelman
235517f111 clear permissions cache when scanning a file 2013-09-24 00:57:58 +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
445d34a2a9 Convert OC_Preference to object interface 2013-09-19 18:13:06 +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
Bernhard Posselt
a58e176852 Merge pull request #4506 from owncloud/oc_avatars 
OC Avatars
 2013-09-14 16:00:36 -07: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
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
Bernhard Posselt
fbedd643f7 Merge pull request #4477 from owncloud/hooks-view 
also emit hooks for views that are a subfolder of the user folder
 2013-09-04 16:09:22 -07:00
kondou
820fd42161 Merge branch 'master' into oc_avatars 2013-09-04 12:56:40 +02:00
kondou
e5fc7b9dbe Merge branch 'master' into clean_up_util 
Conflicts:
	lib/base.php
 2013-09-02 07:58:06 +02:00
Robin Appelman
a22f9ff301 Provide an implementation of the fileapi for oc6 build on top of the old api 2013-09-01 19:47:48 +02:00
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
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