Граф коммитов

2405 Коммитов

Автор SHA1 Сообщение Дата
Anna Sobiepanek 739d5122d1 Merge commit '08c8c80b28ced' into 0.2 2010-12-21 11:08:13 -05:00
rwldrn 08c8c80b28 [#238] Add plugin manifest to Popcorn.registry entries 2010-12-20 18:30:59 -05:00
Anna Sobiepanek c49c835bde Merge commit '9a0dc6a136d' into 0.2
Conflicts:
	popcorn.js
2010-12-20 18:18:51 -05:00
Anna Sobiepanek a9d29637d3 Merge commit '3177abac8168' into 0.2 2010-12-20 17:39:49 -05:00
Anna Sobiepanek 470b3684f3 preliminary map working need to add location] 2010-12-20 17:26:59 -05:00
ScottDowne 91f74fa478 [#166] added manifest as per ticket #237 2010-12-20 17:10:08 -05:00
ScottDowne d952bc465a [#159] added manifest as per ticket #237 2010-12-20 17:02:44 -05:00
ScottDowne 62d01eec40 [#159] comment fix 2010-12-20 16:26:25 -05:00
ScottDowne 19e2404e15 [#159] small tweak with proper profile widget vs search widget 2010-12-20 16:24:25 -05:00
Anna Sobiepanek be01c4db82 made changes as per Ricks review [#158 state:peer-review-requested] 2010-12-20 15:36:49 -05:00
ScottDowne c0f9d44312 [#159] twitter uses @ instead of from: in the twitter source 2010-12-20 14:41:48 -05:00
Anna Sobiepanek b848db6678 finished plugin and testing [#158 state:peer-review-requested] 2010-12-20 14:28:30 -05:00
ScottDowne 02717a8b8f [#159] initial twitter plugin without unit tests 2010-12-20 14:18:43 -05:00
rwldrn 9a0dc6a136 [#176] handle function calls after dom ready 2010-12-20 13:28:52 -05:00
Anna Sobiepanek 1e4db584e2 Merge branch '0.2' of github.com:annasob/popcorn-js into wikiPlugin 2010-12-20 11:19:27 -05:00
ScottDowne 3072f46a2c [#166] initial flickr plugin without unit tests 2010-12-20 11:18:03 -05:00
rwldrn a1498ea4ae Added ready.html to support 176 2010-12-20 11:10:56 -05:00
rwldrn e2c63691b8 Linting 2010-12-20 11:09:01 -05:00
rwldrn 76b9c532a4 [#176] Add DOMContentLoaded check to popcorn core 2010-12-20 10:54:29 -05:00
rwldrn 2be90be1bb Merge branch '0.2' of git://github.com/annasob/popcorn-js into trackevents 2010-12-20 10:01:16 -05:00
rwldrn b983e63130 merge fix 2010-12-20 10:01:13 -05:00
Anna Sobiepanek 3319016739 Merge commit 'e92e27838aa14ec4' into 0.2 2010-12-19 15:59:32 -05:00
Rick Waldron e92e27838a [#233] guid needs to be more unique; unit test revision 2010-12-19 15:51:53 -05:00
Anna Sobiepanek 331bf27f92 Merge commit '58196fb2105839d' into 0.2 2010-12-19 15:44:56 -05:00
Anna Sobiepanek 3821b595bd starting tests 2010-12-19 14:40:53 -05:00
Anna Sobiepanek 93059f825e still need tests 2010-12-17 12:11:20 -05:00
rwldrn 1868b6e7a4 [#233] guid needs to be more unique; +10 unit tests 2010-12-17 11:40:51 -05:00
ScottDowne 51b9788011 [#228] tighten up test run time 2010-12-17 10:23:25 -05:00
ScottDowne 3253ea6a0c Merge branch 'trackevents' of https://github.com/rwldrn/popcorn-js into trackevents 2010-12-17 10:01:50 -05:00
Daniel Brooks 3177abac81 [#232] pass in 'this' instead of 'self' 2010-12-17 00:07:28 -06:00
rwldrn 30483e59a8 [#228] Remove Track Event; index integrity tests; minor bug fixes 2010-12-16 20:11:00 -05:00
ScottDowne 7430305236 testing 2010-12-16 17:07:24 -05:00
rwldrn 83ed115b8c [#228] Remove Track Event; index integrity tests 2010-12-16 16:56:06 -05:00
ScottDowne 52fa923ff5 practice test, should never be seen 2010-12-16 16:18:03 -05:00
rwldrn a748ca02a8 [#228] Remove Track Event 2010-12-16 15:34:28 -05:00
rwldrn 9c5495081d TrackEvent management proposal 2010-12-16 13:44:19 -05:00
rwldrn 58196fb210 [#230] Timeout async tests if the unit fails 2010-12-16 12:33:56 -05:00
ScottDowne 6ba9b776a7 [#224] removed tools not needed at this time 2010-12-16 11:35:27 -05:00
rwldrn 9e939022ef [#227] Fix bad unit tests for Popcorn Events: Real 2010-12-15 17:03:26 -05:00
ScottDowne 9535dbef93 [#224] Makefile for linting 2010-12-15 15:58:10 -05:00
rwldrn b95377e1e8 [#226] Fix comma typo on line 316 2010-12-15 15:56:06 -05:00
rwldrn 88528fc529 [#223] Rename XHR unit tests 2010-12-15 15:36:24 -05:00
rwldrn b8b698e684 Fixes ==/===; deletes test/data/json.js 2010-12-15 14:51:10 -05:00
rwldrn 792d6f7a97 Merge branch '0.2_xhr' into 0.2 2010-12-15 14:32:54 -05:00
rwldrn 4e122176a6 merge 2010-12-15 14:32:48 -05:00
rwldrn 4599b6eb3d [#220] Popcorn.xhr support needed for parsing data-timeline-sources 2010-12-15 14:30:35 -05:00
rwldrn 12bad186b3 [#219] Missing coma on line 64; Causes leaks 2010-12-14 20:11:11 -05:00
rwldrn 28597f236f [#216] tests for removeplugin 2010-12-14 13:09:07 -05:00
rwldrn 682e9cb0d1 [#218] add removeplugin to protected properties 2010-12-14 13:07:46 -05:00
Anna Sobiepanek 14dbbd09fd initial wiki work [#158] 2010-12-14 13:04:49 -05:00