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

2405 Коммитов

Автор SHA1 Сообщение Дата
Anna Sobiepanek 37c94f2d9c Merge commit 'scott/110' 2010-10-18 16:47:59 -04:00
ScottDowne ed31779cff added LICENSE file 2010-10-18 15:13:49 -04:00
ScottDowne b40530654b removed invalid TODO comments 2010-10-18 14:57:32 -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 55a4e35dc6 added git ignore file 2010-10-18 13:24:39 -04:00
ScottDowne c2b5ed9a3c ticket #116 semantic demo fix 2010-10-15 13:27:17 -04:00
ScottDowne c6c5708699 merged tic #116 with most recent master 2010-10-15 10:36:16 -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
ScottDowne 53dfdce864 fixed all lint errors 2010-10-14 15:08:24 -04:00
ScottDowne 2bd6f8f69c tic #115 javascript command default to empty function if non exist 2010-10-14 14:52:56 -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 e15b320ee5 tic #115 javascript command 2010-10-14 13:53:46 -04:00
ScottDowne 8dcd4787bb removed test line 2010-10-14 12:15:19 -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 9f29bc20c7 fixed meta data loader, again 2010-10-13 15:28:09 -04:00
ScottDowne f00e5c2100 fixed meta data loader 2010-10-13 15:24:50 -04:00
ScottDowne 80ee018aba readded default number of words for wiki 2010-10-13 12:06:47 -04:00
ScottDowne 3980d81592 fixed wiki command coming from universal subtitles 2010-10-13 12:04:10 -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
krome 19c8539404 cleanup (remove of the facebook and blogmarks.net support wich are not ready yet) 2010-10-06 10:30:41 +02:00
ScottDowne 5300d17f11 added a simple demo that was not working Sunday 2010-10-05 16:30:29 -04:00
Anna Sobiepanek 3ee6c52036 added typeof fix [#101 state:peer-review-requested] 2010-10-05 14:49:38 -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
krome 073282f099 update of the keyword used for the lastfm support 2010-10-05 11:07:42 +02:00
Anna Sobiepanek ffacb69469 added Bogomil's wiki language fix [#101 state:peer-review-requested] 2010-10-04 21:36:34 -04:00
krome 62ad48dbf7 images forgotten 2010-09-28 16:18:37 +02:00
krome 60fa4589a3 Lastfm support added 2010-09-28 16:17:10 +02:00
Gordon P. Hemsley d001ef222a Merge with upstream and do some more cleanup. (Includes a number of whitespace-only changes.) 2010-09-03 11:33:58 -04:00
Anna Sobiepanek 8a908a15ee Merge branch 'typo' of http://github.com/corbanbrook/popcorn-js 2010-09-01 16:56:23 -04:00
Corban Brook c7b718347d renamed var p to Popcorn. 2010-09-01 15:47:55 -04:00
Corban Brook 9d76d63a8d Fixed typo in git clone path 2010-09-01 15:20:18 -04:00
ScottDowne 6245f7a741 Merge branch 'rework2' of github.com:ScottDowne/popcorn-js into rework 
Conflicts:
	demos/semantic_video/index.html
 2010-09-01 15:18:36 -04:00
ScottDowne fe795ae8b5 Merge branch 'rework' of git://github.com/ScottDowne/popcorn-js into rework 2010-09-01 09:54:05 -04:00
Anna Sobiepanek df7d72e0f7 updated video src and added MP4 fallback 2010-08-30 13:47:57 -04:00
Anna Sobiepanek 2bf9139544 updated demo to look like http://webmademovies.etherworks.ca/popcorndemo/ 2010-08-30 10:38:38 -04:00
Gordon P. Hemsley 1b1c44a94d Add textual alternatives to images. 2010-08-25 17:18:51 -04:00
Gordon P. Hemsley 4137c8afac Convert to home page to HTML5, while creating some uniformity in the markup and fixing some syntax issues. 2010-08-25 17:03:28 -04:00
Gordon P. Hemsley 46554bb03e Make demo valid HTML5. 2010-08-25 16:21:15 -04:00
ScottDowne e812d5b733 rework part deux. global Popcorn object and overlay modification 2010-08-19 15:39:16 -04:00