]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
11 years agoAdd assertions for ->params and array access with json
Thomas Tanghus [Mon, 30 Sep 2013 14:23:43 +0000 (16:23 +0200)]
Add assertions for ->params and array access with json

11 years agoImplement PUT an PATCH support
Thomas Tanghus [Fri, 27 Sep 2013 23:35:24 +0000 (01:35 +0200)]
Implement PUT an PATCH support

11 years agoAdd interface docs to IRequest.
Thomas Tanghus [Fri, 27 Sep 2013 13:55:22 +0000 (15:55 +0200)]
Add interface docs to IRequest.

11 years agoAdd patch method to OC_Route
Thomas Tanghus [Fri, 27 Sep 2013 13:54:18 +0000 (15:54 +0200)]
Add patch method to OC_Route

11 years agoCheck if accessor matched request method.
Thomas Tanghus [Fri, 27 Sep 2013 12:36:19 +0000 (14:36 +0200)]
Check if accessor matched request method.

It's easier to find errors in the code if an exception is thrown.

11 years agoMerge pull request #4459 from owncloud/appframework-master
Thomas Müller [Mon, 30 Sep 2013 11:11:28 +0000 (04:11 -0700)]
Merge pull request #4459 from owncloud/appframework-master

Public API for OC6+ (includes AppFramework)

11 years agoMerge pull request #4995 from owncloud/move-aborted-upload-detection-into-plugin...
Thomas Müller [Mon, 30 Sep 2013 09:31:51 +0000 (02:31 -0700)]
Merge pull request #4995 from owncloud/move-aborted-upload-detection-into-plugin-master

Move aborted upload detection into it's own sabedav plugin

11 years agoMerge branch 'master' into appframework-master
Thomas Müller [Mon, 30 Sep 2013 08:42:05 +0000 (10:42 +0200)]
Merge branch 'master' into appframework-master

11 years agofixing PHPDoc & typo
Thomas Müller [Mon, 30 Sep 2013 08:03:07 +0000 (10:03 +0200)]
fixing PHPDoc & typo

11 years agoMerge branch 'master' into move-aborted-upload-detection-into-plugin-master
Thomas Müller [Mon, 30 Sep 2013 07:21:37 +0000 (09:21 +0200)]
Merge branch 'master' into move-aborted-upload-detection-into-plugin-master

11 years agoMerge pull request #4969 from owncloud/fixing-4043-master
Thomas Müller [Mon, 30 Sep 2013 07:20:34 +0000 (00:20 -0700)]
Merge pull request #4969 from owncloud/fixing-4043-master

adding privilege check on move and rename operations

11 years agoMerge pull request #3563 from evgeni/curl-no-timeout
Thomas Müller [Mon, 30 Sep 2013 07:08:32 +0000 (00:08 -0700)]
Merge pull request #3563 from evgeni/curl-no-timeout

cURL does not honour default_socket_timeout

11 years agocURL does not honour default_socket_timeout
Evgeni Golov [Fri, 31 May 2013 16:21:31 +0000 (18:21 +0200)]
cURL does not honour default_socket_timeout

SabreDAV uses cURL for the requests and as this does not honour
default_socket_timeout, setting it is useless and confusing as
people will expect the request to timeout faster than it actually
will do.

One has to use
 curl_setopt($curl, CURLOPT_TIMEOUT, x)
or
 curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, x)
but there is currently no way to make SabreDAV pass this to cURL.

11 years agoMerge pull request #4966 from owncloud/text_preview_blacklist
Andreas Fischer [Sun, 29 Sep 2013 21:20:34 +0000 (23:20 +0200)]
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

11 years agoMerge pull request #4960 from owncloud/fixing-mirall-1014-master
Thomas Müller [Sun, 29 Sep 2013 19:49:10 +0000 (12:49 -0700)]
Merge pull request #4960 from owncloud/fixing-mirall-1014-master

handle error situation of rename proper

11 years agoMerge branch 'master' into appframework-master
Thomas Müller [Sun, 29 Sep 2013 18:07:56 +0000 (20:07 +0200)]
Merge branch 'master' into appframework-master

11 years agoMerge pull request #5031 from zimba12/master
Thomas Müller [Sun, 29 Sep 2013 16:26:47 +0000 (09:26 -0700)]
Merge pull request #5031 from zimba12/master

followup of #4032 - makes the settings-button bigger...

