Commit Graph

45 Commits

Author SHA1 Message Date
Roeland Jago Douma fa9dfd83c9
Fix AppFramework services
* We can't just register an alias as the services need the appId to be
  injected. if we just register an alias this blows up since the main
  container doesn't have the appId.
* Moved the Authtokens over to show the PoC works

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-07-14 16:01:14 +02:00
Joas Schilling 6e46df26a8
Unify settings middleware with others
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-06-23 20:18:38 +02:00
Joas Schilling 817eff6cbf
Remove old unit tests as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-06-06 11:11:11 +02:00
Joas Schilling 7dcb1cdb42
Remove controller and routes which have no UI component anyway
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-06-04 10:41:08 +02:00
Jan-Christoph Borchardt e981669e89
Fix notification mail tests
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2020-05-01 03:00:42 +02:00
Christoph Wurst cb057829f7
Update license headers for 19
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-29 11:57:22 +02:00
Roeland Jago Douma 2fc35d10e4
Added trailing space
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-04-18 10:26:35 +02:00
John Molakvoæ 36f9ad32f2
Merge pull request #20447 from liamjack/fix/13287/welcome_email
Increase max-height on button in welcome email template
2020-04-17 09:42:49 +02:00
Roeland Jago Douma bb4dedb015
Provide the proper language to the mailer
Else we can't properly translate the footer in the recipients e-mail
language.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-04-16 09:04:13 +02:00
Liam JACK 301335e9e1
Fix #13287 - Increase max-height on button in welcome email template
Signed-off-by: Liam JACK <liamjack@users.noreply.github.com>
2020-04-12 13:07:16 +02:00
Christoph Wurst caff1023ea
Format control structures, classes, methods and function
To continue this formatting madness, here's a tiny patch that adds
unified formatting for control structures like if and loops as well as
classes, their methods and anonymous functions. This basically forces
the constructs to start on the same line. This is not exactly what PSR2
wants, but I think we can have a few exceptions with "our" style. The
starting of braces on the same line is pracrically standard for our
code.

This also removes and empty lines from method/function bodies at the
beginning and end.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-10 14:19:56 +02:00
Christoph Wurst f4c09f299d
Make sure there is exactly one newline after imports
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 16:14:31 +02:00
Christoph Wurst 44577e4345
Remove trailing and in between spaces
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 16:07:47 +02:00
Christoph Wurst afbd9c4e6e
Unify function spacing to PSR2 recommendation
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 13:54:22 +02:00
Christoph Wurst 41b5e5923a
Use exactly one empty line after the namespace declaration
For PSR2

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 11:48:10 +02:00
Christoph Wurst 2fbad1ed72
Fix (array) indent style to always use one tab
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 10:16:08 +02:00
Joas Schilling bc6a5ef5c4
Merge pull request #19890 from nextcloud/enh/comments-reference-id
Add optional comments reference_id
2020-04-02 11:34:21 +02:00
Christoph Wurst 1a9330cd69
Update the license headers for Nextcloud 19
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-03-31 14:52:54 +02:00
Joas Schilling 720dc4e93d
Add optional column oc_comments.reference_id
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-03-31 10:51:15 +02:00
Christoph Wurst 463b388589
Merge pull request #20170 from nextcloud/techdebt/remove-unused-imports
Remove unused imports
2020-03-27 17:14:08 +01:00
Christoph Wurst b80ebc9674
Use the short array syntax, everywhere
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-03-26 16:34:56 +01:00
Christoph Wurst 2ee65f177e
Use the shorter phpunit syntax for mocked return values
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-03-25 22:21:27 +01:00
Christoph Wurst 74936c49ea
Remove unused imports
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-03-25 22:08:08 +01:00
Roeland Jago Douma 3b26bfe879
Merge pull request #20127 from nextcloud/bugfix/noid/check-user-on-remote-wipe
Check the user on remote wipe
2020-03-24 20:26:52 +01:00
Roeland Jago Douma b0ea022a3e
Add basic reverseproxy misconfig detection to setupchecks
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-03-23 10:37:08 +01:00
Julius Härtl 47271e56ee Fix tests due to config adjustments
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-03-20 10:46:13 +01:00
Joas Schilling dc7913efcd
Fix recursive calls in logging via server methods
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-03-18 18:59:49 +01:00
Joas Schilling 9935c71ec3
Check the user on remote wipe
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-03-16 09:29:28 +01:00
Julius Härtl dbd63222c8
Add system config flag to manually set that a subscription is available
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-03-10 14:31:27 +01:00
Joas Schilling f464f2313f
Fix unit tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-02-10 10:14:02 +01:00
Daniel Kesselberg 29fede5fe5
Update test to pass l10n instead of factory
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2020-02-03 10:31:23 +01:00
Roeland Jago Douma bfaf3fff33
Move Admin Settings also to info.xml
More cleanup of the Settings apps. Makes the manager cleaner and a
proper manager.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-01-31 16:55:17 +01:00
Roeland Jago Douma c9253cce6c
Move personal settings to proper registration
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-01-30 22:06:28 +01:00
Roeland Jago Douma dc1979903e
Move password settings
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-01-30 14:03:28 +01:00
Roeland Jago Douma 391a368557
Move the personal 2FA settings to its own app
Small isolated classes are easier to understand and to maintain!
Another step in the cleaning up of the settings. So that adding new
stuff later is easier.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-01-29 20:37:47 +01:00
Roeland Jago Douma 34426a481f
Move can create token logic
It makes sense to have this in the actual authtoken settings. As well.
This is where it is used.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-01-29 15:57:59 +01:00
Christoph Wurst 5bf3d1bb38
Update license headers
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-12-05 15:38:45 +01:00
Roeland Jago Douma 62dc320191
Merge pull request #17725 from nextcloud/enh/share_exp_internal
Allow internal shares to have a default expiration date
2019-11-28 08:37:19 +01:00
Roeland Jago Douma 3a7cf40aaa
Mode to modern phpunit
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-11-27 15:27:18 +01:00
Roeland Jago Douma 078f4efb20
Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-11-27 14:51:14 +01:00
Roeland Jago Douma 3aa5f105fa
Fix more tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-11-27 13:34:41 +01:00
Roeland Jago Douma c007ca624f
Make phpunit8 compatible
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-11-27 13:34:41 +01:00
Roeland Jago Douma 68748d4f85
Some php-cs fixes
* Order the imports
* No leading slash on imports
* Empty line before namespace
* One line per import
* Empty after imports
* Emmpty line at bottom of file

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-11-22 20:52:10 +01:00
Sergej Nikolaev 9aa992e60b
fix updating and deleting authtokens
Signed-off-by: Sergej Nikolaev <kinolaev@gmail.com>
2019-10-05 10:28:47 +02:00
Christoph Wurst de6940352a Move settings to an app
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2019-09-28 09:39:28 +00:00