Missing Features

[markiliffe]

'Form copy' #28, 'submit button' #30 and #31 export to CSV are missing from the deployed .dev branch. Thoughts?

[nicowe]

I realised at the homeless hackathon that there is at least the firm copy feature missing from the dev branch. It is a bit of a git mess up. If I have time today I look at cleaning it up a bit.

[kynan]

Simple: the currently deployed rev is 39fffca, from the offline_capability branch, which doesn't contain any of said changes from the dev branch, which is currently on 300ff7b.

The code base is an utter mess and desperately needs cleaning up. I can't really do that because I don't know what's actually relevant and worth keeping.

Can someone nominate all the branches that are worth keeping? These will then have to be rebased on master to sync them. All other branches should be discarded.

[kynan]

Re-deployed, should be all as expected. I had to fix the post-receive hook to discard local changes to the taarifa.appcache manifest file that gets updated during deployment. Will document on Google doc.

[markiliffe]

Ok, would it be an idea to merge the dev, *offline_capability and master branches, the others remaining could be looked at another time? @nicowe, @puntofisso, @funsim what are the branches that have been worked upon recently at the hackathons?

[funsim]

The code I contributed at the Homeless Hackathon was very specific, so I decided to not work on a Taarifa branch.
@nicowe worked on the wdif_2 branch as far as I know but I am not sure which features are worth merging.

[markiliffe]

@funsim, @kynan and @nicowe can we close this issue? I think @kynan resolved it, however, I'm unsure.