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
..
assets	Merge branch 'dev' into 31-admin-user-management	2022-08-08 23:37:44 +02:00
config	app/config/routes.yml: Adding backend-user-new route	2022-07-24 23:05:00 +02:00
controllers	Merge branch 'dev' into 31-admin-user-management	2022-08-08 23:37:44 +02:00
forms	Merge branch 'dev' into 31-admin-user-management	2022-08-08 23:37:44 +02:00
library	app/library/Form.php: Update classes to bootstrap 5.2.0	2022-08-02 12:52:22 +02:00
listeners	app/listeners/ActivityLog.php: update _log() to phalcon4 model api.	2022-07-26 20:40:53 +02:00
migrations	migration: 20181003134001_user_type.php	2018-12-29 15:24:23 +01:00
models/Data	Merge branch 'dev' into 31-admin-user-management	2022-08-08 23:37:44 +02:00
modules	Phalcon\DiInterface is renamed to Phalcon\Di\DiInterface	2022-07-26 19:58:50 +02:00
templates/mail	adding app/templates/mail/account_activation.volt	2018-09-25 22:25:13 +00:00
views	Merge branch 'dev' into 31-admin-user-management	2022-08-08 23:37:44 +02:00