wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
36403 commits 157 branches 562 tags 714 MiB
Commit graph

13015 commits

Author SHA1 Message Date
Christoph Wurst
8a21fc0908 Merge pull request #2726 from nextcloud/check-all-channels 
[downstream] Consider all channel except blank and git to be signed
 2016-12-18 23:12:57 +01:00
Roeland Jago Douma
a60479a3d3 Merge pull request #2725 from nextcloud/memcached-connect-once 
[downstream] Set options, then add servers
 2016-12-17 19:31:31 +01:00
Roeland Jago Douma
abf302bef8 Merge pull request #2722 from nextcloud/failed-to-create-share-fix 
[downstream] commit transaction after select query
 2016-12-17 19:28:54 +01:00
Victor Dubiniuk
852de31ecb
Consider all channel except blank and git to be signed 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-16 18:07:30 +01:00
Victor Dubiniuk
46a7cb493f
Set options, then add servers 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-16 17:56:39 +01:00
phisch
fc67606d39
commit transaction after select query 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-16 17:44:33 +01:00
Victor Dubiniuk
c5754a5ec5
Do not validate return code is set is successful 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-16 17:33:28 +01:00
Lukas Reschke
b0c1460a1d Merge pull request #2707 from nextcloud/clear_appstore_cache_on_upgrade 
Clear appstore cache on version upgrade
 2016-12-16 17:14:53 +01:00
Lukas Reschke
6fd421cc3c Merge pull request #2695 from nextcloud/remove-leading-slashes-on-share-activity 
Remove leading slash from sharing activity
 2016-12-16 13:20:27 +01:00
Roeland Jago Douma
245501fb0c
Clear appstore cache on version upgrade 
* Add version to cached json
* Compare version
* Updated calls
* Updated tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-12-15 22:04:03 +01:00
Lukas Reschke
776f5bcd34
Don't disable apps on update if PHP >= 7.0.0 
When PHP in a version higher than 7.0.0 is used we catch fatal exceptions in app.php and gracefully already disable the app. There is thus no need to also disable the apps on updates.

This has been requested by Jan to fix because that is "the most annoying thing ever" :TM:. – I'd say we give it a try and if that causes problems in the future we can consider alternative approaches.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-15 16:09:01 +01:00
Joas Schilling
6de0eb0b74
Remove leading slash from sharing activity 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-12-15 15:53:48 +01:00
Roeland Jago Douma
3714a6aaf0 Merge pull request #2670 from nextcloud/issue-2646-dont-connet-to-database-before-creating-it 
Do not connect to database before creating it
 2016-12-14 19:50:16 +01:00
Roeland Jago Douma
67f65677a1 Merge pull request #2665 from nextcloud/remove-db-class-and-interface 
Remove IDb interface which was deprecated for 3 years already
 2016-12-14 19:05:41 +01:00
Roeland Jago Douma
e9628124f6 Merge pull request #2671 from nextcloud/issue-2661-reduce-log-level-on-database-user-creation 
Only log as info when we can not create a new DB user
 2016-12-14 19:05:15 +01:00
Joas Schilling
9a5401ddd7
Only log as info when we can not create a new DB user 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-12-14 14:06:14 +01:00
Joas Schilling
7c061a4e06
Do not connect to database before creating it 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-12-14 13:52:04 +01:00
Lukas Reschke
7d221ff8f4
Safari CSPv3 support is sub-par 
With 10.0.1 CSPv3 is broken in Safari if it doesn't run from a local IP. Awesome.

=> Let's remove this for Safari and keep chrome and Firefox in the whitelist.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-14 13:17:20 +01:00
Joas Schilling
bc3da3a8f5
Remove IDb interface which was deprecated for 3 years already 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-12-14 11:42:16 +01:00
Joas Schilling
77b6b7b23e
Use the mocked config version 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-12-14 10:45:27 +01:00
Lukas Reschke
ed7b18799f Merge pull request #2636 from nextcloud/add-repair-step-to-fix-mounts 
Add a repair step to fix broken mounts
 2016-12-13 14:19:56 +01:00
Lukas Reschke
edd01e3ce4 Merge pull request #2637 from nextcloud/mount-cache-storageid 
also compare storage ids when checking for changed mounts
 2016-12-13 14:02:49 +01:00
