This repository has been archived on 2026-04-03. You can view files and clone it, but you cannot make any changes to it's state, such as pushing and creating new issues, pull requests or comments.

Henrik Hautakoski 4b750f0f37 Merge branch 'dev' into 31-admin-user-management ... # Conflicts: # app/forms/UserSettings.php		2022-08-08 23:37:44 +02:00
..
backend	Merge branch 'dev' into 31-admin-user-management	2022-08-08 23:37:44 +02:00
ApiController.php	app/controllers/UserController.php: move activateLinkAction() to ApiController	2018-09-30 23:12:08 +02:00
AuthController.php	app/controllers/AuthController.php: No need to set event manager anymore	2022-07-26 21:06:16 +02:00
CallbackController.php	Update pagination api.	2022-07-26 21:09:36 +02:00
ControllerBase.php	app/controllers/ControllerBase.php: fixing autocomplete.	2018-08-14 21:17:19 +02:00
ErrorController.php	app/views/error/show404.volt: adding some weird message.	2018-06-13 21:52:45 +02:00
IndexController.php	app/controllers: Fixing namespace.	2018-04-02 12:17:10 +02:00
UserController.php	app/controllers/UserController.php: typofix, should be paginate() and not pageinate()	2022-08-01 21:46:24 +02:00