114 Commits

Author	SHA1	Message	Date
Cevo	48f43ac01c	the real dropdown version second iteration	2015-09-25 14:36:27 +02:00
Cevo	4ae73871d3	initial push for version controlling, will be edited	2015-09-24 16:06:53 +02:00
Tim Daubenschütz	b5e5102ea4	replace in keyword with dot notation checking	2015-09-10 14:00:59 +02:00
Tim Daubenschütz	c3b71b5398	WIP: make fineuploader an input	2015-09-10 10:51:47 +02:00
Tim Daubenschütz	ddfc8b9621	minor fixes	2015-08-28 14:27:02 +02:00
Tim Daubenschütz	52ae348e57	dynamic acl for acl_submit	2015-08-28 14:07:29 +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
diminator	bc28f3d8f5	loan request actions for multiple actions	2015-08-27 13:43:26 +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	5fcee39ed3	shortlisting enabled up till loan request	2015-08-25 15:19:10 +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
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	ea9fb306c4	add request action loan to piece	2015-08-21 16:22:08 +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	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	5c6b753acb	piece loan history	2015-08-20 15:50:30 +02:00
diminator	ffdb4847db	piece bitcoin id	2015-08-20 14:01:02 +02:00
diminator	5b2ab6c1e2	bug fix acls ... otherdata frontend MIGRATE + loaddate whitelabel	2015-08-20 11:32:11 +02:00
Tim Daubenschütz	ad8be7e34a	separate pre-sending form submission functionality	2015-08-18 13:15:22 +02:00
diminator	fc82c866fb	cyland refactor ... whitelabel + cyland app	2015-08-17 20:52:36 +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	d24b325062	bug fix loadPiece	2015-08-13 14:16:44 +02:00
diminator	97c298e304	piece navigation prev next WIP	2015-08-12 16:47:16 +02:00
Tim Daubenschütz	d5dc164810	boilerplate for loan process	2015-08-12 13:34:41 +02:00
diminator	22727c2703	refactored piece container and detail	2015-08-11 17:12:12 +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
Tim Daubenschütz	5be771f6ac	add inline property to form	2015-08-10 14:15:32 +02:00
Tim Daubenschütz	3afb036f24	rename apiUrls to ApiUrls	2015-08-07 15:08:02 +02:00
vrde	e9c776fec4	Add "s" to http lol	2015-08-07 14:23:59 +02:00
Tim Daubenschütz	192f776bd8	Filter open edition tables correctly	2015-08-07 13:05:50 +02:00
Tim Daubenschütz	17b991e06b	adjust store calls to fetch list to new interface	2015-08-04 11:48:12 +02:00
vrde	72821001b7	Merge branch 'AD-601-in-piece_detail-longer-titles-are' ... Conflicts: .gitignore	2015-08-03 13:44:53 +02:00
Tim Daubenschütz	52f10f178f	Merge branch 'master' into AD-601-in-piece_detail-longer-titles-are	2015-07-30 11:49:48 +02:00
Tim Daubenschütz	79bef1e0a9	add ellipsis functionality to detail property	2015-07-30 11:48:47 +02:00
diminator	bab29d6ffa	Merge remote-tracking branch 'remotes/origin/AD-435-hash-locally-for-when-a-artist-do' ... Conflicts: js/components/ascribe_forms/form_loan.js	2015-07-29 15:55:16 +02:00
Tim Daubenschütz	9ebc489c78	refresh piece list correctly after piece with edition creation	2015-07-29 15:24:30 +02:00
diminator	deebacd063	Merged in AD-601-in-piece_detail-longer-titles-are (pull request #22) ... Ad 601 in piece_detail longer titles are	2015-07-29 14:16:40 +02:00
Tim Daubenschütz	275f6c839e	minor fixes	2015-07-27 18:24:21 +02:00