1652 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Tim Daubenschütz	5688bde3c7	update readme	2015-08-24 16:13:37 +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