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

2204 Коммитов

Автор SHA1 Сообщение Дата
Daniel Hodgin 97ad1bd1c3 merged in attribution and updated to make work with videomanager 2010-06-27 15:05:36 -04:00
Anna Sobiepanek ff7b572297 added attribution and Creative Commons images [#34 state:peer-review-requested] [#20 state:peer-review-requested] 2010-06-26 19:23:54 -04:00
Daniel Hodgin e72cbb9f4e updated mapcommand code to test manifest resourceid linking in demo 2010-06-26 16:56:10 -04:00
ScottDowne 572f47693b fixed merge conflict 2010-06-26 07:29:51 -07:00
Daniel Hodgin ed037d7751 merged with scotts master 2010-06-25 23:49:23 -04:00
ScottDowne beba354b7e merged, and fixed some merge problems 2010-06-25 23:22:30 -07:00
Daniel Hodgin 6d7b4454f3 minor changes 2010-06-25 23:47:18 -04:00
ScottDowne 07933e8340 added flickr feeds 2010-06-25 15:55:26 -04:00
Daniel Hodgin 7ffc3e5329 merged scotss twitterwidget branch in, now containes footnote, 47, manifest, twitterWidget, translate, xmldemo 2010-06-25 15:43:48 -04:00
Daniel Hodgin e123fd648c added footnotes to xml 2010-06-25 15:13:16 -04:00
Daniel Hodgin fbfde95b36 merging in scotts branch 47 for ticket #47 2010-06-25 15:00:10 -04:00
Daniel Hodgin ef866c75a0 Merge branch 'footnote' of git://github.com/annasob/popcorn-js 2010-06-25 14:45:09 -04:00
Anna Sobiepanek 6f9f6a54db fixed onOut [#54 state:peer-review-requested] 2010-06-25 14:43:25 -04:00
Daniel Hodgin 1066cb68ea merged in footnote 2010-06-25 14:37:05 -04:00
Daniel Hodgin 1cde0b6fc9 merged in manifest and translate 2010-06-25 14:32:55 -04:00
Anna Sobiepanek 45af4050d5 added footnotes [#54 state:peer-review-requested] 2010-06-25 13:05:45 -04:00
Daniel Hodgin faaa9535d8 Merge branch 'translate' of git://github.com/ScottDowne/popcorn-js 2010-06-25 12:31:00 -04:00
Daniel Hodgin 2e574bbab0 merged with scott manifest 2010-06-25 12:27:46 -04:00
Daniel Hodgin 0e82d48ea6 merged with anna 0.1 2010-06-25 12:22:30 -04:00
Daniel Hodgin 2c3ded5541 #43 xml demo file 2010-06-25 12:19:07 -04:00
ScottDowne 4744aaaf0d forgot the src on the video again 2010-06-24 15:50:00 -04:00
ScottDowne 88437fa9ce added translation and made it update real time 2010-06-24 15:48:15 -04:00
ScottDowne 7a3978fc2d added parsing of the manifest 2010-06-24 14:28:54 -04:00
ScottDowne 15f1010581 forgot to readd remote video src 2010-06-23 13:16:20 -04:00
ScottDowne a3585854f0 added default ins andor outs to 0 and duration 2010-06-23 13:13:45 -04:00
ScottDowne cf9274e390 video src changed back to remote 2010-06-23 11:37:53 -04:00
ScottDowne e9fbfcefa9 Added twitter widget 2010-06-23 11:35:15 -04:00
Anna Sobiepanek 49d9f643aa Merge commit 'scott/lint' into 0.1 
Conflicts:
	index.html
 2010-06-22 14:11:35 -04:00
ScottDowne fa1a56e7d5 added support for SS:FF and SS 2010-06-22 08:53:59 -04:00
Anna Sobiepanek 1548544d21 Revert "Merge branch 'review' of github.com:annasob/popcorn-js into 0.1" 
This reverts commit b6a2893d42, reversing
changes made to 6c6ea05091.
 2010-06-22 08:10:09 -04:00
Anna Sobiepanek b6a2893d42 Merge branch 'review' of github.com:annasob/popcorn-js into 0.1 2010-06-22 07:20:21 -04:00
Anna Sobiepanek 8bda63f816 Merge branch 'time' of http://github.com/ScottDowne/popcorn-js into review 
Conflicts:
	README
	index.html
	popcorn.js
	xml/webMadeMovies.xml
 2010-06-22 07:12:28 -04:00
Anna Sobiepanek 6c6ea05091 edited <video src> to use http:// link to video 2010-06-22 07:05:48 -04:00
ScottDowne c75dc0bcb3 added support for make check-lint and fixed all linting errors 2010-06-21 16:20:37 -04:00
ScottDowne 6bd7a4ceef added video friendly time format, and fixed parseInt to parseFloat to work with milliseconds 2010-06-21 12:28:40 -04:00
Daniel Hodgin a4d5642d91 xml updates for demo 2010-06-20 22:24:50 -04:00
Daniel Hodgin 37914542d4 added AUTHORS file 2010-06-20 20:31:07 -04:00
Daniel Hodgin ce816e94e9 Merge branch '0.1' of git://github.com/annasob/popcorn-js 2010-06-20 20:27:40 -04:00
Anna Sobiepanek 8ab6f00d9a edited README 2010-06-20 19:48:10 -04:00
Anna Sobiepanek bd8073a8c3 merges annasob master 2010-06-20 19:45:24 -04:00
Anna Sobiepanek a7d5db1a9a added dhodgin README and updated 2010-06-20 19:30:05 -04:00
Anna Sobiepanek 4720baa45d merged scotts geo branch 2010-06-20 19:24:05 -04:00
Anna Sobiepanek cc00fb6828 merged scotts geo branch 2010-06-20 19:21:04 -04:00
Anna Sobiepanek 4f1c86a94b merged scotts twiter branch 2010-06-19 19:57:53 -04:00
Anna Sobiepanek 0fb0ddc73f Merge branch 'demo' of github.com:annasob/popcorn-js into demo 2010-06-19 14:50:43 -04:00
Anna Sobiepanek 9c98047469 removed video file 2010-06-19 14:50:11 -04:00
Anna Sobiepanek 82d9abe18b removed video file 2010-06-19 14:48:39 -04:00
Daniel Hodgin adc5c30c37 Merge branch 'geo' of git://github.com/annasob/popcorn-js 2010-06-17 20:06:17 -04:00
Anna Sobiepanek af80bc442b adding in scotts stuff 2010-06-17 17:33:44 -04:00
Daniel Hodgin 41db37922f added comments to video.js to explain functions 2010-05-31 17:17:47 -04:00