Lukas Reschke
591b60d11c
Merge pull request #2758 from nextcloud/only-one-dav-backend
...
Register only one dav backend
2016-12-21 13:03:48 +01:00
Nextcloud bot
fe9a38d5b5
[tx-robot] updated from transifex
2016-12-21 01:07:18 +00:00
Lukas Reschke
f0bb62f2fe
Merge pull request #2273 from nextcloud/fix_invalid_calendar
...
Add DAV repair step to fix calendar data
2016-12-20 23:09:27 +01:00
Lukas Reschke
1c80307537
Add SMB tests and execute files_external tests
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-20 22:05:33 +01:00
Nextcloud bot
f50252c7c1
[tx-robot] updated from transifex
2016-12-20 12:02:31 +00:00
Arthur Schiwon
7887566cff
remove frequent, unimportant log message
...
Fixes #2585
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-19 23:36:11 +01:00
Vincent Petry
000ba6484f
When grouping shares, sort by stime then id ( #26777 )
...
If share times are equal, the first share should still win instead of
having the shares swapped.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 17:38:33 +01:00
Thomas Müller
04cf77120c
Fix error when $view is null when being passed into some plugins
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 15:53:13 +01:00
Thomas Müller
6345748a70
Fix "Call to a member function getUID() on null"
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 15:48:18 +01:00
Thomas Müller
b19aad88fb
No challenge within federated auth
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 15:48:10 +01:00
Thomas Müller
4a823188a9
Allow registration of federated auth
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 15:48:00 +01:00
Thomas Citharel
dcbf434841
Register only one dav auth backend
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 15:47:52 +01:00
Lukas Reschke
34fb313466
Merge pull request #2689 from andreas-p/fix-remote-conflict
...
Fix showConflict
2016-12-19 14:34:56 +01:00
pflug
c7fc010215
Fix showConflict
...
use getFullFileName to show conflicting file
add original.directory to make fileExists happy
Signed-off-by: Andreas Pflug <dev@admin4.org>
2016-12-19 08:11:04 +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
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
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
82d76fbe96
Fix TodoTest
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-16 11:50:50 +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
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
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
Robin Appelman
fc3b2f1139
mark nc12 as supporter
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-14 11:58:57 -06: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
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
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
edec1fafe7
Update app versions and requirements
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-13 20:41:55 +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
Robin Appelman
bbe24d29ca
reuse cacheentry
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-13 12:30:29 +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
6cd421e603
Merge pull request #2620 from nextcloud/theming-externalfiles
...
Show theming icons on external storage folders
2016-12-12 16:04:48 +01:00
Joas Schilling
89ba394c89
Fix the Todos filter
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-12 15:26:28 +01:00
Bjoern Schiessle
91303469e0
improve wording of admin settings to enable search on the public address book
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-12-12 13:55:12 +01:00
Julius Haertl
b12db1b494
Show theming icons on external storage folders
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-12-12 12:18:38 +01:00
Nextcloud bot
0c6c85bafb
[tx-robot] updated from transifex
2016-12-12 01:07:18 +00:00
Maxence Lange
9ef8d25e46
Download a file in a subfolder in a sharedlink is not working
...
the $node created using the path (GET) parameter is not used when executing fileListDownloaded()
2016-12-11 18:32:28 -01:00
Nextcloud bot
ea7a69f198
[tx-robot] updated from transifex
2016-12-11 01:07:18 +00:00
Lukas Reschke
4456fa57e0
Merge pull request #2274 from nextcloud/fix-invites-on-readonly-calendars
...
Do not add invites into read-only calendars
2016-12-10 12:22:15 +01:00
Nextcloud bot
7cb99e74db
[tx-robot] updated from transifex
2016-12-10 01:07:15 +00:00
Björn Schießle
d10be51d40
Merge pull request #2588 from nextcloud/theming-check-empty
...
Check if image files for theming are empty
2016-12-09 15:57:44 +01:00
Joas Schilling
de8908bf29
Merge pull request #2584 from nextcloud/theming-filter-fix
...
Add fallback to FILTER_LANCZOS for icon resizing
2016-12-09 14:53:34 +01:00
Julius Haertl
5fbadee95f
Check if image files for theming are empty
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-12-09 12:54:03 +01:00
Julius Haertl
366f14d7db
Add fallback to FILTER_LANCZOS for icon resizing
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-12-09 11:53:27 +01:00
Joas Schilling
474720ff1c
Overwrite the schedule target calendar with the personal one and create it if missing
...
Otherwise this leads to problems like events being added to the birthday calendar,
if that one is the first calendar which was created for the user. See:
https://github.com/nextcloud/server/pull/2274
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-09 09:34:25 +01:00
Nextcloud bot
88d90066ba
[tx-robot] updated from transifex
2016-12-09 01:07:18 +00:00