]> git.openstreetmap.org Git - rails.git/history - app/assets/javascripts/index
Resolve conflict
[rails.git] / app / assets / javascripts / index /
2013-07-19 Tom HughesMerge remote-tracking branch 'osmlab/map-ui'
2013-07-18 John FirebaughFix export tab bugs
2013-07-18 John FirebaughFix add note
2013-07-18 Tom MacWrightAdd clearer close action, refactor base layer code
2013-07-18 John FirebaughFix export
2013-07-18 John FirebaughPort map key to new UI
2013-07-18 John FirebaughLayers work
2013-07-18 John FirebaughComplete de-globalization of map
2013-07-18 John FirebaughLayers work
2013-07-18 John FirebaughRefactor layer persistence
2013-07-18 John FirebaughRename to L.OSM.Layers and continue implementation
2013-07-18 Saman Bemel-Benrudstarting to cleanup+style map controls.
2013-07-18 Tom MacWrightActually toggle note layer on click.
2013-07-18 Tom MacWrightStart refactoring notes layer
2013-07-18 Tom MacWrightPrevent click propagation on ui panes
2013-07-18 John FirebaughAdd back basic zoom control
2013-07-18 John FirebaughBasic framework for map UI
2013-06-27 Tom HughesUse new Leaflet setPopupContent method
2013-06-27 Tom HughesReplace various Leaflet extensions with new builtin...
2013-06-02 Leo KoppelkammReplace note markers with ones styled like the other...
2013-05-13 Tom HughesClear comment field after a new note is created
2013-05-13 Tom HughesPreserve in progress note comments when the map is...
2013-05-12 Leo KoppelkammDon't focus the text area on touch devices to avoid...
2013-05-08 Tom HughesPersist the state of the notes layer
2013-05-01 Tom HughesMake "add note" cope with base layer changes
2013-04-29 Tom HughesDisable dragging of new notes once they are submitted
2013-04-23 Tom HughesMerge branch 'notes'
2013-04-16 Tom HughesMerge branch 'master' into notes
2013-04-08 Tom HughesMerge branch 'master' into notes
2013-04-08 Tom HughesAdd a "Hide" button to notes when viewed by moderators
2013-03-28 Tom HughesFocus on the text field when a note is opened
2013-03-28 Tom HughesFix display of updates on newly loaded notes
2013-03-28 Tom HughesMerge branch 'master' into notes
2013-03-28 Tom HughesUse OAuth for notes API calls and require authenticatio...
2013-02-12 Tom HughesRemove use of jQuery toggle() function
2013-02-12 Tom HughesClear the note cache when the note layer is turned off
2013-02-05 Tom HughesMerge branch 'master' into notes
2013-02-05 Tom HughesStop newly added notes disappearing
2013-02-05 Tom HughesChange "Close" button to "Resolve" in notes popup
2013-02-05 Tom HughesAvoid javascript warning
2013-02-05 Tom HughesRemove the "new note" marker when the user clicks somew...
2013-02-03 Tom HughesDisable "Add Note" button when there is no text
2013-02-03 Tom HughesEnable the "add note" link after a new note is created
2013-02-03 Tom HughesAllow a note=N parameter in the URL to zoom to and...
2013-02-03 Tom HughesDisable the "add note" link while a note is being added
2013-02-03 Tom HughesAvoid making the map scroll when adding a new note
2013-02-03 Tom HughesMove the note popups up slightly
2013-02-02 Tom HughesTweak sizing of note popups
2013-02-02 Tom HughesMerge branch 'master' into notes
2013-01-15 Tom HughesMerge branch 'master' into notes
2012-12-04 Tom HughesDon't try and add a note when the control is disabled
2012-12-02 Tom HughesAbort any existing load before starting a new one
2012-12-02 Tom HughesPolice the MAX_NOTE_REQUEST_AREA limit on the client
2012-12-02 Tom HughesMake sure popups don't overlay controls or the top bar
2012-12-02 Tom HughesAdd a scrollbar when a note gets too big
2012-12-02 Tom HughesRework notes UI using leaflet
2012-12-01 Tom HughesMerge branch 'master' into notes
2012-11-29 John FirebaughAvoid multiple click bindings on data layer
2012-11-29 John FirebaughMove "Browse Map Data" to layers control
2012-11-23 Tom HughesMerge branch 'leaflet'
2012-11-22 Tom HughesRemove hard coded assumption that layer zero is mapnik
2012-11-20 Tom HughesMerge branch 'master' into notes
2012-11-09 John FirebaughDon't zoom map when enabling location filter
2012-11-09 John FirebaughUpdate leaflet.locationfilter
2012-11-09 John FirebaughRestore maxFeatures check
2012-11-09 John FirebaughReplace leaflet.draw with leaflet-locationfilter
2012-11-09 John FirebaughReduce flicker in data browser
2012-11-09 John FirebaughUpdate leaflet-osm
2012-11-09 John FirebaughCalculate scale in export
2012-11-09 John FirebaughRemove calls to map.setCenter
2012-11-09 John FirebaughUse baselayerchange event
2012-11-09 John FirebaughPort to Leaflet
2012-11-09 John FirebaughUse jQuery's toggle binding
2012-10-16 Tom HughesDisable buttons while form submission is in progress
2012-10-15 Tom HughesMerge branch 'master' into notes
2012-10-14 Tom HughesCorrect field name
2012-10-14 Tom HughesSet attributes on newly created notes
2012-10-14 Tom HughesRefactor note add/update code
2012-10-14 Tom HughesAllow commenting on, and closing of, notes from the...
2012-10-14 Tom HughesUse EJS templates for notes
2012-10-13 Tom HughesRefactor notes code to work with recent site changes
2012-10-13 Tom HughesMerge branch 'master' into notes
2012-10-13 John FirebaughUse ejs templates in browse JS
2012-10-13 John FirebaughUse proj/unproj consistently
2012-10-13 John FirebaughMove browse-related JS to browse.js
2012-10-13 John FirebaughMove export-related JS to export.js
2012-09-30 John FirebaughRequire index-only JS in index.js