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
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
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
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
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
7be62d083e
explicitly cast mtime to int
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-03 14:36:46 +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
87855aa97b
Added genertor helper & tests
...
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
a6ca81b474
Update autoloader
...
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
b33ceb6fdd
Merge pull request #1915 from nextcloud/downstream-26398
...
Add using casing check/fix for initMountPoints
2016-11-03 12:14:28 +01:00
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
8471219b7c
[tx-robot] updated from transifex
2016-11-03 01:07:06 +00:00
6920e609c0
Adjust tests and DI for Share.php
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-02 23:26:49 +01:00
68cebef64c
DI for root.php
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-02 23:16:51 +01:00
39573e602d
Merge pull request #1978 from nextcloud/remove-send-mail-option
...
Remove send mail option
2016-11-02 22:36:05 +01:00
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
f737426eca
Add using casing check/fix for initMountPoints
2016-11-02 22:21:46 +01:00
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
b4cf559707
Merge pull request #1943 from nextcloud/log-query-builder-queries
...
Log QueryBuilder queries
2016-11-02 21:51:39 +01:00
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
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
2c4035e806
Inject config and logger
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-02 20:30:37 +01:00
cd13f50a3f
Log the queries of the QueryBuilder as well
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-02 20:30:36 +01:00
2cd92d0abb
Fix missing update of session, when it was already used.
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-02 20:30:36 +01:00
f7d681d038
Merge pull request #1958 from harry-7/1428issue
...
Added Exception catch and ignore for DBuser exists
2016-11-02 20:22:48 +01:00
e6b52ef4cd
Merge pull request #1347 from nextcloud/bring-back-remember-me
...
fix remember me login
2016-11-02 18:32:38 +01:00
f556c58c22
remove 'send mail notification' option from sharing, replaced by send-by-mail feature
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-02 18:30:38 +01:00
e81d04cd8d
Merge pull request #1940 from nextcloud/new-appstore
...
Use new appstore API
2016-11-02 17:00:24 +00:00
4da6b20e76
document what the method does
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-11-02 17:42:46 +01:00
9d6e01ef40
Add missing tests and fix PHPDoc
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-02 13:39:17 +01:00
271f2a4cff
Fix typ in constant name
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-02 13:39:17 +01:00
b269ed5a7b
Fix invalid PHPDocs
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-02 13:39:17 +01:00
6f86e468d4
inject ISecureRandom into user session and use injected config too
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-11-02 13:39:16 +01:00
d907666232
bring back remember-me
...
* try to reuse the old session token for remember me login
* decrypt/encrypt token password and set the session id accordingly
* create remember-me cookies only if checkbox is checked and 2fa solved
* adjust db token cleanup to store remembered tokens longer
* adjust unit tests
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-11-02 13:39:16 +01:00
370123b8b0
Merge pull request #1966 from nextcloud/fix-csrf-token-generation
...
Fix CSRF token generation / validation
2016-11-02 12:09:30 +01:00
7da3ba3f91
Merge pull request #657 from nextcloud/share-by-mail
...
New share provider: Share by mail
2016-11-02 11:04:33 +01:00
e5d78a3523
Fix CSRF token generation / validation
...
Operate on raw bytes instead of base64-encoded strings.
Issue was introduced in a977465
2016-11-02 10:38:05 +01:00
9b66e8f7d9
Throw an exception when a shipped app was not replaced before the update
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-02 10:00:14 +01:00
Lukas Reschke
Morris Jobke
Robin Appelman
Roeland Jago Douma
Nextcloud bot
Vincent Petry
Roeland Jago Douma
Joas Schilling
Bjoern Schiessle
Michael Grosser
Christoph Wurst
Leon Klingele