11 years agofollowup of #4032 - makes the settings-button bigger and adds again padding at bottom...
Alessandro Cosentino [Sun, 29 Sep 2013 05:46:23 +0000 (01:46 -0400)]
followup of #4032 - makes the settings-button bigger and adds again padding at bottom of app-navigation

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 29 Sep 2013 04:03:26 +0000 (00:03 -0400)]
[tx-robot] updated from transifex

11 years agoinitialize $middleWares
Thomas Müller [Sat, 28 Sep 2013 18:40:25 +0000 (20:40 +0200)]
initialize $middleWares

11 years agoMerge branch 'master' into appframework-master
Thomas Müller [Sat, 28 Sep 2013 18:39:19 +0000 (20:39 +0200)]
Merge branch 'master' into appframework-master

11 years agoMerge pull request #5030 from owncloud/base_defaultavatar_text_on_displayname
Morris Jobke [Sat, 28 Sep 2013 15:52:22 +0000 (08:52 -0700)]
Merge pull request #5030 from owncloud/base_defaultavatar_text_on_displayname

Base defaultavatar text on displayname

11 years agoHave uniform (wrong) indention
kondou [Sat, 28 Sep 2013 15:49:07 +0000 (17:49 +0200)]
Have uniform (wrong) indention

11 years agoBase defaultavatar text on displayname
kondou [Sat, 28 Sep 2013 14:46:53 +0000 (16:46 +0200)]
Base defaultavatar text on displayname

Fix #4876

11 years agoMerge pull request #5004 from owncloud/phpunit-dist-coverage-excludes
Morris Jobke [Sat, 28 Sep 2013 13:50:34 +0000 (06:50 -0700)]
Merge pull request #5004 from owncloud/phpunit-dist-coverage-excludes

phpunit.xml: Port code coverage excludes from autotest to dist.

11 years agodelay middleware registrations
Thomas Müller [Fri, 27 Sep 2013 15:15:26 +0000 (17:15 +0200)]
delay middleware registrations

11 years agofixing error in initialization of TagManager
Thomas Müller [Fri, 27 Sep 2013 15:08:48 +0000 (17:08 +0200)]
fixing error in initialization of TagManager

11 years agorename variable in testIsTransparent
Georg Ehrke [Fri, 27 Sep 2013 12:55:37 +0000 (14:55 +0200)]
rename variable in testIsTransparent

11 years agoMerge branch 'master' into appframework-master
Thomas Müller [Fri, 27 Sep 2013 12:25:47 +0000 (14:25 +0200)]
Merge branch 'master' into appframework-master

11 years agoMerge pull request #4207 from owncloud/search_shared_files
Thomas Müller [Fri, 27 Sep 2013 12:18:12 +0000 (05:18 -0700)]
Merge pull request #4207 from owncloud/search_shared_files

add initial search in shared files

11 years agocode cleanup
Thomas Müller [Fri, 27 Sep 2013 11:41:23 +0000 (13:41 +0200)]
code cleanup

11 years agoMerge pull request #5001 from owncloud/fixing-user-external-backends-master
Morris Jobke [Fri, 27 Sep 2013 09:34:59 +0000 (02:34 -0700)]
Merge pull request #5001 from owncloud/fixing-user-external-backends-master

prelogin apps have to be loaded within setupBackend() otherwise required...

11 years agorename testTxtBlacklist to txtBlacklist
Georg Ehrke [Fri, 27 Sep 2013 09:33:37 +0000 (11:33 +0200)]
rename testTxtBlacklist to txtBlacklist

11 years agomove fileView object initialization to testIsTransparent
Georg Ehrke [Fri, 27 Sep 2013 09:01:47 +0000 (11:01 +0200)]
move fileView object initialization to testIsTransparent

11 years agouse dataProvider for txt blacklist test
Georg Ehrke [Fri, 27 Sep 2013 07:59:04 +0000 (09:59 +0200)]
use dataProvider for txt blacklist test

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 27 Sep 2013 04:02:30 +0000 (00:02 -0400)]
[tx-robot] updated from transifex

11 years agophpunit.xml: Port code coverage excludes from autotest to dist.
Andreas Fischer [Thu, 26 Sep 2013 17:05:47 +0000 (19:05 +0200)]
phpunit.xml: Port code coverage excludes from autotest to dist.

11 years agoMerge pull request #4999 from owncloud/run-unit-tests-for-apps-master
Morris Jobke [Thu, 26 Sep 2013 14:09:32 +0000 (07:09 -0700)]
Merge pull request #4999 from owncloud/run-unit-tests-for-apps-master

run unit tests for apps as well

