 Björn Fromme
|
495e357baf
|
Merge branch 'hotfix/linebreak-fix' into develop
|
2021-03-04 12:15:11 +01:00 |
|
|
Björn Fromme
|
3b2db42a2f
|
Remove superflouos linebreak
|
2021-03-04 12:15:03 +01:00 |
|
|
Björn Fromme
|
e8f77be5dc
|
Merge branch 'release/2021.03-01' into develop
|
2021-03-04 12:08:04 +01:00 |
|
|
Björn Fromme
|
71711b1558
|
Merge branch 'release/2021.03-01'
|
2021-03-04 12:08:04 +01:00 |
|
|
Björn Fromme
|
5bff8955b6
|
Update project dependencies
|
2021-03-04 12:07:02 +01:00 |
|
|
Björn Fromme
|
d35b71e858
|
Adjust wording according to season
|
2021-03-04 12:03:46 +01:00 |
|
|
Björn Fromme
|
f84b77ccaa
|
Merge branch 'release/2021.01-03'
|
2021-02-05 08:23:44 +01:00 |
|
|
Björn Fromme
|
fbbab43948
|
Improve backend module layout, remove buttons, add sysinfo
|
2021-02-05 08:22:35 +01:00 |
|
|
Björn Fromme
|
33dd713016
|
Merge branch 'develop'
|
2021-02-04 21:15:01 +01:00 |
|
|
Björn Fromme
|
407e625aa9
|
Improve timetamp parsing, update date of last import in backend
|
2021-02-04 21:14:51 +01:00 |
|
|
Björn Fromme
|
d66cf8f838
|
Merge branch 'release/2021.01-02'
|
2021-02-04 21:03:42 +01:00 |
|
|
Björn Fromme
|
c8964e4ec6
|
Merge branch 'release/2021.01-02' into develop
|
2021-02-04 21:03:42 +01:00 |
|
|
Björn Fromme
|
2a28ff79cf
|
Update project dependencies
|
2021-02-04 21:03:34 +01:00 |
|
|
Björn Fromme
|
fe9369614e
|
Merge branch 'feature/auto-import' into develop
|
2021-02-04 21:01:55 +01:00 |
|
|
Björn Fromme
|
753dcc98b6
|
Extend ddev config for ssh access
|
2021-02-04 21:01:42 +01:00 |
|
|
Björn Fromme
|
120a5480f7
|
Implement automatic xml import controlled by uploaded timestamp files
|
2021-02-04 21:01:26 +01:00 |
|
|
Björn Fromme
|
87b380e06d
|
Merge branch 'release/2021.01-01'
|
2021-01-21 09:41:24 +01:00 |
|
|
Björn Fromme
|
5543fbcb7a
|
Merge branch 'release/2021.01-01' into develop
|
2021-01-21 09:41:24 +01:00 |
|
|
Björn Fromme
|
5a655d42b8
|
Update project dependencies
|
2021-01-21 09:41:17 +01:00 |
|
|
Björn Fromme
|
e602bcde74
|
Revoke parsing of products index xml file
|
2021-01-21 09:37:11 +01:00 |
|
|
Björn Fromme
|
1fa6dea2d2
|
Merge branch 'hotfix/api-fix'
|
2021-01-14 18:05:13 +01:00 |
|
|
Björn Fromme
|
cf5e8af576
|
Merge branch 'hotfix/api-fix' into develop
|
2021-01-14 18:05:13 +01:00 |
|
|
Björn Fromme
|
63ad4d2dbe
|
Adjust form values to meet api expectations
|
2021-01-14 18:05:03 +01:00 |
|
|
Björn Fromme
|
552d74b85b
|
Merge branch 'release/2020.12-01'
|
2020-12-04 14:57:15 +01:00 |
|
|
Björn Fromme
|
7176be81c7
|
Merge branch 'release/2020.12-01' into develop
|
2020-12-04 14:57:15 +01:00 |
|
|
Björn Fromme
|
39378b5edf
|
Update project dependencies
|
2020-12-04 14:57:10 +01:00 |
|
|
Björn Fromme
|
9b500e0406
|
Adjust booking list styles and content
|
2020-12-04 14:56:07 +01:00 |
|
|
Björn Fromme
|
56e5f1218e
|
Close myep mobile navigation on click
|
2020-12-04 14:55:47 +01:00 |
|
|
Björn Fromme
|
d2fe86e714
|
Merge branch 'hotfix/myep-balance-calculation'
|
2020-12-04 09:54:43 +01:00 |
|
|
Björn Fromme
|
16345c7359
|
Merge branch 'hotfix/myep-balance-calculation' into develop
|
2020-12-04 09:54:43 +01:00 |
|
|
Björn Fromme
|
77ddb73f61
|
Fix incorrect balance display
|
2020-12-04 09:54:39 +01:00 |
|
|
Björn Fromme
|
b3027f7c4b
|
Merge branch 'release/2020.11-04'
|
2020-12-01 11:51:58 +01:00 |
|
|
Björn Fromme
|
5a78fbb3b6
|
Merge branch 'release/2020.11-04' into develop
|
2020-12-01 11:51:58 +01:00 |
|
|
Björn Fromme
|
49a1c9e350
|
Update project dependencies
|
2020-12-01 11:51:52 +01:00 |
|
|
Björn Fromme
|
ec7a6f5aed
|
Streamline text- and textpic/media templates
|
2020-12-01 11:50:29 +01:00 |
|
|
Björn Fromme
|
7012d77429
|
Adjust text
|
2020-11-20 14:34:05 +01:00 |
|
|
Björn Fromme
|
e3b0a7ac9e
|
Merge branch 'hotfix/myep-overzealous-router-guard' into develop
|
2020-11-19 09:37:07 +01:00 |
|
|
Björn Fromme
|
fc938959be
|
Merge branch 'hotfix/myep-overzealous-router-guard'
|
2020-11-19 09:37:07 +01:00 |
|
|
Björn Fromme
|
564f4e6c8f
|
Remove guard from router
|
2020-11-19 09:37:03 +01:00 |
|
|
Björn Fromme
|
4a0ed52e54
|
Merge branch 'develop'
|
2020-11-17 16:34:02 +01:00 |
|
|
Björn Fromme
|
1e5fa40241
|
Allow editing of booked accommodation by group managers only
|
2020-11-17 16:33:36 +01:00 |
|
|
Björn Fromme
|
88df399da6
|
Allow booking editing by all customers
|
2020-11-17 16:33:20 +01:00 |
|
|
Björn Fromme
|
1522758f2d
|
Merge branch 'hotfix/node-modules-sync'
|
2020-11-17 12:08:52 +01:00 |
|
|
Björn Fromme
|
8ed5bfa401
|
Merge branch 'hotfix/node-modules-sync' into develop
|
2020-11-17 12:08:52 +01:00 |
|
|
Björn Fromme
|
7fa75f0735
|
Update build tools
|
2020-11-17 12:08:48 +01:00 |
|
|
Björn Fromme
|
84132d90b7
|
Merge branch 'release/2020.11-03'
|
2020-11-17 12:02:08 +01:00 |
|
|
Björn Fromme
|
111576d6fb
|
Merge branch 'release/2020.11-03' into develop
|
2020-11-17 12:02:08 +01:00 |
|
|
Björn Fromme
|
b9b7b600d6
|
Update project dependencies
|
2020-11-17 12:02:00 +01:00 |
|
|
Björn Fromme
|
895ad712df
|
Merge branch 'hotfix/nullpointer-exception-fix'
|
2020-11-17 11:59:29 +01:00 |
|
|
Björn Fromme
|
fe56b08672
|
Merge branch 'hotfix/nullpointer-exception-fix' into develop
|
2020-11-17 11:59:29 +01:00 |
|