646 Commits

Author	SHA1	Message	Date
diminator	22b201f388	register piece returns to piece detail	2015-07-10 10:30:17 +02:00
diminator	5855b163a8	Merge remote-tracking branch 'remotes/origin/AD-551-work-on-burn-down-list' into AD-419-decouple-piece-registration-from- ... Conflicts: js/components/ascribe_accordion_list/accordion_list_item.js	2015-07-10 10:29:59 +02:00
diminator	8f78de3fb4	editions styling ... fix otherdata collapsible styling	2015-07-09 18:46:53 +01:00
Tim Daubenschütz	2e8e86c62f	add boilerplate code for creating an edition	2015-07-09 17:56:27 +02:00
Tim Daubenschütz	5f459aa139	add dynamic links to piece list item depending on wether editions exist or not	2015-07-09 17:28:21 +02:00
Tim Daubenschütz	d051198676	add loading feedback to new edition toggle	2015-07-09 17:01:08 +02:00
Tim Daubenschütz	0642185087	Merge remote-tracking branch 'origin/AD-419-decouple-piece-registration-from-' into AD-551-work-on-burn-down-list	2015-07-09 16:32:55 +02:00
diminator	cde77bf944	editions layout	2015-07-09 15:29:10 +01:00
Tim Daubenschütz	ec0c668dbf	stop propagation when clicking on an edition link (selection)	2015-07-09 16:26:05 +02:00
Tim Daubenschütz	c538cd757e	remove border from piece list item	2015-07-09 16:09:53 +02:00
diminator	9aa81433a6	Merge remote-tracking branch 'remotes/origin/AD-551-work-on-burn-down-list' into AD-419-decouple-piece-registration-from- ... Conflicts: js/components/ascribe_detail/edition.js	2015-07-09 14:59:24 +01:00
diminator	bf0a36f2a3	Merge remote-tracking branch 'remotes/origin/AD-551-work-on-burn-down-list' into AD-419-decouple-piece-registration-from- ... Conflicts: js/components/ascribe_detail/edition.js	2015-07-09 14:59:16 +01:00
diminator	fd8859fd22	Merge remote-tracking branch 'remotes/origin/master' into AD-419-decouple-piece-registration-from- ... Conflicts: js/components/ascribe_detail/edition.js	2015-07-09 14:54:11 +01:00
Tim Daubenschütz	773d42a3b8	add firstEdition to a piece	2015-07-09 15:44:20 +02:00
diminator	9fd4c1a6fd	otherdata and extradata on a piece level and templated in frontend	2015-07-09 13:37:33 +01:00
Tim Daubenschütz	773cab6505	remove piece list edition table toggle and put it inside of accordion list item	2015-07-09 14:04:48 +02:00
Tim Daubenschütz	d514a553f2	reformat intendation for login modal handler	2015-07-09 12:06:09 +02:00
Tim Daubenschütz	35a287b8a1	made edition registration optional	2015-07-09 11:56:54 +02:00
diminator	8ac26275f5	piece view	2015-07-08 22:54:07 +02:00
Tim Daubenschütz	e9f0af3e72	change the default expand of additional settings	2015-07-08 17:46:52 +02:00
Tim Daubenschütz	bfb40bb19e	made edition table row selectable	2015-07-08 17:35:30 +02:00
Tim Daubenschütz	1c470203b7	scroll page to top on pagination	2015-07-08 17:19:06 +02:00
Tim Daubenschütz	59f131f788	add desktop version for notifications	2015-07-08 17:06:53 +02:00
Tim Daubenschütz	5e14ea6f87	refactor globalnotification	2015-07-08 15:40:32 +02:00
Tim Daubenschütz	16dfe3f224	add debug component for globalnotifications	2015-07-08 15:00:11 +02:00
Tim Daubenschütz	c945fc315b	various visual changes	2015-07-08 14:37:20 +02:00
Tim Daubenschütz	e56fbbac2b	fix polling endless loop	2015-07-08 13:05:15 +02:00
Tim Daubenschütz	7cc5585eb1	readd year again	2015-07-08 11:32:55 +02:00
Tim Daubenschütz	3958c104f1	remove licence for piece list item	2015-07-08 10:56:05 +02:00
Tim Daubenschütz	c61fd71108	Merge branch 'master' of bitbucket.org:ascribe/onion	2015-07-08 10:35:58 +02:00
Tim Daubenschütz	72dfcad17d	Merge branch 'AD-438-progressbar-encoding' ... Conflicts: js/components/edition.js	2015-07-08 10:35:45 +02:00
Tim Daubenschütz	6d72352580	some minor corrections	2015-07-08 10:15:58 +02:00
Tim Daubenschütz	c1e50cbe78	visual edits to fineuploader	2015-07-08 10:03:06 +02:00
Sylvain Bellemare	f066008ce9	translated english text to french	2015-07-08 09:57:50 +02:00
Tim Daubenschütz	22629ac09d	adjust register piece form	2015-07-07 18:07:12 +02:00
diminator	d5ce1ecde2	bug fix	2015-07-07 15:56:35 +02:00
diminator	4a2ad0ea9d	piece registration without editions	2015-07-07 15:48:09 +02:00
diminator	27c1b390ea	editions optional	2015-07-07 15:25:49 +02:00
diminator	b9e8aae298	Merge remote-tracking branch 'remotes/origin/AD-475-loading-feedback-for-all-views' ... Conflicts: sass/ascribe_piece_list_toolbar.scss	2015-07-07 10:34:40 +02:00
diminator	787d48ad11	Merge remote-tracking branch 'origin/master'	2015-07-07 10:28:59 +02:00
diminator	fa2ae7cba8	styling changes for frontend	2015-07-07 10:28:39 +02:00
Tim Daubenschütz	ae9e2e6a28	if user has piece with one edition, do not display show editions	2015-07-07 09:31:56 +02:00
Tim Daubenschütz	ad833a53dc	fix loading feedback for piece list	2015-07-07 09:22:46 +02:00
Tim Daubenschütz	bc53b4b54c	Merge branch 'AD-540-chunked-edition-list-loading-to-a'	2015-07-06 18:35:17 +02:00
Tim Daubenschütz	d5fad09b60	loading animation for show more	2015-07-06 18:29:27 +02:00
Tim Daubenschütz	5ec54f4324	add icons	2015-07-06 17:07:41 +02:00
Tim Daubenschütz	7863431727	add toggle for show more	2015-07-06 15:56:14 +02:00
Tim Daubenschütz	f12a57c3cf	fix merging on ACL action	2015-07-06 15:42:04 +02:00
Tim Daubenschütz	e10b56cfc7	first cut pagination for editions	2015-07-03 16:31:09 +02:00
diminator	37759582ce	cc-staging	2015-07-03 15:52:42 +02:00
vrde	1d6e3cd26c	Add progressbar for encoding	2015-07-03 15:05:14 +02:00
diminator	9d30b9e3b2	embed	2015-07-03 12:35:45 +02:00
diminator	ecef14b4df	fix comma bug	2015-07-03 10:45:37 +02:00
diminator	b760d23813	Merge branch 'master' of bitbucket.org:ascribe/onion	2015-07-03 10:41:32 +02:00
Tim Daubenschütz	643a50a242	Merge branch 'master' of bitbucket.org:ascribe/onion	2015-07-03 10:40:24 +02:00
Tim Daubenschütz	909e9db0b8	add polyfill	2015-07-03 10:40:04 +02:00
diminator	e9c8ab6bf7	Merge remote-tracking branch 'remotes/origin/AD-523-french-translation-of-whole-front'	2015-07-03 10:29:38 +02:00
diminator	3220cfcd5a	Merge remote-tracking branch 'origin/master'	2015-07-02 19:23:23 +02:00
diminator	59cc9cbbce	coa button	2015-07-02 19:22:32 +02:00
Sylvain Bellemare	3eedda7724	[WIP] adding localisation support for French	2015-07-02 19:13:40 +02:00
diminator	fbba3f4670	staging with cors without uglify and lang error	2015-07-02 18:54:47 +02:00
Tim Daubenschütz	ce5b9231af	Merge branch 'AD-527-transition-to-login-form-if-user-'	2015-07-02 18:43:04 +02:00
Tim Daubenschütz	216c63506e	important stuff	2015-07-02 18:42:24 +02:00
diminator	a26e8f7813	test without cors	2015-07-02 18:40:54 +02:00
diminator	531505c0d1	Merge remote-tracking branch 'remotes/origin/AD-506-add-audio-player'	2015-07-02 18:35:04 +02:00
vrde	c2c0fd3ab8	Add audio player	2015-07-02 18:27:09 +02:00
Tim Daubenschütz	dd039b88e8	fix contract fineuploader bugs	2015-07-02 17:57:33 +02:00
vrde	7f8a36b99a	Add videojs and styles	2015-07-02 17:10:32 +02:00
Tim Daubenschütz	24af321669	Merge remote-tracking branch 'origin/AD-368-harmonize-functionality-of-ascrib' into AD-527-transition-to-login-form-if-user-	2015-07-02 16:51:43 +02:00
Tim Daubenschütz	29fdb1e0d7	fix csrf bug with fineuploaders props	2015-07-02 16:51:22 +02:00
diminator	41da3b2029	footer + social icons	2015-07-02 15:41:17 +02:00
Tim Daubenschütz	3ae94a2100	nail login transition	2015-07-02 15:40:54 +02:00
Tim Daubenschütz	85a1574d41	handle slide_num default for non-set queryParams	2015-07-02 14:53:49 +02:00
Tim Daubenschütz	cb996566c7	couple slides container to url state	2015-07-02 14:42:04 +02:00
diminator	3556e8c3c2	ellipsis	2015-07-02 14:40:04 +02:00
Tim Daubenschütz	3adcbe0f8d	add slide functionality	2015-07-02 13:56:24 +02:00
Tim Daubenschütz	4b87d21259	add working slides container boilerplate	2015-07-02 13:31:35 +02:00
diminator	18f3b51153	fineuploader session with cors	2015-07-02 11:54:33 +02:00
Tim Daubenschütz	1f6d20fb15	Merge remote-tracking branch 'origin/AD-368-harmonize-functionality-of-ascrib' into AD-527-transition-to-login-form-if-user- ... Conflicts: js/components/register_piece.js	2015-07-02 11:50:39 +02:00
Tim Daubenschütz	e542d3b2a5	piece registration animation process	2015-07-02 11:49:17 +02:00
diminator	85347a8916	fineuploader session with cors	2015-07-02 11:35:06 +02:00
diminator	4ca2144c0c	request actions in frontend	2015-07-01 19:05:47 +02:00
Tim Daubenschütz	d0b8610050	update piece list after piece registration	2015-07-01 16:21:49 +02:00
Tim Daubenschütz	740f506ced	fix bug in mergeOptions method	2015-07-01 16:19:02 +02:00
diminator	323a2472b4	Merge remote-tracking branch 'remotes/origin/master' into AD-368-harmonize-functionality-of-ascrib	2015-07-01 15:55:32 +02:00
diminator	5f372eedda	edition_index + default license	2015-07-01 15:28:48 +02:00
Tim Daubenschütz	787f25ddde	fix old edition data bug	2015-07-01 15:23:50 +02:00
diminator	eb947e68aa	licenses in header and on piece level	2015-07-01 13:54:58 +02:00
diminator	1ec47338a1	deleted editions cannot be retrieved	2015-07-01 12:17:50 +02:00
Tim Daubenschütz	b5a5481285	add editable acl to react s3 fineuploader	2015-07-01 12:13:05 +02:00
diminator	f58a65eb0c	s3 views dont accept anonymous	2015-07-01 11:43:33 +02:00
Tim Daubenschütz	2bf7d2cbb3	fix collapse bug concerning accordion table	2015-07-01 11:36:36 +02:00
diminator	ca3b058b4d	Merge remote-tracking branch 'remotes/origin/AD-496-add-control-buttons-to-fineupload' into AD-368-harmonize-functionality-of-ascrib	2015-07-01 11:22:49 +02:00
diminator	3e71926b7d	register piece transitions	2015-07-01 11:21:43 +02:00
Tim Daubenschütz	75ea9e1da6	piece list toolbar responsive	2015-07-01 11:13:45 +02:00
Tim Daubenschütz	a4fd7fc837	rename bitcoin address to id	2015-07-01 10:59:06 +02:00
Tim Daubenschütz	d67bbe7770	made accordion table responsive	2015-07-01 10:53:40 +02:00
Tim Daubenschütz	1db9921dd8	use safe urls for thumbnails and links	2015-07-01 10:00:53 +02:00
diminator	2436e198db	styling + licenses url	2015-07-01 09:15:36 +02:00
Tim Daubenschütz	929c694ad7	finalized delete functionality	2015-06-30 17:57:20 +02:00
Tim Daubenschütz	bb73416a8c	Merge remote-tracking branch 'origin/AD-368-harmonize-functionality-of-ascrib' into AD-496-add-control-buttons-to-fineupload	2015-06-30 17:14:53 +02:00
diminator	c6528d8999	other_data : delete without cascade and show acl	2015-06-30 17:12:51 +02:00
diminator	5ecd1368f0	Merge remote-tracking branch 'remotes/origin/AD-496-add-control-buttons-to-fineupload' into AD-368-harmonize-functionality-of-ascrib ... Conflicts: js/components/ascribe_uploader/react_s3_fine_uploader.js	2015-06-30 17:12:21 +02:00
Tim Daubenschütz	26442c9230	add margins to button lists	2015-06-30 17:12:13 +02:00
Tim Daubenschütz	a8120867b9	add call to action on empty piece list	2015-06-30 16:58:26 +02:00
diminator	5008ade408	otherdata delete	2015-06-30 16:54:45 +02:00
Tim Daubenschütz	2a5bd9173e	fix image scaling	2015-06-30 16:53:22 +02:00
Tim Daubenschütz	e6ac475ad5	add download functionality to s3 fine uploader	2015-06-30 16:15:50 +02:00
diminator	fe4d4c6a72	Merge remote-tracking branch 'remotes/origin/AD-496-add-control-buttons-to-fineupload' into AD-368-harmonize-functionality-of-ascrib	2015-06-30 15:43:48 +02:00
Tim Daubenschütz	9ce6c45690	add sessions for already uploaded files and implement manual deletion	2015-06-30 15:41:39 +02:00
diminator	ce13da4b49	password reset complete + subdomain	2015-06-30 15:26:39 +02:00
diminator	6660065cad	signup process complete + subdomained	2015-06-30 14:46:28 +02:00
Tim Daubenschütz	8c3dfc4b73	made download functionality optional	2015-06-30 13:53:02 +02:00
Tim Daubenschütz	ea47f7a371	add place holder for empty piece list	2015-06-30 13:32:41 +02:00
Tim Daubenschütz	1976dee57a	fix firefox simulate click issue	2015-06-30 11:56:38 +02:00
Tim Daubenschütz	e31b6f0108	Merge remote-tracking branch 'origin/AD-368-harmonize-functionality-of-ascrib' into AD-496-add-control-buttons-to-fineupload ... Conflicts: js/components/register_piece.js	2015-06-30 10:45:07 +02:00
diminator	8fc400bb01	licenses in registration	2015-06-30 10:42:58 +02:00
Tim Daubenschütz	e7f29cd973	fix bug in edition detail	2015-06-30 09:23:26 +02:00
Tim Daubenschütz	31e3c23302	rename upload status variable	2015-06-30 09:20:20 +02:00
Tim Daubenschütz	52db729a4d	readd delete functionality	2015-06-29 17:59:35 +02:00
Tim Daubenschütz	f1d3b3968f	Merge remote-tracking branch 'origin/AD-368-harmonize-functionality-of-ascrib' into AD-496-add-control-buttons-to-fineupload	2015-06-29 17:37:51 +02:00
Tim Daubenschütz	a66a4e1c9f	add pause and play functionality	2015-06-29 17:37:14 +02:00
diminator	c6bc34c2f7	otherdata POST and fineuploader_session OK	2015-06-29 17:21:14 +02:00
Tim Daubenschütz	dbbf9fd233	debug	2015-06-29 16:57:31 +02:00
Tim Daubenschütz	e44ae60b75	first cut pause	2015-06-29 16:46:12 +02:00
Tim Daubenschütz	8064fdb39d	Merge remote-tracking branch 'origin/AD-368-harmonize-functionality-of-ascrib' into AD-496-add-control-buttons-to-fineupload	2015-06-29 16:19:04 +02:00
Tim Daubenschütz	90e8278504	integrate file sessions for edition detail	2015-06-29 16:17:57 +02:00
diminator	ea770943f2	editions and api_urls	2015-06-29 16:15:41 +02:00
diminator	e36681ad4d	Merge remote-tracking branch 'remotes/origin/AD-496-add-control-buttons-to-fineupload' into AD-368-harmonize-functionality-of-ascrib ... Conflicts: js/components/ascribe_uploader/react_s3_fine_uploader.js	2015-06-29 16:15:08 +02:00
Tim Daubenschütz	6c44333f1a	add file drag and drop toolbar	2015-06-29 16:00:26 +02:00
diminator	f3677501c1	whitelabel subdomains	2015-06-29 15:58:47 +02:00
Tim Daubenschütz	dcb3e00e3a	styling for mobile	2015-06-29 14:36:55 +02:00
Tim Daubenschütz	867ebec134	fix styling for fineuploader	2015-06-29 13:41:37 +02:00
Tim Daubenschütz	a87f2eb272	refactor form validation	2015-06-29 11:44:16 +02:00
Tim Daubenschütz	1a9c82d683	finalize delete and cancel functionality	2015-06-29 11:01:45 +02:00
Tim Daubenschütz	66fff1c50a	implement cancel functionality	2015-06-29 10:01:54 +02:00
diminator	5916c27c45	uploader defaultprops	2015-06-29 10:00:26 +02:00
diminator	2c2ccd7891	Merge remote-tracking branch 'remotes/origin/AD-496-add-control-buttons-to-fineupload' into AD-504-revive-coa-for-new-frontend	2015-06-26 11:52:59 +02:00
diminator	eff25a9801	withdraw transfer with delete of transfer record	2015-06-26 11:44:35 +02:00
diminator	99d6dd278c	withdraw fix	2015-06-26 01:05:20 +02:00
diminator	7e115e26ad	withdraw transfer part one	2015-06-26 00:38:40 +02:00
diminator	930982873a	Merge remote-tracking branch 'remotes/origin/master' into AD-504-revive-coa-for-new-frontend	2015-06-26 00:04:25 +02:00
diminator	b1ad4cc36f	withdraw transfer part one	2015-06-25 23:25:03 +02:00
diminator	64017f604c	login location with baseurl	2015-06-25 15:30:47 +02:00
diminator	93c1b2e826	login location with baseurl	2015-06-25 15:25:34 +02:00
diminator	d980ef7949	verify button link	2015-06-25 15:23:10 +02:00
diminator	fba30a565b	coa renders per page ... verify	2015-06-25 14:39:39 +02:00
Tim Daubenschütz	12da6c1426	add todo	2015-06-25 14:18:55 +02:00
Tim Daubenschütz	08f574a42b	finish delete functionality	2015-06-25 14:15:02 +02:00
Tim Daubenschütz	ae17d2cb03	first cut: delete functionality	2015-06-25 13:46:10 +02:00
Tim Daubenschütz	b7e933c943	add delete buttons	2015-06-25 13:28:49 +02:00
Tim Daubenschütz	c478bbce9a	add redirect if user is logged in to sign up page	2015-06-25 12:56:43 +02:00
Tim Daubenschütz	761138dbf6	add redirect to login page if user is logged in	2015-06-25 11:49:45 +02:00
Tim Daubenschütz	0ce56a0821	improve usability	2015-06-25 11:29:42 +02:00
Tim Daubenschütz	845f8c9cd3	fix issues related to multiple files upload	2015-06-25 11:12:40 +02:00
Tim Daubenschütz	b9f8be6636	remove console logs	2015-06-25 10:42:35 +02:00
Tim Daubenschütz	2f7bbd01b8	fix multiple attribute for fine uploader	2015-06-25 10:35:25 +02:00
Tim Daubenschütz	bf2a766e84	implement submission for autofill firefox and chrome	2015-06-24 15:52:43 +02:00
ddejongh	208e580985	share + email combined	2015-06-23 17:01:15 +02:00
ddejongh	41d70a9a15	Merge remote-tracking branch 'remotes/origin/AD-350-integrate-localization' into AD-416-account-settings-page-navbar ... Conflicts: js/components/ascribe_forms/form.js js/components/settings_container.js sass/ascribe_settings.scss	2015-06-23 16:07:17 +02:00
ddejongh	95f6c08706	localization	2015-06-23 16:02:48 +02:00
ddejongh	6dd3e582df	fineuploader + register	2015-06-23 13:55:05 +02:00
ddejongh	3f3e9a273f	git removed s3-fineuploader	2015-06-23 10:27:19 +02:00
ddejongh	c8cb456709	Removed submodule react-s3	2015-06-23 10:16:53 +02:00
ddejongh	89884ced1f	edition detail updated with forms	2015-06-22 23:32:41 +02:00
ddejongh	02f8193743	style tweaks	2015-06-22 18:02:04 +02:00
ddejongh	9e1a76a08e	api settings complete	2015-06-22 17:33:25 +02:00
ddejongh	f836d4c2d4	register first cut	2015-06-22 10:50:22 +02:00
ddejongh	23190f6c48	signup/login	2015-06-20 16:43:18 +02:00
ddejongh	e1dbc0e183	Merge remote-tracking branch 'remotes/origin/AD-479-piece-registration-in-new-fronten' into AD-416-account-settings-page-navbar ... Conflicts: js/routes.js	2015-06-19 14:05:56 +02:00
ddejongh	efc7f6d46b	Merge remote-tracking branch 'remotes/origin/AD-479-piece-registration-in-new-fronten' into AD-416-account-settings-page-navbar ... Conflicts: js/routes.js	2015-06-19 13:13:37 +02:00
ddejongh	48d44c0a30	Merge remote-tracking branch 'remotes/origin/AD-479-piece-registration-in-new-fronten' into AD-416-account-settings-page-navbar ... Conflicts: js/routes.js	2015-06-19 11:01:06 +02:00
ddejongh	6c746d09f7	Merge remote-tracking branch 'remotes/origin/AD-479-piece-registration-in-new-fronten' into AD-416-account-settings-page-navbar ... Conflicts: js/routes.js	2015-06-19 10:53:56 +02:00
ddejongh	c2d8b78136	settings	2015-06-18 19:03:03 +02:00
ddejongh	9b3c7e9f21	CC google tag manager	2015-06-18 10:35:36 +02:00
Tim Daubenschütz	3a8efb3dd6	Dimi and Tim styling action	2015-06-17 19:50:52 +02:00
Tim Daubenschütz	cd9c561ddf	boilerplate for piece registration	2015-06-17 17:48:52 +02:00
ddejongh	fabff2922c	account settings	2015-06-17 17:48:23 +02:00
vrde	41b0a33d93	Merge branch 'master' into AD-44-in-piece-detail-support-public-not	2015-06-17 10:46:31 +02:00
vrde	5165fa6c8c	Fix https schema for jquery	2015-06-17 10:16:28 +02:00
ddejongh	37dfde83b0	Merge remote-tracking branch 'remotes/origin/master' into AD-44-in-piece-detail-support-public-not	2015-06-16 20:37:01 +02:00
ddejongh	d50b3ca14d	fixed logout	2015-06-16 20:35:19 +02:00
vrde	bd2be63341	Fix empty X-CSRFToken bug	2015-06-16 19:28:21 +02:00
ddejongh	ff12048c10	edition note	2015-06-16 16:38:22 +02:00
ddejongh	9cf060fdc4	csrf subdomain	2015-06-16 14:49:00 +02:00
vrde	dfd4435e27	Fix baseUrl to load shmui	2015-06-16 14:42:36 +02:00
ddejongh	1ecd579718	Merge remote-tracking branch 'remotes/origin/master' into AD-44-in-piece-detail-support-public-not ... Conflicts: js/utils/requests.js	2015-06-16 14:06:35 +02:00
ddejongh	8d73e4a77b	edit acl ... editionnote	2015-06-16 14:01:53 +02:00
vrde	03f09b8c83	Rename fetch to requests to avoid name clashing	2015-06-16 13:48:48 +02:00
vrde	ed3adf8f67	Rename fetch to requests to avoid name clashing	2015-06-16 13:48:33 +02:00
vrde	a247e111c0	Merge branch 'AD-421-add-signup-functionality' ... Conflicts: js/constants/api_urls.js js/constants/application_constants.js	2015-06-16 10:58:41 +02:00
ddejongh	3784d53609	code review	2015-06-16 10:02:55 +02:00
Tim Daubenschütz	1c8ac24127	replace amazon links	2015-06-16 09:59:09 +02:00
Tim Daubenschütz	e2997891df	loading icon for piece list	2015-06-16 09:57:14 +02:00
Tim Daubenschütz	1ce9b90fff	Fix pagination on search bug	2015-06-16 09:27:04 +02:00
Tim Daubenschütz	7910384d99	solve merge conflicts	2015-06-16 09:02:48 +02:00
ddejongh	cf3b7f234d	password reset ok	2015-06-15 16:56:17 +02:00
Tim Daubenschütz	8ceabda1c5	add queryparams modal	2015-06-15 15:46:33 +02:00
ddejongh	56d32efcc0	password reset ... modal switch problems	2015-06-15 15:28:53 +02:00
ddejongh	66f8a6a1ca	login/logout functional	2015-06-15 12:36:27 +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
ddejongh	4e1ef9fc72	Merge remote-tracking branch 'remotes/origin/master' into AD-43-in-piece_detail-add-generic-field-	2015-06-15 09:59:53 +02:00
Tim Daubenschütz	6e7037e5f2	Finish implementing refactor for open and close for edition lists	2015-06-15 09:29:34 +02:00
Tim Daubenschütz	989b121678	Fix mangling issue	2015-06-15 08:44:44 +02:00
root	9cc70dc4c9	refactor open state of edition table first cut	2015-06-12 17:18:40 +02:00
Tim Daubenschütz	2bb004d2fb	remove edition list count in table	2015-06-12 15:00:26 +02:00
Tim Daubenschütz	dcd770ab5f	readd sourcemaps	2015-06-12 13:36:55 +02:00
ddejongh	6ef233e43d	Merge remote-tracking branch 'origin/AD-43-in-piece_detail-add-generic-field-' into AD-43-in-piece_detail-add-generic-field-	2015-06-11 17:22:27 +02:00
ddejongh	0f1108b14e	form password + signup	2015-06-11 17:22:11 +02:00
vrde	fa97470e21	Enable CORS on the frontend	2015-06-11 17:07:27 +02:00
ddejongh	5e746295bc	application constants	2015-06-11 16:24:37 +02:00
ddejongh	5e7f7983e1	application constants	2015-06-11 15:57:19 +02:00
ddejongh	f4c6e025ae	Merge remote-tracking branch 'remotes/origin/master' into AD-43-in-piece_detail-add-generic-field- ... Conflicts: js/constants/api_urls.js js/constants/application_constants.js	2015-06-11 15:54:50 +02:00
ddejongh	4f5e7a0821	login form	2015-06-11 15:35:18 +02:00
ddejongh	bf0a2aeefb	consign unconsign requests ... async emails	2015-06-11 15:03:55 +02:00
vrde	05b9792d3f	Add some new constants to the app	2015-06-10 17:28:36 +02:00
ddejongh	af71196dfd	delete function for multi editions	2015-06-10 15:49:46 +02:00
vrde	b9c8002495	Add ENV variable to handle BASE_URL	2015-06-09 17:53:44 +02:00
ddejongh	9241d3e38f	further details functional / unstyled	2015-06-09 17:24:06 +02:00
ddejongh	509aa111ab	Merge remote-tracking branch 'remotes/origin/master' into AD-43-in-piece_detail-add-generic-field- ... Conflicts: gulpfile.js added notifications cleaned up proptypes	2015-06-09 16:10:38 +02:00
vrde	5445698eea	[wip] add temporary base url	2015-06-09 16:10:25 +02:00
ddejongh	30ee436f4c	Merge remote-tracking branch 'remotes/origin/master' into AD-43-in-piece_detail-add-generic-field- ... Conflicts: gulpfile.js added notifications cleaned up proptypes	2015-06-09 16:09:59 +02:00
Tim Daubenschütz	669f2b3ae7	resolve merge conflict	2015-06-09 13:38:01 +02:00
Tim Daubenschütz	296176572e	add different kinds of notifications	2015-06-09 13:36:09 +02:00
ddejongh	6563bf97b0	toggable textarea	2015-06-09 13:29:22 +02:00
Tim Daubenschütz	d3fc902411	add que functionality to globalnotification	2015-06-09 12:08:14 +02:00
Tim Daubenschütz	e0e75151e0	add first working prototype	2015-06-08 18:14:25 +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	8a17208643	fix bulk modal bug	2015-06-08 14:23:19 +02:00
Tim Daubenschütz	98d26f5ed7	fix minor checkbox bug	2015-06-08 14:13:35 +02:00
Tim Daubenschütz	b2241c0551	fix bulk action modal formating	2015-06-08 14:01:47 +02:00
Tim Daubenschütz	1b52864f3e	remove testing from watch process	2015-06-08 13:55:55 +02:00
Tim Daubenschütz	6d337890d0	merge conflict	2015-06-08 13:47:24 +02:00
Tim Daubenschütz	cea111c25e	solve conflict	2015-06-08 11:51:49 +02:00
Tim Daubenschütz	e2ab0c1a5c	format stuff	2015-06-08 11:50:40 +02:00
Tim Daubenschütz	793e1a78ca	add tests for generalutils	2015-06-08 11:19:18 +02:00
Tim Daubenschütz	b1973d3a64	finish integrating jest testing suite	2015-06-08 09:53:14 +02:00
Tim Daubenschütz	82bea4c241	integrate jest - not working yet though	2015-06-05 16:57:56 +02:00
Tim Daubenschütz	851d42e1d9	quick fix	2015-06-05 16:23:16 +02:00
Tim Daubenschütz	95f4efa92d	merge conflict	2015-06-05 16:21:36 +02:00
Tim Daubenschütz	443829320f	add personal note to piece detail page	2015-06-05 16:20:28 +02:00
Tim Daubenschütz	3a812e531d	fix search bug	2015-06-05 15:17:35 +02:00
Tim Daubenschütz	7f82d49278	resolve merge	2015-06-05 14:29:37 +02:00
Tim Daubenschütz	76a41a23b9	add details to piece detail page	2015-06-05 14:22:02 +02:00
vrde	62cc6b41df	Lint code	2015-06-05 14:14:59 +02:00
vrde	e8627cd0a3	Merge branch 'master' into AD-412-mediaplayer ... Conflicts: js/components/ascribe_media/resource_viewer.js js/components/edition_container.js js/mixins/inject_in_head_mixin.js package.json	2015-06-05 13:18:16 +02:00
vrde	a4b3438a2d	Add shmui to handle images	2015-06-05 13:15:31 +02:00