517 Commits

Author	SHA1	Message	Date
Tim Daubenschütz	cbb965c264	Merge remote-tracking branch 'origin/AD-419-decouple-piece-registration-from-' into AD-551-work-on-burn-down-list	2015-07-10 19:01:21 +02:00
Tim Daubenschütz	104a72fcc9	generic polling	2015-07-10 19:00:59 +02:00
diminator	62289be5ce	polling for editions	2015-07-10 18:51:35 +02:00
vrde	33d599b923	Start to work on custom landing	2015-07-10 18:45:26 +02:00
vrde	df5295dffd	Cleanup and reorder routes	2015-07-10 18:21:42 +02:00
diminator	e282da8474	Merge remote-tracking branch 'remotes/origin/AD-551-work-on-burn-down-list' into AD-419-decouple-piece-registration-from-	2015-07-10 17:52:39 +02:00
diminator	b58fe51722	fixed crowdcurity issues on login/email/requestpassword ... num editions supports status: -1, 0, >0	2015-07-10 16:45:49 +02:00
vrde	d5ea4e515d	Use distinct routers for different apps	2015-07-10 16:43:35 +02:00
Tim Daubenschütz	b6048a7f91	refactor login form	2015-07-10 16:34:34 +02:00
Tim Daubenschütz	e55bc239b4	refactor signup form	2015-07-10 16:04:57 +02:00
Tim Daubenschütz	b364414e16	input checkbox functionality	2015-07-10 15:56:54 +02:00
diminator	6f7600fca2	login errors + request obfuscated	2015-07-10 15:52:09 +02:00
diminator	8679a2446d	Merge remote-tracking branch 'remotes/origin/AD-551-work-on-burn-down-list' into AD-419-decouple-piece-registration-from-	2015-07-10 14:49:19 +02:00
Tim Daubenschütz	fd6fad5da3	correct number of editions	2015-07-10 14:48:55 +02:00
Tim Daubenschütz	62ae8fd08b	fix warnings	2015-07-10 14:15:22 +02:00
Tim Daubenschütz	fa6e522222	Merge branch 'AD-551-work-on-burn-down-list' of bitbucket.org:ascribe/onion into AD-551-work-on-burn-down-list	2015-07-10 13:54:36 +02:00
Tim Daubenschütz	1df068d75f	add edition creation functionality	2015-07-10 13:54:25 +02:00
diminator	6a84e9d36e	whitelabel logo + sluice	2015-07-10 11:59:03 +02:00
vrde	cbe3be6faa	Correct typo	2015-07-10 11:07:25 +02:00
Tim Daubenschütz	ca72168da2	Merge remote-tracking branch 'origin/AD-419-decouple-piece-registration-from-' into AD-551-work-on-burn-down-list	2015-07-10 10:32:42 +02:00
Tim Daubenschütz	bcb1bbe29b	first cut edition creation in piece list item	2015-07-10 10:32:39 +02:00
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