Commit Graph
1269 Commits
Author SHA1 Message Date
Björn Fromme 6766a75089 Merge branch 'master' into develop 2020-04-28 18:50:44 +02:00
Björn Fromme b1ce1ffefa Merge branch 'hotfix/route-enhancer-fix' 2020-04-28 18:50:44 +02:00
Björn Fromme 79d4fc7b7e Disable uniqueInSite eval for the time being to avoid 404 2020-04-28 18:50:39 +02:00
Björn Fromme a350035775 Merge branch 'master' into develop 2020-04-28 13:58:56 +02:00
Björn Fromme 692b97191d Merge branch 'hotfix/dev-branch' 2020-04-28 13:58:56 +02:00
Björn Fromme 638775cfc1 Update project dependencies to not use dev branch 2020-04-28 13:58:49 +02:00
Björn Fromme f303b0abdf Merge branch 'master' into develop 2020-04-28 13:47:07 +02:00
Björn Fromme aa867d7095 Merge branch 'hotfix/dev-branch' 2020-04-28 13:47:07 +02:00
Björn Fromme 86af7c658e Update dependencies 2020-04-28 13:47:00 +02:00
Björn Fromme 547e66236d Merge tag '2020.04-06' into develop
2020.04-06 2020.04-06
2020-04-28 12:05:46 +02:00
Björn Fromme 41c5dd3d4c Merge branch 'release/2020.04-06' 2020-04-28 12:05:46 +02:00
Björn Fromme e7ea41fb2a Update project dependencies, revoke downgrade 2020-04-28 12:05:35 +02:00
Björn Fromme 15ad6dff56 Merge tag '2020.04-05' into develop
2020.04-05 2020.04-05
2020-04-27 10:58:06 +02:00
Björn Fromme e0ec2fde6c Merge branch 'release/2020.04-05' 2020-04-27 10:58:06 +02:00
Björn Fromme 34c10544bb Downgrade to 9.5.14 to avoid issue with select field 2020-04-27 10:57:34 +02:00
Björn Fromme 0932e7d99c Update ddev config 2020-04-22 09:57:47 +02:00
Björn Fromme 52539757b4 Merge branch 'release/2020.04-04' 2020-04-21 18:14:15 +02:00
Björn Fromme 1bf817f4b6 Merge tag '2020.04-04' into develop
2020.04-04 2020.04-04
2020-04-21 18:14:15 +02:00
Björn Fromme 60f477d9f1 Update project dependencies 2020-04-21 18:14:10 +02:00
Björn Fromme 4868c440dd Merge branch 'hotfix/contingents-ical-fix' 2020-04-21 18:09:46 +02:00
Björn Fromme 3c48dc6c37 Merge branch 'master' into develop 2020-04-21 18:09:46 +02:00
Björn Fromme fdc342bab8 Consider unavailable rooms as blocked 2020-04-21 18:09:42 +02:00
Björn Fromme 136943f4b9 Merge branch 'release/2020.04-03' 2020-04-20 13:00:52 +02:00
Björn Fromme f9ea4677c8 Merge tag '2020.04-03' into develop
2020.04-03 2020.04-03
2020-04-20 13:00:52 +02:00
Björn Fromme b4c94818b0 Update project dependencies 2020-04-20 13:00:46 +02:00
Björn Fromme 906f926cab Fix webpack polling for good 2020-04-20 12:59:52 +02:00
Björn Fromme ada31e0b6d Increase selectable range to 20 months in calendar 2020-04-20 12:59:24 +02:00
Björn Fromme 63ef368087 Merge branch 'release/2020.04-02' 2020-04-17 13:53:35 +02:00
Björn Fromme f103ea21c7 Merge tag '2020.04-02' into develop
2020.04-02 2020.04-02
2020-04-17 13:53:35 +02:00
Björn Fromme 3fbfaac86c Replace calendar browse buttons with dropdown 2020-04-17 13:53:12 +02:00
Björn Fromme 64da0d2381 Adjust domain in ddev environment 2020-04-17 13:52:49 +02:00
Björn Fromme 140eb95da4 Enable webpack polling 2020-04-17 13:52:26 +02:00
Björn Fromme 485b80a103 Merge branch 'release/2020.04-01' 2020-04-17 11:58:42 +02:00
Björn Fromme 5e14f1a6a8 Merge tag '2020.04-01' into develop
2020.04-01 2020.04-01
2020-04-17 11:58:42 +02:00
Björn Fromme 31c2048114 Fix forms being unavailable in backend 2020-04-17 11:58:16 +02:00
Björn Fromme 7ac1deaee6 Update ddev config 2020-04-17 11:57:57 +02:00
Björn Fromme 6ed90f5b47 Update project dependencies 2020-04-17 11:12:09 +02:00
Björn Fromme 70c696aa03 Merge branch 'hotfix/groups-swiss-date-end-fix' 2020-04-01 14:14:51 +02:00
Björn Fromme c72f815883 Merge branch 'master' into develop 2020-04-01 14:14:51 +02:00
Björn Fromme 5287a3d47a Adjust end date of periods minus one day for groups.swiss contingents 2020-04-01 14:14:47 +02:00
Björn Fromme 151cfec89e Revoke using local volumes in ddev 2020-04-01 14:05:28 +02:00
Björn Fromme 0ea54bc8e1 Merge branch 'hotfix/ical-fix' 2020-04-01 14:03:02 +02:00
Björn Fromme 45ca509753 Merge branch 'master' into develop 2020-04-01 14:03:02 +02:00
Björn Fromme e5b36d1b51 Fix accessing undefined variable 2020-04-01 14:02:33 +02:00
Björn Fromme e49e62600d Merge tag '2020.03-07' into develop
2020.03-07 2020.03-07
2020-03-20 09:23:14 +01:00
Björn Fromme 8a56dabc7d Merge branch 'release/2020.03-07' 2020-03-20 09:23:13 +01:00
Björn Fromme 975b101101 Update project dependencies 2020-03-20 09:23:07 +01:00
Björn Fromme cf3a9b15fe Add dedicated mobile navigation 2020-03-20 09:21:55 +01:00
Björn Fromme f43fdd84f3 Skip all unavailable rooms when importing for the time being 2020-03-13 14:11:24 +01:00
Björn Fromme 7606caa2ac Merge tag '2020.03-06' into develop
2020.03-06 2020.03-06
2020-03-13 13:30:50 +01:00