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

63 Коммитов

Автор SHA1 Сообщение Дата
dseif 30e1fcc86f Added demo for ticket 66 2011-04-19 23:47:10 -04:00
ScottDowne b91f7674e7 [#408] google scripts need to wait for google.load 2011-03-21 11:47:26 -04:00
ScottDowne c2db07d779 [#409] parser name referencing issue 2011-03-14 16:28:07 -04:00
Anna Sobiepanek f7c358670a Merge commit '0b981bd74430a53ac49ab09571251c4c4c1' into 0.3 2011-02-08 17:24:43 -05:00
Anna Sobiepanek 11951b172f Merge commit '5265a6391fb' into 0.3 
Conflicts:
	demos/semantic_video/xml/webMadeMovies.xml
 2011-02-08 17:20:35 -05:00
Anna Sobiepanek 614f10271d xml fixed [#276 state:peer-review-requested] 2011-02-08 12:34:24 -05:00
Anna Sobiepanek 0b981bd744 added lastFM [#307] 2011-02-07 15:05:00 -05:00
Anna Sobiepanek 5265a6391f changed long to lng [#264] 2011-02-04 13:49:34 -05:00
ScottDowne caae52b080 [#255] renaming of plugin files 2011-01-11 17:50:16 -05:00
ScottDowne a64396da1c [#246] pulled map updates and 0.2 2011-01-11 16:09:51 -05:00
ScottDowne 29c8528f48 [#246] attribution - if the user did not specify any parameters just pull the text from the tag 2011-01-11 12:42:08 -05:00
ScottDowne 3fa2bb64f6 [#246] uncommented attribution from XML 2011-01-11 11:35:14 -05:00
ScottDowne de16533694 [#246] uncommented googlemap from XML 2011-01-11 10:56:16 -05:00
ScottDowne fefc00fe28 [#246] commented out last fm container, and inactive divs temporarily 2011-01-10 16:28:30 -05:00
ScottDowne c766e43fb6 [#246] removed backup files that slippe din from old 0.1 branch 2011-01-10 15:34:22 -05:00
ScottDowne f290da2054 [#246] more lowercase fixes 2011-01-10 15:25:17 -05:00
ScottDowne db05600a6a [#246] fixed some camel notation references 2011-01-10 12:53:29 -05:00
ScottDowne cf09c98ff7 [#246] removed mistake 2011-01-09 17:06:30 -05:00
ScottDowne 144942a386 [#246] second conversion of 0.1 semantic demo 2011-01-09 17:04:43 -05:00
ScottDowne 3cdf6a0e2e [#246] initial conversion of 0.1 semantic demo 2011-01-08 13:16:28 -05:00
rwldrn 7fe71f2a2e merg 2010-12-28 12:34:22 -05:00
rwldrn bcd6dc99f3 merg 2010-12-28 12:31:48 -05:00
Anna Sobiepanek 8ef1f70fd0 cleanup 2010-12-05 13:15:48 -05:00
Anna Sobiepanek 4eb9bb5233 initial webpage plugin work [#160] 2010-12-04 18:54:01 -05:00
rwldrn c91beafd94 Initial API re-draft; 2010-12-02 18:09:10 -05:00
Anna Sobiepanek 218833d62e Merge commit 'ce0452d4a10daa3' 2010-11-27 17:29:08 -05:00
ScottDowne 61313cc6ae ticket #147 webpage command height and width 2010-11-19 15:50:23 -05:00
ScottDowne ce0452d4a1 ticket #138 initial update call 2010-11-18 12:03:47 -05:00
Anna Sobiepanek d348146940 Merge commit 'dd2d09fb63c27ad5326bf494b3df326b4e04c810' 2010-10-22 18:22:39 -04:00
ScottDowne 3fae06d29d tic #128 hide empty subtitle divs 2010-10-19 15:34:59 -04:00
ScottDowne 61eff42777 tic #110 accessibility id breaks translating 2010-10-18 14:31:26 -04:00
ScottDowne dd2d09fb63 local video source changed back to remote 2010-10-18 13:30:51 -04:00
ScottDowne a430b91578 moved credits into semantic video, andout of library 2010-10-18 13:26:58 -04:00
ScottDowne c2b5ed9a3c ticket #116 semantic demo fix 2010-10-15 13:27:17 -04:00
Anna Sobiepanek c34fd2e6a6 Merge commit 'origin/iframe' 
Conflicts:
	popcorn.js
 2010-10-14 17:28:27 -04:00
Anna Sobiepanek 4b9ec7695e Merge commit 'scott/jscommand' 2010-10-14 16:38:11 -04:00
ScottDowne 4549104143 changed javascript command name into script command name 2010-10-14 16:33:30 -04:00
Anna Sobiepanek ced92ce77e added iframe support [#114 state:peer-review-requested] 2010-10-14 14:06:39 -04:00
ScottDowne ce1f101e1c tic #115 javascript command demo 2010-10-14 14:03:32 -04:00
ScottDowne bad5e7c780 tic #105 twitter and jquery scripts loaded internally 2010-10-14 12:14:44 -04:00
Anna Sobiepanek b67392c7c3 Merge branch 'metadataLoader' of http://github.com/ScottDowne/popcorn-js 
Conflicts:
	demos/universalSubtitles/index.html
	demos/universalSubtitles/style.css
	popcorn.js
 2010-10-13 16:06:16 -04:00
Anna Sobiepanek 43db5f5a22 merged scotts dutch branch 2010-10-13 15:39:52 -04:00
ScottDowne f00e5c2100 fixed meta data loader 2010-10-13 15:24:50 -04:00
ScottDowne 35045a3bb0 styled dutch demo, and fixed lint errors for wiki, universal, and lastfm patches 2010-10-12 14:49:24 -04:00
ScottDowne 5cf21ff637 Merge branch 'dutch' of github.com:ScottDowne/popcorn-js 
Conflicts:
	popcorn.js
 2010-10-12 13:52:01 -04:00
Anna Sobiepanek 7cd1846fbb Merge branch 'lastFm' of github.com:annasob/popcorn-js 2010-10-07 12:16:23 -04:00
Anna Sobiepanek 6268475a9f fixed language to english for village telco wiki [#101] 2010-10-06 11:37:54 -04:00
Anna Sobiepanek 2691d0a01c added actual track for this video [#103 peer-review-requested] 2010-10-06 11:26:58 -04:00
ScottDowne 5300d17f11 added a simple demo that was not working Sunday 2010-10-05 16:30:29 -04:00
ScottDowne bcca42cf35 added support to retreive subtitle, map, twitter and wiki data from universal subtitles 2010-10-05 10:55:14 -04:00