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

36366 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roeland Jago Douma
4fdefef7e8 Merge pull request #2625 from nextcloud/fix-todo-filter 
Fix the Todos filter
 2016-12-16 08:20:00 +01:00
Roeland Jago Douma
40e0c49b04 Merge pull request #2681 from nextcloud/changes-to-changelog 
let's add a date :D
 2016-12-16 08:14:29 +01:00
Jos Poortvliet
46a2e938b3
let's add a date :D 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-12-15 20:35:42 +01:00
Lukas Reschke
ee9f46b13f Merge pull request #2698 from nextcloud/dont-disable-apps-on-update-if-at-least-php7 
Don't disable apps on update if PHP >= 7.0.0
 2016-12-15 18:31:54 +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
Lukas Reschke
5b474e72d5 Merge pull request #2673 from nextcloud/shared-scanner-unmasked 
use unmasked permissions in shared scanner
 2016-12-15 15:54:32 +01:00
Robin Appelman
b8d44c21ca
Add integration tests for uploading files to a permission limited share 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-12-15 14:31:40 +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
Morris Jobke
237791e315 Merge pull request #2674 from nextcloud/lookup-server-connector-12 
mark nc12 as supported for the lookup_server_connector
 2016-12-14 12:31:27 -06: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
Robin Appelman
fc3b2f1139
mark nc12 as supporter 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-12-14 11:58:57 -06:00
Roeland Jago Douma
00bd971272 Merge pull request #2677 from nextcloud/fix-avatars-in-mail 
Don't set Content-Disposition header if one already exists
 2016-12-14 18:55:52 +01:00
Lukas Reschke
8a00638425
Don't set Content-Disposition header if one already exists 
If a Content-Disposition header is already set by another plugin we don't need to set another one as this breaks clients.

Fixes https://github.com/nextcloud/server/issues/1992

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-14 17:35:27 +01:00
Robin Appelman
5d0897b8d7
use unmasked permissions in shared scanner 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-12-14 14:37:51 +01:00
Joas Schilling
e1b806467c Merge pull request #2668 from nextcloud/master-one-gotta-love-apples-regressions 
Safari CSPv3 support is sub-par
 2016-12-14 14:20:03 +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
Roeland Jago Douma
cd1929382f Merge pull request #2654 from nextcloud/increase-master-version 
Update app versions and requirements
 2016-12-14 11:20:58 +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
Roeland Jago Douma
4f96fcfb9d Merge pull request #2659 from nextcloud/fix_2641 
Fix overwriting parameter
 2016-12-14 10:36:05 +01:00
Roeland Jago Douma
9e353f6289
Fix overwriting parameter 
Fixes #2641

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-12-13 22:28:09 +01:00
Joas Schilling
4f32a8b6ef
Increase server version 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-12-13 20:44:00 +01:00
Joas Schilling
edec1fafe7
Update app versions and requirements 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-12-13 20:41:55 +01:00
Joas Schilling
03b648be13 Merge pull request #2643 from nextcloud/apps-buttons-wording 
fix wording for apps mgmt buttons
 2016-12-13 15:49:38 +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
a7aa7de6c2
Add a unit test 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-12-13 13:54:18 +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
Lukas Reschke
3b3ab256a5 Merge pull request #2642 from nextcloud/avatars_class_name 
Avatars class name
 2016-12-13 13:22:50 +01:00
Jan-Christoph Borchardt
89252497c6 fix wording for apps mgmt buttons 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2016-12-13 13:19:10 +01:00
Lukas Reschke
b56a47eba6 Merge pull request #2639 from nextcloud/final-increase-of-version 
Final version increasement for 11
 2016-12-13 12:59:59 +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
Roeland Jago Douma
df03860e2e Merge pull request #2635 from nextcloud/fix_autoload_checker 
Fix autoload checker
 2016-12-13 12:46:10 +01:00
Robin Appelman
bbe24d29ca
reuse cacheentry 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-12-13 12:30:29 +01:00
Lukas Reschke
72884b45a1
Final version increasement for 11 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-13 12:16:16 +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
60af938bf6
The hash can change so checking for it is kind of dangerous 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-12-13 12:07:07 +01:00
Lukas Reschke
e49088315e Merge pull request #2615 from nextcloud/daita-sharecontroller 
Download a file in a subfolder in a sharedlink is not working
 2016-12-12 18:28:06 +01:00
Maxence Lange
43374292b1 update phpdoc 
Signed-off-by: Maxence Lange <maxence@pontapreta.net>
 2016-12-12 16:15:13 -01:00
Lukas Reschke
e79cd27e5d Merge pull request #2629 from nextcloud/increase-v-1-again 
Increase version once again
 2016-12-12 18:13:13 +01:00
Lukas Reschke
3f5bbb22d2
Increase version once again 
For https://github.com/nextcloud/server/pull/2615

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-12 18:03:49 +01:00
Lukas Reschke
ab3ef8a44a Merge pull request #2627 from nextcloud/already-increase-version 
Increase version to 11.0.0
 2016-12-12 16:40:40 +01:00
Lukas Reschke
6cd421e603 Merge pull request #2620 from nextcloud/theming-externalfiles 
Show theming icons on external storage folders
 2016-12-12 16:04:48 +01:00