Christoph Wurst
9300312046
push activity when backup codes are generated
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-12-19 11:59:47 +01:00
Christoph Wurst
7ae9442f3d
Publish, parse and filter 2FA activities
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-12-19 11:59:47 +01:00
Roeland Jago Douma
9b71ee27ff
Merge pull request #2727 from nextcloud/fix-colon-issue
...
[downstream] Fix colon issue
2016-12-19 10:19:15 +01:00
Roeland Jago Douma
4f79d2ff0d
Merge pull request #2721 from nextcloud/ocs-die-on-exception
...
[downstream] Die in OCS v1.php on exception
2016-12-19 08:38:02 +01:00
Roeland Jago Douma
f54547ff1c
Merge pull request #2723 from nextcloud/integrity-exit-code
...
[downstream] Return 1 if integrity check is failed. Fixes #22806
2016-12-19 08:37:43 +01:00
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
Christoph Wurst
c80465a68c
Merge pull request #2735 from nextcloud/fix-settingsmenu
...
Adjust shadows and fix positioning in header menus
2016-12-18 20:50:20 +01:00
Julius Haertl
1ad3613307
Adjust shadows and fix positioning
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-12-17 20:06:19 +01:00
Lukas Reschke
ad725de9ad
Update third-party ref for new sabre/uri version
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-17 19:42:47 +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
Roeland Jago Douma
dfc17c9ae1
Merge pull request #2720 from nextcloud/fix-25692
...
[downstream] Do not validate return code is set is successful
2016-12-17 19:27:23 +01:00
Vincent Petry
553883a1f4
Add integration test for creating folder with colon
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-16 18:16:35 +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
Victor Dubiniuk
93a8eba137
Return 1 if integrity check is failed. Fixes #22806
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-16 17:48:37 +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
Vincent Petry
00f135d320
Die in OCS v1.php on exception
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-16 17:35:42 +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
Roeland Jago Douma
f86f4eb98d
Merge pull request #2504 from nextcloud/downstream-ldap-15
...
Downstream LDAP Range Support
2016-12-16 16:40:04 +01:00
Lukas Reschke
00b4dedef5
Merge pull request #2550 from nextcloud/smb-notify-rename
...
Fix order of parameters when getting notified of smb renames
2016-12-16 16:11:39 +01:00
Lukas Reschke
058b536aea
Merge pull request #2714 from amittel/patch-1
...
Changed anchor
2016-12-16 15:52:06 +01:00
Lukas Reschke
511056dd3f
Merge pull request #1678 from nextcloud/smb-stat-root
...
Fix mtimes for share root
2016-12-16 13:41:33 +01:00
Lukas Reschke
9aef75cb36
Merge pull request #2398 from nextcloud/fix-2368
...
flicker-free permission change in share dialog
2016-12-16 13:35:33 +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
09d5c557e7
Merge pull request #2715 from nextcloud/fix_dav_toto_tests
...
Fix TodoTest
2016-12-16 12:42:11 +01:00
Roeland Jago Douma
82d76fbe96
Fix TodoTest
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-16 11:50:50 +01:00
amittel
14541683e3
Changed anchor
...
from `avatar` to `personal-settings`
fixes #2711
2016-12-16 10:51:01 +01:00
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
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
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
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
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