904 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
diminator	5108ca2fc6	merge conflict	2015-08-05 14:50:44 +02:00
diminator	bd52bc8136	Merge remote-tracking branch 'remotes/origin/AD-699-rename-prize-endpoint-to-prizes' into AD-686-in-sluice-art-prize-i-can-submit- ... Conflicts: .gitignore js/components/whitelabel/prize/constants/api_urls.js	2015-08-05 14:50:17 +02:00
diminator	6ab5bec8d3	WIP prize settings for admin	2015-08-05 14:40:26 +02:00
diminator	5ce549e533	disable submit prize with ACL	2015-08-04 13:15:38 +02:00
diminator	2258968856	Merge remote-tracking branch 'remotes/origin/AD-619-due-1208-create-jury-dashboard' into AD-686-in-sluice-art-prize-i-can-submit- ... Conflicts: .gitignore	2015-08-04 11:45:20 +02:00
Tim Daubenschütz	ae8bc674d2	add logging for complete as well	2015-08-03 18:50:14 +02:00
Tim Daubenschütz	4bf21e1afd	Merge branch 'master' of bitbucket.org:ascribe/onion	2015-08-03 18:38:33 +02:00
Tim Daubenschütz	b5d9ed2569	Merge branch 'AD-708-fineuploader-process-logging'	2015-08-03 18:37:57 +02:00
Tim Daubenschütz	92d699a831	add chunk logging	2015-08-03 18:35:56 +02:00
Tim Daubenschütz	30d84af7fb	add more logs	2015-08-03 18:02:21 +02:00
vrde	c31acd4317	Merge branch 'AD-700-redirect-landing-to-collection-if-logged-in'	2015-08-03 13:53:30 +02:00
vrde	72821001b7	Merge branch 'AD-601-in-piece_detail-longer-titles-are' ... Conflicts: .gitignore	2015-08-03 13:44:53 +02:00
TimDaubenschuetz	34a47d0290	Merged in AD-708-fineuploader-process-logging (pull request #28) ... Ad 708 fineuploader process logging	2015-08-03 12:56:21 +02:00
Tim Daubenschütz	5d92716726	add logging in fineuploader	2015-08-03 11:45:44 +02:00
vrde	ac4a98fa16	Redirect from landing to collection if user is logged in	2015-08-03 11:32:52 +02:00
Tim Daubenschütz	6bf33f541a	remove raven	2015-08-03 11:26:30 +02:00
Tim Daubenschütz	765969c5b3	log file list to sentry on error	2015-08-03 11:09:31 +02:00
Tim Daubenschütz	63b763dd25	remove onComplete call if there has been an error with fineuploader	2015-08-03 10:54:34 +02:00
Tim Daubenschütz	c9042a0934	delete password of user when submitting to sentry	2015-08-03 10:41:51 +02:00
Tim Daubenschütz	2c7c78af67	Merge remote-tracking branch 'origin/master' into AD-699-rename-prize-endpoint-to-prizes	2015-07-31 13:45:53 +02:00
Tim Daubenschütz	84703779a9	rename prize endpoint to prizes	2015-07-31 13:44:57 +02:00
Tim Daubenschütz	5289626b2d	update readme and gitignore	2015-07-30 14:36:19 +02:00
diminator	950e63b6d0	content copy for hash_locally	2015-07-30 14:04:39 +02:00
Tim Daubenschütz	d1ed25fe97	ellipsis for artist name in accordion list item	2015-07-30 13:27:05 +02:00
Tim Daubenschütz	2abd3c4a97	search bar padding	2015-07-30 11:56:13 +02:00
Tim Daubenschütz	52f10f178f	Merge branch 'master' into AD-601-in-piece_detail-longer-titles-are	2015-07-30 11:49:48 +02:00
Tim Daubenschütz	79bef1e0a9	add ellipsis functionality to detail property	2015-07-30 11:48:47 +02:00
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