← Back to branch summary

~keith-hughitt/helioviewer.org/keith

~keith-hughitt/helioviewer.org/keith

Viewing all changes in revision 1385.

Committer: Keith Hughitt
Date: 2012-08-01 20:11:22 UTC
mfrom: (402.7.148 hv-trunk)
Revision ID: keith.hughitt@nasa.gov-20120801201122-frf55qjr10arken5

Pulling in changes from upstream

files added:
docs/demos

docs/demos/canvas-color-tables

docs/demos/canvas-color-tables/SOHO_EIT_171_Color_Table.png

docs/demos/canvas-color-tables/grayscale.png

docs/demos/canvas-color-tables/index.html

docs/demos/canvas-color-tables/small.png

docs/demos/canvas-tiling

docs/demos/canvas-tiling/._index.html

docs/demos/canvas-tiling/index.html

docs/demos/canvas-tiling/tile.jpg

docs/demos/canvas-transparency-mask

docs/demos/canvas-transparency-mask/index.html

docs/demos/canvas-transparency-mask/mdi.png

extra/conky

extra/conky/helioviewer_status.py

lib/swfobject

lib/swfobject/expressInstall.swf

lib/swfobject/index.html

lib/swfobject/index_dynamic.html

lib/swfobject/src

lib/swfobject/src/expressInstall.as

lib/swfobject/src/expressInstall.fla

lib/swfobject/src/swfobject.js

lib/swfobject/swfobject.js

lib/swfobject/test.swf

movies

movies/latest.php

resources/images/codefisher

resources/images/codefisher/bbcode_16.png

resources/images/codefisher/bbcode_24.png

resources/images/codefisher/bbcode_256.png

resources/images/codefisher/bbcode_32.png

resources/images/codefisher/bbcode_48.png

resources/images/codefisher/bbcode_64.png

resources/images/codefisher/bbcode_72.png

resources/images/codefisher/bbcode_96.png

files renamed:
lib/flowplayer/flowplayer.controls-3.2.8.swf => lib/flowplayer/flowplayer.controls.swf

files modified:
api/index.php

api/scripts/launchpad_milestone_stats.py

api/scripts/movie_usage_stats.py

api/scripts/remove_by_metadata.py

api/scripts/youtube_remove_missing.py

api/src/Database/DbConnection.php

api/src/Database/ImgIndex.php

api/src/Database/Statistics.php

api/src/Helper/ErrorHandler.php

api/src/Helper/HelioviewerLayers.php

api/src/Helper/RegionOfInterest.php

api/src/Image/Composite/HelioviewerCompositeImage.php

api/src/Image/JPEG2000/HelioviewerJPXImage.php

api/src/Image/JPEG2000/JP2Image.php

api/src/Image/JPEG2000/JP2ImageXMLBox.php

api/src/Image/SubFieldImage.php

api/src/Job/MovieBuilder.php

api/src/Module/JHelioviewer.php

api/src/Module/Movies.php

api/src/Module/WebClient.php

api/src/Movie/FFMPEGEncoder.php

api/src/Movie/HelioviewerMovie.php

api/src/Movie/YouTube.php

api/src/Validation/InputValidator.php

dialogs/glossary.html

help/browser.html

help/index.php

install/downloader.py

install/helioviewer/__init__.py

install/helioviewer/hvpull/browser/basebrowser.py

install/helioviewer/hvpull/browser/httpbrowser.py

install/helioviewer/hvpull/downloader/urllib.py

install/helioviewer/hvpull/net/daemon.py

install/settings/settings.example.cfg

mobile/gallery.php

resources/css/dialogs.css

resources/css/helioviewer-web.css

resources/css/media-manager.css

src/js/HelioviewerWebClient.js

src/js/Media/MovieManagerUI.js

src/js/UI/MessageConsole.js

src/js/Viewport/Helper/MouseCoordinates.js

src/php/HelioviewerEmbeddedClient.php

src/php/HelioviewerWebClient.php

statistics/index.php

statistics/statistics.css

statistics/statistics.js

status/index.php

Show diffs side-by-side

added added

removed removed

api/scripts/launchpad_milestone_stats.py

api/scripts/movie_usage_stats.py

api/scripts/remove_by_metadata.py

api/scripts/youtube_remove_missing.py

api/src/Database/DbConnection.php

api/src/Database/ImgIndex.php

api/src/Database/Statistics.php

api/src/Helper/ErrorHandler.php

api/src/Helper/HelioviewerLayers.php

api/src/Helper/RegionOfInterest.php

api/src/Image/Composite/HelioviewerCompositeImage.php

api/src/Image/JPEG2000/HelioviewerJPXImage.php

api/src/Image/JPEG2000/JP2Image.php

api/src/Image/JPEG2000/JP2ImageXMLBox.php

api/src/Image/SubFieldImage.php

api/src/Job/MovieBuilder.php

api/src/Module/JHelioviewer.php

api/src/Module/Movies.php

api/src/Module/WebClient.php

api/src/Movie/FFMPEGEncoder.php

api/src/Movie/HelioviewerMovie.php

api/src/Movie/YouTube.php

api/src/Validation/InputValidator.php

dialogs/glossary.html

docs/demos/canvas-color-tables/

docs/demos/canvas-color-tables/SOHO_EIT_171_Color_Table.png

docs/demos/canvas-color-tables/grayscale.png

docs/demos/canvas-color-tables/index.html

docs/demos/canvas-color-tables/small.png

docs/demos/canvas-tiling/

docs/demos/canvas-tiling/._index.html

docs/demos/canvas-tiling/index.html

docs/demos/canvas-tiling/tile.jpg

docs/demos/canvas-transparency-mask/

docs/demos/canvas-transparency-mask/index.html

docs/demos/canvas-transparency-mask/mdi.png

extra/conky/helioviewer_status.py

help/browser.html

install/downloader.py

install/helioviewer/__init__.py

install/helioviewer/hvpull/browser/basebrowser.py

install/helioviewer/hvpull/browser/httpbrowser.py

install/helioviewer/hvpull/downloader/urllib.py

install/helioviewer/hvpull/net/daemon.py

install/settings/settings.example.cfg

lib/swfobject/expressInstall.swf

lib/swfobject/index.html

lib/swfobject/index_dynamic.html

lib/swfobject/src/

lib/swfobject/src/expressInstall.as

lib/swfobject/src/expressInstall.fla

lib/swfobject/src/swfobject.js

lib/swfobject/swfobject.js

lib/swfobject/test.swf

mobile/gallery.php

movies/latest.php

resources/css/dialogs.css

resources/css/helioviewer-web.css

resources/css/media-manager.css

resources/images/codefisher/

resources/images/codefisher/bbcode_16.png

resources/images/codefisher/bbcode_24.png

resources/images/codefisher/bbcode_256.png

resources/images/codefisher/bbcode_32.png

resources/images/codefisher/bbcode_48.png

resources/images/codefisher/bbcode_64.png

resources/images/codefisher/bbcode_72.png

resources/images/codefisher/bbcode_96.png

src/js/HelioviewerWebClient.js

src/js/Media/MovieManagerUI.js

src/js/UI/MessageConsole.js

src/js/Viewport/Helper/MouseCoordinates.js

src/php/HelioviewerEmbeddedClient.php

src/php/HelioviewerWebClient.php

statistics/index.php

statistics/statistics.css

statistics/statistics.js

status/index.php

Older »