No changes
Merge remote-tracking branch 'origin/master'
Implemented FLACC scale.
Added NSLocalized strings to painscale
Finished internationalization.
Made changes to pain descriptions..
Changed FLACC scale image filename
Merge remote-tracking branch 'origin/master'
Changed FLACC scale image filename
Merge remote-tracking branch 'github/master'
Fixed a bug in showing pain scale information.
No changes
Merge branch 'Internationalization'
Added localization, made info available for FLACC scale
Added export data button, that converts our pList to jSon
Added device name to the data exported in JSON format.
Data is now saved in three packages, one for each view. Hour-format is changed from 12H to 24H throughout the app.
Added more precise timestamp to pain registration
Fixed a bug in the diary with pain registrations not showing up.
Merge branch 'newDataStructure'