mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
14,065 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

660 Commits

Author SHA1 Message Date
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
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
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 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 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
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
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