Commit Graph
100 Commits
Author SHA1 Message Date
Björn Fromme a8b8ac7df1 Merge tag '2019.12-05' into develop
2019.12-05 2019.12-05
2019-12-13 09:56:52 +01:00
Björn Fromme a0c4bfe3e7 Merge branch 'release/2019.12-05' 2019-12-13 09:56:51 +01:00
Björn Fromme 11959b39e7 Update project dependencies 2019-12-13 09:56:41 +01:00
Björn Fromme ed188acc4f Merge branch 'feature/snowzone-brand-update' into develop 2019-12-13 09:55:34 +01:00
Björn Fromme 8af60e9ed6 Adjust colors 2019-12-13 09:54:44 +01:00
Björn Fromme 70cb73a664 Merge branch 'master' into develop 2019-12-12 18:46:45 +01:00
Björn Fromme 5093fdf672 Replace logo image 2019-12-11 16:14:35 +01:00
Björn Fromme 4b7657eced Merge branch 'hotfix/remove-canonical' 2019-12-11 10:08:46 +01:00
Björn Fromme 20a17df8ba Remove superflouos and even damaging hardcoded canonical url 2019-12-11 10:08:41 +01:00
Björn Fromme 20c990beac Testdrive new logo and colors 2019-12-10 16:49:08 +01:00
Björn Fromme 4223f0f18a Merge branch 'master' into develop 2019-12-10 16:22:56 +01:00
Björn Fromme 993bc0a90c Merge branch 'hotfix/add-timezone' 2019-12-10 16:22:55 +01:00
Björn Fromme 23691da262 Add global timezone to ical feed 2019-12-10 16:22:51 +01:00
Björn Fromme e64facbd6f Properly detect blocked contingents 2019-12-05 14:43:07 +01:00
Björn Fromme f0959b47e8 Merge branch 'release/2019.12-04' 2019-12-05 14:35:22 +01:00
Björn Fromme cd0fe5c3ad Merge tag '2019.12-04' into develop
2019.12-04 2019.12-04
2019-12-05 14:35:22 +01:00
Björn Fromme d947f4548f Adjust ical service to respect blocked contingents 2019-12-05 14:34:18 +01:00
Björn Fromme ca0a0adaae Code cleanup 2019-12-04 17:48:02 +01:00
Björn Fromme 23ae4db820 Refactor ical action to dedicated controller, add route enhancer 2019-12-04 14:05:13 +01:00
Björn Fromme 51570b2300 Merge branch 'master' into develop 2019-12-04 13:32:37 +01:00
Björn Fromme dfec31a8c0 Merge branch 'hotfix/percentage-calculation-fail' 2019-12-04 13:32:37 +01:00
Björn Fromme 40f6fc9976 Fix incorrect percentage calculation 2019-12-04 13:32:33 +01:00
Björn Fromme d9f62a7e43 Merge tag '2019.12-01' into develop
2019.12-01 2019.12-01
2019-12-04 13:18:54 +01:00
Björn Fromme 4e55d6f5f9 Merge branch 'release/2019.12-01' 2019-12-04 13:18:54 +01:00
Björn Fromme 7c47d9f2e9 Update project dependencies 2019-12-04 13:18:46 +01:00
Björn Fromme 2beb925532 Bump php version 2019-12-04 13:18:38 +01:00
Björn Fromme 9e58c72e4f Implement ical feed for contingents 2019-12-04 13:15:33 +01:00
Björn Fromme 11d1e2edb1 Merge branch 'hotfix/fsc-layouts' 2019-12-02 17:56:38 +01:00
Björn Fromme d1aa39c653 Merge branch 'master' into develop 2019-12-02 17:56:38 +01:00
Björn Fromme c98c46cd87 Use layouts to render anchor above all content elements 2019-12-02 17:56:19 +01:00
Björn Fromme fff9555e6c Merge tag '2019.11-04' into develop
2019.11-04 2019.11-04
2019-11-27 13:08:21 +01:00
Björn Fromme 23cf79956e Merge branch 'release/2019.11-04' 2019-11-27 13:08:20 +01:00
Björn Fromme f4f79aea99 Update project dependencies 2019-11-27 13:08:12 +01:00
Björn Fromme e1daa8d8e9 Merge branch 'feature/updates-2019-11-27' into develop 2019-11-27 13:06:30 +01:00
Björn Fromme 748cdc3090 Adjust booking button color at uc and snz 2019-11-27 10:56:26 +01:00
Björn Fromme 74ea5bd11a Show full page footer in mobile view 2019-11-27 10:47:58 +01:00
Björn Fromme 0b545255e2 Add anchors to link to on same page 2019-11-27 10:41:31 +01:00
Björn Fromme e4fa998a29 Rename filter field 2019-11-27 10:28:53 +01:00
Björn Fromme 6312fc8ce1 Remove filter fields 2019-11-27 10:28:47 +01:00
Björn Fromme 716b441c84 Merge branch 'release/2019.11-03' 2019-11-19 14:50:45 +01:00
Björn Fromme 04633145c3 Merge tag '2019.11-03' into develop
2019.11-03 2019.11-03
2019-11-19 14:50:45 +01:00
Björn Fromme 5eda78bbf4 Update project dependencies 2019-11-19 14:50:34 +01:00
Björn Fromme 187539d088 Adjust property names 2019-11-18 17:30:54 +01:00
Björn Fromme bfb5ab7666 Merge branch 'hotfix/herounit-label-linebreak' 2019-11-14 10:34:24 +01:00
Björn Fromme 635b0ee4af Merge branch 'master' into develop 2019-11-14 10:34:24 +01:00
Björn Fromme ea621877b5 Avoid forced linebreak in herounit 2019-11-14 10:34:17 +01:00
Björn Fromme ac74902bb8 Merge branch 'release/2019.11-02' 2019-11-11 10:20:48 +01:00
Björn Fromme 63805fe640 Merge tag '2019.11-02' into develop
2019.11-02 2019.11-02
2019-11-11 10:20:48 +01:00
Björn Fromme c331affa9c Update project dependencies 2019-11-11 10:20:39 +01:00
Björn Fromme 4ff566eb22 Add link to searchbar 2019-11-11 10:18:18 +01:00
Björn Fromme dbbe86be59 Merge branch 'master' into develop 2019-11-06 11:49:28 +01:00
Björn Fromme 974406c456 Merge branch 'hotfix/image-proxy' 2019-11-06 11:49:27 +01:00
Björn Fromme f500f987d5 Simplify and fix image proxy 2019-11-06 11:49:22 +01:00
Björn Fromme 5f480c72e5 Cleanup snowreport and webcam data after importing 2019-11-05 13:53:14 +01:00
Björn Fromme 016beb9ec3 Update webcam url on import 2019-11-05 12:18:36 +01:00
Björn Fromme 440238abd4 Update project dependencies 2019-11-05 11:55:52 +01:00
Björn Fromme 0eab74d4eb Enable yoast snippet on custom page types 2019-11-05 11:54:38 +01:00
Björn Fromme d6c242c774 Add pagetype for yoast snippet 2019-11-05 11:54:20 +01:00
Björn Fromme 6556693e1c Merge tag '2019.10-08' into develop
2019.10-08 2019.10-08
2019-10-28 18:53:32 +01:00
Björn Fromme 66b1a536d3 Merge branch 'release/2019.10-08' 2019-10-28 18:53:32 +01:00
Björn Fromme 9970d2ae2d Update project dependencies 2019-10-28 18:53:23 +01:00
Björn Fromme 6dabe833de Merge branch 'master' into develop 2019-10-28 18:48:41 +01:00
Björn Fromme 7be64d4f54 Merge branch 'hotfix/social-media-fix' 2019-10-28 18:48:41 +01:00
Björn Fromme 4938e39ea5 Update social media extension, adjust template 2019-10-28 18:48:35 +01:00
Björn Fromme 417b9c38ad Merge branch 'release/2019.10-08' 2019-10-25 12:59:45 +02:00
Björn Fromme 87d650deb8 Update project dependencies 2019-10-25 12:59:36 +02:00
Björn Fromme cb9d36ba79 Add journey information to copy and paste for resellers 2019-10-25 12:57:18 +02:00
Björn Fromme 96f47caa89 Merge branch 'master' into develop 2019-10-25 10:42:59 +02:00
Björn Fromme 3c13959927 Merge branch 'hotfix/skipass-fix' 2019-10-25 10:42:59 +02:00
Björn Fromme 7922ac86ca Fix typo in variable name 2019-10-25 10:42:54 +02:00
Björn Fromme ea5b8c5809 Merge branch 'master' into develop 2019-10-24 14:34:57 +02:00
Björn Fromme eedb7f6c7d Merge branch 'hotfix/myep-events' 2019-10-24 14:34:57 +02:00
Björn Fromme 8944e96725 Adapt untranslated properties in json data 2019-10-24 14:34:48 +02:00
Björn Fromme 9f102a8f1a Merge branch 'master' into develop 2019-10-24 14:14:47 +02:00
Björn Fromme 0f9187a049 Merge branch 'hotfix/pacode-fix' 2019-10-24 14:14:46 +02:00
Björn Fromme 9fa7529fc2 Ensure pacode being appended to links in ajax generated tables 2019-10-24 14:14:38 +02:00
Björn Fromme c9c03abcde Adjust page id to current prod data 2019-10-24 14:13:37 +02:00
Björn Fromme 55ef8cc4e3 Update project dependencies 2019-10-24 14:13:18 +02:00
Björn Fromme 9f406638e9 Merge tag '2019.10-07' into develop
2019.10-07 2019.10-07
2019-10-15 12:56:42 +02:00
Björn Fromme 0a73cb5c58 Merge branch 'release/2019.10-07' 2019-10-15 12:56:42 +02:00
Björn Fromme aea7c9fa1a Update project dependencies 2019-10-15 12:56:33 +02:00
Björn Fromme 79157be4ef Merge tag '2019.10-06' into develop
2019.10-06 2019.10-06
2019-10-11 22:13:03 +02:00
Björn Fromme 3938179856 Merge branch 'release/2019.10-06' 2019-10-11 22:13:03 +02:00
Björn Fromme ed27375acd Update project dependencies 2019-10-11 22:12:50 +02:00
Björn Fromme f241fcba9b Implement teaser for booking links 2019-10-11 22:08:31 +02:00
Björn Fromme 11363b85bf Merge branch 'master' into develop 2019-10-11 20:53:10 +02:00
Björn Fromme 95d718cab1 Merge branch 'hotfix/facebook-pixel-contenttype' 2019-10-11 16:29:07 +02:00
Björn Fromme 6f619084ba Revoke changing fb pixel code content type 2019-10-11 16:29:02 +02:00
Björn Fromme e86215dd2a Merge branch 'hotfix/page-header-cropping' 2019-10-11 11:49:26 +02:00
Björn Fromme 3ed9f5806f Add cropping variants for page header sliders 2019-10-11 11:49:20 +02:00
Björn Fromme b886d36385 Merge branch 'master' into develop 2019-10-10 16:49:52 +02:00
Björn Fromme 8d9fa17581 Merge branch 'hotfix/ogimage-slide' 2019-10-10 16:49:52 +02:00
Björn Fromme dfc6176f34 Slide pages upwards to find default og:image, remove config 2019-10-10 16:49:43 +02:00
Björn Fromme bac9712441 Merge tag '2019.10-05' into develop
2019.10-05 2019.10-05
2019-10-10 14:21:16 +02:00
Björn Fromme e2289a5814 Merge branch 'release/2019.10-05' 2019-10-10 14:21:16 +02:00
Björn Fromme 0d3d28cc4d Update project dependencies 2019-10-10 14:21:06 +02:00
Björn Fromme 98c60df129 Merge branch 'master' into develop 2019-10-10 14:19:48 +02:00
Björn Fromme a59f4d0fa3 Merge branch 'hotfix/ogimage-default' 2019-10-10 14:19:48 +02:00
Björn Fromme b06aa109d5 Implement default image for og:image meta tag 2019-10-10 14:19:42 +02:00
Björn Fromme 3ea8d63832 Merge branch 'master' into develop 2019-10-10 09:40:34 +02:00