Merge branch 'master' into snapshotserver
[potlatch2.git] / net / systemeD / potlatch2 / panels / BackgroundMergePanel.mxml
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