 Jens Pelzetter
|
f5b5e67b9c
|
Another conflict
|
2021-12-24 12:40:11 +01:00 |
|
Jens Pelzetter
|
c0a99d1f87
|
Updated .gitignore, update pom.xml
|
2021-12-24 12:38:16 +01:00 |
|
Jens Pelzetter
|
b97c1f142b
|
Merge branch 'master' of git.libreccm.org:LibreCCM/libreccm
Former-commit-id: fb0ec61409
|
2021-03-13 08:41:20 +01:00 |
Jens Pelzetter
|
06efe0a055
|
Fixed Wildfly version for all modules
Former-commit-id: 66c2bf54dc
|
2021-01-17 09:33:06 +01:00 |
|
Jens Pelzetter
|
cf87a905a6
|
Fix Wildfly version for tests
Former-commit-id: b5b39f5d31
|
2021-01-16 20:27:33 +01:00 |
|
jensp
|
1736d5bcff
|
Merge pull request 'mvc-theme-integration' (#8) from mvc-theme-integration into master
Reviewed-on: #8
|
2021-01-09 16:16:03 +01:00 |
|
jensp
|
5a380449be
|
Merge pull request 'mvc-theme-integration' (#8) from mvc-theme-integration into master
Reviewed-on: #8
Former-commit-id: 3a33be81bb
|
2021-01-09 16:16:03 +01:00 |
|
Jens Pelzetter
|
b700604399
|
Use MVC based login for MVC based admin application
|
2021-01-09 16:14:44 +01:00 |
|
Jens Pelzetter
|
8cd6162ccd
|
Use MVC based login for MVC based admin application
Former-commit-id: 83db8be9f5
|
2021-01-09 16:14:44 +01:00 |
|
Jens Pelzetter
|
d632003bbc
|
Minimales theme für login
|
2021-01-08 19:53:58 +01:00 |
|
Jens Pelzetter
|
15dc1d0fce
|
Minimales theme für login
Former-commit-id: af4873abfe
|
2021-01-08 19:53:58 +01:00 |
|
Jens Pelzetter
|
375e5eff65
|
JavaDoc for the integration of EE MVC and the themeing system
|
2021-01-07 20:18:19 +01:00 |
|
Jens Pelzetter
|
a07301082d
|
JavaDoc for the integration of EE MVC and the themeing system
Former-commit-id: 4f338ad224
|
2021-01-07 20:18:19 +01:00 |
|
Jens Pelzetter
|
32d5eed14d
|
More user friendly methods for getting template for ThemesMvc
|
2021-01-06 19:27:44 +01:00 |
|
Jens Pelzetter
|
6da18a1fdc
|
More user friendly methods for getting template for ThemesMvc
Former-commit-id: ae1a3447e3
|
2021-01-06 19:27:44 +01:00 |
|
Jens Pelzetter
|
4a5b38f42e
|
Logout Application
|
2021-01-06 17:13:40 +01:00 |
|
Jens Pelzetter
|
510a54921e
|
Logout Application
Former-commit-id: a6b157306e
|
2021-01-06 17:13:40 +01:00 |
|
Jens Pelzetter
|
8968057d6e
|
Small fixes for login app
|
2021-01-06 14:46:50 +01:00 |
|
Jens Pelzetter
|
707562de6e
|
Small fixes for login app
Former-commit-id: 1530cd74c8
|
2021-01-06 14:46:50 +01:00 |
|
Jens Pelzetter
|
5f155a754f
|
Integration of EE MVC and CCM themes
|
2021-01-05 19:21:23 +01:00 |
|
Jens Pelzetter
|
f02721df90
|
Integration of EE MVC and CCM themes
Former-commit-id: f0e152822d
|
2021-01-05 19:21:23 +01:00 |
|
Jens Pelzetter
|
5c2c4e583f
|
MVC theme integration
|
2021-01-04 19:46:13 +01:00 |
|
Jens Pelzetter
|
1f4bb8e2ae
|
MVC theme integration
Former-commit-id: 12d779b5d3
|
2021-01-04 19:46:13 +01:00 |
|
Jens Pelzetter
|
7378d34e9e
|
Merge branch 'master' into mvc-theme-integration
|
2020-12-24 12:03:41 +01:00 |
|
Jens Pelzetter
|
c8b14b0dbd
|
Merge branch 'master' into mvc-theme-integration
Former-commit-id: 7ca3c0b254
|
2020-12-24 12:03:41 +01:00 |
|
Jens Pelzetter
|
201a4bf038
|
Some bugfixes
|
2020-12-24 12:03:33 +01:00 |
|
Jens Pelzetter
|
6ccae78ab8
|
Some bugfixes
Former-commit-id: 8d3b72efee
|
2020-12-24 12:03:33 +01:00 |
|
Jens Pelzetter
|
a8a8ac3acf
|
Krazo Theme integration
|
2020-12-23 21:48:31 +01:00 |
|
Jens Pelzetter
|
3e6ccdb5c5
|
Krazo Theme integration
Former-commit-id: 7002ed7682
|
2020-12-23 21:48:31 +01:00 |
|
Jens Pelzetter
|
e025bd6108
|
Fixed test failures
|
2020-12-23 14:46:19 +01:00 |
|
Jens Pelzetter
|
47a7850de1
|
Fixed test failures
Former-commit-id: b6be86c5d6
|
2020-12-23 14:46:19 +01:00 |
|
Jens Pelzetter
|
efb5800f4c
|
Fixed dependencies for integration tests
|
2020-12-22 21:22:31 +01:00 |
|
Jens Pelzetter
|
c4db8573f2
|
Fixed dependencies for integration tests
Former-commit-id: 7565750ac0
|
2020-12-22 21:22:31 +01:00 |
|
Jens Pelzetter
|
90fa2b26ce
|
Fixed test failures due to missing dependencies
|
2020-12-21 17:42:55 +01:00 |
|
Jens Pelzetter
|
544a78f395
|
Fixed test failures due to missing dependencies
Former-commit-id: 17d8b48437
|
2020-12-21 17:42:55 +01:00 |
|
Jens Pelzetter
|
5c35ffda23
|
Controller for EE MVC based login app
|
2020-12-20 11:41:51 +01:00 |
|
Jens Pelzetter
|
f13dd4b4ec
|
Controller for EE MVC based login app
Former-commit-id: 8920bbb7c2
|
2020-12-20 11:41:51 +01:00 |
|
Jens Pelzetter
|
0a26ff3f25
|
Integration of Themes with MVC
|
2020-12-19 19:10:12 +01:00 |
|
Jens Pelzetter
|
ed15e4d16e
|
Integration of Themes with MVC
Former-commit-id: 9bbab62c8a
|
2020-12-19 19:10:12 +01:00 |
|
jensp
|
04d06586c5
|
Merge pull request 'ccm-admin' (#7) from ccm-admin into master
Reviewed-on: #7
|
2020-12-19 16:56:31 +01:00 |
|
jensp
|
dfc66b56a6
|
Merge pull request 'ccm-admin' (#7) from ccm-admin into master
Reviewed-on: #7
Former-commit-id: ebbf951981
|
2020-12-19 16:56:31 +01:00 |
|
Jens Pelzetter
|
e28f646702
|
Merge branch 'master' into ccm-admin
|
2020-12-19 16:53:56 +01:00 |
|
Jens Pelzetter
|
6d187c3434
|
Merge branch 'master' into ccm-admin
Former-commit-id: 24923b06e3
|
2020-12-19 16:53:56 +01:00 |
|
Jens Pelzetter
|
209ca41e5e
|
JavaDoc for Admin UI
|
2020-12-10 15:28:12 +01:00 |
|
Jens Pelzetter
|
4a209582f5
|
JavaDoc for Admin UI
Former-commit-id: ce299163ab
|
2020-12-10 15:28:12 +01:00 |
|
Jens Pelzetter
|
36bba3b9dc
|
Code cleanup
|
2020-12-09 20:26:03 +01:00 |
|
Jens Pelzetter
|
ba1cd8c49c
|
Code cleanup
Former-commit-id: 93c300df1d
|
2020-12-09 20:26:03 +01:00 |
|
Jens Pelzetter
|
0b3d03cae6
|
UI for Import/Export of entities
|
2020-12-09 20:19:39 +01:00 |
|
Jens Pelzetter
|
e6e6919b92
|
UI for Import/Export of entities
Former-commit-id: 8bddae0711
|
2020-12-09 20:19:39 +01:00 |
|
Jens Pelzetter
|
9537554149
|
Added a reload method to the interface of the AbstractImExporter class
|
2020-12-08 20:26:13 +01:00 |