1
0
mirror of https://github.com/ascribe/onion.git synced 2024-12-23 09:50:31 +01:00
Commit Graph

2592 Commits

Author SHA1 Message Date
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
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
c47b2c3283 Merged in readme (pull request #3)
removed comments about now resolved issue
2015-07-02 11:36:15 +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
Sylvain Bellemare
ed74674bcf removed comments about now resolved issue 2015-07-01 13:19:02 +02:00
Tim Daubenschütz
16c8df2f8d Merge branch 'AD-496-add-control-buttons-to-fineupload' 2015-07-01 13:09:31 +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