Merge pull request #55 from tomhughes/master
[potlatch2.git] / net / systemeD / potlatch2 / panels / BackgroundMergePanel.mxml
2012-03-25 Richard FairhurstMerge pull request #46 from stevage/natural-beach2
2012-03-25 Richard FairhurstMerge pull request #40 from stevage/vet-pool-4128
2012-03-25 Richard FairhurstMerge pull request #42 from stevage/train-routes
2012-03-25 Richard FairhurstMerge pull request #39 from stevage/fix-tram-route...
2012-03-25 Richard FairhurstMerge pull request #43 from stevage/voltage-tweaks
2012-03-25 Richard FairhurstMerge pull request #41 from stevage/pedestrian-crossings
2012-03-24 Andy AllanMerge branch 'master' into history
2012-03-24 Tom HughesMerge remote-tracking branch 'systemed/filebank' into...
2012-03-04 Richard FairhurstMerge remote-tracking branch 'gravitystorm/form-layout...
2012-03-04 Richard FairhurstMerge pull request #30 from gravitystorm/background...
2012-03-04 Richard FairhurstMerge pull request #28 from gravitystorm/docs
2012-02-22 Andy AllanSparkify the merge panel, and reflect improved guidance.
2012-02-22 Andy AllanAsdoc for the BackgroundMergePanel.
2011-10-08 Richard FairhurstMerge branch 'master' into snapshotserver
2011-09-30 Andy AllanMerge branch 'master' into snapshotserver
2011-09-30 Andy AllanMerge branch 'master' into snapshotserver
2011-09-30 Andy AllanConvert celebrations into proper text
2011-07-06 Andy AllanMerge branch 'master' into snapshotserver
2011-07-04 Andy AllanAdd the status button. Needs refactoring
2011-07-04 Andy AllanSet blank tags as black, and use that to debug some...
2011-07-04 Andy AllanImplement the mergeForKey functionality
2011-07-04 Andy AllanMinor reworking of the merge button layout, which also...
2011-07-04 Andy AllanColo(u)r in the background of the background data value...
2011-07-04 Andy AllanMinor tweaks
2011-07-04 Andy AllanFirst stab at merge button, albeit the visibility stuff...
2011-07-01 Andy AllanFigure out which entity is which, and populate the...
2011-07-01 Andy AllanFirst basics of a background tag merging panel