938 Commits

Author	SHA1	Message	Date
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	8eec5d8f38	Merge branch 'AD-863-acl-forms-prefil-email-address-an' into AD-456-ikonotv-branded-page-for-registra	2015-08-28 12:44:02 +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	9a9aa68ca9	fix lazy evalutaion of loan form	2015-08-28 11:13:28 +02:00
Tim Daubenschütz	8e5c04140f	add vendor prefixes for slide container	2015-08-27 18:11:47 +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
Tim Daubenschütz	4b2f48bc50	Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra	2015-08-27 13:48:33 +02:00
diminator	bc28f3d8f5	loan request actions for multiple actions	2015-08-27 13:43:26 +02:00
diminator	79106dd106	loan request + answer complete	2015-08-27 11:38:21 +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	144b823777	Merge remote-tracking branch 'origin/AD-661-due-1208-implement-jury-rating-an' into AD-661-due-1208-implement-jury-rating-an	2015-08-27 09:22:08 +02:00
diminator	1f95ae3a41	show email of user registered on select	2015-08-27 09:21:48 +02:00
Tim Daubenschütz	8cc1f91a3a	Merge branch 'AD-661-due-1208-implement-jury-rating-an' of bitbucket.org:ascribe/onion into AD-661-due-1208-implement-jury-rating-an	2015-08-26 18:05:22 +02:00
Tim Daubenschütz	b4f68f23e8	update react-datepicker DO NPM INSTALL	2015-08-26 18:03:58 +02:00
Tim Daubenschütz	6028812128	adjust loan form to disable dates	2015-08-26 18:01:50 +02:00
diminator	65571848fb	ordering by selected	2015-08-26 17:41:36 +02:00
Tim Daubenschütz	e473b4c779	fix invariant violation	2015-08-26 17:32:42 +02:00
diminator	19c882f3b4	reveal name on shortlist in list	2015-08-26 16:55:12 +02:00
diminator	c64aae332d	Merge remote-tracking branch 'remotes/origin/AD-862-remove-confusion-introduced-in-prev-update' into AD-661-due-1208-implement-jury-rating-an	2015-08-26 16:54:41 +02:00
Tim Daubenschütz	6808c7c228	remove loan button from piece detail page	2015-08-26 16:44:24 +02:00
diminator	6530149971	problem with loanForm	2015-08-26 16:34:41 +02:00
diminator	ab97fa420c	loan request with moment ... shortlist on accordeonlist OK	2015-08-26 15:46:27 +02:00
Tim Daubenschütz	1f8c8a7d9e	(hopefully) fix auto-fill bug for safari/chrome	2015-08-26 15:41:59 +02:00
Tim Daubenschütz	88b525f352	change link in accordionlist item dependent on domain	2015-08-26 15:18:05 +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
Tim Daubenschütz	f54d7bb85c	fix validation method	2015-08-24 13:57:02 +02:00
Tim Daubenschütz	07ae8cc9bb	Merge branch 'AD-613-cyland-white-label-page' of bitbucket.org:ascribe/onion into AD-613-cyland-white-label-page	2015-08-24 13:13:08 +02:00
Tim Daubenschütz	c14ab4dcd4	fix fineuploader notification bug	2015-08-24 13:12:59 +02:00
diminator	b76c752966	Merge remote-tracking branch 'remotes/origin/master' into AD-661-due-1208-implement-jury-rating-an ... Conflicts: ownership/test/test_api.py piece/models.py	2015-08-24 12:20:54 +02:00
diminator	411b7cb010	increase otherdata limit to 50MB	2015-08-24 12:11:07 +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	96fe1c69c6	Merge branch 'AD-613-cyland-white-label-page' of bitbucket.org:ascribe/onion into AD-613-cyland-white-label-page	2015-08-24 11:22:54 +02:00
Tim Daubenschütz	d05662b879	fix PR issues	2015-08-24 11:22:44 +02:00
diminator	0be6b7f118	bug fix loadPiece	2015-08-24 11:01:42 +02:00
diminator	3b27238adf	request form on piece level ... bug fix cyland piece endpoint bug fix otherDataUploader editable	2015-08-24 10:48:40 +02:00
diminator	7a09b863b5	switch between request action and acl buttons on piece detail page	2015-08-21 16:49:04 +02:00
diminator	8b6c5e6e0f	username boolean	2015-08-21 16:39:06 +02:00
diminator	33cd23d11e	getlangtext	2015-08-21 16:38:18 +02:00
diminator	f564ce7959	Merge remote-tracking branch 'origin/AD-613-cyland-white-label-page' into AD-613-cyland-white-label-page	2015-08-21 16:24:22 +02:00
diminator	ea9fb306c4	add request action loan to piece	2015-08-21 16:22:08 +02:00
Tim Daubenschütz	4dcd66c05b	Merge branch 'AD-613-cyland-white-label-page' of bitbucket.org:ascribe/onion into AD-613-cyland-white-label-page	2015-08-21 16:14:58 +02:00
Tim Daubenschütz	284919f3db	fix bug	2015-08-21 16:14:15 +02:00
diminator	edec430109	public and private note in edition and piece ... connection in frontend	2015-08-21 15:04:38 +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	e0b2f352df	fix locked fields	2015-08-21 11:29:57 +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
Tim Daubenschütz	5d4762f942	fix lock functionality bug	2015-08-20 11:03:00 +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	12de8139c2	separate breadcrumb functionality into own component	2015-08-19 18:36:23 +02:00
Tim Daubenschütz	689796b115	slidecontainer: display lock on progress	2015-08-19 18:23:04 +02:00
Tim Daubenschütz	215f251845	enable overriding of editable prop for property	2015-08-19 18:09:37 +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
Tim Daubenschütz	862cd7986c	add lock/disabled functionality to form	2015-08-19 17:06:14 +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