More testing
Merge branch 'testing' of github.com:jdalphon/rSENSE into testing
Switched the order of the Save and Cancel buttons for the editor. Save is on the right now, and Cancel is on the left. Also added a bit of padding between the button. Although these buttons are properly spaced on FireFox, they are directly next to each other on Chrome.
Adding more testing
Adding footnote for fields deletion #1150
Chaning the datetime picker always show both time and date.
Changing some CSS so that it is more condensed
Addresses #1157
- Fixed the flash message for user update.
Progress bars missing from custom bootstrap download
Addresses #1143
Merge pull request #1154 from jdalphon/master

Adding footnote for fields deletion
Removing stray logger
Merge pull request #1152 from jdalphon/testing

Testing
Merge pull request #1145 from kcarcia/UIfixes

Save and Cancel buttons for the editor are now fixed
Adding jsonDataUpload which will pass data through the santization steps
that file uploads go through. ManualUpload will eventually go away so that
all data passes through the same steps to get into the database.
-Added check to prevent image-only contents from being considered blank.
Merge pull request #1159 from mmcguinn/mm1147

-Added check to prevent image-only contents from being considered blank.
Added some documentation to the code
Fixing floating buttons on projects show page.
- Addresses #1144
Merge branch 'master' of git://github.com/isenseDev/rSENSE
Merge pull request #1158 from jdalphon/api

Adding jsonDataUpload
Merge pull request #1161 from jdalphon/master

Fixing floating buttons