712 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
TimDaubenschuetz	3f4a5ced9a	Merged in AD-523-french-translation-of-whole-front (pull request #5) ... translated english text to french	2015-07-08 10:20:44 +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
diminator	8d6a126aa7	Merge remote-tracking branch 'remotes/origin/AD-527-transition-to-login-form-if-user-'	2015-07-02 18:34:33 +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
diminator	0391b99f1f	styling of accordeon-list items	2015-07-02 14:12:54 +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
Sylvain Bellemare	ba46427e5f	README.md edited online with Bitbucket	2015-07-02 10:24:59 +00:00