Commit Graph

3709 Commits (c65c182e1486415d9ddf95d5dda6be396a23618a)
 

Author SHA1 Message Date
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
Jens Pelzetter e1137ae2e9 Added a reload method to the interface of the AbstractImExporter class
Former-commit-id: 6fd4e177cf
2020-12-08 20:26:13 +01:00
Jens Pelzetter 210c0e08bb Aktueller Stand ImExport UI 2020-12-05 19:36:39 +01:00
Jens Pelzetter 1ddff7a54a Aktueller Stand ImExport UI
Former-commit-id: 0acc7f17b4
2020-12-05 19:36:39 +01:00
Jens Pelzetter 39358f6c02 Form for configuring export 2020-12-03 21:10:31 +01:00
Jens Pelzetter c3f1c74890 Form for configuring export
Former-commit-id: beef038b62
2020-12-03 21:10:31 +01:00
Jens Pelzetter f9a129cd39 Bugfix 2020-12-03 21:10:14 +01:00
Jens Pelzetter b987fd763d Bugfix
Former-commit-id: a539740f3c
2020-12-03 21:10:14 +01:00
Jens Pelzetter 20ba08580a Constructor of EntityImExporterTreeNode is now protected 2020-12-03 20:31:26 +01:00
Jens Pelzetter b6b7d61b90 Constructor of EntityImExporterTreeNode is now protected
Former-commit-id: ff5d2b1390
2020-12-03 20:31:26 +01:00
Jens Pelzetter 2489599372 EntityImExporterTreeNode.java is now public 2020-12-03 20:30:48 +01:00
Jens Pelzetter ecf238b7a3 EntityImExporterTreeNode.java is now public
Former-commit-id: 73c140894d
2020-12-03 20:30:48 +01:00
Jens Pelzetter 1887deda67 Code formatting 2020-12-03 20:29:06 +01:00
Jens Pelzetter 6eeff4a464 Code formatting
Former-commit-id: 24cc42167b
2020-12-03 20:29:06 +01:00
Jens Pelzetter c363b8cd43 Some bugfixes 2020-12-03 20:27:16 +01:00
Jens Pelzetter 96163f44fc Some bugfixes
Former-commit-id: 5dd6009aef
2020-12-03 20:27:16 +01:00
Jens Pelzetter bd0ccd0ae6 Im/Exporter for ContentSections 2020-12-03 20:26:50 +01:00
Jens Pelzetter 7e760cc9d0 Im/Exporter for ContentSections
Former-commit-id: f9e8311694
2020-12-03 20:26:50 +01:00
Jens Pelzetter 5caacee0e8 Some initial work for im/export ui 2020-12-02 20:06:04 +01:00
Jens Pelzetter d3c0a322b3 Some initial work for im/export ui
Former-commit-id: 6313ef9ab2
2020-12-02 20:06:04 +01:00
Jens Pelzetter dbdc197738 Typo 2020-12-01 20:43:09 +01:00
Jens Pelzetter dacca9c2a5 Typo
Former-commit-id: 943caf71f4
2020-12-01 20:43:09 +01:00
Jens Pelzetter b3e28eade1 Theme Management via Admin UI 2020-12-01 20:42:52 +01:00
Jens Pelzetter e00a9e42b3 Theme Management via Admin UI
Former-commit-id: 228691d540
2020-12-01 20:42:52 +01:00