927 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
vrde	91078bfdd9	Fix comment	2015-07-29 18:24:54 +02:00
Tim Daubenschütz	88cbf1641c	fix table cell layout	2015-07-29 18:19:24 +02:00
vrde	8f52d8bf87	Comment the solution	2015-07-29 18:19:04 +02:00
Tim Daubenschütz	4f2aa430f2	refactor ascribe table and add prizes dashboard boilerplate code	2015-07-29 18:03:49 +02:00
vrde	ef61470b5f	First iteration	2015-07-29 18:00:49 +02:00
vrde	658f4c36e1	Merge branch 'AD-611-limit-image-size'	2015-07-29 16:04:49 +02:00
vrde	f792c7e045	remove max-height for fullscreen video	2015-07-29 16:04:33 +02:00
diminator	77093d6007	Merge remote-tracking branch 'origin/master'	2015-07-29 15:55:34 +02:00
diminator	bab29d6ffa	Merge remote-tracking branch 'remotes/origin/AD-435-hash-locally-for-when-a-artist-do' ... Conflicts: js/components/ascribe_forms/form_loan.js	2015-07-29 15:55:16 +02:00
vrde	63c57e6725	Merge branch 'AD-611-limit-image-size'	2015-07-29 15:55:01 +02:00
vrde	83ebca2795	Add new constraints for image size	2015-07-29 15:54:08 +02:00
Tim Daubenschütz	9ebc489c78	refresh piece list correctly after piece with edition creation	2015-07-29 15:24:30 +02:00
diminator	f5732661bd	subdomain-dependent localhashing	2015-07-29 15:22:30 +02:00
Tim Daubenschütz	b0d3213816	add flushLoanContract logic	2015-07-29 15:03:15 +02:00
diminator	f4ccd417fc	loan form styling	2015-07-29 14:49:36 +02:00
Tim Daubenschütz	8da71d0229	make term components unique in loan form	2015-07-29 14:46:33 +02:00
diminator	deebacd063	Merged in AD-601-in-piece_detail-longer-titles-are (pull request #22) ... Ad 601 in piece_detail longer titles are	2015-07-29 14:16:40 +02:00
Tim Daubenschütz	cb5b381e0b	fix scaling issue for slides container	2015-07-29 11:23:25 +02:00
Tim Daubenschütz	ee0c36a73d	Merge branch 'master' of bitbucket.org:ascribe/onion	2015-07-29 09:35:29 +02:00
Tim Daubenschütz	76cf9fd74d	Merge branch 'AD-435-hash-locally-for-when-a-artist-do' ... Conflicts: js/components/ascribe_forms/form_register_piece.js js/components/ascribe_slides_container/slides_container.js js/components/ascribe_uploader/file_drag_and_drop.js js/components/ascribe_uploader/react_s3_fine_uploader.js	2015-07-29 09:35:14 +02:00
Tim Daubenschütz	390e5d51e9	advanced error logging for register piece	2015-07-28 17:45:05 +02:00
vrde	56b4ee5964	Merge branch 'master' of bitbucket.org:ascribe/onion	2015-07-28 17:34:51 +02:00
vrde	eee74e26b7	Limit image size	2015-07-28 17:34:15 +02:00
Tim Daubenschütz	22230b0c59	correct scaling for accordion list	2015-07-28 17:19:19 +02:00
Tim Daubenschütz	d72844f29a	fix alignment of elements (minor css)	2015-07-28 17:10:04 +02:00
TimDaubenschuetz	78049b448e	Merged in AD-598-register-action-switches (pull request #14) ... Ad 598 register action switches	2015-07-28 16:36:57 +02:00
Tim Daubenschütz	8868842817	react fineuploader remove multiple property	2015-07-28 16:30:50 +02:00
Tim Daubenschütz	0f658b9a71	add error reason to fineuploader raven	2015-07-28 16:24:18 +02:00
Tim Daubenschütz	4c99632616	remove form console.log	2015-07-28 15:49:08 +02:00
Tim Daubenschütz	bd28450619	add documentation for input checkbox	2015-07-28 15:46:55 +02:00
Tim Daubenschütz	bb11bbc6e4	Fix all instances of input checkbox	2015-07-28 15:33:47 +02:00
diminator	3142e00ea5	Merge remote-tracking branch 'remotes/origin/master' into AD-435-hash-locally-for-when-a-artist-do	2015-07-28 12:13:40 +02:00
diminator	232991b566	removed signup terms default false	2015-07-28 12:13:19 +02:00
diminator	3031fcdbe1	Merge remote-tracking branch 'remotes/origin/AD-606-login-returns-this-field-may-not-' into AD-435-hash-locally-for-when-a-artist-do ... Conflicts: js/components/ascribe_forms/input_checkbox.js js/components/ascribe_forms/property.js	2015-07-28 12:11:48 +02:00
Tim Daubenschütz	09ce4de29d	refactor input checkbox	2015-07-28 12:03:45 +02:00
diminator	c5072164eb	Merge remote-tracking branch 'origin/AD-435-hash-locally-for-when-a-artist-do' into AD-435-hash-locally-for-when-a-artist-do	2015-07-28 11:32:31 +02:00
diminator	2cece3ce33	inputcheckbox defaultvalue WIP	2015-07-28 11:32:16 +02:00
vrde	5d1b7d3294	Merge branch 'AD-622-google-analytics-tracking'	2015-07-28 11:15:35 +02:00
Tim Daubenschütz	b530018dda	remove unused components	2015-07-28 11:06:19 +02:00
Tim Daubenschütz	212038ae43	cosmetic changes + fix react warning for map fn	2015-07-28 10:09:54 +02:00
Tim Daubenschütz	828d24044b	Integrate hashing setting in uploader	2015-07-28 10:05:31 +02:00
diminator	60ad72aabb	Merge remote-tracking branch 'origin/AD-435-hash-locally-for-when-a-artist-do' into AD-435-hash-locally-for-when-a-artist-do	2015-07-28 09:50:29 +02:00
diminator	6d71c20ea8	inputcheckbox for loan ... settings container with profile update	2015-07-28 09:49:53 +02:00
Tim Daubenschütz	275f6c839e	minor fixes	2015-07-27 18:24:21 +02:00
vrde	17ec6f34e0	Fix code after review	2015-07-27 18:21:20 +02:00
Tim Daubenschütz	1a1ba8bbb1	add ellipsis again	2015-07-27 18:19:55 +02:00
vrde	c2601f242f	Comment events not yet implemented	2015-07-27 18:08:12 +02:00
vrde	4d93e076df	Add third party modules to handle tracking without polluting the code	2015-07-27 18:06:02 +02:00
Tim Daubenschütz	21fc2cee28	convert cancel hashing action to anchor	2015-07-27 16:37:54 +02:00
Tim Daubenschütz	332366ec15	Integrate dropzone inactivity into user flow	2015-07-27 16:00:54 +02:00