8 Commits

Author	SHA1	Message	Date
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
Tim Daubenschütz	84703779a9	rename prize endpoint to prizes	2015-07-31 13:44:57 +02:00
Tim Daubenschütz	ea871f3d1d	acl for delete	2015-07-15 01:46:37 +02:00
Tim Daubenschütz	ebfd4339ab	change prize submission to new backend route	2015-07-15 00:57:31 +02:00
Tim Daubenschütz	56389a542e	override api_urls and fix wording	2015-07-15 00:14:17 +02:00
vrde	c5fd8aa28f	Add custom url mapping	2015-07-14 21:15:10 +02:00