45 Commits

Author	SHA1	Message	Date
Tim Daubenschütz	ab1cab2091	Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra ... Clear some merge conflicts and also some wrong merges. BAD GIT!!! Conflicts: js/components/ascribe_forms/property.js js/components/ascribe_uploader/react_s3_fine_uploader_utils.js sass/ascribe_uploader.scss	2015-09-15 13:30:24 +02:00
Tim Daubenschütz	8e98a7bff7	show overall progress	2015-09-04 14:54:39 +02:00
diminator	4bdab3410e	contractagreementserializer with contract fully expanded	2015-09-04 14:48:10 +02:00
diminator	9b7a69bc20	contract agreement notifications	2015-09-04 11:49:55 +02:00
Tim Daubenschütz	ac45283968	first iteration: whitelabel pages depending on customer	2015-08-11 17:40:26 +02:00
Tim Daubenschütz	eb6e3cb20a	finishing boilerplate for wallet app + prefixing whitelabel specific files	2015-08-11 14:47:28 +02:00
vrde	17ec6f34e0	Fix code after review	2015-07-27 18:21:20 +02:00
vrde	4d93e076df	Add third party modules to handle tracking without polluting the code	2015-07-27 18:06:02 +02:00
Tim Daubenschütz	2ff47ede89	replace console logs with global logging	2015-07-17 15:52:53 +02:00
Tim Daubenschütz	af42bb8e67	error handling first cut	2015-07-17 15:41:09 +02:00
Tim Daubenschütz	13e151e83b	add logging and responsive user navigation	2015-07-16 19:12:18 +02:00
Tim Daubenschütz	7da2149e24	raven fix	2015-07-16 17:07:09 +02:00
Tim Daubenschütz	0ce2794608	disable raven	2015-07-16 17:06:25 +02:00
Tim Daubenschütz	f12d2273d5	fix csrftoken cookie issue	2015-07-16 17:04:37 +02:00
vrde	9e7e9782d6	Add google analytics	2015-07-15 01:45:03 +02:00
vrde	c5fd8aa28f	Add custom url mapping	2015-07-14 21:15:10 +02:00
Tim Daubenschütz	ff64734545	styling	2015-07-14 17:41:57 +02:00
Tim Daubenschütz	5ef63fbba3	use local whitelabel constants for route switching	2015-07-14 17:12:32 +02:00
vrde	1aa2863b80	Declutter piece list if no pieces are found	2015-07-13 21:51:05 +02:00
vrde	3fbe60692e	Working on landing	2015-07-13 14:29:20 +02:00
vrde	df5295dffd	Cleanup and reorder routes	2015-07-10 18:21:42 +02:00
vrde	d5ea4e515d	Use distinct routers for different apps	2015-07-10 16:43:35 +02:00
Tim Daubenschütz	909e9db0b8	add polyfill	2015-07-03 10:40:04 +02:00
vrde	03f09b8c83	Rename fetch to requests to avoid name clashing	2015-06-16 13:48:48 +02:00
vrde	07686f514f	Fix (hopefully) CORS	2015-06-15 11:55:50 +02:00
ddejongh	aac8ae2a9e	merged master	2015-06-15 11:02:49 +02:00
vrde	fa97470e21	Enable CORS on the frontend	2015-06-11 17:07:27 +02:00
vrde	05b9792d3f	Add some new constants to the app	2015-06-10 17:28:36 +02:00
vrde	f732cec523	Merge branch 'AD-432-put-onion-online' ... Conflicts: gulpfile.js package.json	2015-06-08 18:00:17 +02:00
vrde	a1bfbb8f86	[wip] add server to serve app	2015-06-08 15:24:58 +02:00
Tim Daubenschütz	b49f3fe9f2	set state bug fix	2015-06-08 14:51:13 +02:00
Tim Daubenschütz	f987bce7cc	add es6lint to build process and fix most (not really) errors and warnings	2015-06-05 11:06:36 +02:00
Tim Daubenschütz	ccbf411168	fixed store bindings	2015-06-04 13:16:19 +02:00
vrde	4ee4530029	Refactor fetch	2015-06-01 17:43:38 +02:00
vrde	f50d28be98	Refactor fetch, WIP	2015-06-01 14:22:04 +02:00
vrde	0a2895e0d6	Pagination works, it still needs some love	2015-05-21 17:54:27 +02:00
vrde	21e9216540	Add jQuery to index.html	2015-05-20 11:23:50 +02:00
vrde	4da72d8846	Load some pieces from API endpoint	2015-05-19 10:16:44 +02:00
vrde	5dd7cd7554	Refactor a bit	2015-05-18 18:00:12 +02:00
Tim Daubenschütz	c6097fe5c2	outsourced routes to separate file and created a boilerplate action and store	2015-05-18 13:43:42 +02:00
Tim Daubenschütz	25a715ddb3	continuing file structure	2015-05-18 09:56:16 +02:00
Tim Daubenschütz	0d0069a2a6	renaming app from HelloApp to AscribeApp	2015-05-18 09:31:22 +02:00
Tim Daubenschütz	7a1bd8cd82	fixed hash in url	2015-05-18 09:29:51 +02:00
Tim Daubenschütz	4d7198fab9	integrated react-router	2015-05-15 15:38:25 +02:00
vrde	23c033f12f	Build pipeline works	2015-05-15 15:05:17 +02:00