Commit Graph
100 Commits
Author SHA1 Message Date
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
Björn Fromme 87d1bfc280 Merge branch 'hotfix/return-value-fix' into develop 2021-06-26 15:39:11 +02:00
Björn Fromme 8a69b6047a Merge branch 'hotfix/return-value-fix' 2021-06-26 15:39:11 +02:00
Björn Fromme c90c38dcab Use proper return value in cli commands 2021-06-26 15:39:07 +02:00
Björn Fromme 511a760bf4 Merge branch 'hotfix/regression-fix' into develop 2021-06-26 15:27:06 +02:00
Björn Fromme 7253508791 Merge branch 'hotfix/regression-fix' 2021-06-26 15:27:06 +02:00
Björn Fromme a78f53e1e0 Adjust leftover code 2021-06-26 15:27:01 +02:00
Björn Fromme ee504df45b Merge branch 'release/2021.06-02' into develop 2021-06-26 15:22:02 +02:00
Björn Fromme cdf610fb3f Merge branch 'release/2021.06-02' 2021-06-26 15:22:02 +02:00
Björn Fromme 36e8e7d92d Update project dependencies 2021-06-26 15:21:49 +02:00
Björn Fromme 45365a4872 Use hotel uid in groups.swiss export command, code cleanup 2021-06-26 15:20:13 +02:00
Björn Fromme 3a9ed0bb81 Merge branch 'hotfix/myep-list-style' 2021-06-16 12:43:07 +02:00
Björn Fromme 9ae808e305 Merge branch 'hotfix/myep-list-style' into develop 2021-06-16 12:43:07 +02:00
Björn Fromme f7a9aa7b3a Use tailwind css classes to style surcharges list 2021-06-16 12:43:04 +02:00
Björn Fromme 2159c7277e Merge branch 'develop' 2021-06-16 12:31:20 +02:00
Björn Fromme fef5af6faa Adopt changes in MyE&P 2021-06-16 12:31:10 +02:00
Björn Fromme 9577e954b1 Merge branch 'develop' 2021-06-15 18:47:21 +02:00
Björn Fromme 2a7c9290dd Adopt changes in MyE&P 2021-06-15 18:47:08 +02:00
Björn Fromme 6c782bf960 Merge branch 'develop' 2021-06-09 16:18:16 +02:00
Björn Fromme ad82781031 Split groups.swiss task into separate console commands to spread load 2021-06-09 16:17:38 +02:00
Björn Fromme 2fe512af6e Merge branch 'develop' 2021-06-08 18:02:55 +02:00
Björn Fromme 95b3ebae5e Improve settings utility 2021-06-08 18:02:45 +02:00
Björn Fromme ea0f900e5b Merge branch 'develop' 2021-06-08 17:44:48 +02:00
Björn Fromme 244cbd7002 Add logging 2021-06-08 17:44:33 +02:00
Björn Fromme b4e7179e8d Add ignored room types 2021-06-08 17:44:20 +02:00
Björn Fromme d9330c2a17 Fix incorrect update requirement detection 2021-06-08 17:44:03 +02:00
Björn Fromme dacc22d334 Adopt changed method signature 2021-06-08 17:30:34 +02:00
Björn Fromme b0884462f0 Merge branch 'develop' 2021-06-08 16:50:17 +02:00
Björn Fromme dc73a5af59 Improve contingent import reliability 2021-06-08 16:50:06 +02:00
Björn Fromme 51ea80d219 Fix cachetool config by adding missing argument 2021-06-08 15:12:36 +02:00
Björn Fromme e7d6e80337 Update browserslist 2021-06-08 15:09:21 +02:00
Björn Fromme 9f24ff77ac Merge branch 'release/2021.06-01' 2021-06-08 14:58:37 +02:00
Björn Fromme 214d7cd494 Merge branch 'release/2021.06-01' into develop 2021-06-08 14:58:37 +02:00
Björn Fromme db1e07197a Update project dependencies 2021-06-08 14:58:25 +02:00
Björn Fromme 2cbaa305eb Fix failing contingent calculation due to missing typecast 2021-06-08 14:54:06 +02:00
Björn Fromme c1e3a4daa3 Update local copy of prod htaccess file 2021-05-17 12:12:12 +02:00
Björn Fromme ff68e6e264 Merge branch 'release/2021.04-01' 2021-04-23 13:50:38 +02:00
Björn Fromme 8e3be1a6f5 Mention short-term price addon in email 2021-04-23 13:49:14 +02:00
Björn Fromme d0c67564b6 Update project dependencies 2021-04-22 12:10:46 +02:00
Björn Fromme 9fb9556d92 Update ddev config 2021-04-22 10:53:03 +02:00
Björn Fromme 7ed8105a24 Merge branch 'develop' 2021-03-31 14:56:19 +02:00
Björn Fromme 571bba47f1 Replace available contingents with actual booked contingents 2021-03-31 14:55:55 +02:00
Björn Fromme cdf4c02f05 Merge branch 'release/2021.03-02' 2021-03-23 09:32:42 +01:00
Björn Fromme 51ea9bb4ac Merge branch 'release/2021.03-02' into develop 2021-03-23 09:32:42 +01:00
Björn Fromme 55cc22e955 Update project dependencies 2021-03-23 09:32:36 +01:00
Björn Fromme a00ed3bc1c Merge branch 'hotfix/deployer-config' 2021-03-05 11:37:27 +01:00
Björn Fromme b5a2dc2c97 Merge branch 'hotfix/deployer-config' into develop 2021-03-05 11:37:27 +01:00
Björn Fromme a813b5899f Tune deployer config to be more efficient 2021-03-05 11:37:23 +01:00
Björn Fromme 9ec053588a Deploy using rsync 2021-03-04 17:17:05 +01:00
Björn Fromme 803fc4c841 Adjust deployer config for GitHub actions 2021-03-04 17:07:54 +01:00
Björn Fromme 156f7e25d4 Add github action for deployment 2021-03-04 17:02:17 +01:00
Björn Fromme 495e357baf Merge branch 'hotfix/linebreak-fix' into develop 2021-03-04 12:15:11 +01:00
Björn Fromme b553be5039 Merge branch 'hotfix/linebreak-fix' 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