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

31740 Commits

Author SHA1 Message Date
Morris Jobke 024919b9de
Fix docker image naming issue for CI 
* wrongly named PHP7 - it is PHP 5.6
* moved integration tests at the very end
 2016-07-06 15:05:27 +02:00
Vincent Petry 3864555390 Merge pull request #25360 from owncloud/stable9-backportshareownerfix 
[stable9] Change order of share creation validation
 2016-07-06 12:48:26 +02:00
Vincent Petry c92c234059
Ignore invalid paths in the JS file list (#25368) 2016-07-06 12:02:04 +02:00
Vincent Petry a2e0573987 Merge pull request #25298 from owncloud/schiessle-fix-get-contact-stable9 
[stable9] get only vcards which match both the address book id and the vcard uri
 2016-07-06 11:52:27 +02:00
Vincent Petry 6e27375cbe Merge pull request #25222 from owncloud/web-executor-stable9 
[stable9] occ web executor
 2016-07-05 12:05:12 +02:00
Vincent Petry ffe1a8bffc
Add integration test for sharing with group, then user in group 
Add integration test for the use case where a group share exists and
then the same owner creates a direct share to a user in that group.
 2016-07-05 11:14:56 +02:00
Lukas Reschke 6d9809ef45 Merge pull request #310 from nextcloud/version-number 
Increase version to 9.0.52
 2016-07-05 11:07:11 +02:00
Lukas Reschke 04d88bc874
Increase version to 9.0.52 2016-07-05 11:04:01 +02:00
Vincent Petry a2bbc220e0
Change order of share creation validation 
Makes sure that the share owner is set before entering the checks that
need it.

Partial backport of afa37d3
 2016-07-05 10:59:27 +02:00
Lukas Reschke 179a9c28b7 Merge pull request #308 from nextcloud/use-proper-branding-again 
Use proper branding again
 2016-07-04 21:09:40 +02:00
Lukas Reschke 70f36b40df Use proper branding again 
The merge of the theming app changed these defaults back again.
 2016-07-04 20:43:35 +02:00
felixboehm fdb0d4ad52 check if renamed user is still valid by reapplying the ldap filter (#25338) 2016-07-04 14:16:13 +02:00
Vincent Petry 1a42979104
Revert "Remove repair steps for broken updater repair" 
This reverts commit 58ed5b9328e9e12dd4319c0730202f385ca0dc5d.
 2016-07-04 12:49:46 +02:00
Morris Jobke 01f6f26343 Merge pull request #304 from nextcloud/versions-fix 
add additional check if we have a valid uid and filename
 2016-07-04 12:24:10 +02:00
Morris Jobke dd8af5c36d Merge pull request #298 from nextcloud/use-parameterized-query 
[stable9] Use paramterized parameter for \OC\SystemTag\SystemTagManager
 2016-07-04 11:50:06 +02:00
Bjoern Schiessle 717b480a2e
add additional check if we have a valid uid and filename 2016-07-04 11:00:50 +02:00
Morris Jobke 42d8ef5a0e Merge pull request #291 from nextcloud/stable9-update-transifex-link 
[stable9] We have our own Transifex org now ;)
 2016-07-04 08:07:01 +02:00
Lukas Reschke ce70ea3501
[stable9] Use paramterized parameter for \OC\SystemTag\SystemTagManager 
$nameSearchPattern was passed in and directly appended to the SQL query. Luckily the code path isn't reached anywhere in Nextcloud or the included apps.
 2016-07-03 16:50:28 +02:00
Marius Blüm 0ae10eaf1e We have our own Transifex org now ;) 2016-07-02 14:22:13 +02:00
Lukas Reschke 37a6636840 Merge pull request #287 from nextcloud/rc1-for-9-0-52 
9.0.52 RC1
 2016-07-01 23:37:31 +02:00
Lukas Reschke bc025ee777 9.0.52 RC1 2016-07-01 23:11:16 +02:00
Lukas Reschke 531e69947f
Revert "Revert "[stable9] Don't show the updater if updater is incompatible"" 
This reverts commit f896470542.
 2016-07-01 23:09:32 +02:00
Björn Schießle 12796500e0 Merge pull request #277 from nextcloud/traversal-directory-js 
[stable9] Do not allow directory traversal using "../" in JS file list
 2016-07-01 18:00:25 +02:00
Björn Schießle 756b0c05b6 Merge pull request #282 from nextcloud/fix-tests 
Fix unit test compatibility issues with phpunit 5.2+
 2016-07-01 17:11:19 +02:00
