Commit graph

12775 commits

Author SHA1 Message Date
Robin Appelman
cbcdf69dc2
only query substorages to calculate the final mtime/size/etag lazily
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-10 13:59:22 +01:00
Morris Jobke
742c215946 Merge pull request #2058 from nextcloud/better-error-message-for-installation-error
Use a better error message and point the users to the support channels
2016-11-09 13:59:33 +01:00
Lukas Reschke
9305094b8b
Add test and adjust PHP function arguments
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-09 10:49:57 +01:00
Joas Schilling
2f7e291101
Correctly catch the "soft errors" now
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-09 10:30:19 +01:00
Joas Schilling
224dfaf1e6
Use a better error message and point the users to the support channels
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-09 09:10:32 +01:00
Joas Schilling
706b5c3fb6
Use a php class for the definitions to avoid loading problems
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-09 08:52:07 +01:00
Roeland Jago Douma
100cec59a7 Merge pull request #2037 from nextcloud/fix-preview-urls
Fix preview URLs
2016-11-08 18:29:57 +01:00
Björn Schießle
1ad3043e4f Merge pull request #1998 from nextcloud/share-by-mail-notification
add share by mail activity
2016-11-08 17:37:46 +01:00
Joas Schilling
9296038d78
Fix preview URLs
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-08 16:39:13 +01:00
Bjoern Schiessle
25bcd71d02
add activity if a file was shared by mail
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-08 15:58:52 +01:00
Bjoern Schiessle
3bc643ec23
add new definition
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-08 15:42:07 +01:00
Bjoern Schiessle
087dab85b4
add activity for share by mail
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-08 15:42:07 +01:00
Donquixote
537d588726
refactoring code to reduce cyclomatic complexit
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-07 08:18:16 +01:00
Nextcloud bot
8d954c0ece
[tx-robot] updated from transifex 2016-11-07 01:07:03 +00:00
Nextcloud bot
e217040402
[tx-robot] updated from transifex 2016-11-06 01:07:48 +00:00
Nextcloud bot
ca3616cb58
[tx-robot] updated from transifex 2016-11-05 01:07:14 +00:00
Lukas Reschke
a9547a2fd7 Merge pull request #2015 from nextcloud/swift-bucket
allow using 'bucket' to set the swift container
2016-11-04 21:46:59 +01:00
Morris Jobke
f42d5b6e56 Merge pull request #2007 from nextcloud/downstream-26411
[oc] Fix initMountPoints to set usersSetup earlier
2016-11-04 15:03:52 +01:00
Robin Appelman
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
Roeland Jago Douma
a56717673f
Remove adding sharedialogmailview
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-04 07:41:35 +01:00
Nextcloud bot
479d76d426
[tx-robot] updated from transifex 2016-11-04 01:07:04 +00:00
Lukas Reschke
c0bbae28f0 Merge pull request #1741 from nextcloud/new_preview
Improve previews
2016-11-03 21:07:16 +01:00
Vincent Petry
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
Lukas Reschke
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
Robin Appelman
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
Robin Appelman
7be62d083e
explicitly cast mtime to int
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-03 14:36:46 +01:00
Roeland Jago Douma
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
Roeland Jago Douma
87855aa97b
Added genertor helper & tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-03 14:00:33 +01:00
Roeland Jago Douma
d720a2fb57
Moved over files_versions
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-03 14:00:33 +01:00
Roeland Jago Douma
a6ca81b474
Update autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-03 14:00:33 +01:00
Roeland Jago Douma
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
Roeland Jago Douma
8468212386
Fix name conflict
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-03 14:00:33 +01:00
Roeland Jago Douma
d6f1287ae6
Move file
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-03 14:00:33 +01:00
Roeland Jago Douma
02525fd98b
Move preview endpoint to controller
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-03 14:00:33 +01:00
Roeland Jago Douma
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
Roeland Jago Douma
743132650a
Move to AppData
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-03 14:00:32 +01:00
Roeland Jago Douma
958c1289b1
New preview generator
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-03 14:00:32 +01:00
Lukas Reschke
b33ceb6fdd Merge pull request #1915 from nextcloud/downstream-26398
Add using casing check/fix for initMountPoints
2016-11-03 12:14:28 +01:00
Morris Jobke
0741346385
Show a hint for system based cron user name
* makes it easier to setup cron job
* gives hints for PHP documentation
* disables the cron setting if requirements not met
* fixes #1989

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-03 10:38:00 +01:00
Nextcloud bot
8471219b7c
[tx-robot] updated from transifex 2016-11-03 01:07:06 +00:00
Lukas Reschke
6920e609c0
Adjust tests and DI for Share.php
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-02 23:26:49 +01:00
Lukas Reschke
68cebef64c
DI for root.php
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-02 23:16:51 +01:00
Morris Jobke
39573e602d Merge pull request #1978 from nextcloud/remove-send-mail-option
Remove send mail option
2016-11-02 22:36:05 +01:00
Morris Jobke
8653d14862
Do not expose user data in exceptions & fix typo
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-02 22:21:47 +01:00
Vincent Petry
f737426eca
Add using casing check/fix for initMountPoints 2016-11-02 22:21:46 +01:00
Lukas Reschke
c1feae1684 Merge pull request #1981 from nextcloud/multibucket-num-buckets
Allow setting a maximun number of buckets for multibucket
2016-11-02 22:05:57 +01:00
Lukas Reschke
b4cf559707 Merge pull request #1943 from nextcloud/log-query-builder-queries
Log QueryBuilder queries
2016-11-02 21:51:39 +01:00
Robin Appelman
049bcae29e
Allow setting a maximun number of buckets for multibucket
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-02 21:31:24 +01:00
Morris Jobke
e74c527268 Merge pull request #1973 from nextcloud/dont-disable-shipped-apps-but-throw-instead
Throw an exception when a shipped app was not replaced before the update
2016-11-02 21:20:23 +01:00
Joas Schilling
2c4035e806
Inject config and logger
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-02 20:30:37 +01:00