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

Add iD Editor and JOSM Quickstarts, derived from LearnOSM docs #255

Merged
merged 559 commits into from
Jul 7, 2017
Merged

Add iD Editor and JOSM Quickstarts, derived from LearnOSM docs #255

merged 559 commits into from
Jul 7, 2017

Conversation

camerons
Copy link
Contributor

@camerons camerons commented Jul 5, 2017

No description provided.

Nick-Tallguy and others added 30 commits June 1, 2015 02:10
@Nick-Tallguy
more renaming and links
1e0d3ef
@Nick-Tallguy
beginner reorganising
7d3fe04
@Nick-Tallguy
updating beginner - moving id
0d5d5a7
@Nick-Tallguy
josm rearrange
fa02f51
@Nick-Tallguy
tidying josm plugins as #306
2255de3
@Nick-Tallguy
Rename Submitting bugs or ideas to draft_Submitting_bugs_or_ideas.md
2ce16b4
@Nick-Tallguy
initial clearup
c6bb95c
@Nick-Tallguy
Merge remote-tracking branch 'upstream/gh-pages'
72632a2
@Nick-Tallguy
updating from page of staging / testing site
d33496e
@Nick-Tallguy
front page of staging site to show staging only
8cc5352
@michael63-osm
Update 0200-12-12-papers.md
f989c2f
@michael63-osm
Update 0200-12-12-papers.md
892f9c7
@Nick-Tallguy
Merge remote-tracking branch 'upstream/gh-pages'
e246811
@Nick-Tallguy
removing redundant file
94da5dc
@Nick-Tallguy
moving all chapters to beginning of index in english
9a95048
@Nick-Tallguy
returning en index to normal
bd7c6cf
@Nick-Tallguy
removes 'all chapters' from beginner section in all languages hotosm/…
5cf65ec 
…learnosm#416 refers
@Nick-Tallguy
Merge branch 'master' into ac
b965754 
Conflicts:
	_posts/nb/beginner/0200-12-29-introduction.md
	_posts/nb/beginner/0200-12-31-beginner.md
@Nick-Tallguy
gps move to mobile-mapping en, de & bi
791becb
@Nick-Tallguy
Merge pull request #13 from Nick-Tallguy/gps
9e37a53 
gps move to mobile-mapping en, de & bi
@Nick-Tallguy
id editor to beginner and only one file
f0818fd
@Nick-Tallguy
move field papers to mobile-mapping, all languages
31649e3
@michael63-osm
Update 0900-12-25-gps.md
af198cc
@michael63-osm
Update 0900-12-25-gps.md
b49c0f6
@Nick-Tallguy
Merge pull request #22 from michael63-osm/master
f242eef 
GPS section to mobile mapping - German update
@Nick-Tallguy
removing duplicate id-editing from editing section
76062b3
@Nick-Tallguy
josm section in en & sw with files moved from beginner
e6d0a4b
@Nick-Tallguy
glossary en from coordinationn to beginner
67c8d06
@Nick-Tallguy
move remote-mapping to coordination en ru sw & uk
6ae505c
@Nick-Tallguy
remove duplicate remote-mapping file en
2dc6f3d
camerons and others added 15 commits July 5, 2017 08:45
@camerons
Add images for Learn OSM docs, available under CC0 license, from http…
9352d68 
…s://github.com/hotosm/learnosm/blob/gh-pages/_posts/en/ - for ideditor and josm quickstarts
@camerons
Merge branch 'forvicky' of https://github.com/camerons/OSGeoLive-doc …
79b1551 
…into forvicky
@camerons
move Learn OSM docs into quickstart directories. Source https://githu…
969812e 
…b.com/hotosm/learnosm/blob/gh-pages/_posts/en/ in CC0 license
@camerons
covert LearnOSM docs, idEditor and JOSM to OSGeo-Live quickstart form…
942a784 
…at, including moving from MD to RST format
@camerons
covert LearnOSM docs, idEditor and JOSM to OSGeo-Live quickstart form…
e91ed30 
…at, including moving from MD to RST format
@cvvergara
Merge pull request #11 from camerons/forvicky
e02fe4a 
Forvicky
@cvvergara
removing the josm file with no history
8bccba4
@cvvergara
fixing link to file with history
bb62f8c
@cvvergara
fixed errors on ideditor quickstart
692a798
@cvvergara
A only convertor of multiple files
917cb0e
@camerons
Merge pull request #6 from cvvergara/checking-adding-2-files
45f93d9 
Checking adding 2 files
@camerons
moved josmeditor_quickstart to josm_quickstart
e11ed56
@camerons
Convert from LearnOSM docs in MD format to RST format aligned to OSGe…
b3c12ae 
…o-Live template
@kalxas
Merge pull request #254 from camerons/forvicky
8b3e6da 
Add JSOM and iD Editor Quickstarts (for Open Street Map)
@althio
Update ideditor_quickstart.rst
d20880c 
typo
@kalxas kalxas self-assigned this Jul 5, 2017
althio and others added 6 commits July 5, 2017 13:58
@althio
Update josm_quickstart.rst
3b8fece 
link to file sample.osm over the internet
rewording of ending
@althio
Merge pull request #1 from althio/patch-5
5bf629f 
Update josm_quickstart.rst
@althio
Update ideditor_overview.rst
50a4cff 
"OpenStreetMap" is without spaces (not "Open Street Map")
@kalxas
Merge pull request #256 from althio/patch-4
4771f26 
review OpenStreetMap editors quickstarts: iD, JOSM
@cvvergara
removed errors caused by changing "figure" command to "image" command
b74de73
@cvvergara
changing links back from josmeditor to josm
667c1e2
@cvvergara cvvergara mentioned this pull request Jul 5, 2017
Merged
@kalxas
Copy link
Member

kalxas commented Jul 6, 2017

@Nick-Tallguy @michael63-osm @bgirardot @M1dgard @govvin @Anwaario @SteveBower @russdeffner @feyeandal @d3netxer @althio
Since you are going to be listed as contributors in the OSGeo-Live docs git history, can you please add your name in the contributor list?
https://github.com/OSGeo/OSGeoLive-doc/blob/master/contributors.csv

@kalxas kalxas merged commit 786c49e into master Jul 7, 2017
@kalxas kalxas deleted the forvicky branch July 7, 2017 17:49
@cvvergara cvvergara added this to the Release 11.0 milestone Jul 21, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@kalxas kalxas

Labels
None yet
Projects
None yet
Milestone
Release 11.0.0