Jörn Friedrich Dreyer
|
1bc28261d5
|
make JobList::next() lock free
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
|
2017-04-07 13:03:16 -05:00 |
Roeland Jago Douma
|
35b1f23d11
|
Merge pull request #4230 from nextcloud/stable11-increase-version
[stable11] Increase to 11.0.3 RC1
|
2017-04-07 10:50:28 +02:00 |
Nextcloud bot
|
04e22a94b8
|
[tx-robot] updated from transifex
|
2017-04-07 00:09:21 +00:00 |
Morris Jobke
|
1f79248a33
|
Merge pull request #4234 from nextcloud/backport-4066-always-fix-broken-dav-values
[stable11] Directly fix invalid values of DTEND and DTSTART
|
2017-04-06 10:58:18 -05:00 |
Morris Jobke
|
15ecaa9f0f
|
Merge pull request #4235 from nextcloud/backport-3857-legacy-caldav-endpoint-email-invitations
[stable11] Fix scheduling plugin on legacy caldav endpoint
|
2017-04-06 10:47:48 -05:00 |
Morris Jobke
|
aabcb043f3
|
Merge pull request #4236 from nextcloud/backport-3827-remove-double-password-confirmation
[stable11] Remove the double password confirmation on changing cron
|
2017-04-06 10:46:30 -05:00 |
Joas Schilling
|
125c0eb30e
|
Merge pull request #4238 from nextcloud/4094-stable11
[stable11] Fix LDAP description
|
2017-04-06 14:18:30 +02:00 |
Joas Schilling
|
e5f51f2ee6
|
Merge pull request #4237 from nextcloud/backport-3781-log-spam-with-external-storages
[stable11] Also add the root of external storages to the file id list
|
2017-04-06 14:10:01 +02:00 |
Joas Schilling
|
02a47150db
|
Merge pull request #4242 from nextcloud/encryption-fix-mail-share-stable11
[stable11] take share by mail into consideration if we calculate the access list
|
2017-04-06 14:09:28 +02:00 |
Joas Schilling
|
562b930046
|
Merge pull request #4225 from nextcloud/stable11-token-save-scope
[Stable11] token save scope
|
2017-04-06 14:08:00 +02:00 |
Joas Schilling
|
6532ce22c2
|
Merge pull request #4233 from nextcloud/backport-4071-database-conversion-failure
[stable11] Make sure blob columns are correctly converted as parameters
|
2017-04-06 14:06:54 +02:00 |
Bjoern Schiessle
|
d0b93ad404
|
take share by mail into consideration if we calculate the access list
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
|
2017-04-06 12:00:42 +02:00 |
Lukas Reschke
|
fcf5739cc5
|
Fix test
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
|
2017-04-06 10:30:32 +02:00 |
Marius Blüm
|
ad41395dc1
|
Fix LDAP description
Signed-off-by: Marius Blüm <marius@lineone.io>
|
2017-04-06 10:26:31 +02:00 |
Joas Schilling
|
d0a7e01baf
|
Also add the root of external storages to the file id list
Signed-off-by: Joas Schilling <coding@schilljs.com>
|
2017-04-06 10:13:50 +02:00 |
Joas Schilling
|
c5d980788c
|
Remove the double password confirmation on changing cron
Signed-off-by: Joas Schilling <coding@schilljs.com>
|
2017-04-06 10:10:10 +02:00 |
Joas Schilling
|
fb9eb6aa68
|
Fix scheduling plugin on legacy caldav endpoint
Signed-off-by: Joas Schilling <coding@schilljs.com>
|
2017-04-06 10:06:51 +02:00 |
Joas Schilling
|
abc9e706c5
|
Directly fix the values
Signed-off-by: Joas Schilling <coding@schilljs.com>
|
2017-04-06 10:03:56 +02:00 |
Joas Schilling
|
a7efdd6094
|
Use false because null crashes the cache
Signed-off-by: Joas Schilling <coding@schilljs.com>
|
2017-04-06 10:01:32 +02:00 |
Joas Schilling
|
ea34f3bbbd
|
Make sure blob columns are correctly converted as parameters
Signed-off-by: Joas Schilling <coding@schilljs.com>
|
2017-04-06 10:01:15 +02:00 |
Joas Schilling
|
392610e3c6
|
Merge pull request #4154 from nextcloud/stable11-4153
[stable11] Fix upload of folders in Chrome
|
2017-04-06 09:57:16 +02:00 |
Morris Jobke
|
b2c87ae63f
|
Merge pull request #4229 from nextcloud/stable11-dont-list-on-public-calendar-endpoint
[stable11] Don't list on public calendar endpoints
|
2017-04-06 00:55:36 -05:00 |
Morris Jobke
|
6918ed9903
|
Fix upload of folders in Chrome
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
|
2017-04-06 00:54:09 -05:00 |
Morris Jobke
|
190ccef819
|
Merge pull request #4228 from nextcloud/stable11-error-messages
[Stable11] Error messages
|
2017-04-06 00:30:10 -05:00 |
Nextcloud bot
|
96c20ebddb
|
[tx-robot] updated from transifex
|
2017-04-06 00:08:02 +00:00 |
Lukas Reschke
|
7f199a2c6b
|
[stable11] Increase to 11.0.3 RC1
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
|
2017-04-05 23:27:20 +02:00 |
Lukas Reschke
|
022768387c
|
Don't list on public calendar endpoints
There is no need to allow listing here.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
|
2017-04-05 23:18:13 +02:00 |
Lukas Reschke
|
f9b258a371
|
Replace unecessary unescaped prints with print
There's no need to have those unescaped from what I can see.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
|
2017-04-05 23:14:12 +02:00 |
Lukas Reschke
|
462073c686
|
Remove verbose error message
There's no need to have this included in the error message.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
|
2017-04-05 23:14:04 +02:00 |
Lukas Reschke
|
cabb52b909
|
Add integration tests for token auth
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
|
2017-04-05 23:00:53 +02:00 |
Robin Appelman
|
f4b6c34ddf
|
Save the scope of an auth token in the session
Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
|
2017-04-05 23:00:53 +02:00 |
Roeland Jago Douma
|
f6ebdee8fd
|
Merge pull request #4214 from nextcloud/share-dialog-no-avatars
don't try to render the avatars if avatars are disabled
|
2017-04-05 14:07:44 +02:00 |
Bjoern Schiessle
|
616b767835
|
don't try to render the avatars if avatars are disabled
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
|
2017-04-05 12:26:27 +02:00 |
Roeland Jago Douma
|
7f0c07fa5d
|
Merge pull request #4207 from nextcloud/masterkey-publiclink-nc11
[stable11] Make public links work with master key
|
2017-04-05 10:21:34 +02:00 |
Nextcloud bot
|
9c9bdabf74
|
[tx-robot] updated from transifex
|
2017-04-05 00:08:31 +00:00 |
Vincent Petry
|
6cbb6ceba3
|
Use master key for public links as well
|
2017-04-04 17:57:40 +02:00 |
Vincent Petry
|
f000df0263
|
Add tests for null user
|
2017-04-04 17:57:32 +02:00 |
Vincent Petry
|
c215255771
|
Fix public link for master key
In public link mode there is no session, so the code should use the
public key instead.
|
2017-04-04 17:57:20 +02:00 |
Nextcloud bot
|
e5468409b5
|
[tx-robot] updated from transifex
|
2017-04-04 00:07:55 +00:00 |
Roeland Jago Douma
|
8bab4ecffc
|
Merge pull request #4167 from nextcloud/backport-4166-invalid-int-for-transparency-on-calendars
[stable11] Make sure transparency is an integer when saving a calendar
|
2017-04-03 11:00:18 +02:00 |
Nextcloud bot
|
9964782b79
|
[tx-robot] updated from transifex
|
2017-04-03 00:08:30 +00:00 |
Nextcloud bot
|
82eb215c41
|
[tx-robot] updated from transifex
|
2017-04-02 00:07:57 +00:00 |
Nextcloud bot
|
df5ca72796
|
[tx-robot] updated from transifex
|
2017-04-01 00:08:18 +00:00 |
Nextcloud bot
|
6fa95a2ecf
|
[tx-robot] updated from transifex
|
2017-03-31 00:08:44 +00:00 |
Roeland Jago Douma
|
00a023ec7b
|
Merge pull request #3415 from nextcloud/backport-3184-migration-restriction-by-vendor-version
[stable11] Prevent migration from ownCloud 10 to Nextcloud 11
|
2017-03-30 23:13:03 +02:00 |
Joas Schilling
|
21b413b08b
|
Make sure transparency is an integer when saving a calendar
Signed-off-by: Joas Schilling <coding@schilljs.com>
|
2017-03-30 18:01:21 +02:00 |
Joas Schilling
|
cf8a680b97
|
Fix the update from NC 10 and 11 to the latest NC 11
Signed-off-by: Joas Schilling <coding@schilljs.com>
|
2017-03-30 15:31:50 +02:00 |
Morris Jobke
|
0b17068c9e
|
fix version number
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
|
2017-03-30 15:22:40 +02:00 |
Morris Jobke
|
9a526a2eb8
|
Fix return value of getAllowedPreviousVersions()
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
|
2017-03-30 15:22:40 +02:00 |
Joas Schilling
|
e8bbef462f
|
Prevent migration from ownCloud 10 to Nextcloud 11
Signed-off-by: Joas Schilling <coding@schilljs.com>
|
2017-03-30 15:22:39 +02:00 |