976 Commits

Author	SHA1	Message	Date
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
Tim Daubenschütz	eb54e6fff6	refresh piece list after loan	2015-08-18 10:53:50 +02:00
Tim Daubenschütz	6a0a1b1e35	Merge branch 'AD-777-fineuploader-needs-to-support-mul' into AD-613-cyland-white-label-page	2015-08-18 10:45:57 +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	d24b325062	bug fix loadPiece	2015-08-13 14:16:44 +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
Tim Daubenschütz	95e0b256b6	Merge branch 'master' into AD-613-cyland-white-label-page ... Conflicts: .gitignore	2015-08-11 11:50:09 +02:00
Tim Daubenschütz	0cf63fa6c8	fix synchronization of files of fineuploader	2015-08-11 11:39:58 +02:00
Tim Daubenschütz	58c0ce4c3f	fix wording for multiple uploads	2015-08-11 10:03:12 +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	9408370239	Merged in AD-707-add-https-to-embed (pull request #33) ... Add "s" to http	2015-08-10 17:03:16 +02:00
diminator	36ca2004ff	rating create and fetch	2015-08-10 17:02:10 +02:00
Tim Daubenschütz	8ff2dea4df	refactor: acl buttons message functionality	2015-08-10 15:57:20 +02:00
diminator	a27415eb86	jury dashboard + rating WIP	2015-08-10 15:23:13 +02:00
Tim Daubenschütz	d12dc4dab2	remove deprecated collapsible mixin	2015-08-10 14:42:38 +02:00
Tim Daubenschütz	f6be11d530	remove alert mixin	2015-08-10 14:22:25 +02:00
Tim Daubenschütz	ada07e707e	switch action wording	2015-08-10 14:20:26 +02:00
Tim Daubenschütz	5be771f6ac	add inline property to form	2015-08-10 14:15:32 +02:00
Tim Daubenschütz	4b8987dc7c	add urls	2015-08-10 14:07:23 +02:00