upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-12 18:21:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 20
31573 commits 1042 branches 1221 tags 8.4 GiB
Commit graph

31573 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Lukas Reschke
2c785ebdf1
Merge remote-tracking branch 'upstream/stable9' into stable9-sync-upstream 2016-07-01 11:31:15 +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
Lukas Reschke
d52343fc4e Merge pull request #260 from nextcloud/fix-versions-stable9 
[stable9] check permissions before rollback
 2016-06-30 17:15:28 +02:00
Lukas Reschke
912f07e2a9 Merge pull request #249 from nextcloud/add-exemption-for-acs 
[stable9] Add exemption for ACS endpoint
 2016-06-30 17:06:11 +02:00
Marius Blüm
1f9735b204 Merge pull request #261 from nextcloud/stable9-fix243 
[stable9] targets 3rdparty submodule from Nc instead of oC
 2016-06-30 17:05:36 +02:00
Morris Jobke
07c43751d1 Merge pull request #265 from nextcloud/stable9-add-wnd 
[stable9] Backport WND
 2016-06-30 16:47:29 +02:00
Bjoern Schiessle
347787d92c
getShareByToken() should also consider remote shares 2016-06-30 16:45:13 +02:00
Marius Blüm
212ff8ef6f Merge pull request #251 from nextcloud/make-it-user-saml 
Mark user_saml official and kill user_shibboleth
 2016-06-30 16:36:23 +02:00
Morris Jobke
be7980c826 Merge pull request #263 from nextcloud/dav-permission-check-stable9 
add some additonal permission checks to the webdav backend
 2016-06-30 15:59:21 +02:00
Lukas Reschke
da0666e4f0
Name method properly 2016-06-30 15:37:33 +02:00
Lukas Reschke
a80af7079d
[stable9] Backport WND 
Backports:

- https://github.com/nextcloud/server/pull/233
- https://github.com/nextcloud/server/pull/190
- https://github.com/nextcloud/server/pull/188
 2016-06-30 15:36:03 +02:00
Lukas Reschke
29929c9728 Merge pull request #240 from nextcloud/password_policy_events_stable9 
[stable9] add events to check passwords with the password policy app
 2016-06-30 15:06:40 +02:00
Bjoern Schiessle
3491400261
add some additonal permission checks to the webdav backend 2016-06-30 15:05:13 +02:00
Marius Blüm
4b05f1c7b4 targets 3rdparty submodule from Nc instead of oC 
* backport of #245
* fixes #243
 2016-06-30 14:51:47 +02:00
Lukas Reschke
723cf78169 Merge pull request #259 from nextcloud/stable9-set-disposition 
[stable9] Set content-type to "application/octet-stream"
 2016-06-30 14:29:11 +02:00
Bjoern Schiessle
1208953ba1
check permissions before rollback 2016-06-30 14:22:40 +02:00
Lukas Reschke
94975af6db
[stable9] Set content-type to "application/octet-stream" 
Some browsers such as Firefox on Microsoft Windows otherwise do offer to open the file directly which is kinda silly.

Backport of https://github.com/nextcloud/server/pull/258
 2016-06-30 13:04:54 +02:00
Bjoern Schiessle
6a61cc0e35
get only vcard which match both the address book id and the vcard uri 2016-06-30 10:46:21 +02:00