11 years agoRemove $RUNTIME_NOAPPS - setting to false was not enough
Thomas Müller [Thu, 26 Sep 2013 12:03:04 +0000 (14:03 +0200)]
Remove $RUNTIME_NOAPPS - setting to false was not enough

11 years agoprelogin apps have to be loaded within setupBackend() otherwise required classes...
Thomas Müller [Thu, 26 Sep 2013 11:34:47 +0000 (13:34 +0200)]
prelogin apps have to be loaded within setupBackend() otherwise required classes cannot be loaded

11 years agoMerge pull request #4990 from owncloud/user_fix_manager
blizzz [Thu, 26 Sep 2013 11:03:20 +0000 (04:03 -0700)]
Merge pull request #4990 from owncloud/user_fix_manager

manager checkPassword now returns User object, adjust internal user clas...

11 years agoMerge pull request #4887 from owncloud/sharing_disable_public_upload
Björn Schießle [Thu, 26 Sep 2013 10:16:15 +0000 (03:16 -0700)]
Merge pull request #4887 from owncloud/sharing_disable_public_upload

check only permission from link-share to decide if public upload is enabled or disabled

11 years agoMerge pull request #4991 from owncloud/enc_fix_warning
Thomas Müller [Thu, 26 Sep 2013 10:15:14 +0000 (03:15 -0700)]
Merge pull request #4991 from owncloud/enc_fix_warning

check if key exists before reading it

11 years agorun unit tests for apps as well
Thomas Müller [Thu, 26 Sep 2013 10:02:06 +0000 (12:02 +0200)]
run unit tests for apps as well

11 years agoadding unit tests for ObjectTree::move()
Thomas Müller [Thu, 26 Sep 2013 08:50:15 +0000 (10:50 +0200)]
adding unit tests for ObjectTree::move()

11 years agoMerge pull request #4892 from owncloud/vcategories_public
Thomas Müller [Wed, 25 Sep 2013 21:24:37 +0000 (14:24 -0700)]
Merge pull request #4892 from owncloud/vcategories_public

OC_VCategories => OC\Tags. Public interface and getter in server container

11 years agofix check if app is enabled
Bjoern Schiessle [Wed, 25 Sep 2013 17:23:07 +0000 (19:23 +0200)]
fix check if app is enabled

11 years agoMissing Test for the previous commit
Arthur Schiwon [Wed, 25 Sep 2013 17:15:27 +0000 (19:15 +0200)]
Missing Test for the previous commit

11 years agoMerge pull request #4987 from owncloud/different_color_placeholder
Morris Jobke [Wed, 25 Sep 2013 17:11:52 +0000 (10:11 -0700)]
Merge pull request #4987 from owncloud/different_color_placeholder

Make it possible to have a different color than the username for placeholder

11 years agocheck if key exists before reading it
Bjoern Schiessle [Wed, 25 Sep 2013 15:44:05 +0000 (17:44 +0200)]
check if key exists before reading it

11 years agoMerge branch 'master' into move-aborted-upload-detection-into-plugin-master
Thomas Müller [Wed, 25 Sep 2013 15:43:25 +0000 (17:43 +0200)]
Merge branch 'master' into move-aborted-upload-detection-into-plugin-master

11 years agoexpect unlinkto be called
Thomas Müller [Wed, 25 Sep 2013 15:41:16 +0000 (17:41 +0200)]
expect unlinkto be called

11 years agoadding unit tests
Thomas Müller [Wed, 25 Sep 2013 15:34:28 +0000 (17:34 +0200)]
adding unit tests

11 years agoremove unneccessary code
Thomas Müller [Wed, 25 Sep 2013 15:28:45 +0000 (17:28 +0200)]
remove unneccessary code

11 years agoShorten optional text-argument processing
kondou [Wed, 25 Sep 2013 15:19:38 +0000 (17:19 +0200)]
Shorten optional text-argument processing

11 years ago$path already contains the full path to the file
Thomas Müller [Wed, 25 Sep 2013 15:17:29 +0000 (17:17 +0200)]
$path already contains the full path to the file

11 years agofixing copyright and add class documentation
Thomas Müller [Wed, 25 Sep 2013 15:00:20 +0000 (17:00 +0200)]
fixing copyright and add class documentation

11 years agoMerge pull request #4989 from owncloud/coverage-for-all-master
Thomas Müller [Wed, 25 Sep 2013 14:46:49 +0000 (07:46 -0700)]
Merge pull request #4989 from owncloud/coverage-for-all-master

collect coverage for all databases again - ci.owncloud.org has more RAM ...