Joas Schilling ce6009e475
Fix Single execution of preview tests 2016-07-01 16:41:46 +02:00
Joas Schilling 3399d66c8e
Fix Comments tests with phpunit 5.2+ 2016-07-01 16:41:29 +02:00
Joas Schilling eb715dd1b6
Fix Sharing app tests with phpunit 5.2+ 2016-07-01 16:29:53 +02:00
Joas Schilling fd5bdf5e1a
Fix Encryption tests with phpunit 5.2+ 2016-07-01 16:22:50 +02:00
Björn Schießle 7e4366ec86 Merge pull request #244 from nextcloud/theming-app-stable9 
[stable9] theming app
 2016-07-01 16:22:01 +02:00
Joas Schilling 28b3a0a37e
Fix DAV tests with phpunit 5.2+ 2016-07-01 16:16:40 +02:00
Joas Schilling 75c172a062
Fix Share Manager tests with phpunit 5.2+ 2016-07-01 16:08:26 +02:00
Joas Schilling 777dbec369
Fix Notification tests with phpunit 5.2+ 2016-07-01 16:05:16 +02:00
Joas Schilling ea9c79b7c0
Fix Appframework tests with phpunit 5.2+ 2016-07-01 16:05:00 +02:00
Joas Schilling 197e94457f
Fix AvatarControllerTest with phpunit 5.2+ 2016-07-01 16:04:25 +02:00
Joas Schilling 497c3fbfd7
Also fix the dav test 2016-07-01 15:45:58 +02:00
Joas Schilling 8ab26381a4
Clear the storage wrappers after clearing the hooks 2016-07-01 15:42:19 +02:00
Morris Jobke 6e3bf06c1d Merge pull request #274 from nextcloud/stable9-sync-upstream 
[Stable9] sync upstream
 2016-07-01 15:20:08 +02:00
Lukas Reschke dea8e29289
Match on 405 2016-07-01 15:19:08 +02:00
Lukas Reschke 8aa0832bd4
Match for /../ 2016-07-01 15:00:31 +02:00
Lukas Reschke 2da43e3751
Do not allow directory traversal using "../" 
We should not allow directory traversals using "../" here.

To test access the following URL once with and then without this patch:

http://localhost/server/index.php/apps/files/?dir=../../This+Should+Not+Be+Here
 2016-07-01 13:33:00 +02:00
VicDeo 9fcb26910e
occ web executor (#24957) 
* Initial web executor

* Fix PHPDoc

Fix broken integration test

OccControllerTests do not require database access - moch them all!

Kill unused sprintf
 2016-07-01 11:31:57 +02:00
Lukas Reschke 2c785ebdf1
Merge remote-tracking branch 'upstream/stable9' into stable9-sync-upstream 2016-07-01 11:31:15 +02:00
VicDeo 21bdd3005b Fix OC_Helper::rmdirr for nested symlinks (#25255) 2016-07-01 11:31:02 +02:00
Thomas Müller 4ac256ea6c [stable9] Fix decrypt message stable9 (#25188) 
* Fix Decrypt message via occ

* Comments fixed

* Fixed reviews

* Originally:
commit 2304e4bda027e61ff1302c55c2f70f8e4c8f47d0
Author: Joas Schilling <nickvergessen@owncloud.com>
Date:   Tue Jun 7 09:13:11 2016 +0200

    Allow to decrypt user '0' files only

* Fix uid comparison
 2016-07-01 11:30:39 +02:00
Thomas Müller 4a4103b923 Suppress warnings from DAV migration if there's nothing to do (#25279) 2016-07-01 11:30:14 +02:00
Vincent Petry abdc587b5c Merge pull request #25264 from owncloud/stable9-search-fixsearchfromotherfilelists 
[stable9] Fix search result link for file results outside default list
 2016-07-01 11:22:35 +02:00
Vincent Petry 98818283e5 Merge pull request #25234 from owncloud/stable9-iedavclient-nullheaders 
[stable9] Init the headers in iedavclient.js
 2016-07-01 11:22:06 +02:00
Morris Jobke 23cc465b0d Merge pull request #254 from nextcloud/fix-229-stable9 
[stable9] get only vcard which match both the address book id and the vcard uri
 2016-06-30 17:43:46 +02:00
Bjoern Schiessle 3cb7672b06
initial commit for the theming app 2016-06-30 17:26:03 +02:00
Björn Schießle eed6c6a8b9 Merge pull request #266 from nextcloud/fix-262 
[stable9] getShareByToken() should also consider remote shares
 2016-06-30 17:17:21 +02:00