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

38 Коммитов

Автор SHA1 Сообщение Дата
Jon Buckley 67c5c51924 Merge remote-tracking branch 'dseif/t534b' into develop 2011-06-15 15:17:13 -04:00
ScottDowne 7d635d2666 [#568] stable target names in manifest 2011-06-10 17:13:03 -04:00
David Seifried fa297f1193 [#534b] All changes are in one commit now ready fro review 2011-06-09 16:43:15 -04:00
Mohammed Buttu e4eb188929 #485 fixed titles 2011-05-18 13:51:33 -04:00
Mohammed Buttu 3704982a4f #485 Fixed issue so that images display in same order created 2011-05-18 13:49:05 -04:00
Mohammed Buttu 5a51bc42e8 #332 Fixed number of unit tests 2011-05-18 13:26:37 -04:00
Mohammed Buttu 786b7d89d9 Merge branch '0.6' of git://github.com/annasob/popcorn-js into t485
Conflicts:
	plugins/image/popcorn.image.js
	plugins/image/popcorn.image.unit.js
2011-05-18 13:08:03 -04:00
Mohammed Buttu eff3dec732 #485 removed alert in unit test 2011-05-17 16:03:59 -04:00
Mohammed Buttu db5892c769 #485 Added unit tests to make sure the order of the images created appear in the same order 2011-05-17 15:53:06 -04:00
Mohammed Buttu 8fa0f530f9 #485 Fixed code style 2011-05-17 13:23:17 -04:00
ScottDowne ad7a07064a [#t484] teardown checks for target, linting, explicit googlefeed delete 2011-05-16 19:19:37 -04:00
Mohammed Buttu cb025655ef #485 Fixed leaking divTextStyle variable and corrected code style 2011-05-16 15:51:12 -04:00
ScottDowne c540b761ce [#t484] teardown functions for plugins that need it + tests 2011-05-13 16:01:03 -04:00
Mohammed Buttu fe9bbd1520 Fixed image loading order [#485] 2011-05-11 13:16:51 -04:00
Anna Sobiepanek e3cb1c73f1 Merge commit 'minoo/imageText' into 0.5
Conflicts:
	plugins/image/popcorn.image.unit.js
2011-04-20 12:15:55 -04:00
minoo f55e5553a9 fixed lint complain -#368 2011-04-19 21:11:53 -04:00
Minoo 06eb8e3eb7 removed a commented code -#368 2011-04-19 20:56:28 -04:00
Minoo d6b9d57982 added the eventListener to img -#368 2011-04-19 20:53:16 -04:00
Minoo 0842d8c6df updated unit test of image -#368 2011-04-15 20:19:46 -04:00
Minoo b2ffd66fe9 fixed image plugin lint errors, unit test, added optional text -#368 2011-04-15 20:03:59 -04:00
unknown 46927b7bb3 updated text position for image plugin, more than one image can be displayed now -#368 2011-04-14 15:48:49 -04:00
Minoo 2fbe8d7326 added position and height to a and img elements -#368 2011-04-04 17:32:58 -04:00
Minoo f21c52797e removed couple of unnecessary lines -#368 2011-04-01 14:49:15 -04:00
Minoo 49342b0e71 changed the div background to img element - #368 2011-04-01 14:06:07 -04:00
Minoo bda55f19b7 fixed the width and height of div container of the image -#368 2011-03-24 21:09:19 -04:00
Anna Sobiepanek 6d1a7dfd73 Merge branch '393' into 0.4 2011-03-14 14:09:51 -04:00
Anna Sobiepanek 5214b956c9 fixed name [#393 state:peer-review-requested] 2011-03-10 17:13:16 -05:00
Minoo f104b99eec just a minor fix on image unit test -#368 2011-03-09 20:25:18 -05:00
Minoo 5d50d38314 updated the image plugin, fixed some lint complaints, modified the test for text overlaying -#368 2011-03-09 20:17:36 -05:00
Minoo cba7dc8ade added text overlay to the image plugin, made a default size for images -#368 2011-03-08 23:14:21 -05:00
ScottDowne 080c03ac7f [#374] removing setinterval from plugin tests, had problems with wiki, so not included yet 2011-03-08 11:17:43 -05:00
Anna Sobiepanek 6a94da7228 changed image src and muted the video [#344] 2011-02-23 17:01:13 -05:00
Anna Sobiepanek 0249621d94 target.options fixed [#256 state:peer-review-requested] 2011-01-11 18:09:53 -05:00
ScottDowne a9f8fd32b8 [#63] updated minifest.options.target to intended value 2010-12-23 15:14:08 -05:00
ScottDowne 2f1cffec05 [#63] href is optional, and removed the border 2010-12-23 14:48:25 -05:00
ScottDowne da19e2de54 [#63] fixed manifest.target.label value 2010-12-22 15:58:48 -05:00
ScottDowne e22c50cc68 [#63] updated manifest labels 2010-12-22 15:55:20 -05:00
ScottDowne 842d7a17d9 [#63] image plugin with unit tests 2010-12-22 15:12:58 -05:00