e30e4ea1cc
php 5.3 compatibility regarding OC\DB\Connection fixed
2013-10-21 22:51:56 +02:00
408e0022dd
Merge pull request #5249 from owncloud/activities-api
...
[OC6] Activities api
2013-10-21 13:21:17 -07:00
124984905e
introduce OC_Helper::linkToDocs()
2013-10-21 22:01:27 +02:00
97aff7c64e
Use quoteIdentifier with proper objects
2013-10-21 22:31:57 +03:00
148d2616e5
introduce link_to_docs() and migrate links
2013-10-21 21:29:45 +02:00
66a2f3b0b9
New OCS route:
...
/ocs/cloud/user
Response:
<?xml version="1.0"?>
<ocs>
<meta>
<status>ok</status>
<statuscode>100</statuscode>
<message/>
</meta>
<data>
<id>thomas</id>
<display-name>DeepDiver</display-name>
<email>no-response@domain.tld</email>
</data>
</ocs>
2013-10-21 20:14:18 +02:00
581cd9bb9c
Support existing sessions within OCS API calls
2013-10-21 18:58:46 +02:00
5978ddbec6
Try to create custom log file before falling back to default.
2013-10-20 23:58:07 +02:00
701009bd72
dispayNamesInGroup(s) should always return uid as key in the result attr, fixes #5209
2013-10-20 20:55:27 +02:00
9e99f9d13d
the logfile shoudn't be world readable.
2013-10-18 17:15:02 +02:00
1f1fcc6129
Remove "link" shares right after disabling the "allow_link_share" setting
2013-10-18 11:37:13 +02:00
5c5621d84e
Merge pull request #5395 from owncloud/more_check_options
...
add options to disable the check for a working .htaccess file in data
2013-10-18 01:23:20 -07:00
11cfb9dc48
Merge pull request #5358 from owncloud/postinstall-ocdavclientwithtimeout
...
Added timeout for WebDAV post setup check
2013-10-18 01:10:04 -07:00
b1f72edc57
Fixed spaces
2013-10-17 23:22:19 +02:00
d2d2c9a46d
fixes #5367
2013-10-17 20:20:13 +02:00
6a60a47d59
add options to disable the check for a working .htaccess file in data and for a working WebDAV server. This are advanced settings that are needed in special situations where our check fail and the user runs into an http timeout.
2013-10-17 16:27:43 +02:00
c3c27b3e58
Merge pull request #5394 from owncloud/sabre-server-location
...
Move OC_Connector_Sabre_Server to expected location.
2013-10-17 07:11:50 -07:00
5ee74b656c
Move OC_Connector_Sabre_Server to expected location.
2013-10-17 16:04:59 +02:00
4c5959e1f5
fix comment
2013-10-17 15:19:15 +02:00
e55d2359b1
removing pointless calls on quoteIdentifier() - reason: name on $tableDiff doesn't exist and my design the name cannot be changed
...
adding PHPDoc
2013-10-17 14:54:37 +02:00
521277b8b6
only call shell_exec if enabled
2013-10-17 14:31:07 +02:00
9c8d1190c0
Merge pull request #5385 from owncloud/generate-sql-migration-master
...
new console command to generate sql migration scripts
2013-10-17 04:53:18 -07:00
d2b1a361cc
Merge pull request #5379 from owncloud/undefined-shipped
...
fix undefined "shipped"
2013-10-17 04:37:40 -07:00
6e1881dbe4
new console command to generate sql migration scripts
2013-10-17 12:51:30 +02:00
793ccfd1df
fix undefined "shipped"
2013-10-17 11:35:13 +02:00
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
186c6a56d1
Merge pull request #4949 from owncloud/improve_unknown_preview_backend
...
use svg to generate filetype icon if imagick available
2013-10-17 01:48:34 -07:00
04783da829
Merge pull request #5276 from owncloud/fixing-5170-master
...
only text/plain is now used to generate text previews
2013-10-16 14:21:40 -07:00
221a650815
Merge branch 'master' into activities-api
...
Conflicts:
lib/private/server.php
2013-10-16 21:15:25 +02:00
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
c3f7d22adc
Merge pull request #5067 from owncloud/urlParams_fix
...
Get urlParams registered before Request is instantiated
2013-10-16 06:42:09 -07:00
8c2b0b1394
Merge branch 'master' into activities-api
2013-10-16 15:36:35 +02:00
aca66270c7
accept text/markdown as well
2013-10-16 15:31:43 +02:00
d8a7b1e537
Merge branch 'master' into fixing-5170-master
2013-10-16 14:48:55 +02:00
fa3a65aea7
Merge pull request #5325 from owncloud/setup-fs-on-apache-auth-backend
...
file system is now initialized with apache authentication as well
2013-10-16 04:23:45 -07:00
52e31405f7
Added timeout value to WebDAV post setup check
...
Fixes #5357
2013-10-16 12:34:22 +02:00
7037f9c6f8
Added DAV client wrapper that support timeout values
...
Since SabreDAV does not support passing a timeout value to curl, this
commit adds a subclass for it that will set the timeout value to
curlRequest().
2013-10-16 12:32:42 +02:00
ada94fb558
Merge pull request #5333 from owncloud/avater_with_encryption
...
avatars should also work with encryption after pr #5332 was merged
2013-10-16 01:34:05 -07:00
5f249e1a54
Prevent renaming/deleting mount points
...
Fixed permissions returned for mount points to not include update and
delete permissions.
Fixes #5291
2013-10-15 14:58:58 +02:00
25320f19df
Merge branch 'master' into avater_with_encryption
2013-10-15 11:53:51 +02:00
fa341e49a8
Merge pull request #5341 from owncloud/fix-logout-link-html
...
Fix logout link HTML.
2013-10-15 00:33:00 -07:00
e3489b36ff
any preview requiring the which command will not be used on Windows
2013-10-15 00:15:45 +02:00
06f9b7b862
Fix logout link HTML.
...
<a id="logout" href=/projects/owncloud/core/index.php?logout=true>
2013-10-14 22:31:13 +02:00
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
3380bd650f
avatars should also work with encryption after pr #5332 was merged
2013-10-14 17:30:24 +02:00
c97b52090e
Merge pull request #4867 from owncloud/fixing-4546-master
...
Adding detection of aborted uploads for chunked uploads
2013-10-14 06:39:32 -07:00
5318df3b3c
there shall be tabs
2013-10-14 14:51:25 +02:00
fb3829e8b8
file system is now initialized with apache authentication as well
2013-10-14 14:46:43 +02:00
71601a7c6f
implement previews for markdown
2013-10-14 14:10:47 +02:00
258ccdfabe
case insensitive sort
2013-10-14 11:15:04 +02:00
a201a66878
fix style
2013-10-14 10:57:00 +02:00
a5e808defc
Merge branch 'master' into fixing-4546-master
...
Conflicts:
lib/private/connector/sabre/file.php
2013-10-14 10:56:50 +02:00
f06df170cb
finally fix the app sorting
2013-10-14 10:54:38 +02:00
14617682c8
Merge branch 'master' of github.com:owncloud/core into fix-unlogged-session-error
2013-10-12 09:15:59 +01:00
dc58195c7f
Merge pull request #5207 from owncloud/fixing-4011-part2-master
...
[OC6] file upload exception handling
2013-10-11 10:35:17 -07:00
cf7ea4bec5
Handle ownCloud logging when data dir not created
2013-10-11 17:16:37 +01:00
e28f7f8a33
remove php and js previews
2013-10-11 11:43:26 +02:00
d75d80ba13
OCP\AppFramework\Controller\Controller => OCP\AppFramework\Controller
2013-10-11 10:07:57 +02:00
51e6565aab
only text/plain is now used to generate text previews
...
blacklist implementation remove because no longer needed
2013-10-11 00:25:34 +02:00
19ea4f79da
resize svg without loosing quality
2013-10-11 00:12:37 +02:00
26c0007a5f
Merge pull request #5263 from owncloud/fixing-5255-master
...
Proper behavior of resolvePath()
2013-10-10 09:27:45 -07:00
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
1378af838c
merge master into hooks-view-same-start
2013-10-10 11:34:30 +02:00
1cb47bf777
Merge pull request #5221 from owncloud/fixing-5217-master
...
fixing php 5.3 compatibility
2013-10-10 01:55:18 -07:00
6053007768
Merge pull request #5210 from owncloud/sharing_search_users_fix
...
find users which are in the same group
2013-10-10 01:50:51 -07:00
1a899ac4c3
Merge pull request #5232 from owncloud/fixing-webdav-touch-master
...
due to internal implementations touch will always be successful - $mtime...
2013-10-10 01:49:59 -07:00
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
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
8e97752bf7
adding OC6 public API for activities
2013-10-09 18:06:21 +02:00
926b3c9b7b
Merge branch 'master' into activities-api
2013-10-09 17:53:57 +02:00
27738fc4f5
due to internal implementations touch will always be successful - $mtime will be stored in the cache
...
from desktop client perspective it is necessary to set the mtime under every condition
2013-10-09 15:35:09 +02:00
b4df4cc61d
Merge pull request #5219 from owncloud/catch_wrong_timezone
...
catch unknown timezone and fall-back to UTC
2013-10-09 01:59:09 -07:00
c1e5725db9
changed default time format to ISO8601
2013-10-09 10:40:20 +02:00
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
7bd5352509
php 5.3 compatibility for \OC\AppFramework\DependencyInjection\DIContainer
2013-10-08 23:14:08 +02:00
51b581a84d
php 5.3 compatibility for \OC\Files\Storage
2013-10-08 23:00:41 +02:00
24e99016a9
Merge pull request #5188 from owncloud/master-delete-user
...
User::delete should return bool
2013-10-08 13:28:19 -07:00
6f3c49dabb
fixing php 5.3 compatibility
...
PHP Fatal error: Can't inherit abstract function OCP\ISession::set() (previously declared abstract in OC\Session\Session)
2013-10-08 21:52:54 +02:00
3cf4c46c43
catch unknown timezone and fall-back to UTC
2013-10-08 20:42:35 +02:00
75588fc0b6
Use strict comparison === instead of ==.
2013-10-08 20:03:16 +02:00
6eab36a89b
Make OC_User_Dummy::checkPassword() compatible with OC_User_Example.
...
The user id has to be returned.
2013-10-08 19:57:37 +02:00
76bdd6bc81
Merge pull request #5173 from owncloud/set_timezone_for_log
...
let admin specify timezone for log file entries
2013-10-08 09:27:13 -07:00
835f36cb09
find users which are in the same group
2013-10-08 16:43:23 +02:00
92d9263e24
Merge pull request #5146 from guruz/cache_enabled_apps_list
...
OC_App: Cache list of enabled apps
2013-10-08 07:17:36 -07:00
3f27fefdbe
fixing status code and formatting
2013-10-08 15:40:42 +02:00
e7e53363ac
Merge pull request #5194 from owncloud/fixing-5172-master
...
adding check isDeletable() on $sourcePath
2013-10-08 06:18:29 -07:00
caa27824a9
catch specific file exceptions and convert them to proper http status code via webdav
2013-10-08 15:04:31 +02:00
053b55721d
Merge branch 'master' into fixing-appframework-master
2013-10-08 12:13:24 +02:00
6c45fab037
part file needs to have .part extension
2013-10-08 12:00:32 +02:00
c77f74e1de
adding check isDeletable() on $sourcePath
2013-10-08 11:43:44 +02:00
dd202d9ad3
updating a existing large file creates new file chunks. Therefore createFile() needs to check not only if we can write to the parent folder but also if we can update the existing file"
2013-10-08 11:27:08 +02:00
0293d8e04f
If a existing file in Shared/ with update permissions gets updated we need to write the .part file to a different place because we can't create new files in the Shared folder
2013-10-08 11:26:49 +02:00
2123ef57d8
Merge pull request #5181 from owncloud/fixing-chunked-upload-master
...
Fixing broken chunked upload due to #4974
2013-10-07 13:20:43 -07:00
77f43c357c
User::delete should return bool
2013-10-07 22:30:15 +03:00
6a93994a01
Merge pull request #4796 from owncloud/config-no-catch
...
Remove the exception catch in OC_Config, this should be handled by a higher layer
2013-10-07 11:45:13 -07:00
61a534fb60
moving createFileChunked() to OC_Connector_Sabre_File
2013-10-07 17:49:21 +02:00
5e397d89c4
Merge branch 'master' into fixing-4546-master
...
Conflicts:
lib/private/connector/sabre/directory.php
2013-10-07 17:47:54 +02:00
f496609085
the path for reassembling was created the wrong way
2013-10-07 17:34:21 +02:00
6a411833b9
let admin specify timezone for log file entries
2013-10-07 15:34:48 +02:00
b48dffa9a3
Merge pull request #5072 from owncloud/apache-auth-master
...
OC6 Apache Authentication
2013-10-07 06:29:56 -07:00
Thomas Müller
Victor Dubiniuk
Andreas Fischer
Arthur Schiwon
Frank Karlitschek
Morris Jobke
Vincent Petry
Georg Ehrke
Björn Schießle
Bjoern Schiessle
Tom Needham
Thomas Tanghus
VicDeo
Robin Appelman
Bart Visscher