Commit Graph

25749 Commits

Author SHA1 Message Date
Lukas Reschke 8400bb9979 Merge pull request #17403 from owncloud/reorg-sampe.config.php
Reorganize sampe.config.php
2015-07-06 12:37:43 +02:00
Vincent Petry 073e654692 Merge pull request #17304 from owncloud/fix-17265
Check if response could get generated
2015-07-06 12:29:07 +02:00
Joas Schilling 4dbc8ab77f Merge pull request #17335 from owncloud/better-federated-cloud-sharing-activities
Improve federated cloud sharing activities
2015-07-06 10:23:33 +02:00
Joas Schilling fca6bcb632 Merge pull request #16733 from owncloud/add-smashbox-tests-remote-shares
Add OCS API to send, get, accept and decline remote shares
2015-07-06 10:12:29 +02:00
Morris Jobke 44c3fa9108 refine sample config text 2015-07-06 09:11:05 +02:00
Morris Jobke 8359ca43db [config sample] merge Miscellaneous & All other options 2015-07-06 09:07:35 +02:00
Morris Jobke 5133a738e1 autotest.sh with docker support for postgres
* waits until the docker container is started
* export USEDOCKER=1 to run the docker version of postgres
2015-07-06 08:36:07 +02:00
Jenkins for ownCloud 5734edfe20 [tx-robot] updated from transifex 2015-07-06 01:54:38 -04:00
Jenkins for ownCloud 55f4d0eea1 [tx-robot] updated from transifex 2015-07-05 01:54:50 -04:00
Robin McCorkell 34637b5874 Merge pull request #16846 from RealRancor/apps_list_issue_template
Add occ app:list and ldap:show-config to issue_template.md
2015-07-04 20:57:24 +01:00
RealRancor b0e5901354 Add occ app:list and ldap:show-config to issue_template.md 2015-07-04 18:41:48 +02:00
Jenkins for ownCloud 468871818d [tx-robot] updated from transifex 2015-07-04 01:55:24 -04:00
Morris Jobke 7959605e4e Merge pull request #17378 from owncloud/kill-more-legacy-classes
Kill more legacy classes
2015-07-03 20:45:02 +02:00
Thomas Müller 43ebf0d127 Fix unit test 2015-07-03 18:00:16 +02:00
Thomas Müller 403deb2a33 Fixing unit test execution 2015-07-03 18:00:16 +02:00
Thomas Müller 1385b1ec48 Remove OC_Appconfig 2015-07-03 18:00:16 +02:00
Thomas Müller d3ac73c0c9 Remove OC_Log 2015-07-03 18:00:16 +02:00
Thomas Müller 68fd74963e Remove legacy search classes 2015-07-03 17:56:14 +02:00
Vincent Petry 3df27a01be Merge pull request #17379 from owncloud/kill-file-mapper
Remove file mapper - was only use in Windows and never worked properly
2015-07-03 17:53:47 +02:00
Thomas Müller 7b9daf84ee Merge pull request #16923 from owncloud/flysystem-base
Flysystem base adapter
2015-07-03 17:48:10 +02:00
Vincent Petry cc373ab89a Merge pull request #15470 from rullzer/files_sharing_getUrlContent
Move away from private static function OC_Util::getUrlContent
2015-07-03 17:47:46 +02:00
Thomas Müller dbb3dc1be7 Merge pull request #17382 from owncloud/remove-bogus-testresult
Remove bogus test result
2015-07-03 17:37:01 +02:00
Vincent Petry b45c1f76b4 Remove bogus test result
This file was created during a bogus test run that created files in the
wrong location, and was checked in by mistake.
2015-07-03 17:31:14 +02:00
Robin Appelman de4e4cb6ea also dont download existing on fopen when using w+ and wb+ 2015-07-03 15:53:02 +02:00
Robin Appelman 6cc65b53ab add phpdoc 2015-07-03 15:53:02 +02:00
Robin Appelman 232872e401 add flysystem adapater 2015-07-03 15:53:02 +02:00
Thomas Müller f55aa856ad Remove file mapper - was only use in Windows and never worked properly 2015-07-03 15:41:29 +02:00
Thomas Müller 62f07261ea Merge pull request #17365 from owncloud/update-ref
Update reference to include newest php-parser
2015-07-03 15:29:37 +02:00
Björn Schießle 525745caf5 Merge pull request #17140 from owncloud/trashbin_occ
add occ command to remove deleted files
2015-07-03 15:10:50 +02:00
Morris Jobke 838ddc72c1 Merge pull request #17348 from owncloud/fix-lower-than
Correct lower than wording
2015-07-03 14:42:08 +02:00
Thomas Müller 7644c631e4 Merge pull request #15663 from owncloud/remove-ocp-app-register
Remove \OCP\App::register()
2015-07-03 13:44:58 +02:00
Robin Appelman a0c089a1c9 add unit tests 2015-07-03 13:44:03 +02:00
Robin Appelman b849b7c7f2 better handling of folders 2015-07-03 13:43:22 +02:00
Morris Jobke 208985dc1c fix wording 2015-07-03 12:54:49 +02:00
Lukas Reschke 7e8b71e1af Update reference to include newest php-parser 2015-07-03 10:04:02 +02:00
Lukas Reschke 0b8ced1ab3 Merge pull request #17345 from owncloud/app-code-check-search
[app code check] add OC_Search_Provider and _Result
2015-07-03 09:44:18 +02:00
Morris Jobke 9da10788bc Merge pull request #17349 from owncloud/share-onlyshowstaticownerifavailable
Do not show static share owner if not available
2015-07-03 09:31:40 +02:00
Joas Schilling 2118713477 Add OCS api to get, accept and decline remote shares 2015-07-03 09:30:49 +02:00
Joas Schilling df303b910a Allow sharing with type remote share 2015-07-03 09:28:56 +02:00
Vincent Petry f70791653c Merge pull request #17291 from owncloud/mount-manager-public
expose the mount manager in the public api
2015-07-03 07:57:31 +02:00
Jenkins for ownCloud b8f5b2c47a [tx-robot] updated from transifex 2015-07-03 01:54:57 -04:00
Morris Jobke fd8f6a18fd Merge pull request #17327 from owncloud/fix_index
owner is stored as 'uid_owner', not as 'owner' in the oc_share table
2015-07-02 23:26:28 +02:00
Lukas Reschke ded2b2b690 Merge pull request #17353 from owncloud/apps-keepgloballist
Fix global app list state
2015-07-02 20:00:56 +02:00
Morris Jobke a3df41ddb6 Merge pull request #17159 from owncloud/fix-duplicate-id
remove duplicate ID in HTML template for public shares
2015-07-02 17:50:39 +02:00
Morris Jobke 99f9f7c3c4 Merge pull request #17343 from owncloud/share-disablepluginwhennocoreshare
Do not register JS share plugin if core sharing API is disabled
2015-07-02 17:26:43 +02:00
Vincent Petry d5b7e40c19 Unit test for app list 2015-07-02 17:22:56 +02:00
Vincent Petry 2f6dc8743e Fix global app list state 2015-07-02 17:15:14 +02:00
Vincent Petry 71ae96bb56 Do not show static share owner if not available
In some corner cases, an outgoing share exists but sharing is not
allowed for the current user. This would cause the file list to break
because the static text could not be rendered as the owner was
undefined.
2015-07-02 16:38:20 +02:00
Lukas Reschke 8335c7a4e9 Correct wording
If a max version of 8.0.1 has been specified the message should indicate that 8.0.1 is also supported.
2015-07-02 16:37:39 +02:00
Lukas Reschke b21d4a55f2 Add missing type annotations 2015-07-02 16:36:40 +02:00