215 Commits

Author	SHA1	Message	Date
vrde	50eeafba16	Merge branch 'master' into AD-884-refactor-styles-for-buttons ... Conflicts: sass/main.scss	2015-09-03 10:40:33 +02:00
vrde	2f5c70eceb	Remove unused ButtonSubmitOrClose and styles	2015-09-02 17:36:01 +02:00
vrde	e2b2c91f8e	Merge branch 'exp-styleguide' into AD-884-refactor-styles-for-buttons	2015-09-01 15:48:48 +02:00
vrde	d2adc7a388	Merge remote-tracking branch 'origin/master' into AD-901-add-lint-for-scss ... Conflicts: sass/main.scss	2015-08-31 19:09:09 +02:00
vrde	99af814492	Lint scss	2015-08-31 19:04:47 +02:00
vrde	3f34fc680e	Get rid of ascribe-btn-gray	2015-08-28 16:40:54 +02:00
vrde	73c5ab56c3	playing around with the styleguide app	2015-08-28 11:06:25 +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
diminator	bc28f3d8f5	loan request actions for multiple actions	2015-08-27 13:43:26 +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	15bcd4ba14	average rating ... cyland bug fix	2015-08-25 10:47:38 +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
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	8a88f978c6	add start_from parameter to slide container	2015-08-19 15:30:48 +02:00
diminator	6d8d318e8d	Merge branch 'tmp2' into AD-456-ikonotv-branded-page-for-registra	2015-08-19 13:58:55 +02:00
diminator	e933b334c2	loan contract form	2015-08-18 16:24:36 +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	cf86e352e4	slide breadcrumbs	2015-08-17 12:18:40 +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	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	22727c2703	refactored piece container and detail	2015-08-11 17:12:12 +02:00
Tim Daubenschütz	0cf63fa6c8	fix synchronization of files of fineuploader	2015-08-11 11:39:58 +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	a27415eb86	jury dashboard + rating WIP	2015-08-10 15:23:13 +02:00
Tim Daubenschütz	cde6118b8e	panel styling	2015-08-10 14:57:06 +02:00
Tim Daubenschütz	d12dc4dab2	remove deprecated collapsible mixin	2015-08-10 14:42:38 +02:00
Tim Daubenschütz	b70eb23dc0	refactor action panel: mostly css and layout	2015-08-10 09:22:39 +02:00
diminator	67f70357a5	jury invitation, revoke, resend ... MIGRATE!	2015-08-07 11:27:44 +02:00
diminator	99ea0e1af8	action-panel WIP	2015-08-06 13:56:37 +02:00
diminator	36356dd5c5	Merge remote-tracking branches 'remotes/origin/AD-391-add-filter-functions-to-pieces-an', 'remotes/origin/AD-589-Form-Cancel-doesnt-reset' and 'remotes/origin/AD-619-due-1208-create-jury-dashboard' into AD-686-in-sluice-art-prize-i-can-submit-	2015-08-05 14:52:18 +02:00
Tim Daubenschütz	f31d576583	add styling for piece list filter widget	2015-08-04 15:58:39 +02:00
diminator	2258968856	Merge remote-tracking branch 'remotes/origin/AD-619-due-1208-create-jury-dashboard' into AD-686-in-sluice-art-prize-i-can-submit- ... Conflicts: .gitignore	2015-08-04 11:45:20 +02:00
Tim Daubenschütz	e3b46c69a5	implement piece list filter widget functionality	2015-08-04 11:39:33 +02:00
Tim Daubenschütz	7ee296c963	static styling of filter widget	2015-08-04 10:06:02 +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	d1ed25fe97	ellipsis for artist name in accordion list item	2015-07-30 13:27:05 +02:00
Tim Daubenschütz	2abd3c4a97	search bar padding	2015-07-30 11:56:13 +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	88cbf1641c	fix table cell layout	2015-07-29 18:19:24 +02:00
vrde	658f4c36e1	Merge branch 'AD-611-limit-image-size'	2015-07-29 16:04:49 +02:00
vrde	f792c7e045	remove max-height for fullscreen video	2015-07-29 16:04:33 +02:00
vrde	63c57e6725	Merge branch 'AD-611-limit-image-size'	2015-07-29 15:55:01 +02:00
vrde	83ebca2795	Add new constraints for image size	2015-07-29 15:54:08 +02:00
diminator	f4ccd417fc	loan form styling	2015-07-29 14:49:36 +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