Commit Graph

317 Commits

Author SHA1 Message Date
Joas Schilling 81c54ea515
Use automatic injection whenever possible
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-02 14:34:51 +02:00
Lukas Reschke f93a82b8b0
Remove explicit type hints for Controller
This is public API and breaks the middlewares of existing apps. Since this also requires maintaining two different code paths for 12 and 13 I'm at the moment voting for reverting this change.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-01 17:32:03 +02:00
Morris Jobke 6010c4f267 Merge pull request #5877 from nextcloud/typehint_middleware
Prop argument type for Middleware
2017-08-01 14:28:16 +02:00
Roeland Jago Douma bc54e6ff7c
Use ITimeFactory
* Inject the timefacotry so we can mock it properly in the tests.
* Extended unit tests to cover the new paths

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-01 11:23:40 +02:00
Bjoern Schiessle 3ffff08819
we don't need to remove the job manually here, even if we ask once more the other server will decline and the background job will be removed
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-08-01 10:07:53 +02:00
Bjoern Schiessle 80c08e8fd0
update unit tests
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-08-01 10:07:53 +02:00
Bjoern Schiessle 9c9cb1a6db
cleanup constructors
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-08-01 10:07:53 +02:00
Bjoern Schiessle 06b9e58081
expire requestSharedSecret job after 30 days
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-08-01 10:07:53 +02:00
Bjoern Schiessle 51d85eb2f8
expire getShareadSecret job after 30 days
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-08-01 10:07:51 +02:00
Lukas Reschke d321e9792e
Add |null to PHPDoc
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-01 08:20:15 +02:00
Roeland Jago Douma f71dc7523f
Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-31 16:54:19 +02:00
Nextcloud bot baa6db3539
[tx-robot] updated from transifex 2017-07-28 00:08:05 +00:00
Nextcloud bot da31a30edb
[tx-robot] updated from transifex 2017-07-26 00:08:06 +00:00
Nextcloud bot d95b46ffb7
[tx-robot] updated from transifex 2017-07-24 00:08:01 +00:00
Nextcloud bot 46332b0d8e
[tx-robot] updated from transifex 2017-07-23 00:07:58 +00:00
Nextcloud bot b1b843e572
[tx-robot] updated from transifex 2017-07-18 00:08:02 +00:00
Nextcloud bot 261513b04a
[tx-robot] updated from transifex 2017-07-13 00:08:31 +00:00
Nextcloud bot 26d6c4a64a
[tx-robot] updated from transifex 2017-06-17 00:08:26 +00:00
Nextcloud bot 7a269ae872
[tx-robot] updated from transifex 2017-06-15 00:08:40 +00:00
Nextcloud bot ea64cb0028
[tx-robot] updated from transifex 2017-06-13 00:08:22 +00:00
Nextcloud bot a3c5d43cd5
[tx-robot] updated from transifex 2017-06-07 00:09:00 +00:00
Nextcloud bot c70de161cf
[tx-robot] updated from transifex 2017-06-02 00:08:30 +00:00
Nextcloud bot 4be17dff0f
[tx-robot] updated from transifex 2017-05-29 00:08:33 +00:00
Nextcloud bot a46d2f1d39
[tx-robot] updated from transifex 2017-05-25 00:08:04 +00:00
Joas Schilling bc8fbc1a67
Bump app versions as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-22 10:35:25 +02:00
Joas Schilling fdfe8f7f15
Adjust version requirement
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-22 10:32:05 +02:00
Nextcloud bot 9ad57cabc8
[tx-robot] updated from transifex 2017-05-15 00:08:14 +00:00
Nextcloud bot 241226c23c
[tx-robot] updated from transifex 2017-05-11 00:08:08 +00:00
Nextcloud bot fb78774eb8
[tx-robot] updated from transifex 2017-05-10 00:08:31 +00:00
Nextcloud bot 43275b1000
[tx-robot] updated from transifex 2017-05-09 04:32:51 +00:00
Nextcloud bot 2152d5f1f6
[tx-robot] updated from transifex 2017-05-01 00:07:32 +00:00
Nextcloud bot c1c5f51fd8
[tx-robot] updated from transifex 2017-04-27 00:07:40 +00:00
Joas Schilling bec9f18a0f Merge pull request #4478 from nextcloud/improve_settings_help
adding some documentation hints and some smaller cleanup
2017-04-26 09:45:01 +02:00
Nextcloud bot e5fe41e16b
[tx-robot] updated from transifex 2017-04-26 00:07:43 +00:00
Jan-Christoph Borchardt bbb58625fe Wording fixes
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-25 17:45:35 +02:00
Jan-Christoph Borchardt 4e537b5d6b Small layout fixes to settings hints
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-25 17:45:35 +02:00
Frank Karlitschek f62b75b2b8 change the headline as suggested 2017-04-25 17:45:35 +02:00
Frank Karlitschek 5e1ce69b05 adding some documentation hints and some smaller cleanup 2017-04-25 17:45:35 +02:00
Morris Jobke c54a59d51e
Remove unused use statements
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-22 19:23:31 -05:00
Roeland Jago Douma bec4b468c3
No need to log guzzle exception
When getting/requesting a shared secret there is no need to log the full
exception when an unexpected status code is returned since this won't
really tell us anything as the bad stuff happened on a remote server

