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

2405 Коммитов

Автор SHA1 Сообщение Дата
ScottDowne d1f1cf91c9 [#257] cleanup of if/else 2011-01-11 18:09:42 -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
Anna Sobiepanek 18a5e303bc Merge commit '0820972090' into 0.2 2011-01-11 14:26:39 -05:00
Anna Sobiepanek 0820972090 fixing naming and tests removing alert[#254] 2011-01-11 14:07:31 -05:00
Anna Sobiepanek 0c4ca8b833 refactoring google map [#254 state:peer-review-requested] 2011-01-11 14:00:48 -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
Anna Sobiepanek 23d441321d Merge commit '9ec6f1c5289' into 0.2 2011-01-11 11:21:08 -05:00
ScottDowne de16533694 [#246] uncommented googlemap from XML 2011-01-11 10:56:16 -05:00
Anna Sobiepanek c87c378eae Merge commit '46e8abbde' into 0.2 2011-01-11 10:55:23 -05:00
ScottDowne dad70b9c54 Merge branch '0.2' of git://github.com/annasob/popcorn-js into 246 2011-01-11 10:30:24 -05:00
Anna Sobiepanek 9ec6f1c528 fixed geocoder location [#252 state:peer-review-requested] 2011-01-10 17:32:40 -05:00
Anna Sobiepanek c5bfa2d139 Merge commit '9bb67bb082b' into 0.2 2011-01-10 16:57:34 -05:00
ScottDowne cb62c663d1 [#246] fixed google maps to check that zoom is a number, and lowercased plugin unit tests 2011-01-10 16:54:16 -05:00
Anna Sobiepanek e06cf709d6 Merge commit 'a131fcceab7' into 0.2 2011-01-10 16:49:06 -05:00
Anna Sobiepanek 9bb67bb082 [#250] fixed target as per PR 2011-01-10 16:42:51 -05:00
ScottDowne fefc00fe28 [#246] commented out last fm container, and inactive divs temporarily 2011-01-10 16:28:30 -05:00
ScottDowne a131fcceab [#249] moved code block into closure 2011-01-10 16:09:46 -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 85d23acabb [#249] loading twitter widget internally 2011-01-10 15:00:22 -05:00
rwldrn 46e8abbde4 [#251] Issue with object addressing of registered exec callbacks 2011-01-10 13:41:03 -05:00
rwldrn 92996e8ea2 ,merge 2011-01-10 13:24:54 -05:00
Anna Sobiepanek 1a9eacb14b fixed licenseType dependecy and naming [#250 state:peer-review-requested] 2011-01-10 13:21:52 -05:00
ScottDowne db05600a6a [#246] fixed some camel notation references 2011-01-10 12:53:29 -05:00
Anna Sobiepanek 655a65c77b Merge commit 'cd19946d3e15' into 0.2 2011-01-10 12:10:16 -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 9cd37e8331 Merge branch '0.2' of git://github.com/annasob/popcorn-js into 246 2011-01-09 15:33:02 -05:00
Anna Sobiepanek f0db66c1fe Merge commit '1e60571c05' into 0.2 2011-01-08 14:06:03 -05:00
Anna Sobiepanek ba016277fc Merge commit 'd8dbe33a77612b2b5' into 0.2 2011-01-08 14:03:17 -05:00
Anna Sobiepanek 0da8951c9d Merge commit '4a0a4373ca9' into 0.2 2011-01-08 13:59:48 -05:00
Anna Sobiepanek 7ba856ab42 Merge commit 'a9d38b15310' into 0.2 2011-01-08 13:40:35 -05:00
ScottDowne f09ea77894 Merge branch '0.2' of git://github.com/annasob/popcorn-js into 246 2011-01-08 13:35:34 -05:00
Anna Sobiepanek 0f879666f9 Merge commit '1bbaab0a5e' into 0.2 2011-01-08 13:25:38 -05:00
ScottDowne 3cdf6a0e2e [#246] initial conversion of 0.1 semantic demo 2011-01-08 13:16:28 -05:00
ScottDowne a9d38b1531 [#168] google news plugin 2011-01-07 16:26:11 -05:00
Anna Sobiepanek d8dbe33a77 tagThisPerson plugin with simple tests [#247 state:peer-review-requested] 2011-01-07 15:43:05 -05:00
ScottDowne 4a0a4373ca [#170] lower third plugin 2011-01-07 15:16:26 -05:00
ScottDowne 1bbaab0a5e [#175] something that shouldn't of been 2011-01-07 13:54:28 -05:00
ScottDowne 5e8243588d [#175] subtitle plugin without tests 2011-01-07 13:53:18 -05:00
Anna Sobiepanek a904282d32 Merge commit 'c81c046eab79a8' into 0.2
Conflicts:
	popcorn.js
2011-01-06 18:37:43 -05:00
Anna Sobiepanek 1e60571c05 attribution Plugin with simple tests [#165 state: peer-review-requested] 2011-01-06 17:53:11 -05:00
rwldrn cd19946d3e [#240] Popcorn.exec fires more than once per binding 2011-01-06 14:28:12 -05:00
ScottDowne c81c046eab [#221] data-timeline-sources functionality upgraded 2011-01-06 11:55:00 -05:00
ScottDowne 640fc4b15e [#221] initial data-timeline-sources 2011-01-05 12:22:54 -05:00
ScottDowne 64ee08bc6c [#221] moved XML files in a data folder 2011-01-05 11:53:22 -05:00
ScottDowne c8304af619 [#221] 0.1 XML parser unit test 2011-01-05 11:50:53 -05:00
ScottDowne 5f1af9fda2 [#221] parser plugin structure with XML parser, needs test and data-timeline-sources 2011-01-05 10:51:33 -05:00