1085 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	bfbb96311c	Merged in AD-613-cyland-white-label-page (pull request #39) ... Ad 613 cyland white label page	2015-08-24 15:39:56 +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	82cc53fdc5	bug fix remove from collection signal	2015-08-21 15:53:55 +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
Tim Daubenschütz	33b2efd1b8	Merge branch 'master' of bitbucket.org:ascribe/onion	2015-08-21 10:04:34 +02:00
Tim Daubenschütz	0687f28745	feature list for testing	2015-08-21 10:04:24 +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