mozilla
/
popcorn-js
зеркало из https://github.com/mozilla/popcorn-js.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность
964 коммитов 4 Ветки 30 Теги 81 MiB
Граф коммитов

964 Коммитов

Автор SHA1 Сообщение Дата
stevenaw e237cbf969 [#140] Server detection, object embedding, and mute fix and UI tweaks 2011-03-15 18:20:36 -04:00
stevenaw 12805a7aec [#140] Unit tests fixed 2011-03-15 14:22:08 -04:00
unknown 08dc612a51 Bug #322 - Added credits to source code and version input to make file. Authors file added. 2011-03-15 13:53:19 -04:00
stevenaw 79c12c5f0f [#140] Updated for core engine changes 2011-03-15 11:44:58 -04:00
stevenaw a8a3dc2288 [#140] Merge vvasabi's work 2011-03-15 11:27:12 -04:00
stevenaw d55216a98a Merge branch '0.4' of git://github.com/annasob/popcorn-js into 0.4 2011-03-15 11:06:03 -04:00
ScottDowne c2db07d779 [#409] parser name referencing issue 2011-03-14 16:28:07 -04:00
Anna Sobiepanek d88eb93d21 Merge commit 'scott/324' into 0.4 2011-03-14 16:16:12 -04:00
Anna Sobiepanek 2d82612abc Merge commit 'scott/340' into 0.4 2011-03-14 15:44:12 -04:00
Anna Sobiepanek 6d1a7dfd73 Merge branch '393' into 0.4 2011-03-14 14:09:51 -04:00
Anna Sobiepanek 1087cc0f1b Merge commit 'dseif/ticket342' into 0.4 2011-03-14 14:07:30 -04:00
Anna Sobiepanek a86cccac73 Merge branch '358' into 0.4 2011-03-14 14:03:01 -04:00
Anna Sobiepanek 4cf105eb13 Merge commit 'humph/367' into 0.4 2011-03-14 13:39:26 -04:00
Anna Sobiepanek 1d89d108e8 fixed unit test as per review [#358 state:peer-review-requested] 2011-03-14 12:34:23 -04:00
Nick Doiron 081fa3659d fixed comma syntax error 2011-03-13 17:45:02 -04:00
Nick Doiron 7e6169a798 * Updated to Popcorn 0.4 plugin format 
* markers are added at start and removed at end, no synchronization
* markers can have popup
* marker size can be changed
 2011-03-13 17:16:55 -04:00
Anna Sobiepanek 5e45899089 Merge commit 'scott/374' into 0.4 2011-03-12 16:38:28 -05:00
Anna Sobiepanek 5ece74e156 Merge branch '388' into 0.4 2011-03-12 16:36:14 -05:00
Anna Sobiepanek 9c3429b45f deleted old files and updated src in html 2011-03-12 16:35:44 -05:00
Nick Doiron c38112911e changed to follow style format 2011-03-12 14:21:48 -05:00
ScottDowne 94fade213a [#324] line too long 2011-03-11 16:32:45 -05:00
ScottDowne 1d67748f3a [#324] scratch all that, let's go super simple 2011-03-11 16:26:17 -05:00
ScottDowne 82f1b712af [#324] added nop functions if needed, and error handling and simplified check 2011-03-11 16:05:28 -05:00
David Humphrey 99159c3a6d Add parsers to popcorn-complete, linting, plus fixes to parsers for minification/linting [ticket #367]. 2011-03-11 15:37:03 -05:00
ScottDowne f75be03e30 [#324] remove single unused variable I forgot to remove last commit 2011-03-11 11:34:00 -05:00
ScottDowne b18116c1c8 [#324] Popcorn now takes an id, or an abstracted video like object 2011-03-11 11:22:09 -05:00
Brad Chen baf55c326d Use corret unix file format. 2011-03-11 02:22:03 -05:00
Brad Chen 5079221fae Use popcorn.extend to inject class methods. 2011-03-11 02:19:59 -05:00
Brad Chen 73bcf4d0c4 Initial draft of the normalized approach. 2011-03-11 02:07:11 -05:00
Anna Sobiepanek 5214b956c9 fixed name [#393 state:peer-review-requested] 2011-03-10 17:13:16 -05:00
Anna Sobiepanek fd520a3526 testing the innerHTML is inconsistent + small fixes [#358 state:peer-review-requested] 2011-03-10 14:58:18 -05:00
Anna Sobiepanek 43f14ad0ee Merge commit 'origin/0.4' into 358 
Conflicts:
	plugins/wikipedia/popcorn.wikipedia.js
	plugins/wikipedia/popcorn.wikipedia.unit.js
 2011-03-10 14:46:42 -05:00
Anna Sobiepanek 88b2526bf7 changed unit tests to use exec [#358] 2011-03-10 14:45:09 -05:00
Minoo f104b99eec just a minor fix on image unit test -#368 2011-03-09 20:25:18 -05:00
Minoo 5d50d38314 updated the image plugin, fixed some lint complaints, modified the test for text overlaying -#368 2011-03-09 20:17:36 -05:00
Anna Sobiepanek 02a9c1f1be Merge commit 'dan/t321b' into 0.4 
Conflicts:
	plugins/subtitle/popcorn.subtitle.unit.html
 2011-03-09 19:52:31 -05:00
Anna Sobiepanek bc645c772d Merged dan's ad4737147a into 4.0 2011-03-09 19:35:10 -05:00
stevenaw 238d522ed0 [#280] Core tests added 2011-03-09 12:36:52 -05:00
Minoo cba7dc8ade added text overlay to the image plugin, made a default size for images -#368 2011-03-08 23:14:21 -05:00
Dan Ventura 015d7ce1db added additional plugins to automation. Adjusted duration times. Fixed bug regarding clearEvents() function 2011-03-08 18:04:40 -05:00
Dan Ventura ad4737147a added subtitle unit tests. Added subtitle div id assignment to popcorn.subtitle.js 2011-03-08 18:03:44 -05:00
Dan Ventura b87354d1bf updated to 0.4 2011-03-08 17:04:42 -05:00
Anna Sobiepanek 2e5d1fbaec Merge commit 'scott/340' into 0.4 2011-03-08 16:50:30 -05:00
Anna Sobiepanek 6b3025e8ab Merge commit 'scott/378' into 0.4 2011-03-08 16:37:00 -05:00
stevenaw 3b75ef482e Merge branch '0.4' of git://github.com/annasob/popcorn-js into 0.4 2011-03-08 16:24:54 -05:00
rwldrn 4c928a37d6 [#390] Removes erroneously added files 2011-03-08 16:09:04 -05:00
rwldrn e36d9d3594 [#390] Adds removeInstanceById existance test 2011-03-08 15:11:16 -05:00
rwldrn 645df845c5 [#390] Remove unnec line from tests 2011-03-08 14:33:11 -05:00
Anna Sobiepanek 0400d8ae11 replaced file name [#388] 2011-03-08 14:28:51 -05:00
rwldrn 4f4cc9625c [#390] Re-org; Adds instance return; Adds Popcorn.removeInstanceById(); Adds unit test 2011-03-08 14:28:13 -05:00