Commit Graph

35392 Commits

Author SHA1 Message Date
Christoph Wurst e11197bc48 Merge pull request #1954 from nextcloud/issue_#1953
#1953 add can to subshare options
2016-11-03 11:50:29 +01:00
Andreas Hechenberger 09c4fe6d62
Fixes https://github.com/nextcloud/server/issues/1953
Signed-off-by: Andreas Hechenberger <world@greenstation.de>
2016-11-03 11:19:45 +01:00
Morris Jobke f697c594a0 Merge pull request #1993 from nextcloud/wait-600-seconds-for-mysqlmb4
adjust autotest.sh to also wait 600 seconds for mysqlmb4
2016-11-03 11:03:21 +01:00
Morris Jobke 83770651bc
adjust autotest.sh to also wait 600 seconds for mysqlmb4
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-03 09:45:16 +01:00
Morris Jobke 9ebbb3c654 Merge pull request #1991 from nextcloud/code-check-more-shipped-apps
Run code checker on more shipped apps
2016-11-03 09:16:20 +01:00
Morris Jobke 181de17372 Merge pull request #1990 from nextcloud/use-php-7.1-rc-5
Use PHP 7.1 RC5 for CI
2016-11-03 09:15:38 +01:00
Nextcloud bot 8471219b7c
[tx-robot] updated from transifex 2016-11-03 01:07:06 +00:00
Lukas Reschke ffba8297df
Run code checker on more shipped apps
Adds:
- sharebymail
- systemtags
- theming
- workflowengine

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-03 00:11:28 +01:00
Lukas Reschke a2def38a7a
Use PHP 7.1 RC5 for CI
This image has PHP 7.1 RC5 inside and the currently used one only RC4.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-02 23:35:40 +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
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
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
Roeland Jago Douma a8d9bf48ff Merge pull request #1511 from nextcloud/master-kill-upload-limit
Remove upload_limit in files app as it is not needed with PUT upload
2016-11-02 21:24:10 +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
Roeland Jago Douma 7d17b42f4d
Remove from core.json
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-02 21:17:05 +01:00
Bjoern Schiessle d235c4833f
remove the 'shareapi_allow_mail_notification' setting
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-02 21:17:05 +01:00
Lukas Reschke a8b7df9cc1
Add tests
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-02 21:10:51 +01:00
Morris Jobke 9eede5a573 Merge pull request #1986 from nextcloud/add-htaccess-checker
Add .htaccess checker as CI step
2016-11-02 20:52:16 +01:00
Vincent Petry 7e701504be
Remove upload_limit in files app as it is not needed with PUT upload (#26069)
The web UI now uses for PUT uploads which aren't restricted by PHP's
upload_max_filesize and post_max_size

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-02 20:43:35 +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
Lukas Reschke 50cb3a5e5a Merge pull request #1984 from nextcloud/improve-error-messages-federated-sharing
improved error messages in case federated sharing fails
2016-11-02 20:19:44 +01:00
Lukas Reschke 88199f1cc1
Add .htaccess checker as CI step
Don't want anyone to commit invalid changes in that file again 🙈

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-02 20:11:30 +01:00
Roeland Jago Douma c901c851ca Merge pull request #1960 from nextcloud/adjust-link-to-contributing.md
Adjust link to contributing.md
2016-11-02 20:04:45 +01:00
Roeland Jago Douma 3bdec28dad Merge pull request #1971 from nextcloud/fix-checkbox-glitch
Fix checkbox left margin glitch
2016-11-02 20:02:36 +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
Bjoern Schiessle 4623b70cc9
catch all exception and return a user friendly exception message
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-02 18:05:14 +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 23dd62b653 Merge pull request #1982 from nextcloud/revert-1949-disable-codecov-comments
Revert "Disable codecov comments"
2016-11-02 16:33:08 +01:00
Lukas Reschke db891d823a Remove sunburst 2016-11-02 15:33:22 +01:00
Lukas Reschke d747590771 Revert "Disable codecov comments" 2016-11-02 15:29:13 +01:00
John Molakvoæ bc5268bdc8
Fix #1782
Fix checkbox left margin glitch
Fix tests
fix unit tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-02 15:07:24 +01:00
Morris Jobke ffebc050d0 Merge pull request #1887 from nextcloud/downstream-26370
Added functions to check etag of elements - integration tests
2016-11-02 14:57:45 +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
Joas Schilling dada3ffb51 Merge pull request #1977 from nextcloud/adjust-badges
Adjust badges
2016-11-02 12:35:32 +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
Roeland Jago Douma acf01b7f06 Merge pull request #1975 from nextcloud/federated-sharing-always-https-by-default
use https by default if no protocol is given.
2016-11-02 12:09:11 +01:00
Lukas Reschke f86e4642af
Adjust badges
- Removes the Drone badge
  - This one is lying most of the time since it isn't checking master but the latest build. Thus it fails when it effectively doesn't fail. Let's remove that since it makes us look bad.
- Add CodeCov badge
- Add CII badge

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-02 11:51:23 +01:00
Joas Schilling 7da3ba3f91 Merge pull request #657 from nextcloud/share-by-mail
New share provider: Share by mail
2016-11-02 11:04:33 +01:00