85 Commits

Author	SHA1	Message	Date
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
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	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
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	36ca2004ff	rating create and fetch	2015-08-10 17:02:10 +02:00
diminator	a27415eb86	jury dashboard + rating WIP	2015-08-10 15:23:13 +02:00
Tim Daubenschütz	3ff401904b	fix submit to prize button	2015-08-10 10:10:43 +02:00
Tim Daubenschütz	a55efc1692	fix large buttons on sluice landing page	2015-08-10 09:39:32 +02:00
Tim Daubenschütz	b70eb23dc0	refactor action panel: mostly css and layout	2015-08-10 09:22:39 +02:00
diminator	8275a8d626	prize: permission refactor ... email: moved cc folders bug fix email: encode email in queryparams	2015-08-07 15:10:39 +02:00
Tim Daubenschütz	3afb036f24	rename apiUrls to ApiUrls	2015-08-07 15:08:02 +02:00
Tim Daubenschütz	f73001a5b8	remove form property header and replace class name definition	2015-08-07 14:31:37 +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	5108ca2fc6	merge conflict	2015-08-05 14:50:44 +02:00
diminator	bd52bc8136	Merge remote-tracking branch 'remotes/origin/AD-699-rename-prize-endpoint-to-prizes' into AD-686-in-sluice-art-prize-i-can-submit- ... Conflicts: .gitignore js/components/whitelabel/prize/constants/api_urls.js	2015-08-05 14:50:17 +02:00
diminator	6ab5bec8d3	WIP prize settings for admin	2015-08-05 14:40:26 +02:00
diminator	5ce549e533	disable submit prize with ACL	2015-08-04 13:15:38 +02:00
vrde	ac4a98fa16	Redirect from landing to collection if user is logged in	2015-08-03 11:32:52 +02:00
Tim Daubenschütz	84703779a9	rename prize endpoint to prizes	2015-07-31 13:44:57 +02:00
diminator	f5732661bd	subdomain-dependent localhashing	2015-07-29 15:22:30 +02:00
Tim Daubenschütz	1a1ba8bbb1	add ellipsis again	2015-07-27 18:19:55 +02:00
vrde	b536af29be	Logout is now a route	2015-07-17 15:02:44 +02:00
Tim Daubenschütz	d56286a472	fix scaling of button for sluice on mobile	2015-07-16 13:54:02 +02:00
vrde	28d6052d6f	Fix typo	2015-07-15 19:01:36 +02:00