158 Commits

Author	SHA1	Message	Date
Tim Daubenschütz	b5b1e36109	nested collapsible paragraphs	2015-09-01 14:00:06 +02:00
Tim Daubenschütz	56cdcdb5c6	Merge branch 'AD-901-add-lint-for-scss' into AD-456-ikonotv-branded-page-for-registra	2015-09-01 13:30:04 +02:00
vrde	d2adc7a388	Merge remote-tracking branch 'origin/master' into AD-901-add-lint-for-scss ... Conflicts: sass/main.scss	2015-08-31 19:09:09 +02:00
Tim Daubenschütz	7e1815bb1f	refactor account settings into multiple files	2015-08-31 16:36:24 +02:00
vrde	3f34fc680e	Get rid of ascribe-btn-gray	2015-08-28 16:40:54 +02:00
Tim Daubenschütz	d9f3f2a9d7	rename contract_form to form_contract	2015-08-28 15:55:39 +02:00
Tim Daubenschütz	ddfc8b9621	minor fixes	2015-08-28 14:27:02 +02:00
Tim Daubenschütz	8e7aeab3a6	Merge branch 'AD-456-ikonotv-branded-page-for-registra' of bitbucket.org:ascribe/onion into AD-456-ikonotv-branded-page-for-registra	2015-08-28 14:08:45 +02:00
Tim Daubenschütz	52ae348e57	dynamic acl for acl_submit	2015-08-28 14:07:29 +02:00
diminator	02e105d2b8	text refactor	2015-08-28 14:00:50 +02:00
diminator	1b730573c7	ikonotv acl_submitted + refactor	2015-08-28 13:58:24 +02:00
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