f42d5b6e56
Merge pull request #2007 from nextcloud/downstream-26411
...
[oc] Fix initMountPoints to set usersSetup earlier
2016-11-04 15:03:52 +01:00
b72e5a2e4e
allow using 'bucket' to set the swift container
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-04 14:15:18 +01:00
9fa3a22ddd
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-04 13:37:00 +01:00
ca379bdb7d
[3rdparty] Bump sabre/dav to 3.2
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-04 13:35:52 +01:00
c778b1bade
Update sabre dav to 3.2 ( #26115 )
...
* Update sabre/dav to 3.2.0
* Adjust code to work with sabre/dav 3.2.0 and it's dependencies
* Adding own CalDAV plugin to fix calendar home property
* Test if there is a user logged in when listing files home
* Update sabre version used by integration tests
* Disable unauthenticated DAV access
This is needed to make Sabre 3.2 behave like we did before.
Eventually we should integrate better with the ACL plugin which itself
should implement an auth failure when appropriate.
=====
* Fixed so cherry-pick was succesfull
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-04 13:35:10 +01:00
a77e7075f6
Merge pull request #2010 from nextcloud/downstream-26534
...
[oC] Fixed disappearing of share info in file view
2016-11-04 13:29:19 +01:00
6a156b795c
Merge pull request #1880 from nextcloud/downstream-26235
...
Integration tests refactoring
2016-11-04 12:09:00 +01:00
d5665eb93b
Add sleep function
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-04 11:20:33 +01:00
bf9376a7f6
Fixed disappearing of share info in file view
2016-11-04 10:37:30 +01:00
27304e5694
Merge pull request #2008 from nextcloud/remove_removed_script
...
Remove adding sharedialogmailview
2016-11-04 09:42:33 +01:00
bcd7a9a034
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-04 08:44:35 +01:00
a56717673f
Remove adding sharedialogmailview
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-04 07:41:35 +01:00
479d76d426
[tx-robot] updated from transifex
2016-11-04 01:07:04 +00:00
2a0f5407ba
Merge pull request #2006 from nextcloud/downstream-26380
...
[oC] Hide "Add group" for subadmins
2016-11-03 23:20:58 +01:00
ac61f64190
Merge pull request #1109 from nextcloud/add-more-secrets-to-password-reset-link
...
Use mail for encrypting the password reset token as well
2016-11-03 22:11:43 +01:00
c0bbae28f0
Merge pull request #1741 from nextcloud/new_preview
...
Improve previews
2016-11-03 21:07:16 +01:00
237dab675e
Fix initMountPoints to set usersSetup earlier
...
This is needed because in some cases like LDAP, the user manager itself
might trigger avatar updates which would internally also call
initMountPoints with the same user. This could cause the same user to
be setup twice, and in some sharing situations could cause recursive
deduplication of shares by adding "(2)" every time.
2016-11-03 20:45:40 +01:00
8bf57462ea
Merge pull request #2002 from nextcloud/propagate-mtime-iont
...
explicitly cast mtime to int in propagation
2016-11-03 20:43:13 +01:00
e8d614b59e
Hide "Add group" for subadmins
2016-11-03 20:41:10 +01:00
f6ff624e3d
Merge pull request #1733 from nextcloud/dav-events
...
Activities for calendars, events and todos
2016-11-03 19:31:20 +01:00
dca9184a12
Fix tests
...
* Tests fixed and controller coverage to 100%
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-03 19:08:56 +01:00
9e27e2f048
Merge pull request #2003 from nextcloud/query-logger-limit
...
Cap the number of queries we save in the query logger
2016-11-03 17:04:50 +01:00
95ac9f60ce
Cap the number of queries we save in the query logger
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-03 16:00:28 +01:00
1c52d87821
Merge pull request #2000 from nextcloud/sharebymail-icon
...
add share by mail icon, fix #1979
2016-11-03 15:33:58 +01:00
7a0e003ade
Add more tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-03 15:24:18 +01:00
7be62d083e
explicitly cast mtime to int
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-03 14:36:46 +01:00
36b656e207
Add tests for triggerCalendarActivity
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-03 14:30:02 +01:00
6d686c213b
[WIP] Use mail for encrypting the password reset token as well
2016-11-03 14:27:26 +01:00
ae5eb79593
Merge pull request #1908 from nextcloud/downstream-26078
...
Upload autorename on client side
2016-11-03 14:21:35 +01:00
7ba7949dc1
Merge pull request #1994 from nextcloud/proper-cron-hints
...
Show a hint for system based cron user name
2016-11-03 14:11:37 +01:00
f44cd7aed3
Update changelog
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-03 14:08:54 +01:00
219b536f70
add share by mail icon, fix #1979
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-03 14:05:43 +01:00
9e6b26dcd0
Add cache 1 day cache to preview endpoint
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-03 14:00:33 +01:00
55af6b45f7
More tests
...
* PreviewController test
* PublicPreview test
* Versions Preview test
* Trash Preview test
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-03 14:00:33 +01:00
87855aa97b
Added genertor helper & tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-03 14:00:33 +01:00
3d6ee7ffc9
Update thumbnail endpoint to new generato
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-03 14:00:33 +01:00
5d11085190
Move over files_trashbin
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-03 14:00:33 +01:00
d720a2fb57
Moved over files_versions
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-03 14:00:33 +01:00
2164085f22
Fix urlgenerator test
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-03 14:00:33 +01:00
a6ca81b474
Update autoloader
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-03 14:00:33 +01:00
3822bceea2
Move publicpreview over
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-03 14:00:33 +01:00
5466fbf761
Move Ipreview to more of DI thingy
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-03 14:00:33 +01:00
8468212386
Fix name conflict
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-03 14:00:33 +01:00
d6f1287ae6
Move file
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-03 14:00:33 +01:00
02525fd98b
Move preview endpoint to controller
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-03 14:00:33 +01:00
c8ff9fb00e
Watch for file modification/deletion
...
* Only connect the watcher once the instance is properly setup else
AppData fails hard.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-03 14:00:33 +01:00
743132650a
Move to AppData
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-03 14:00:32 +01:00
958c1289b1
New preview generator
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-03 14:00:32 +01:00
b129adfb58
Merge pull request #1997 from nextcloud/changelog
...
Introducing changelog.md
2016-11-03 13:57:10 +01:00
d1550283de
Merge pull request #1996 from nextcloud/allow-phpunit-options
...
Allow to run autotest with phpunit options
2016-11-03 13:15:39 +01:00
Morris Jobke
Robin Appelman
Roeland Jago Douma
Thomas Müller
Joas Schilling
Michael Jobst
Roeland Jago Douma
Nextcloud bot
Lukas Reschke
Vincent Petry
Björn Schießle
Jan-Christoph Borchardt