1
0
mirror of https://github.com/ascribe/onion.git synced 2024-12-23 09:50:31 +01:00
Commit Graph

6 Commits

Author SHA1 Message Date
Brett Sun
b02f6d7695 Merge with master 2015-12-08 16:11:27 +01:00
Tim Daubenschütz
83b20e6472 First cut: Upload button for contract settings 2015-09-15 16:35:45 +02:00
Tim Daubenschütz
ab1cab2091 Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra
Clear some merge conflicts and also some wrong merges.

BAD GIT!!!

Conflicts:
	js/components/ascribe_forms/property.js
	js/components/ascribe_uploader/react_s3_fine_uploader_utils.js
	sass/ascribe_uploader.scss
2015-09-15 13:30:24 +02:00
Tim Daubenschütz
b4756be60a replace anonymous filter functions with util functions 2015-09-10 09:54:02 +02:00
Tim Daubenschütz
b4abe7a245 generic form submission determination for fineuploader 2015-09-01 14:42:09 +02:00
Tim Daubenschütz
ad8be7e34a separate pre-sending form submission functionality 2015-08-18 13:15:22 +02:00