]> git.openstreetmap.org Git - rails.git/history - app/views/site/_potlatch2.html.erb
Resolve conflict
[rails.git] / app / views / site / _potlatch2.html.erb
2013-12-05 Tom HughesAlways use controller computed zoom when starting Potlatch
2013-12-03 Tom HughesRemove unused code for handling search results in Potlatch
2013-12-03 Tom HughesImprove zoom level selection when invoking Potlatch...
2013-12-01 Tom HughesFix URL updating in Potlatch 1
2013-11-28 Tom HughesMerge branch 'redesign'
2013-11-19 John FirebaughMerge branch 'master' into redesign
2013-11-16 John FirebaughMerge branch 'master' into redesign
2013-10-13 John FirebaughSimplify geolink-related code
2013-09-22 Tom HughesAllow iD and Potlatch 2 to load assets outside the...
2013-08-04 Tom HughesMerge remote-tracking branch 'osmlab/hash'
2013-07-30 John FirebaughUpdate hash on P2 and iD edit pages and throttle
2013-07-19 Tom HughesMerge remote-tracking branch 'osmlab/map-ui'
2013-07-18 Tom MacWrightEven more map ui js refactor
2013-07-18 Tom MacWrightStart to refactor updatelinks
2013-05-12 Tom HughesCast the locale to a string
2013-05-12 Tom HughesMake sure updatelinks() is called even if Potlatch...
2013-05-08 Tom HughesImprove locale selection for Potlatch 2 and iD
2013-04-25 John FirebaughFix P2 interaction with search links
2013-01-15 Tom HughesMerge branch 'master' into notes
2012-12-21 Tom HughesEnable "destructive edit" warnings in Potlatch 2
2012-10-13 Tom HughesMerge branch 'master' into notes
2012-09-29 John FirebaughUse the jQuery data() function to access HTML 5 data...
2012-09-21 John FirebaughSupport the same edit params for Potlatch 1 and 2
2012-09-20 Tom HughesMerge branch 'master' into openstreetbugs
2012-09-18 John FirebaughMove param-based map configuration to client
2012-08-22 Tom HughesMerge branch 'master' into openstreetbugs
2012-06-01 Tom HughesReplace link_to_function with UJS based code
2012-03-25 Tom HughesLoad Potlatch 2 through the asset pipeline
2012-03-21 Grant SlaterSet required Flash version to 10.1.x per request of...
2012-03-21 Grant SlaterPotlatch 2 compiled with Flex 4.5 requires Flash 10...
2012-01-05 Tom HughesMerge branch 'master' into openstreetbugs
2011-11-26 Tom HughesWhen asked to edit an object centre on the correct...
2011-11-26 Tom HughesSwitch from Prototype to jQuery
2011-11-24 Tom HughesDon't escape links in "flash required" message
2011-11-14 Tom HughesServe swfobject via the assets pipeline
2011-10-06 Grant SlaterAdd an inner div for the plugin as swfobject will repla...
2011-10-05 Grant SlaterReplace swfobject 1.5 with swfobject 2
2011-10-01 Grant SlaterFlash 10 is now required
2011-08-13 Tom HughesMerge branch 'master' into openstreetbugs
2011-07-08 Grant SlaterShow the Potlatch 2 help the first time a user starts it
2011-05-21 Tom HughesMerge branch 'master' into openid
2011-05-21 Tom HughesMerge branch 'openID' of git://git.openstreetmap.org...
2011-04-20 Tom HughesMerge branch 'master' into openstreetbugs
2011-04-20 Kai KruegerMerge branch 'master' into openstreetbugs2
2011-04-06 Tom HughesMake Potlatch 2 default to the en locale if there is...
2011-04-06 Tom HughesTell Potlatch 2 which locale to use
2011-04-03 Tom HughesReport a friendly(ish) error if no OAauth key is set...
2011-02-10 Tom HughesMerge branch 'master' into openid
2011-01-14 Tom HughesUse the normal rails asset tagging mechanisms for the...
2010-12-15 Tom HughesAdd support for the tileurl parameter to Potlatch 2
2010-12-10 Tom HughesRelative URLs seem to upset OAuth so use the host from...
2010-12-10 Tom HughesUse relative URLs rather than hard coding the server...
2010-12-05 Tom HughesMerge branch 'master' into openid
2010-12-03 Tom HughesAdd a javascript callback for Potlatch 2 to update...
2010-11-30 Tom HughesImprove the unsaved edits warning for Potlatch 2
2010-11-30 Tom HughesMake setPosition reposition Potlatch 2 instead of reloa...
2010-11-30 Tom HughesMake launching of Potlatch 2 from the GPS trace list...
2010-11-30 Tom HughesWire up maximise/minimise support for Potlatch 2
2010-11-29 Tom HughesImplement automatic OAuth setup for Potlatch 2
2010-11-29 Tom HughesAdd Potlatch 2 as an editor option