Skip to content

Rebase from upstream#17

Open
vpavlushkov wants to merge 78 commits intoCGI-Move:masterfrom
HSLdevcom:master
Open

Rebase from upstream#17
vpavlushkov wants to merge 78 commits intoCGI-Move:masterfrom
HSLdevcom:master

Conversation

@vpavlushkov
Copy link

@vpavlushkov vpavlushkov commented Apr 21, 2021

Proposed Changes

Pull Request Check List

  • A reasonable set of unit tests is included
  • Console does not show new warnings/errors
  • Changes are documented or they are self explanatory
  • This pull request does not have any merge conflicts
  • All existing tests pass in CI build
  • Code coverage does not decrease (unless measured incorrectly)

Review

  • Read and verify the code changes
  • Test the functionality by running the UI locally with all popular browsers available in your platform
  • Check that the implementation matches the design, when such one is defined in a Jira issue
  • Merge the pull request

vesameskanen and others added 30 commits November 12, 2020 09:18
@vesameskanen
chore: enable citybikes in Lappeenranta
e4e00fc
@vesameskanen
chore: remove duplicate information
a13e657
@optionsome
chore: remove unused zone are geojson files
78bc755
@optionsome
fix: remove mention about zones from lahti and hameenlinna tooltips
1eac86b
@vesameskanen
Merge pull request #3731 from HSLdevcom/tooltip-fixes
33e9caf 
fix: remove mention about zones from lahti and hameenlinna tooltips
@vesameskanen
feat: bikerental without capacity info and lappeenranta city bikes
3f90158
@vesameskanen
test: update some citybike unit tests
90648f0
@optionsome
feat: zone lines for lahti
dc381c9
@optionsome
refactor: reduce coordinate accuracy jyvaskyla zone lines
bdf5b9e
@optionsome
chore: remove old jkl zone lines file
066e3eb
@optionsome
feat: zone lines for Kuopio
411faab
@vesameskanen
chore: fix summaryrow availability, disable hsl citybikes again
d9e5ff8
@vesameskanen
fix: define layer, not external layer config
d57908f
@vesameskanen
chore: allow no-cors for external json
5291172
@vesameskanen
chore: tune stationrowcont update test
c31c835
@vesameskanen
Merge pull request #3738 from HSLdevcom/DT-3985
adaa07a 
DT-3985 Kuopio, Add zone layer and DT-3986 Lahti, Add zone layer
@optionsome
fix: check that zone is included in feedIds before showing in popup
8ceb84f
@optionsome
feat: custom font sizes for location popup zones
741bd99
@vesameskanen
Merge pull request #3744 from HSLdevcom/DT-4111
6157921 
DT-4111 Scale map popup zone icon font size based on text length
@optionsome
fix: don't use headsigns that contain / in mqtt subscriptions
d947e0a
@vesameskanen
Merge pull request #3760 from HSLdevcom/DT-3917
38efb39 
DT-3917 Tampere, route short name of vehicle position dots are constantly changing
@optionsome
ci: remove travis
041eb25
@optionsome
ci: add github actions and use github envs instead of travis
3edfcc8
@optionsome
ci: fix readme link
17ed447
@optionsome
ci: fix step name
ec95392
@optionsome
ci: rename job
9988307
@vesameskanen
Merge pull request #3771 from HSLdevcom/DT-4112
8b84ec8 
DT-4112 Migrate UI CI from travis into github actions
@optionsome
docs: show github actions status badge from master builds only
97a3e08
@optionsome
ci: add missing checkout step
daf20f5
@vesameskanen
Merge branch 'master' into DT-3679
b9ff6d1
Kimmo Hujanen and others added 23 commits February 16, 2021 14:10
fix: addded STOP_MAP
e530335
fix: no vehicles
bb9fbc0
@optionsome
Merge pull request #3950 from HSLdevcom/linjasto2021
8d91d61 
DT-4091: Create Tampere tram instance
@optionsome
chore: updated hameenlinna zone icons
f528223
@optionsome
chore: remove unnecessary inner polygons and reduce coordinate accuracy
3f3be38
@vesameskanen
Merge pull request #3952 from HSLdevcom/DT-4296-2
6af1e80 
Update to DT-4296: Add zone layers to Hämeenlinna's instance
@vesameskanen
chore: update tre corona links
fd0dd4d
@optionsome
feat: enable helsinki area citybike networks for matka
79132ab
@optionsome
feat: enable citybikes for lappeenranta
ad50db2
@optionsome
chore: update hsl citybike urls
67d8eb4
@optionsome
Merge pull request #4042 from HSLdevcom/DT-4472
0799eb2 
DT-4472 Citybikes for opas.matka.fi
@optionsome
chore: temporarily disable lappeenranta citybikes
8d75683
@Antiik91
Revert "chore: temporarily disable lappeenranta citybikes"
4bcb203 
This reverts commit 8d75683.
@Antiik91
chore: enable bike routes
a616acf
@Antiik91
fix: app path prefix
d9dc93c
@ahjyrkia
chore: removed pdf timetables
40f71c8
@vesameskanen
Merge pull request #4062 from HSLdevcom/DT-4541-master
56ed3bb 
DT-4541-master: removed links to tampere pdf timetables
@optionsome
feat: add Salo to walttiOpas
a611322
@vesameskanen
Merge pull request #4065 from HSLdevcom/DT-4448
6364b3c 
feat: add Salo to walttiOpas
@optionsome
feat: define custom color for tampere trams
dc3638c
@optionsome
feat: parse mode from topic
f53c8d5
@optionsome
feat: allow definition of topicFeedId through REALTIME_PATCH
8eb452a
@vesameskanen
Merge pull request #4067 from HSLdevcom/DT-4503-master
28ab710 
DT-4503-master Tampere tram color and realtime
@vpavlushkov vpavlushkov self-assigned this Apr 21, 2021
@vesameskanen vesameskanen deleted the branch CGI-Move:master January 20, 2022 08:47
@vesameskanen vesameskanen deleted the master branch January 20, 2022 08:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@vpavlushkov vpavlushkov

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@vpavlushkov @vesameskanen @optionsome @Antiik91 @ahjyrkia @AleksiSiitari