Joas Schilling
69575f099c
Update autoloading 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-12-13 13:56:30 +01:00
Joas Schilling
d5df692481
Add a repair step to fix broken mounts 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-12-13 13:54:18 +01:00
Robin Appelman
14a561ddad
always use numeric storage id in cacheentry 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-12-13 12:53:38 +01:00
Robin Appelman
86473306f3
fix cacheentry return wrong storage id 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-12-13 12:50:17 +01:00
Roeland Jago Douma
e3d6b4fe1c
Fixed correct filename of MoveAvatarsBackgroundJob 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-12-13 12:46:58 +01:00
Robin Appelman
6f46a8bd5b
also compare storage ids when checking for changed mounts 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-12-13 12:11:10 +01:00
Roeland Jago Douma
36da3aa52d
Update autoloader 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-12-13 12:07:10 +01:00
Roeland Jago Douma
341265fbcb Merge pull request #2590 from nextcloud/postgres-install-failing 
Revert "Quote database and role in queries"
 2016-12-09 22:46:03 +01:00
Lukas Reschke
32bf8ec826
Don't use cached informations for app version 
When installing an app from the appstore the `\OC_App::getAppVersion` code is triggered twice:

- First when the downloader tries to compare the current version to the new version on the appstore to check if there is a newer version. This protects against downgrade attacks and is implemented in `\OC\Installer::downloadApp`.
- Second, when the app is actually installed the current version is written to the database. (`\OC\Installer::installApp`)

This fails however when the version is actually cached. Because in step 1 the cached version will be set to "0" and then be reused in the second step.

While this is probably not the cleanest version I assume this is an approach that is least invasive. Feedback and suggestions welcome :)

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-09 18:01:45 +01:00
Joas Schilling
a5a35cda7c
Lower the role name before using it 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-12-09 16:41:01 +01:00
Joas Schilling
0d6134f512
Revert "Quote database and role in queries" 
This reverts commit 9ebd5d5bb2.
 2016-12-09 15:36:14 +01:00
Julius Haertl
086a5eb9d0
Check if the theming app is loaded 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2016-12-09 12:52:17 +01:00
Joas Schilling
61e15988a0
Allow to overwrite the message which we already do in SubadminMiddleware 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-12-08 16:23:49 +01:00
Roeland Jago Douma
402a07bfe0 Merge pull request #2565 from nextcloud/direct-desktop-clients 
Change URL for desktop clients directly to pop-up
 2016-12-08 14:33:08 +01:00
Felix A. Epp
98bdef8d83 Cahnge URL for desktop clients directly to pop-up 
by adding `/#install-clients` to the URL

Signed-off-by: Felix A. Epp <work@felixepp.de>
 2016-12-08 12:40:52 +01:00
Lari Tikkanen
9ebd5d5bb2 Quote database and role in queries 
Fixes #1793
Signed-off-by: Lari Tikkanen <lartza@outlook.com>
 2016-12-07 22:12:25 +02:00
Joas Schilling
815d349afe
Make sure $provider is defined when we use it 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-12-07 07:11:32 +01:00
Roeland Jago Douma
db6359d1e4 Merge pull request #2513 from nextcloud/fix-htaccess-checks 
Properly check the data dir
 2016-12-06 08:57:36 +01:00
Morris Jobke
7aa510b2f0
Document updater channel & check for correct PHP version in updater 
* see https://github.com/nextcloud/updater/issues/53

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-12-06 00:19:13 +01:00
Morris Jobke
a2867c0664
Properly check the data dir 
* fixes #1364

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-12-05 23:35:35 +01:00
Morris Jobke
572b078de7 Merge pull request #2520 from nextcloud/replace-string 
Check for nextcloud version as well
 2016-12-05 23:26:32 +01:00
Morris Jobke
a89b033869 Merge pull request #497 from nextcloud/postgres-setup-no-admin 
handle postgres setup when we cant connect as admin
 2016-12-05 23:25:41 +01:00
Morris Jobke
aac3024878 Merge pull request #2505 from nextcloud/sudo-mode-provisioning-api 
Require sudo mode on the provisioning API
 2016-12-05 22:29:29 +01:00
Lukas Reschke
60d1e8e63e
Check for nextcloud version as well 
The code checker didn't consider the "nextcloud" version before, resulting in fails such as https://travis-ci.org/nextcloud/richdocuments/jobs/181470760#L415-L416

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-05 22:18:24 +01:00
Roeland Jago Douma
e368a745aa
Set last-login-check on basic auth 
Else the last-login-check fails hard because the session value is not
set and thus defaults to 0.

* Started with tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-12-05 20:57:15 +01:00
Roeland Jago Douma
97d18b155b
Handle unavailable share providers more graceful 
If the sharebymail app (or the federatedshareprovider app) are disabled
this kills a lot of stuff. So we should handle a share provider not
begin available a bit more graceful.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-12-05 19:40:37 +01:00
Robin Appelman
5365c1a32f
handle postgres setup when we cant connect as admin 2016-12-05 16:00:05 +01:00
Morris Jobke
1253d1008a Merge pull request #2411 from nextcloud/fix-encryption-home-storage 
check if the file should really be encrypted before we update the file cache
 2016-12-05 15:38:12 +01:00