11 years agomanager checkPassword now returns User object, adjust internal user class accordingly.
Arthur Schiwon [Wed, 25 Sep 2013 13:03:22 +0000 (15:03 +0200)]
manager checkPassword now returns User object, adjust internal user class accordingly.

11 years agocollect coverage for all databases again - ci.owncloud.org has more RAM available
Thomas Müller [Wed, 25 Sep 2013 12:41:03 +0000 (14:41 +0200)]
collect coverage for all databases again - ci.owncloud.org has more RAM available

11 years agoMerge pull request #4968 from owncloud/user_checkpwd
Thomas Müller [Wed, 25 Sep 2013 12:28:42 +0000 (05:28 -0700)]
Merge pull request #4968 from owncloud/user_checkpwd

User: move checkPassword from User to Manager to not break API

11 years agoMake it possible to have a different color than the username for placeholder
kondou [Wed, 25 Sep 2013 10:57:41 +0000 (12:57 +0200)]
Make it possible to have a different color than the username for placeholder

11 years agostripos return value check
Thomas Müller [Wed, 25 Sep 2013 09:05:59 +0000 (11:05 +0200)]
stripos return value check

11 years agoclass API decommissioning part 1
Thomas Müller [Wed, 25 Sep 2013 09:05:24 +0000 (11:05 +0200)]
class API decommissioning part 1

11 years agoAppFramework:
Thomas Müller [Wed, 25 Sep 2013 08:30:48 +0000 (10:30 +0200)]
AppFramework:
- get request from the server container
- implement registerMiddleWare()
- adding getAppName() to app container

11 years agoadd test for txt blacklist
Georg Ehrke [Wed, 25 Sep 2013 08:20:40 +0000 (10:20 +0200)]
add test for txt blacklist

11 years agoMerge branch 'master' into appframework-master
Thomas Müller [Wed, 25 Sep 2013 07:52:12 +0000 (09:52 +0200)]
Merge branch 'master' into appframework-master

Conflicts:
apps/files/lib/helper.php
apps/files_trashbin/lib/helper.php

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 24 Sep 2013 16:59:48 +0000 (12:59 -0400)]
[tx-robot] updated from transifex

11 years agoAdd factory class for the server container.
Thomas Tanghus [Tue, 24 Sep 2013 15:10:01 +0000 (17:10 +0200)]
Add factory class for the server container.

11 years agoAdjust Tests and satisfy them
Arthur Schiwon [Tue, 24 Sep 2013 15:10:01 +0000 (17:10 +0200)]
Adjust Tests and satisfy them

11 years agoMerge pull request #4898 from owncloud/server_folder_methods
Thomas Müller [Tue, 24 Sep 2013 13:58:47 +0000 (06:58 -0700)]
Merge pull request #4898 from owncloud/server_folder_methods

Server folder methods

11 years agoFix doc
Arthur Schiwon [Tue, 24 Sep 2013 12:12:44 +0000 (14:12 +0200)]
Fix doc

11 years agoFix return value from User object to User ID
Arthur Schiwon [Tue, 24 Sep 2013 12:11:47 +0000 (14:11 +0200)]
Fix return value from User object to User ID

11 years agoduplicate code :sigh: - will fix this in a second pr
Thomas Müller [Tue, 24 Sep 2013 11:54:18 +0000 (13:54 +0200)]
duplicate code :sigh: - will fix this in a second pr

11 years agoadding file_exists check just to be on the save side
Thomas Müller [Tue, 24 Sep 2013 11:53:32 +0000 (13:53 +0200)]
adding file_exists check just to be on the save side

11 years ago=== not ==
Arthur Schiwon [Tue, 24 Sep 2013 11:51:33 +0000 (13:51 +0200)]
=== not ==

11 years agoUser: move checkPassword from User to Manager to not break API
Arthur Schiwon [Mon, 16 Sep 2013 12:15:35 +0000 (14:15 +0200)]
User: move checkPassword from User to Manager to not break API

11 years agoMerge pull request #4963 from cyberb/patch-1
Christopher [Tue, 24 Sep 2013 11:45:13 +0000 (04:45 -0700)]
Merge pull request #4963 from cyberb/patch-1

fixing typo

11 years agoadd test data for cal and contact preview
Georg Ehrke [Tue, 24 Sep 2013 11:26:51 +0000 (13:26 +0200)]
add test data for cal and contact preview

11 years agoadding privilege check on move and rename operations
Thomas Müller [Tue, 24 Sep 2013 11:26:12 +0000 (13:26 +0200)]
adding privilege check on move and rename operations

