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

1219 Коммитов

Автор SHA1 Сообщение Дата
Mohammed Buttu dd9de45ce8 #516 Fixed code style 2011-06-17 11:54:12 -04:00
Mohammed Buttu 774b5e899f #516 Fixed code style 2011-06-17 11:48:56 -04:00
Mohammed Buttu 34e6f9999b #516 Fixed code style 2011-06-16 13:45:10 -04:00
Mohammed Buttu c9c52a6235 #516 Removed quotes from numbers 2011-06-16 13:29:21 -04:00
Mohammed Buttu 7d16e82d72 #516 Added more unit tests to test whether flickr images tagged 'georgia' are displayed 2011-06-16 12:40:53 -04:00
Mohammed Buttu 3036c5ced1 #516 Images with just a tag and no userid, username, or apikey now load 2011-06-16 12:08:58 -04:00
Jon Buckley 8561824db0 Merge remote-tracking branch 'dseif/youtubeSeek' into develop 2011-06-15 16:02:27 -04:00
Jon Buckley 387c508c3c Merge remote-tracking branch 'rwldrn/t573' into develop 2011-06-15 15:31:36 -04:00
David Seifried a8627785ec [#569] Added unit tests for added functionality, also initialized variable the created variable to false as thats what it should be 2011-06-15 15:24:29 -04:00
Jon Buckley 3a86093014 Merge remote-tracking branch 'ScottDowne/t562' into develop 2011-06-15 15:22:06 -04:00
Jon Buckley 67c5c51924 Merge remote-tracking branch 'dseif/t534b' into develop 2011-06-15 15:17:13 -04:00
Jon Buckley de8dd2b135 Merge remote-tracking branch 'ScottDowne/t519' into develop 2011-06-15 15:10:50 -04:00
Jon Buckley 1e8c9df865 Merge remote-tracking branch 'cadecairos/t551' into develop 2011-06-15 14:58:29 -04:00
Jon Buckley ce9d71bc7f Merge remote-tracking branch 'ScottDowne/t568' into develop 2011-06-15 14:46:08 -04:00
Jon Buckley 4ef9f228d3 Merge remote-tracking branch 'cadecairos/t542' into develop 2011-06-15 14:40:57 -04:00
Jon Buckley 4126af5fa1 Merge remote-tracking branch 'ScottDowne/t566' into develop 2011-06-15 14:35:43 -04:00
Jon Buckley 46f10f3636 Merge remote-tracking branch 'ScottDowne/wordrivermanifest' into develop 2011-06-15 13:07:41 -04:00
David Seifried 4dbdd83ddd Merge branch 'develop' of https://github.com/jbuck/popcorn-js into youtubeSeek 2011-06-15 11:44:02 -04:00
Jon Buckley 721082612f Merge remote-tracking branch 'ScottDowne/t572' into develop 2011-06-14 09:51:45 -04:00
ScottDowne e72cdde5fa [#572] white space 2011-06-14 09:20:23 -04:00
Rick Waldron 6133d56efb [#573] Adds protection handling for popcorn proto methods inside of removePlugin; 28 Unit tests 2011-06-13 22:26:21 -04:00
ScottDowne 3cf18e1eca [#572] fixed addtrackevent typo... and tests for it 2011-06-13 18:52:29 -04:00
ScottDowne 9c98f6c79e [#519] removePlugin() calling teardown before removal of plugin 2011-06-13 15:23:09 -04:00
Jon Buckley 6e02766e50 Merge remote-tracking branch 'cadecairos/t299b' into develop 2011-06-13 14:00:09 -04:00
Jon Buckley af86d904df Merge remote-tracking branch 'ScottDowne/t567' into develop 2011-06-13 12:22:41 -04:00
Christopher De Cairos 3acaa8f109 removed unused var, moved prop declaration to top of method, fixed styles, fixed copy-pasta typo, fixed logic error that I noticed in for loop 2011-06-13 12:07:28 -04:00
Jon Buckley ece0daef46 Merge remote-tracking branch 'dseif/t557' into develop 2011-06-13 12:05:43 -04:00
David Seifried feeabfc0ba Added flag that is used in butter to track whether the state of the video is paused or not 2011-06-13 11:32:08 -04:00
Christopher De Cairos 0ab5cd3f42 modified tests 2011-06-13 11:06:09 -04:00
ScottDowne 7d635d2666 [#568] stable target names in manifest 2011-06-10 17:13:03 -04:00
ScottDowne 62b47f3fcf [#567] removed dead code 2011-06-10 14:03:29 -04:00
ScottDowne 3aea6675e5 [#566] code plugin manifest function type added 2011-06-10 13:40:16 -04:00
David Seifried fa297f1193 [#534b] All changes are in one commit now ready fro review 2011-06-09 16:43:15 -04:00
ScottDowne 6a24a9b04e [#562] fixed teardown bug in wordriver 2011-06-08 21:29:52 -04:00
ScottDowne 989bd6b233 added manifest to wordriver 2011-06-08 21:06:49 -04:00
Christopher De Cairos 796804d209 Merge branch 'master' of github.com:cadecairos/popcorn-js into t542 2011-06-08 18:45:53 -04:00
David Seifried ef3cdf6f1d [#557] Changed all occurences of tagName to nodeName 2011-06-08 10:39:33 -04:00
David Seifried 0976602b0a [#557] Accidentally added an extra character at the start of the file 2011-06-08 10:38:33 -04:00
David Seifried 130c3d3e47 [#557] Fixed issue about an error being thrown when jquery dragable is being used 2011-06-08 10:37:17 -04:00
Christopher De Cairos 3a7f3d0157 cleaned up the branch so that the only changes are the tests that I added 2011-06-07 13:29:44 -04:00
Christopher De Cairos 9db72e4f84 fixed documentation errors 2011-06-07 11:42:12 -04:00
Christopher De Cairos c047a72684 Merge branch 'develop' of https://github.com/jbuck/popcorn-js 2011-06-07 09:56:32 -04:00
Jon Buckley 29402e7d18 Merge remote-tracking branch 'dseif/t469' into develop 2011-06-03 16:45:42 -04:00
David Seifried 192aff6435 [#469] Fixed error throwing to use Popcorn.error and also switched to using setTimeout instead of setInterval as per requested 2011-06-03 15:28:35 -04:00
David Seifried b05b9c34f8 Added a check to ensure the script was loaded before the mustache object was being accessed 2011-06-03 12:02:22 -04:00
Christopher De Cairos d3a7d2a35b Merge branch 'develop' of https://github.com/jbuck/popcorn-js 2011-06-03 10:29:50 -04:00
Jon Buckley 5ee6491d53 Merge remote-tracking branch 'rwldrn/t546b' into develop 2011-06-02 18:05:24 -04:00
Jon Buckley f918216003 Merge remote-tracking branch 'cadecairos/t406' into develop 2011-06-02 18:01:36 -04:00
Jon Buckley 9dcb877e94 Merge remote-tracking branch 'cadecairos/t481' into develop 2011-06-02 18:00:19 -04:00
rwldrn 41ae819e09 Updates tests 2011-06-02 11:30:44 -04:00