Skip to content

Commit d62b80b

Browse files
Merge branch 'develop' into master
2 parents dd42a58 + a6c7cd9 commit d62b80b

18 files changed

Lines changed: 4489 additions & 5020 deletions

‎CHANGELOG.md‎

Lines changed: 607 additions & 0 deletions
Large diffs are not rendered by default.

‎CHANGELOG.rst‎

Lines changed: 0 additions & 765 deletions
This file was deleted.

‎Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,11 @@ ready-for-hosting: dependencies-get build/opening_hours+deps.min.js
131131

132132
## command line programs {{{
133133
.PHONY: run-regex_search
134-
run-regex_search: export.$(SEARCH).json interactive_testing.js regex_search.py
135-
$(NODEJS) regex_search.py "$<"
134+
run-regex_search: export.$(SEARCH).json ./scripts/interactive_testing.js scripts/regex_search.py
135+
python3 ./scripts/regex_search.py "$<"
136136

137137
.PHONY: run-interactive_testing
138-
run-interactive_testing: interactive_testing.js opening_hours.js
138+
run-interactive_testing: ./scripts/interactive_testing.js ./build/opening_hours.js
139139
$(NODEJS) "$<" --locale "$(CHECK_LANG)"
140140
## }}}
141141

‎README.md‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -823,7 +823,7 @@ If you want to contribute to this project, please read the [contribution guideli
823823

824824
## Contributors
825825

826-
Refer to the [Changelog](https://github.com/opening-hours/opening_hours.js/blob/main/CHANGELOG.rst)
826+
Refer to the [Changelog](https://github.com/opening-hours/opening_hours.js/blob/main/CHANGELOG.md)
827827

828828
## Credits
829829

@@ -857,13 +857,11 @@ See also:
857857
[nominatim]: https://wiki.openstreetmap.org/wiki/Nominatim#Reverse_Geocoding_.2F_Address_lookup
858858
[suncalc]: https://github.com/mourner/suncalc
859859
[fossgis-project]: https://wiki.openstreetmap.org/wiki/FOSSGIS/Server/Projects/opening_hours.js
860-
[issue-report]: /../../issues
861860
[releases on github]: /../../releases
862861
[key:opening_hours]: https://wiki.openstreetmap.org/wiki/Key:opening_hours
863862
[oh:specification]: https://wiki.openstreetmap.org/wiki/Key:opening_hours/specification
864863
[oh:specification:fallback rule]: https://wiki.openstreetmap.org/wiki/Key:opening_hours/specification#fallback_rule_separator
865864
[oh:specification:additional rule]: https://wiki.openstreetmap.org/wiki/Key:opening_hours/specification#additional_rule_separator
866-
[oh:spec:any_rule_separator]: https://wiki.openstreetmap.org/wiki/Key:opening_hours/specification#any_rule_separator
867865
[oh:spec:separator_for_readability]: https://wiki.openstreetmap.org/wiki/Key:opening_hours/specification#separator_for_readability
868866

869867
<!-- Can not use short links only referring to the section inside the README.md any more because this will not work on other pages like https://www.npmjs.org/package/opening_hours.
@@ -879,7 +877,6 @@ Edit: This does also work on npmjs in this short version … -->
879877
[ohlib.github]: https://github.com/opening-hours/opening_hours.js
880878
[hc]: https://gitlab.com/ypid/hc
881879
[evaluation tool]: https://openingh.openstreetmap.de/evaluation_tool/
882-
[schulferien.org]: https://www.schulferien.org/deutschland/ical/
883880
[ph-ar]: https://en.wikipedia.org/wiki/Public_holidays_in_Argentina
884881
[ph-at]: https://de.wikipedia.org/wiki/Feiertage_in_%C3%96sterreich
885882
[ph-au]: https://en.wikipedia.org/wiki/Public_holidays_in_Australia

0 commit comments

Comments
 (0)