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
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
Joas Schilling
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
Joas Schilling
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
Lukas Reschke
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
Morris Jobke
e6b52ef4cd
Merge pull request #1347 from nextcloud/bring-back-remember-me
...
fix remember me login
2016-11-02 18:32:38 +01:00
Bjoern Schiessle
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
Michael Grosser
e81d04cd8d
Merge pull request #1940 from nextcloud/new-appstore
...
Use new appstore API
2016-11-02 17:00:24 +00:00
Christoph Wurst
4da6b20e76
document what the method does
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-11-02 17:42:46 +01:00
Lukas Reschke
9d6e01ef40
Add missing tests and fix PHPDoc
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-02 13:39:17 +01:00
Lukas Reschke
271f2a4cff
Fix typ in constant name
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-02 13:39:17 +01:00
Lukas Reschke
b269ed5a7b
Fix invalid PHPDocs
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-02 13:39:17 +01:00
Christoph Wurst
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
Christoph Wurst
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
Roeland Jago Douma
370123b8b0
Merge pull request #1966 from nextcloud/fix-csrf-token-generation
...
Fix CSRF token generation / validation
2016-11-02 12:09:30 +01:00
Leon Klingele
e5d78a3523
Fix CSRF token generation / validation
...
Operate on raw bytes instead of base64-encoded strings.
Issue was introduced in a977465
Signed-off-by: Leon Klingele <git@leonklingele.de>
2016-11-02 10:38:05 +01:00
Joas Schilling
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
Bjoern Schiessle
1e930df91f
find and show share-by mail links
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:41 +01:00
Bjoern Schiessle
31c8c38bd6
send mail for share-by-mail shares
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:40 +01:00
Bjoern Schiessle
318160647a
add method to check if a share provider for a given type is loaded
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:39 +01:00
Bjoern Schiessle
a17c6a485d
add share by mail share provider
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:51:11 +01:00
Bjoern Schiessle
0a6f02801f
introduce share by mail, ui part
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:51:11 +01:00
Roeland Jago Douma
fc4d0a86ef
Fix merging backend results
...
* Merge share types correctly
* Filter share types
* Order share types
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-01 12:16:05 +01:00
Roeland Jago Douma
5a00870a2b
Stricter signature
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-31 20:19:14 +01:00
Lukas Reschke
0eeef26a8e
Add tests for installer method
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-10-31 19:39:35 +01:00
Lukas Reschke
1a676bacb4
Remove non-required getter
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-10-31 18:45:13 +01:00
Lukas Reschke
086d43f26d
Move to non-static version
...
The static version is used nowhere in the code and just decreases coverage
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-10-31 18:42:19 +01:00
Lukas Reschke
d805df7bb3
Use findAppInDirectories
...
The other function doesn't work if the appstore is disabled
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-10-31 17:30:02 +01:00
Lukas Reschke
8acb54aa0b
Add update support
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-10-31 17:17:47 +01:00
Lukas Reschke
df7fd2b57c
Query the timefactory instead of creating it
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-10-31 17:17:46 +01:00
Lukas Reschke
3e6dd86ee4
Add support for CRL
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-10-31 17:17:46 +01:00
Lukas Reschke
0e2aee2be6
Replace with exception instead of boolean return value
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-10-31 17:17:46 +01:00
Lukas Reschke
01c566883e
%d instead %s
...
These are only numbers. THX @nickvergessen
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-10-31 17:17:46 +01:00
Lukas Reschke
89fc4358ba
Use substr and explode instead of a regex
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-10-31 17:17:45 +01:00
Lukas Reschke
067fb18670
Read array elements instead of substr
...
Otherwise this would break with 11.0.0
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-10-31 17:17:45 +01:00
Lukas Reschke
ca7f6dec55
Make non-static
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-10-31 17:17:45 +01:00
Lukas Reschke
32cf661215
Use new appstore API
...
This change introduces the new appstore API in Nextcloud.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-10-31 17:17:44 +01:00
Robin Appelman
3692769b0a
Add getShareTypesInFolder to optimize folder listening
...
Signed-off-by: Robin Appelman <icewind@owncloud.com>
2016-10-31 15:55:40 +01:00
Hemanth Kumar Veeranki
2b7d63f565
Added Exception catch in case of DB User exists
...
Signed-off-by: Hemanth Kumar Veeranki <hemanthveeranki@gmail.com>
2016-10-31 16:32:22 +05:30
Roeland Jago Douma
e416ee7b74
Merge pull request #1937 from nextcloud/ros-for-notification-message
...
Allow rich object strings in messages as well
2016-10-31 11:51:02 +01:00
Joas Schilling
54c0501ffa
Type hints already make sure it is an array
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-31 10:37:40 +01:00