11 years agoadd blacklist to txt preview backend
Georg Ehrke [Tue, 24 Sep 2013 09:00:08 +0000 (11:00 +0200)]
add blacklist to txt preview backend

11 years agoadding PHPDoc comments to getBackend
Thomas Müller [Tue, 24 Sep 2013 08:37:58 +0000 (10:37 +0200)]
adding PHPDoc comments to getBackend
ensure getChildren() is called on an instance of Share_Backend_Collection

11 years agoMerge pull request #4930 from owncloud/fix-apps-settings
Thomas Müller [Tue, 24 Sep 2013 08:02:50 +0000 (01:02 -0700)]
Merge pull request #4930 from owncloud/fix-apps-settings

Fix the apps enabling/disabling in settings

11 years agoMerge pull request #4917 from owncloud/scan-clear-permissions
Thomas Müller [Tue, 24 Sep 2013 07:50:33 +0000 (00:50 -0700)]
Merge pull request #4917 from owncloud/scan-clear-permissions

clear permissions cache when scanning a file

11 years agofixing typo
Boris Rybalkin [Tue, 24 Sep 2013 01:08:58 +0000 (21:08 -0400)]
fixing typo

Typo in comment "feature" => "future"

11 years agoDo not recheck $cacheData. Move if($reuseExisting) under if($cacheData).
Andreas Fischer [Mon, 23 Sep 2013 22:59:23 +0000 (00:59 +0200)]
Do not recheck $cacheData. Move if($reuseExisting) under if($cacheData).

11 years agoclear permissions cache when scanning a file
Robin Appelman [Thu, 19 Sep 2013 19:37:52 +0000 (21:37 +0200)]
clear permissions cache when scanning a file

11 years agoRemove duplicate method definitions
Thomas Tanghus [Mon, 23 Sep 2013 22:12:23 +0000 (00:12 +0200)]
Remove duplicate method definitions

11 years agoMerge branch 'server_folder_methods' of github.com:owncloud/core into server_folder_m...
Thomas Tanghus [Mon, 23 Sep 2013 22:09:21 +0000 (00:09 +0200)]
Merge branch 'server_folder_methods' of github.com:owncloud/core into server_folder_methods

Conflicts:
lib/public/iservercontainer.php
lib/server.php

11 years agoDon't try to be clever
Thomas Tanghus [Wed, 18 Sep 2013 12:25:12 +0000 (14:25 +0200)]
Don't try to be clever

11 years agoAdd getUserFolder/getAppFolder to Server.
Thomas Tanghus [Wed, 18 Sep 2013 10:34:10 +0000 (12:34 +0200)]
Add getUserFolder/getAppFolder to Server.

11 years agoFix conflict
Thomas Tanghus [Mon, 23 Sep 2013 21:48:28 +0000 (23:48 +0200)]
Fix conflict

11 years agoMoar tests.
Thomas Tanghus [Mon, 23 Sep 2013 13:52:50 +0000 (15:52 +0200)]
Moar tests.

11 years agoUse fetchOne() instead of numRows() when doing a COUNT(*).
Thomas Tanghus [Mon, 23 Sep 2013 13:52:06 +0000 (15:52 +0200)]
Use fetchOne() instead of numRows() when doing a COUNT(*).

11 years agoForgot to return false if add() didn't add anything.
Thomas Tanghus [Mon, 23 Sep 2013 11:29:21 +0000 (13:29 +0200)]
Forgot to return false if add() didn't add anything.

11 years agoAdded more error checking in add()
Thomas Tanghus [Mon, 23 Sep 2013 11:27:43 +0000 (13:27 +0200)]
Added more error checking in add()

11 years agoAdd another test.
Thomas Tanghus [Thu, 19 Sep 2013 11:55:45 +0000 (13:55 +0200)]
Add another test.

11 years agoUpdated method names and added a few more tests.
Thomas Tanghus [Thu, 19 Sep 2013 09:27:13 +0000 (11:27 +0200)]
Updated method names and added a few more tests.

11 years agofixing namespaces and rename hasCategory to hasTag
Thomas Müller [Wed, 18 Sep 2013 20:49:09 +0000 (22:49 +0200)]
fixing namespaces and rename hasCategory to hasTag

11 years agoOC_VCategories=>OC\Tags. Public interface + getter in server container
Thomas Tanghus [Tue, 17 Sep 2013 22:37:00 +0000 (00:37 +0200)]
OC_VCategories=>OC\Tags. Public interface + getter in server container