wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
35597 commits 157 branches 562 tags 714 MiB
Commit graph

3613 commits

Author SHA1 Message Date
Roeland Jago Douma
28babd319b Merge pull request #2137 from nextcloud/make-sure-tests-run-on-phpunit-4-again 
Add a magic wrapper to allow phpunit4 to run the code again
 2016-11-15 21:48:55 +01:00
Lukas Reschke
b775d935f2
Endpoint is now 11.0.0 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-15 15:10:17 +01:00
Lukas Reschke
5fd428413b
Adjust previous fallbacks 
11.0 is 11 and not 9.2 anymore

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-15 15:07:58 +01:00
Joas Schilling
e76ef9aaa8
Add a magic wrapper from hell to allow phpunit4 to run the code again 
Remove this once phpunit 5 is the lowest supported version, by reverting:
https://github.com/nextcloud/server/pull/2137

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-15 14:49:14 +01:00
Roeland Jago Douma
b7e13b43fb Merge pull request #2114 from nextcloud/downstream-26498 
make object prefix configurable
 2016-11-14 17:07:00 +01:00
Jörn Friedrich Dreyer
4a9361905d
make object prefix configurable 2016-11-14 15:10:56 +01:00
Thomas Müller
506ccdbd8d
Introduce an event for first time login based on the last login time stamp 
Use firstLogin event to trigger creation of default calendar and default address book

Delay login of admin user after setup so that firstLogin event can properly be processed for the admin

Fixing tests ...

Skeleton files are not copied over -> only 3 cache entries are remaining

Use updateLastLoginTimestamp to properly setup lastLogin value for a test user
 2016-11-14 14:50:10 +01:00
Morris Jobke
16a110e803 Merge pull request #2067 from nextcloud/fileinfo-lazy-substorages 
only query substorages to calculate the final mtime/size/etag when we need it
 2016-11-14 11:39:02 +01:00
Lukas Reschke
7cb0df28e2
Prevent downgrade attacks for apps 
We should verify the app versions when installing a new update, otherwise this could result in downgrade attacks when an attacker just copies the old signature.

Plus it prevents the case that in case of a bug in the appstore actually an older version gets installed.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-11 18:53:26 +01:00
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
eadccc239a Merge pull request #2052 from nextcloud/ros-definitions-as-php-class 
Use a php class for the definitions to avoid loading problems
 2016-11-09 13:53:54 +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
92e5fb4053
Add tests for validity of the definitions 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-09 10:08:29 +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
b6562cb386
Generate js codecov coverage 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-09 08:03:29 +01:00
Morris Jobke
05cf1dab4c Merge pull request #2053 from nextcloud/make-sure-we-can-backup-the-command-bus 
Make sure the database is not replaced while we make a backup of the …
 2016-11-08 20:37:22 +01:00
Joas Schilling
4393e8003b
Make sure the database is not replaced while we make a backup of the service 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-08 16:32:41 +01:00
Christoph Wurst
9e5e120ef9
refactor share permission logic into own method to reuse it for the share tab 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2016-11-07 14:58:45 +01:00
Roeland Jago Douma
95a8964cc8
Add settings PersonalController 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-06 14:05:49 +01:00
Roeland Jago Douma
04ece69a33
Cleanup OC_Group usage a bit 
This is deprecated internal stuff. Should not be used anymore.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-04 20:55:47 +01:00
Morris Jobke
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
Lukas Reschke
c0bbae28f0 Merge pull request #1741 from nextcloud/new_preview 
Improve previews
 2016-11-03 21:07:16 +01:00
Roeland Jago Douma
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
Lukas Reschke
6d686c213b
[WIP] Use mail for encrypting the password reset token as well 2016-11-03 14:27:26 +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
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
Roeland Jago Douma
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
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
2164085f22
Fix urlgenerator test 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-03 14:00:33 +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
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
178d7f5bfa Merge pull request #1988 from nextcloud/silly-but-effective-test 
Add test for "languageCodes.php"
 2016-11-02 22:30:52 +01:00
Vincent Petry
889e0a574b
Fix mock warning in some FS tests (#26464) 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
8d4bda7de6
Add test for "languageCodesTest.php" 
Arguably not the most awesome test but increases coverage and is an easy gain.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-02 21:53:54 +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
Lukas Reschke
a8b7df9cc1
Add tests 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-02 21:10:51 +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
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
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
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