upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-15 09:59:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 52
36409 commits 960 branches 1208 tags 8.1 GiB
Commit graph

15129 commits

Author SHA1 Message Date
Nextcloud bot
cbc76a1ccb
[tx-robot] updated from transifex 2017-01-17 01:08:03 +00:00
Bjoern Schiessle
84ae958c12
generate correct path for owner and use the display name instead of the user id 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-01-16 12:31:09 +01:00
Nextcloud bot
f044edaadc
[tx-robot] updated from transifex 2017-01-16 01:15:59 +00:00
Nextcloud bot
fc2a2c3ee9
[tx-robot] updated from transifex 2017-01-12 01:07:53 +00:00
Nextcloud bot
685381f3a1
[tx-robot] updated from transifex 2017-01-11 15:20:31 +00:00
Joas Schilling
73e93d11c2
Make sure the used event type and the setting/filter are the same 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-10 12:34:13 +01:00
Nextcloud bot
639391717d
[tx-robot] updated from transifex 2017-01-09 08:25:08 +00:00
Nextcloud bot
2c2c4cc6c7
[tx-robot] updated from transifex 2017-01-05 13:10:01 +00:00
Morris Jobke
7f648905b3 Merge pull request #2949 from nextcloud/backport-2677-fix-avatars-in-mail 
[stable11] Don't set Content-Disposition header if one already exists
 2017-01-05 13:27:34 +01:00
Lukas Reschke
adef282c44
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>
 2017-01-05 12:22:27 +01:00
Nextcloud bot
4f8329c95a
[tx-robot] updated from transifex 2017-01-04 12:09:51 +00:00
Nextcloud bot
14bc90df9e
[tx-robot] updated from transifex 2017-01-03 01:07:56 +00:00
Nextcloud bot
c9039a59aa
[tx-robot] updated from transifex 2017-01-02 01:07:41 +00:00
Nextcloud bot
93d0cb220a
[tx-robot] updated from transifex 2017-01-01 01:07:38 +00:00
Nextcloud bot
fba1008d19
[tx-robot] updated from transifex 2016-12-31 01:08:44 +00:00
Nextcloud bot
768f1cf533
[tx-robot] updated from transifex 2016-12-30 01:07:36 +00:00
Nextcloud bot
a2b45c3cb7
[tx-robot] updated from transifex 2016-12-29 01:08:08 +00:00
Nextcloud bot
a4c85c76a9
[tx-robot] updated from transifex 2016-12-28 01:07:49 +00:00
Nextcloud bot
ca6d8c5eba
[tx-robot] updated from transifex 2016-12-27 01:07:48 +00:00
Nextcloud bot
015408fc3a
[tx-robot] updated from transifex 2016-12-26 01:09:33 +00:00
Morris Jobke
43dcc686bd Merge pull request #2825 from nextcloud/stable11-2659 
[stable11] Fix overwriting parameter
 2016-12-22 14:47:40 +01:00
Roeland Jago Douma
1339e51585
Fix overwriting parameter 
Fixes #2641

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-12-22 14:02:55 +01:00
Roeland Jago Douma
3649d86b65
Add DAV repair step to fix calendar data 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-12-21 20:30:27 +01:00
Roeland Jago Douma
29cc292e2a
Fix TodoTest 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-12-19 09:48:08 +01:00
Joas Schilling
a1210fe5b0
Fix the Todos filter 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-12-19 09:47:11 +01:00
Lukas Reschke
80ab69ba3f Merge pull request #2696 from nextcloud/shared-scanner-unmasked-11 
[11] use unmasked permissions in shared scanner
 2016-12-16 13:15:07 +01:00
Roeland Jago Douma
b452e250e0
Fix legacy caldav endpoints 
* CaldavBackend is now endpoint aware (use old style principals on old
endpoint and new onces on new).

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-12-15 20:12:10 +01:00
Robin Appelman
5290eee9ec
use unmasked permissions in shared scanner 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-12-15 15:58:49 +01:00
Lukas Reschke
69f0977686
Add test execution against legacy DAV backend 
Since the tests to quite hugely rely on sync tokens being present I also included those in the legacy backend.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-12-15 11:19:59 +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
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
Roeland Jago Douma
158cc9c261 Merge pull request #2545 from nextcloud/fix-popover-width 
Fix popover width
 2016-12-08 13:49:56 +01:00
Nextcloud bot
74d1b0bada
[tx-robot] updated from transifex 2016-12-08 01:07:26 +00:00
John Molakvoæ (skjnldsv)
2eca4e65b3
Fix popover margin and width 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2016-12-07 10:50:54 +01:00