Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sabas merge #105

Merged
merged 126 commits into from
Jan 16, 2023
Merged

Sabas merge #105

merged 126 commits into from
Jan 16, 2023

Conversation

ArcaneDots
Copy link
Contributor

Site seems to be working. Translations should be complete but are rough. Plan to reduce number of translation keys used once this is PR is merged.

sabas and others added 30 commits September 28, 2013 21:10
@sabas
Traduzione interfaccia
96c8c37
adding CNAME pointer to su.openstreetmap.it
d12ed58
@sabas
Merge pull request osmlab#1 from cortesimone/gh-pages
c7d3750 
adding CNAME pointer to su.openstreetmap.it
@sabas
Update README.md
c843b06
@cortesimone
adding extra head space
bbf3111
@sabas
Merge pull request osmlab#2 from cortesimone/gh-pages
0a9d096 
adding extra head space
@sabas
s/Fatto/Finito
7efd339 
Suggerito da Ale
@sabas
Traduzione select2
c09f75f
@sabas
fix json error
b7a5bb6
@sabas
Fix ajax call
1b7f7bc
@sabas
Update categories.json
879c028
@sabas
Update categories.json
f882a64
@sabas
Update categories.json
d09314c
@sabas
Adding marker drag options
5c4ca6f 
Alternative to search by querying nominatim
@sabas
Update categories.json
d4175c2 
Screw you json
@sabas
Adding a categories box for free text explaination
2bb13c3
Tradotte alcune categorie
124dde1
@sabas
Merge pull request osmlab#3 from dforsi/gh-pages
f84bfff 
Tradotte alcune categorie
@sabas
Make fields optional in note text as suggested in ml
a18df5e
@sabas
Change geocoding to use jsonp callback, adding Solr testing instance
4f2257b 
Atm it's using still Nominatim, the switch occurs changing line 53.
Fixes osmlab#5
@sabas
Bump select2, adding payment and rewording social field
67592de
@sabas
Add payment to note
7f01ed7
@sabas
Update site.js
f8cacf8 
I'm the jedi master of typos \o/
@sabas
Update site.js
124bd6e 
Newline missing
@sabas
Adding more info in last panel
7068807
@sabas
Adding analytics code
4be6190
@sabas
Update index.html
04710c8
@sabas
Update categories.json
79c0771
@sabas
Update site.css
ec1f91a 
Media query to position no text along the logo in narrow screens
@sabas
Alphabetical order
0d2a431
naposm and others added 19 commits May 12, 2020 23:40
@naposm
Risolto bug
39c5cc7
@naposm
Risolti problemi
70af32d
@naposm
Merge remote branch 'origin/gh-pages'
5d300bf
@naposm
Merge remote branch 'origin/gh-pages'
a620236
@naposm
Merge remote branch 'origin/gh-pages'
4730def
@fansanelli
Apply suggestions from code review
15c15c7 
Fix link
@fansanelli
Merge pull request osmlab#40 from naposm/gh-pages
04716d0 
Migliorata interazione con l' utente
@Aury88
New website introduction/description
d68c72f 
proposal to solve issue osmlab#43
@Aury88
improved the service appeal
22bde75 
improved the service appeal (the map is not only used but also showed by many famous web services
@sabas
Merge pull request osmlab#44 from Aury88/patch-1
341f7b5 
New website introduction/description
@Mannivu
Update translation.json
7283951 
Fix maiuscole accentate
@sabas
Merge pull request osmlab#45 from Mannivu/patch-1
8d5edc0 
Update translation.json
@ArcaneDots
inital sabas merge
f012688
@ArcaneDots
working merge
fcf7b09
@ArcaneDots
minor html and translation fixes
8e0d81e
@ArcaneDots
fixed broken link for twemoji source
8da3af6
@ArcaneDots
fixed bad readme merge
d285397
@ArcaneDots
Cleaned up readme
6035cd5
@ArcaneDots
fix and simplify note generation
c9ad454
@ArcaneDots ArcaneDots marked this pull request as ready for review January 13, 2023 23:17
@ArcaneDots
Copy link
Contributor Author

Fully merged improvements from the Sabas fork back into main project. Fixed a few bugs and verified that notes were generated correctly.

@ArcaneDots
Copy link
Contributor Author

The Sabas fork already had fixes for issues #46 and #47

iandees
iandees requested changes Jan 16, 2023
View reviewed changes
Copy link
Member

@iandees iandees left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for taking the time to do this.

Can you please fix a couple things for me:

  • The CNAME, LICENSE, and README.md files should not be marked executable
  • The CNAME file should stay at onosm.org otherwise the site will stop working

CNAME Outdated Show resolved Hide resolved
@ArcaneDots ArcaneDots requested a review from iandees January 16, 2023 05:39
iandees
iandees approved these changes Jan 16, 2023
View reviewed changes
Copy link
Member

@iandees iandees left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@iandees iandees merged commit 529a06b into osmlab:gh-pages Jan 16, 2023
This was referenced Feb 11, 2023
Closed
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@iandees iandees iandees approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@ArcaneDots @iandees @sabas @cortesimone @fansanelli @naposm @Aury88 @Mannivu