Fixes #3380

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-21 11:29:01 +02:00
Nextcloud bot dafa9c740a
[tx-robot] updated from transifex 2017-04-15 00:07:36 +00:00
Nextcloud bot 396618fd19
[tx-robot] updated from transifex 2017-04-13 00:08:02 +00:00
Björn Schießle b90e91144b Merge pull request #3614 from nextcloud/discover-federatedsharing-endpoints
Discover federatedsharing endpoints
2017-04-12 16:01:07 +02:00
Morris Jobke 1729e4471f
Update comments to Nextcloud
* based on PR by @Ardinis
* see #4311

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-11 23:16:27 -05:00
Roeland Jago Douma 53bca14a27
Do proper DI
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-11 15:04:01 +02:00
Bjoern Schiessle 3bc72f7224
give old end-points a seperate name
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-11 15:04:01 +02:00
Bjoern Schiessle e2d7bffcda
fix constructor
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-11 15:04:01 +02:00
Bjoern Schiessle 821e287805
adjust existing tests
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-11 15:04:01 +02:00
Bjoern Schiessle d5dec527c9
get addressbook url and carddav user from remote server
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-11 15:04:01 +02:00
Bjoern Schiessle 930c507d89
use discovered end-point for trusted servers
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-11 15:04:01 +02:00
Nextcloud bot 4b0f50c456
[tx-robot] updated from transifex 2017-04-08 00:07:45 +00:00
Nextcloud bot 84035862f7
[tx-robot] updated from transifex 2017-04-05 00:08:20 +00:00
Nextcloud bot 9098042c95
[tx-robot] updated from transifex 2017-04-01 00:08:09 +00:00
Nextcloud bot 6a6300b1f2
[tx-robot] updated from transifex 2017-03-31 00:08:35 +00:00
Nextcloud bot f984cf0987
[tx-robot] updated from transifex 2017-03-30 00:07:41 +00:00
Nextcloud bot d9ebc2626f
[tx-robot] updated from transifex 2017-03-27 00:07:55 +00:00
Bjoern Schiessle 4531b4a81d
only execute code if exception was thrown by the corresponding controller
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-03-24 11:06:44 +01:00
Nextcloud bot 39ac804899
[tx-robot] updated from transifex 2017-03-23 01:07:52 +00:00
Nextcloud bot 528a903a7b
[tx-robot] updated from transifex 2017-03-20 01:07:43 +00:00
Nextcloud bot 5683365a2c
[tx-robot] updated from transifex 2017-03-17 01:07:41 +00:00
Nextcloud bot 4da6b7e796
[tx-robot] updated from transifex 2017-03-15 01:07:49 +00:00
Bjoern Schiessle e08c3f1b1d
add new routes for trusted servers which are more align with the other end-points
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-03-09 09:54:52 +01:00
Nextcloud bot 53195b156c
[tx-robot] updated from transifex 2017-03-02 16:48:52 +00:00
Nextcloud bot 97b6c1496e
[tx-robot] updated from transifex 2017-02-24 01:21:37 +00:00
Nextcloud bot d754227b4c
[tx-robot] updated from transifex 2017-02-21 01:08:46 +00:00
Nextcloud bot 7113af3f91
[tx-robot] updated from transifex 2017-02-14 01:07:20 +00:00
Nextcloud bot 88047aaea7
[tx-robot] updated from transifex 2017-02-13 01:07:10 +00:00
Nextcloud bot 01b3da612b
[tx-robot] updated from transifex 2017-02-11 01:07:23 +00:00
Nextcloud bot 1aba2d9ed8
[tx-robot] updated from transifex 2017-02-08 01:07:09 +00:00
Nextcloud bot fa96b9e356
[tx-robot] updated from transifex 2017-02-06 01:07:04 +00:00
Nextcloud bot 49bce91404
[tx-robot] updated from transifex 2017-02-03 01:07:21 +00:00
Nextcloud bot 1952560ac7
[tx-robot] updated from transifex 2017-02-01 01:06:57 +00:00
Nextcloud bot 9a13fac418
[tx-robot] updated from transifex 2017-01-31 01:07:05 +00:00
Nextcloud bot f4de328695
[tx-robot] updated from transifex 2017-01-29 01:06:55 +00:00
Nextcloud bot b614547ff8
[tx-robot] updated from transifex 2017-01-28 01:06:59 +00:00
Nextcloud bot c35ea15916
[tx-robot] updated from transifex 2017-01-11 15:20:22 +00:00
Nextcloud bot 4f9ff96f79
[tx-robot] updated from transifex 2017-01-09 08:24:58 +00:00
Nextcloud bot 0d24e5d5f9
[tx-robot] updated from transifex 2017-01-02 01:07:33 +00:00
Nextcloud bot fc02564ea6
[tx-robot] updated from transifex 2016-12-30 01:07:28 +00:00
Nextcloud bot 52b734b3e4
[tx-robot] updated from transifex 2016-12-29 01:07:59 +00:00
Nextcloud bot b399ad2fee
[tx-robot] updated from transifex 2016-12-28 01:07:41 +00:00
Nextcloud bot 3fc4e1b5b9
[tx-robot] updated from transifex 2016-12-26 01:09:23 +00:00
Thomas Müller b19aad88fb
No challenge within federated auth
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 15:48:10 +01:00
Joas Schilling edec1fafe7
Update app versions and requirements
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-13 20:41:55 +01:00
Nextcloud bot 4ca7f9c896
[tx-robot] updated from transifex 2016-12-01 01:07:17 +00:00
Nextcloud bot f075c22c72
[tx-robot] updated from transifex 2016-11-30 14:18:08 +00:00
Nextcloud bot 41dcceeb35
[tx-robot] updated from transifex 2016-11-30 01:07:16 +00:00
Nextcloud bot e8ea9a5d27
[tx-robot] updated from transifex 2016-11-29 01:06:47 +00:00
Nextcloud bot 4e682d4113
[tx-robot] updated from transifex 2016-11-28 01:06:56 +00:00
Nextcloud bot 9788cf04ee
[tx-robot] updated from transifex 2016-11-27 01:07:08 +00:00
Nextcloud bot 8f4ec8583d
[tx-robot] updated from transifex 2016-11-26 01:06:57 +00:00
Joas Schilling fbd574cc82
Fix some language issues in the federation admin panel
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-24 09:34:06 +01:00
Nextcloud bot ba9b17c906
[tx-robot] updated from transifex 2016-11-21 01:06:58 +00:00
Nextcloud bot 97af4f762d
[tx-robot] updated from transifex 2016-11-20 01:06:44 +00:00
Morris Jobke 310d60b585 Merge pull request #2064 from nextcloud/oc-26189
[downstream] Add submit button to validate the federated server,
2016-11-18 12:12:53 +01:00
Bjoern Schiessle 7df5c5db2d
don't add server automatically to trusted server
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-17 18:08:45 +01:00
Nextcloud bot ab18d2f55e
[tx-robot] updated from transifex 2016-11-17 01:07:02 +00:00
Lukas Reschke bc1008ac38
Use 11.0 instead 9.2
As discussed we're changing the version from 9.2 to 11.0 to make some more sense.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-15 14:45:58 +01:00
Felix Heidecke d4afccfeb0
Add submit button to validate the federated server,
fixes issue #25364
2016-11-09 14:27:05 +01:00
Nextcloud bot 20f45e6fe4
[tx-robot] updated from transifex 2016-11-01 01:06:57 +00:00