100 Commits
Author SHA1 Message Date
Björn Fromme e198d11d02 Merge branch 'release/2019.10-04' 2019-10-03 18:22:55 +02:00
Björn Fromme 336857034c Merge tag '2019.10-04' into develop
2019.10-04 2019.10-04
2019-10-03 18:22:55 +02:00
Björn Fromme 1ab7e7e105 Implement token refreshing 2019-10-03 18:20:42 +02:00
Björn Fromme 3e158c6aa9 Merge branch 'hotfix/sinkhole' 2019-09-30 09:58:10 +02:00
Björn Fromme f5aa2afd0c Merge branch 'master' into develop 2019-09-30 09:58:10 +02:00
Björn Fromme bb49d77d6a Share sinkhole file between releases 2019-09-30 09:52:27 +02:00
Björn Fromme ebbebcca08 Code cleanup 2019-09-28 22:40:29 +02:00
Björn Fromme 5713c811cc Adjust to teamer data api 2019-09-28 10:26:41 +02:00
Björn Fromme 9db2fd456d Allow cookies on login 2019-09-28 10:26:34 +02:00
Björn Fromme 8fe92a5f3d Merge branch 'hotfix/mobile-styles' 2019-09-27 13:40:20 +02:00
Björn Fromme 027c47a376 Merge branch 'master' into develop 2019-09-27 13:40:20 +02:00
Björn Fromme 2517ff0cd0 Improve size and position of custom badge in mobile view 2019-09-27 13:40:12 +02:00
Björn Fromme e7ba0bae9a Limit image size in banner element 2019-09-27 13:39:58 +02:00
Björn Fromme 8cd0aabe29 Adjust crmdata store 2019-09-27 13:25:34 +02:00
Björn Fromme ed51294ee5 Remove scrollbehaviour 2019-09-27 13:25:18 +02:00
Björn Fromme 4b462da45f Integrate watchlist closer into store 2019-09-27 13:25:07 +02:00
Björn Fromme ef14ae5863 WIP Refactor general api login 2019-09-27 11:46:55 +02:00
Björn Fromme 6079340162 Adapt changes in api 2019-09-17 11:14:22 +02:00
Björn Fromme 8dea5bac47 Merge branch 'release/2019.09-08' 2019-09-17 09:43:09 +02:00
Björn Fromme 21473803f4 Merge tag '2019.09-08' into develop
2019.09-08
2019-09-17 09:43:09 +02:00
Björn Fromme 2bdc7c0bfc Update project dependencies 2019-09-17 09:43:00 +02:00
Björn Fromme fcb6960e69 Extend page layout/template 2019-09-17 09:40:59 +02:00
Björn Fromme 0f3c22c437 Adjust event pricetable styles 2019-09-17 09:23:13 +02:00
Björn Fromme 0529cdfc09 Merge branch 'release/2019.09-07' 2019-09-16 13:57:24 +02:00
Björn Fromme bef08e3cb0 Merge tag '2019.09-07' into develop
2019.09-07
2019-09-16 13:57:24 +02:00
Björn Fromme 9fb363d9ca Merge branch 'feature/pricetable-overhaul' into develop 2019-09-16 13:54:06 +02:00
Björn Fromme 554325cf61 Add missed css property 2019-09-16 13:54:01 +02:00
Björn Fromme e4cad50526 Rearrange pricetable sections to improve legibility 2019-09-16 13:53:53 +02:00
Björn Fromme a61d8aab34 Avoid js error 2019-09-16 13:53:35 +02:00
Björn Fromme 56407a2c5c Merge branch 'hotfix/button-style-fix' 2019-09-16 13:15:10 +02:00
Björn Fromme 0d035a042a Merge branch 'master' into develop 2019-09-16 13:15:10 +02:00
Björn Fromme 73e3515ce8 Fix icon button style 2019-09-16 13:15:04 +02:00
Björn Fromme a88376a3bb Merge branch 'release/2019.09-06' 2019-09-16 13:08:55 +02:00
Björn Fromme 58860988c6 Merge tag '2019.09-06' into develop
2019.09-06
2019-09-16 13:08:55 +02:00
Björn Fromme 3e32818d3b Add icon link style 2019-09-16 13:08:43 +02:00
Björn Fromme 4ff2ad0e9b Adjust editorconfig for scss files 2019-09-16 13:08:31 +02:00
Björn Fromme 55d0342e4f Fix dedicated RTE config for ep-events not working 2019-09-16 13:00:51 +02:00
Björn Fromme 0efedb5354 Change cursor when hovering clickable teasers 2019-09-16 12:42:26 +02:00
Björn Fromme fd52746115 Merge branch 'hotfix/booking-link-redirect' 2019-09-16 11:37:25 +02:00
Björn Fromme 226b0bd2f1 Merge branch 'master' into develop 2019-09-16 11:37:25 +02:00
Björn Fromme 5750e40554 Redirect to search page on empty url argument 2019-09-16 11:37:18 +02:00
Björn Fromme 9b10ac5c12 Merge branch 'hotfix/filelist-search' 2019-09-13 18:08:47 +02:00
Björn Fromme bcd72c54b6 Merge branch 'master' into develop 2019-09-13 18:08:47 +02:00
Björn Fromme 41745869bd Fix failing search in filelist
To be removed after bug is fixed in ext:media
2019-09-13 18:08:41 +02:00
Björn Fromme 2161d52547 Merge branch 'release/2019.09-05' 2019-09-13 18:00:01 +02:00
Björn Fromme c32fe1d874 Merge tag '2019.09-05' into develop
2019.09-05
2019-09-13 18:00:01 +02:00
Björn Fromme 1f7ca12a55 Update project dependencies 2019-09-13 17:59:50 +02:00
Björn Fromme bcda84924e Implement plugin for booking link page rendering 2019-09-13 17:58:55 +02:00
Björn Fromme 95e4644625 Merge branch 'release/2019.09-04' 2019-09-12 20:35:44 +02:00
Björn Fromme 07e712b46e Merge tag '2019.09-04' into develop
2019.09-04
2019-09-12 20:35:44 +02:00
Björn Fromme de70e083c6 Assign loading image to prevent reflow 2019-09-12 19:45:53 +02:00
Björn Fromme c4d3954962 Adjust social media teaser image dimensions 2019-09-12 19:45:29 +02:00
Björn Fromme b05343139b Merge branch 'hotfix/directory-exists' 2019-09-12 09:46:18 +02:00
Björn Fromme d054ec27dd Merge branch 'master' into develop 2019-09-12 09:46:18 +02:00
Björn Fromme 75457ded6b Don't allow command to be scheduled via backend 2019-09-12 09:46:11 +02:00
Björn Fromme 278b399879 Avoid issues in case export directory doesn't exist 2019-09-12 09:45:57 +02:00
Björn Fromme 1739e776cb Merge branch 'release/2019.09-03' 2019-09-12 09:27:58 +02:00
Björn Fromme 2639e02595 Merge tag '2019.09-03' into develop
2019.09-03
2019-09-12 09:27:58 +02:00
Björn Fromme d14aa67f55 Merge branch 'feature/export-to-static' into develop 2019-09-12 09:26:19 +02:00
Björn Fromme 96f8311176 Remove obsolete cache 2019-09-12 09:26:07 +02:00
Björn Fromme debb27a612 Implement cli based export of reseller data 2019-09-11 22:23:30 +02:00
Björn Fromme e21281588f Merge branch 'hotfix/export-formatting' 2019-09-11 13:43:59 +02:00
Björn Fromme 7803ec41ac Merge branch 'master' into develop 2019-09-11 13:43:59 +02:00
Björn Fromme 7862ee39fa Render text as html in copy and paste view 2019-09-11 13:43:53 +02:00
Björn Fromme ffeceb3fbc Remove xml formatting to reduce resulting filesize 2019-09-11 13:43:33 +02:00
Björn Fromme 71fcd5ad96 Merge branch 'hotfix/unique-cache-key' 2019-09-11 12:45:21 +02:00
Björn Fromme ddee84af51 Merge branch 'master' into develop 2019-09-11 12:45:21 +02:00
Björn Fromme dd3d77283e Ensure unique cache keys 2019-09-11 12:45:15 +02:00
Björn Fromme f796e3df06 Merge branch 'release/2019.09-02' 2019-09-11 12:38:37 +02:00
Björn Fromme 039db431b0 Merge tag '2019.09-02' into develop
2019.09-02
2019-09-11 12:38:37 +02:00
Björn Fromme 9a9468fe4d Update project dependencies 2019-09-11 12:38:16 +02:00
Björn Fromme d014f7c161 Implement cache for reseller data exports 2019-09-11 12:35:19 +02:00
Björn Fromme f61a7ba89d Merge branch 'hotfix/utm-parameters' 2019-09-11 09:09:47 +02:00
Björn Fromme 42b2444a2c Merge branch 'master' into develop 2019-09-11 09:09:47 +02:00
Björn Fromme 50f1c2994f Reenable utm parameters for Google 2019-09-11 09:09:40 +02:00
Björn Fromme d59748a030 Connect contact forms with buspro api 2019-09-09 13:54:43 +02:00
Björn Fromme 1c03c3e035 Merge branch 'hotfix/static-searchresult' 2019-09-09 08:47:50 +02:00
Björn Fromme 5827af2b5f Merge branch 'master' into develop 2019-09-09 08:47:50 +02:00
Björn Fromme 72ade5d49a Revoke removal of static search result plugin 2019-09-09 08:47:44 +02:00
Björn Fromme 41be8bec54 Merge branch 'release/2019.09-01' 2019-09-08 13:17:45 +02:00
Björn Fromme 4746df6ee9 Merge tag '2019.09-01' into develop
2019.09-01
2019-09-08 13:17:45 +02:00
Björn Fromme b2cd00d3b4 Update project and build dependencies 2019-09-08 13:16:00 +02:00
Björn Fromme e2e4af0662 Merge branch 'feature/no-repost-warning' into develop 2019-09-08 13:13:16 +02:00
Björn Fromme e828aea169 Implement dynamic backlink, remove session storage 2019-09-08 13:12:23 +02:00
Björn Fromme ea2a777de7 Modify search result plugin to use redirect, remove static search result 2019-09-08 13:11:24 +02:00
Björn Fromme 618f8bba97 Properly order image sources 2019-09-08 13:09:57 +02:00
Björn Fromme eed1947e19 Merge branch 'hotfix/template-code' 2019-09-03 10:45:42 +02:00
Björn Fromme 7bdb41eba1 Merge branch 'master' into develop 2019-09-03 10:45:42 +02:00
Björn Fromme 8d0a3260ef Consider template code in booking urls for weekend trips 2019-09-03 10:45:35 +02:00
Björn Fromme 0d1d326b2c Merge branch 'release/2019.08.004' 2019-08-29 12:43:37 +02:00
Björn Fromme f782e32fd3 Merge tag '2019.08.004' into develop
2019.08.004
2019-08-29 12:43:37 +02:00
Björn Fromme 428d012713 Update project dependencies 2019-08-29 12:43:26 +02:00
Björn Fromme 8c85dad22f Add distinct trigger classes to determine form source 2019-08-29 12:42:13 +02:00
Björn Fromme 2fe97f3b6a Merge branch 'hotfix/hide-non-bookable-dates' 2019-08-23 10:26:03 +02:00
Björn Fromme def99fda88 Merge branch 'master' into develop 2019-08-23 10:26:03 +02:00
Björn Fromme 3a02159213 Use proper value for bookable state determination 2019-08-23 10:25:57 +02:00
Björn Fromme 366b4a4a86 Merge branch 'hotfix/invisible-backendlayout-rows' 2019-08-21 15:48:30 +02:00
Björn Fromme a5c0e4d1d5 Merge branch 'master' into develop 2019-08-21 15:48:30 +02:00
Björn Fromme 14e5366e08 Don't hide rows in backend layout 2019-08-21 15:48:25 +02:00
Björn Fromme 3948afe39e Merge branch 'release/2019.08.003' 2019-08-21 11:37:53 +02:00