347 Commits

Author	SHA1	Message	Date
diminator	680cc8572f	ikonotv acl_submit	2015-08-28 13:52:58 +02:00
Tim Daubenschütz	d40b671b45	remove ikonotv boilerplate landing page	2015-08-28 12:48:48 +02:00
Tim Daubenschütz	5219dd5cf7	fix bug + enable contract	2015-08-28 12:40:00 +02:00
Tim Daubenschütz	e9d0311f58	custom ikonotv piece page	2015-08-28 12:33:00 +02:00
Tim Daubenschütz	2c26aab8cc	add exception for loaning a piece for ikonotv	2015-08-28 12:20:36 +02:00
Tim Daubenschütz	89f68abcec	add: Loan form for Ikonotv	2015-08-28 12:11:29 +02:00
Tim Daubenschütz	86efb66663	add collapsible appendix to send contract form	2015-08-27 17:33:51 +02:00
Tim Daubenschütz	65148e24de	remove contract form from ikonotv codebase and integrate it into ascribe-core	2015-08-27 14:56:49 +02:00
Tim Daubenschütz	64d23f82df	refactoring of the general architecture	2015-08-27 14:47:33 +02:00
Tim Daubenschütz	9d7a9bd028	add router/navigation integration into whole project	2015-08-27 14:34:15 +02:00
Tim Daubenschütz	b67466d196	Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra	2015-08-27 14:05:21 +02:00
diminator	bc28f3d8f5	loan request actions for multiple actions	2015-08-27 13:43:26 +02:00
diminator	8406272187	review comments	2015-08-27 10:18:50 +02:00
diminator	33d5480f2f	review comments	2015-08-27 10:10:39 +02:00
diminator	1f95ae3a41	show email of user registered on select	2015-08-27 09:21:48 +02:00
diminator	65571848fb	ordering by selected	2015-08-26 17:41:36 +02:00
diminator	19c882f3b4	reveal name on shortlist in list	2015-08-26 16:55:12 +02:00
diminator	ab97fa420c	loan request with moment ... shortlist on accordeonlist OK	2015-08-26 15:46:27 +02:00
diminator	bcd6400a78	bug fix promises and notifications	2015-08-26 14:50:16 +02:00
diminator	e3b85bf808	removed loadPieceList from shortlist in detail	2015-08-26 12:51:25 +02:00
diminator	ad7e86108e	prize piece serializer with DB rating stats	2015-08-26 12:33:06 +02:00
diminator	b2fed6426f	loan request up till accept	2015-08-26 09:50:38 +02:00
Tim Daubenschütz	cd49a9c402	Create generic links in nav using routes	2015-08-25 16:33:26 +02:00
diminator	5fcee39ed3	shortlisting enabled up till loan request	2015-08-25 15:19:10 +02:00
diminator	a07b4cc35c	reset cyland register form ... "no votes yet" for judge	2015-08-25 11:11:22 +02:00
diminator	2d10887e1b	reset cyland additional data form	2015-08-25 10:49:49 +02:00
diminator	15bcd4ba14	average rating ... cyland bug fix	2015-08-25 10:47:38 +02:00
diminator	1b335e31a4	Merge remote-tracking branch 'remotes/origin/master' into AD-661-due-1208-implement-jury-rating-an	2015-08-24 16:45:03 +02:00
diminator	70c39794b4	sluice judge + average WIP	2015-08-24 15:33:36 +02:00
Tim Daubenschütz	18634ffe50	fix additional files button bug	2015-08-24 14:16:13 +02:00
diminator	440dcd9785	Merge branch 'AD-846-loan-request-action-panel-on-piec' into AD-613-cyland-white-label-page	2015-08-24 11:36:30 +02:00
diminator	54ec829588	notes in cyland	2015-08-24 11:35:35 +02:00
Tim Daubenschütz	d05662b879	fix PR issues	2015-08-24 11:22:44 +02:00
Tim Daubenschütz	116cb9c2fc	fix disappearing fineuploader in additional data	2015-08-21 14:07:10 +02:00
Tim Daubenschütz	5acce27df2	Merge branch 'AD-613-cyland-white-label-page' of bitbucket.org:ascribe/onion into AD-613-cyland-white-label-page	2015-08-21 11:35:00 +02:00
Tim Daubenschütz	09c0451c86	Merge branch 'AD-835-make-form-fields-lockable' into AD-613-cyland-white-label-page ... Conflicts: js/components/ascribe_detail/further_details_fileuploader.js	2015-08-21 11:34:47 +02:00
Tim Daubenschütz	3b46dbb9f5	add upload busy function to fineuploader	2015-08-21 11:11:31 +02:00
Tim Daubenschütz	30d57a943f	fix lock form	2015-08-21 11:01:13 +02:00
diminator	433703a470	moved terms	2015-08-21 10:54:57 +02:00
diminator	5c6b753acb	piece loan history	2015-08-20 15:50:30 +02:00
diminator	60db83c626	cyland detail subheader	2015-08-20 14:18:01 +02:00
diminator	ffdb4847db	piece bitcoin id	2015-08-20 14:01:02 +02:00
diminator	7afb3d68b8	Merge remote-tracking branch 'remotes/origin/AD-835-make-form-fields-lockable' into AD-613-cyland-white-label-page	2015-08-20 11:32:27 +02:00
diminator	5b2ab6c1e2	bug fix acls ... otherdata frontend MIGRATE + loaddate whitelabel	2015-08-20 11:32:11 +02:00
diminator	1f1a8b7761	bug fix piece loan acl ... bug fix piece edit acl DOUBLE MIGRATE	2015-08-19 19:12:30 +02:00
Tim Daubenschütz	689796b115	slidecontainer: display lock on progress	2015-08-19 18:23:04 +02:00
Tim Daubenschütz	495f5600af	implement form locking for cyland	2015-08-19 17:39:25 +02:00
diminator	7e9e187c18	bug fix breadcrumbs ... bug fix sluice landing page bug fix sluice register_piece bug fix ownershiphistory pending	2015-08-19 17:18:32 +02:00
diminator	b66fdc332d	Merge branch 'tmp2' into AD-613-cyland-white-label-page	2015-08-19 16:46:07 +02:00
Tim Daubenschütz	d5e8181855	make cyland submission stateful	2015-08-19 16:02:10 +02:00
Tim Daubenschütz	0b4b3fa727	fix slideContainer broken functionality	2015-08-19 15:54:13 +02:00
Tim Daubenschütz	8a88f978c6	add start_from parameter to slide container	2015-08-19 15:30:48 +02:00
diminator	b1703b6284	cyland landing	2015-08-19 14:48:22 +02:00
Tim Daubenschütz	406cee5bd3	refactor breadcrumbs to attributes	2015-08-19 14:11:03 +02:00
diminator	6d8d318e8d	Merge branch 'tmp2' into AD-456-ikonotv-branded-page-for-registra	2015-08-19 13:58:55 +02:00
Tim Daubenschütz	6dab66ec61	restructure cyland submit button	2015-08-19 13:56:43 +02:00
diminator	b7e81fb0dd	cyland landing	2015-08-19 13:54:45 +02:00
diminator	188cca4834	ikono register	2015-08-19 09:31:36 +02:00
diminator	e933b334c2	loan contract form	2015-08-18 16:24:36 +02:00
Tim Daubenschütz	e88612704f	cyland loan form for accordion list	2015-08-18 13:39:06 +02:00
Tim Daubenschütz	ad8be7e34a	separate pre-sending form submission functionality	2015-08-18 13:15:22 +02:00
diminator	e862fa39a9	Merge remote-tracking branch 'remotes/origin/AD-803-refactor-acls' into AD-456-ikonotv-branded-page-for-registra ... Conflicts: web/settings.py	2015-08-18 12:36:38 +02:00
diminator	8ae7edaa1c	ikonotv initial setup	2015-08-18 12:08:01 +02:00
Tim Daubenschütz	eb54e6fff6	refresh piece list after loan	2015-08-18 10:53:50 +02:00
diminator	f77f1d1d5d	cyland submit button and form WIP ... cyland footers	2015-08-18 09:42:28 +02:00
diminator	fc82c866fb	cyland refactor ... whitelabel + cyland app	2015-08-17 20:52:36 +02:00
diminator	0be3e249bb	breadcrumb style fix	2015-08-17 13:46:04 +02:00
diminator	cf86e352e4	slide breadcrumbs	2015-08-17 12:18:40 +02:00
diminator	12dde0458c	Merge remote-tracking branch 'remotes/origin/master' into AD-613-cyland-white-label-page	2015-08-17 09:56:55 +02:00
diminator	5b2e90a03c	sorting acl and styling	2015-08-14 15:38:30 +02:00
diminator	e843e2fa52	order by rating	2015-08-14 14:58:23 +02:00
diminator	247cca3ee2	piece rating + navigation OK ... close prize	2015-08-13 13:28:09 +02:00
Tim Daubenschütz	81ff4641c7	fix prev and next button for navigationheader	2015-08-12 17:30:39 +02:00
diminator	7c0e2312a1	revert piece navigation and bug fix in navigation serializer	2015-08-12 17:09:48 +02:00
diminator	97c298e304	piece navigation prev next WIP	2015-08-12 16:47:16 +02:00
Tim Daubenschütz	88423e6757	fix scroll overflow	2015-08-12 16:26:24 +02:00
Tim Daubenschütz	0cf5815f42	add functionality to make a forwarded process slide container	2015-08-12 16:11:15 +02:00
Tim Daubenschütz	d3bf990ca5	adjust props	2015-08-12 14:40:44 +02:00
Tim Daubenschütz	1620437c86	add defaultValue to inputdate	2015-08-12 13:53:17 +02:00
Tim Daubenschütz	d5dc164810	boilerplate for loan process	2015-08-12 13:34:41 +02:00
diminator	c25de71b4b	notes and bug fixes	2015-08-12 13:21:05 +02:00
Tim Daubenschütz	9630d043db	first slide cyland archive submission	2015-08-12 09:52:51 +02:00
Tim Daubenschütz	8612f73e96	separate cc register form	2015-08-12 09:30:24 +02:00
Tim Daubenschütz	ac45283968	first iteration: whitelabel pages depending on customer	2015-08-11 17:40:26 +02:00
diminator	22727c2703	refactored piece container and detail	2015-08-11 17:12:12 +02:00
Tim Daubenschütz	eb6e3cb20a	finishing boilerplate for wallet app + prefixing whitelabel specific files	2015-08-11 14:47:28 +02:00
Tim Daubenschütz	f086bece71	add boilerplate code for wallet application	2015-08-11 13:10:15 +02:00
diminator	d5efd79d14	refactored accordion list item: ... accordion-list-item accordion-list-item-piece < accordion-list-item accordion-list-item-wallet < accordion-list-item-piece accordion-list-item-prize < accordion-list-item-piece	2015-08-11 12:06:01 +02:00
diminator	f5b34222a9	remove ratings from master branch	2015-08-10 17:45:49 +02:00
diminator	a6e257bd27	Merged in AD-545-add-rating-support-for-the-pieces (pull request #36) ... Ad 545 add rating support for the pieces	2015-08-10 17:08:11 +02:00
diminator	bdeef598eb	Merge remote-tracking branch 'remotes/origin/AD-716-aclbutton-doesnt-respect-modals-r' ... Conflicts: js/components/settings_container.js	2015-08-10 17:07:15 +02:00
diminator	36ca2004ff	rating create and fetch	2015-08-10 17:02:10 +02:00
diminator	a27415eb86	jury dashboard + rating WIP	2015-08-10 15:23:13 +02:00
Tim Daubenschütz	3ff401904b	fix submit to prize button	2015-08-10 10:10:43 +02:00
Tim Daubenschütz	a55efc1692	fix large buttons on sluice landing page	2015-08-10 09:39:32 +02:00
Tim Daubenschütz	b70eb23dc0	refactor action panel: mostly css and layout	2015-08-10 09:22:39 +02:00
diminator	8275a8d626	prize: permission refactor ... email: moved cc folders bug fix email: encode email in queryparams	2015-08-07 15:10:39 +02:00
Tim Daubenschütz	3afb036f24	rename apiUrls to ApiUrls	2015-08-07 15:08:02 +02:00
Tim Daubenschütz	f73001a5b8	remove form property header and replace class name definition	2015-08-07 14:31:37 +02:00
diminator	67f70357a5	jury invitation, revoke, resend ... MIGRATE!	2015-08-07 11:27:44 +02:00
diminator	99ea0e1af8	action-panel WIP	2015-08-06 13:56:37 +02:00
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
vrde	ac4a98fa16	Redirect from landing to collection if user is logged in	2015-08-03 11:32:52 +02:00
Tim Daubenschütz	84703779a9	rename prize endpoint to prizes	2015-07-31 13:44:57 +02:00
diminator	f5732661bd	subdomain-dependent localhashing	2015-07-29 15:22:30 +02:00
Tim Daubenschütz	1a1ba8bbb1	add ellipsis again	2015-07-27 18:19:55 +02:00
vrde	b536af29be	Logout is now a route	2015-07-17 15:02:44 +02:00
Tim Daubenschütz	d56286a472	fix scaling of button for sluice on mobile	2015-07-16 13:54:02 +02:00
vrde	28d6052d6f	Fix typo	2015-07-15 19:01:36 +02:00
diminator	44f0b36e73	Merge remote-tracking branch 'remotes/origin/AD-499-whitelabel-prize-with-sluice-as-k' into AD-419-decouple-piece-registration-from-	2015-07-15 14:51:36 +02:00
diminator	049a5a6fcb	prize extra data form detail	2015-07-15 14:36:25 +02:00
Tim Daubenschütz	81aeb478b7	Merge remote-tracking branch 'origin/AD-419-decouple-piece-registration-from-' into AD-499-whitelabel-prize-with-sluice-as-k	2015-07-15 14:06:03 +02:00
diminator	9ba30f0938	acl_unshare false for prize ... piece prize details num_submissions	2015-07-15 12:23:02 +02:00
Tim Daubenschütz	92644c285e	change wording for landing page	2015-07-15 11:54:20 +02:00
Tim Daubenschütz	cc0301f5e5	Merge remote-tracking branch 'origin/AD-419-decouple-piece-registration-from-' into AD-499-whitelabel-prize-with-sluice-as-k	2015-07-15 11:43:10 +02:00
diminator	a86befb2d7	fixed signup serializer, acl_editions_view ... piece container whitelabel	2015-07-15 11:39:08 +02:00
Tim Daubenschütz	e3e8f088c7	add licences for cc	2015-07-15 11:28:53 +02:00
Tim Daubenschütz	ea871f3d1d	acl for delete	2015-07-15 01:46:37 +02:00
Tim Daubenschütz	f1e90795f0	specify editions generically by whitelabel	2015-07-15 01:40:48 +02:00
Tim Daubenschütz	ebfd4339ab	change prize submission to new backend route	2015-07-15 00:57:31 +02:00
Tim Daubenschütz	56389a542e	override api_urls and fix wording	2015-07-15 00:14:17 +02:00
vrde	6405d08673	Merge branch 'AD-499-custom-api-url-mapping' into AD-499-whitelabel-prize-with-sluice-as-k	2015-07-14 22:42:10 +02:00
vrde	c5fd8aa28f	Add custom url mapping	2015-07-14 21:15:10 +02:00
Tim Daubenschütz	d2b2bdf7d5	add custom submit button to piece list	2015-07-14 21:13:15 +02:00
Tim Daubenschütz	b52d000ac7	made add work conditional	2015-07-14 21:06:11 +02:00
Tim Daubenschütz	18898b6f8a	start working on register piece for price - WIP	2015-07-14 20:07:55 +02:00
Tim Daubenschütz	e833dbf61a	Merge remote-tracking branch 'origin/master' into AD-499-whitelabel-prize-with-sluice-as-k	2015-07-14 18:56:00 +02:00
Tim Daubenschütz	97f8d416af	styling again	2015-07-14 18:55:34 +02:00
Tim Daubenschütz	e49b920318	more styling on the landing page	2015-07-14 18:34:46 +02:00
vrde	ce46f7c886	Fix bug in whitelabel landing page	2015-07-14 18:00:34 +02:00
Tim Daubenschütz	ff64734545	styling	2015-07-14 17:41:57 +02:00
vrde	695a195e55	Replace history for slider	2015-07-14 12:32:18 +02:00
Tim Daubenschütz	b238fbeeb1	fix piece list error	2015-07-13 23:29:07 +02:00
vrde	19f82b2bbd	work on register piece for for prize	2015-07-13 22:58:53 +02:00
vrde	5ea6095f6a	Redirect if no artworks are found	2015-07-13 22:05:16 +02:00
vrde	1aa2863b80	Declutter piece list if no pieces are found	2015-07-13 21:51:05 +02:00
vrde	69b3c8e3dd	Fix handler on sign up	2015-07-13 21:09:39 +02:00
vrde	7aea6669c9	Refactor login and signup	2015-07-13 20:47:43 +02:00
vrde	4af174dffb	Work on signup/login	2015-07-13 19:53:16 +02:00
vrde	8f07abc39b	WIP	2015-07-13 16:34:26 +02:00
vrde	3fbe60692e	Working on landing	2015-07-13 14:29:20 +02:00
vrde	33d599b923	Start to work on custom landing	2015-07-10 18:45:26 +02:00
vrde	df5295dffd	Cleanup and reorder routes	2015-07-10 18:21:42 +02:00
vrde	d5ea4e515d	Use distinct routers for different apps	2015-07-10 16:43:35 +02:00