 Björn Fromme
|
e921a12e77
|
Adjust headline in sidebar facts box
|
2021-08-31 16:40:00 +02:00 |
|
|
Björn Fromme
|
024d5849ff
|
Merge branch 'hotfix/import-fix' into develop
|
2021-08-31 16:23:56 +02:00 |
|
|
Björn Fromme
|
d252471900
|
Use proper operator
|
2021-08-31 16:23:53 +02:00 |
|
|
Björn Fromme
|
856dbe81d8
|
Improve failure tolerance of contingent import service
|
2021-08-28 09:59:38 +02:00 |
|
|
Björn Fromme
|
349b82d6e6
|
Merge branch 'hotfix/grups-price-fix'
|
2021-08-23 17:15:03 +02:00 |
|
|
Björn Fromme
|
cdd3266f3f
|
Merge branch 'hotfix/grups-price-fix' into develop
|
2021-08-23 17:15:03 +02:00 |
|
|
Björn Fromme
|
7c26bc29aa
|
Fix another use of improper total pax value in groups price calculator
|
2021-08-23 17:15:00 +02:00 |
|
|
Björn Fromme
|
6757955cdb
|
Merge branch 'hotfix/groups-price-fix' into develop
|
2021-08-23 16:28:06 +02:00 |
|
|
Björn Fromme
|
277926663f
|
Merge branch 'hotfix/groups-price-fix'
|
2021-08-23 16:28:05 +02:00 |
|
|
Björn Fromme
|
1bd801e977
|
Use propert total pax value for running costs calculation
|
2021-08-23 16:28:01 +02:00 |
|
|
Björn Fromme
|
cfb9bc501c
|
Merge branch 'hotfix/contingent-import-fix' into develop
|
2021-08-23 16:13:07 +02:00 |
|
|
Björn Fromme
|
28c2ce46cd
|
Merge branch 'hotfix/contingent-import-fix'
|
2021-08-23 16:13:07 +02:00 |
|
|
Björn Fromme
|
54c683702c
|
Use room config of linked product on contingent import
|
2021-08-23 16:13:01 +02:00 |
|
|
Björn Fromme
|
6a3c4d92ea
|
Respect contingents of linked products
|
2021-08-23 15:58:30 +02:00 |
|
|
Björn Fromme
|
18394fa298
|
Translate button
|
2021-08-20 14:53:24 +02:00 |
|
|
Björn Fromme
|
e1fda8981c
|
Revoke translation of buttons
This reverts commit 14a114ebd7, reversing
changes made to c40b25c812.
|
2021-08-20 14:50:59 +02:00 |
|
|
Björn Fromme
|
14a114ebd7
|
Merge branch 'develop'
|
2021-08-20 14:43:07 +02:00 |
|
|
Björn Fromme
|
9aaf5708dc
|
Translate button
|
2021-08-20 14:42:57 +02:00 |
|
|
Björn Fromme
|
c40b25c812
|
Merge branch 'release/2021.08-03'
|
2021-08-18 19:02:58 +02:00 |
|
|
Björn Fromme
|
ebb9214586
|
Refactor import service to consider linked contingents
|
2021-08-18 19:02:38 +02:00 |
|
|
Björn Fromme
|
aca2180e41
|
Update project dependencies
|
2021-08-18 18:11:13 +02:00 |
|
|
Björn Fromme
|
b9de11315a
|
Fix weird link rendering in content teasers
|
2021-08-18 16:21:02 +02:00 |
|
|
Björn Fromme
|
0be0b484ed
|
Switch to nginx in ddev
|
2021-08-12 17:40:58 +02:00 |
|
|
Björn Fromme
|
258b9ed397
|
Merge branch 'release/2021.08-02'
|
2021-08-12 15:26:59 +02:00 |
|
|
Björn Fromme
|
eacae66fe0
|
Merge branch 'release/2021.08-02' into develop
|
2021-08-12 15:26:59 +02:00 |
|
|
Björn Fromme
|
3995303eb7
|
Update project dependencies
|
2021-08-12 15:26:53 +02:00 |
|
|
Björn Fromme
|
97e090b556
|
Remove problematic tca settings
|
2021-08-12 15:25:01 +02:00 |
|
|
Björn Fromme
|
a05675d6cf
|
Merge branch 'develop'
|
2021-08-10 09:51:21 +02:00 |
|
|
Björn Fromme
|
fd6a6061c7
|
Mention bonus card when included
|
2021-08-10 09:51:12 +02:00 |
|
|
Björn Fromme
|
d0ffdf0efd
|
Merge branch 'release/2021.08-01'
|
2021-08-09 17:56:10 +02:00 |
|
|
Björn Fromme
|
2e564558e8
|
Merge branch 'release/2021.08-01' into develop
|
2021-08-09 17:56:10 +02:00 |
|
|
Björn Fromme
|
b56cb828d5
|
Update project dependencies
|
2021-08-09 17:56:04 +02:00 |
|
|
Björn Fromme
|
686d3996e2
|
Add option to render teasers of additional concepts in detail view
|
2021-08-09 17:54:28 +02:00 |
|
|
Björn Fromme
|
27fffdbf00
|
Merge branch 'develop'
|
2021-08-09 17:36:00 +02:00 |
|
|
Björn Fromme
|
fc42801c8a
|
Add age range based prices to groups price config
|
2021-08-09 17:34:58 +02:00 |
|
|
Björn Fromme
|
3916dede50
|
Update editorconfig for vue files
|
2021-08-09 17:34:27 +02:00 |
|
|
Björn Fromme
|
8182326d28
|
Update package.json to new format
|
2021-08-09 11:21:52 +02:00 |
|
|
Björn Fromme
|
2d05435ea1
|
Merge branch 'develop'
|
2021-07-27 14:06:39 +02:00 |
|
|
Björn Fromme
|
a6834e0e8c
|
Fix xml-import using incorrect attribute
|
2021-07-27 14:05:57 +02:00 |
|
|
Björn Fromme
|
e1f311932d
|
Merge branch 'release/2021.07-01'
|
2021-07-15 11:19:49 +02:00 |
|
|
Björn Fromme
|
5936538f2a
|
Merge branch 'release/2021.07-01' into develop
|
2021-07-15 11:19:49 +02:00 |
|
|
Björn Fromme
|
a9974d6559
|
Update project dependencies
|
2021-07-15 11:19:43 +02:00 |
|
|
Björn Fromme
|
7c6a8302df
|
Fix incorrect path of included pagets file
|
2021-07-15 11:13:16 +02:00 |
|
|
Björn Fromme
|
eb1179a020
|
Fix error caused by removed option
|
2021-07-15 11:10:05 +02:00 |
|
|
Björn Fromme
|
b81fb124b2
|
Merge branch 'hotfix/ical-fix'
|
2021-06-29 10:59:57 +02:00 |
|
|
Björn Fromme
|
3a7f4bef5f
|
Merge branch 'hotfix/ical-fix' into develop
|
2021-06-29 10:59:57 +02:00 |
|
|
Björn Fromme
|
0b87a113e3
|
Adopt changes in contingents service
|
2021-06-29 10:59:53 +02:00 |
|
|
Björn Fromme
|
74114e27e2
|
Add missing form field label
|
2021-06-29 10:22:18 +02:00 |
|
|
Björn Fromme
|
be723046c6
|
Merge branch 'hotfix/form-field-label'
|
2021-06-29 10:22:07 +02:00 |
|
|
Björn Fromme
|
5514c68ee1
|
Add missing form field label
|
2021-06-29 10:21:37 +02:00 |
|