Code

Issue with FFMPEG connection#7

Code

Open

jsossa117 wants to merge 67 commits intomasteroscarperpinan/spacetime-vis:masterfrom gh-pagesoscarperpinan/spacetime-vis:gh-pagesCopy head branch name to clipboard

+4,745-63,941

Commits

Commits on Jun 1, 2012

• Created gh-pages branch via GitHub

  oscarperpinan

  committed
  c53eba9

Commits on Jun 6, 2012

• Update gh-pages

  oscarperpinan

  committed
  a26b145

• Main text of the webpage

  oscarperpinan

  committed
  2f26dee

• Added </p>

  oscarperpinan

  committed
  c00b7c5

Commits on Jul 16, 2012

• Merge branch 'master' into gh-pages

  

  Oscar Perpiñan Lamigueiro

  authored and

  Oscar Perpiñan Lamigueiro

  committed
  fa0c22d

Commits on May 1, 2013

• data folder not needed in gh-pages

  oscarperpinan

  committed
  03d7810

• remove image folder; images is correct

  oscarperpinan

  committed
  359770c

• code folder is not needed in gh-pages

  oscarperpinan

  committed
  160fd04

• new images of spacetime part

  oscarperpinan

  committed
  965af23

• Content added to spacetime webpage

  oscarperpinan

  committed
  a0fe8aa

• vimeo video in spacetime

  oscarperpinan

  committed
  7220ba3

Commits on Jun 5, 2013

• Images updated after second version of book

  oscarperpinan

  committed
  12ed41a

• New images

  oscarperpinan

  committed
  a398ad2

• Website updated

  oscarperpinan

  committed
  2f0202d

Commits on Jul 31, 2013

• CSS instead of tables

  oscarperpinan

  committed
  60ef49f

• Merge branch 'gh-pages' of github.com:oscarperpinan/spacetime-vis into gh-pages

  Show description for a9d10f9
  oscarperpinan

  committed
  a9d10f9

• Fixed problems after merge

  oscarperpinan

  committed
  9a8ee51

• More problems after merge

  oscarperpinan

  committed
  96c442d

• ...still solving merge

  oscarperpinan

  committed
  d93a16b

Commits on Aug 1, 2013

• Added responsive CSS in main webpage

  oscarperpinan

  committed
  a62497f

• Fixed viewscreen size in @media

  oscarperpinan

  committed
  4d73bb5

• Lato not imported; improved CSS code

  oscarperpinan

  committed
  d6a2eec

• Changed personal webpage link

  oscarperpinan

  committed
  2fb178a

• Added responsive CSS code in inner pages

  oscarperpinan

  committed
  f096337

• Footer (postamble) with HOME in inner pages

  oscarperpinan

  committed
  135c4a6

• Fixed personal url

  oscarperpinan

  committed
  5448392

• Fixed images overlapping

  oscarperpinan

  committed
  1bddfe0

• Image borders, and transitions when image hover

  oscarperpinan

  committed
  0a890f8

• Fonts improved

  oscarperpinan

  committed
  7a5a887

Commits on Sep 20, 2013

• Testing geojson with github

  oscarperpinan

  committed
  a3fb788

• Improved embedding of GeoJSON from gist

  oscarperpinan

  committed
  97b7a73

• HMTL_HEAD instead STYLE in org files (8.0)

  oscarperpinan

  committed
  065416f

• The NO2 geojson file is now in the repository (link updated)

  oscarperpinan

  committed
  ccb0f2c

Commits on Oct 1, 2013

• Images updated.

  oscarperpinan

  committed
  f8b7dba

Commits on Oct 2, 2013

• New thumbnails; playing with colorbox instead of PDFs

  oscarperpinan

  committed
  2be0f4c

• Starting with thumbnails

  oscarperpinan

  committed
  bea2007

Commits on Oct 3, 2013

• Time Series thumbnails fixed using display=table

  oscarperpinan

  committed
  2efd525

• Thumbnails fixed in spatial.html

  oscarperpinan

  committed
  7d0995c

• Thumbnails fixed in spacetime.html

  oscarperpinan

  committed
  13b7087

Commits on Oct 4, 2013

• Higher resolution brazil

  oscarperpinan

  committed
  eaabffe

• colorbox.js improved with different values for height and width

  oscarperpinan

  committed
  f1b9d9c

• some figures need class='svg' for colorbox

  oscarperpinan

  committed
  c9cdf1a

• Vertical align in styles.css

  oscarperpinan

  committed
  6e41dd7

• jQuery UI in airMadrid.html

  oscarperpinan

  committed
  aebca01

Commits on Oct 10, 2013

• Images resolution improved

  oscarperpinan

  committed
  5b33a58

• CO2 SVG fixed

  oscarperpinan

  committed
  87c65f3

Commits on Oct 21, 2013

• Playing with STL files from rgl

  oscarperpinan

  committed
  20bd62e

• Increased resolution of STL file from rgl

  oscarperpinan

  committed
  f34b522

• Too large. Reducing STL file from rgl

  oscarperpinan

  committed
  a836104

Commits on Dec 10, 2013

• Fix code URL in webpages

  oscarperpinan

  committed
  11f4f68

• Merge branch 'gh-pages' of github.com:oscarperpinan/spacetime-vis into gh-pages

  oscarperpinan

  committed
  0cffaba

Commits on Dec 22, 2013

• The book has a page in Chapman

  oscarperpinan

  committed
  901664e

Commits on Jan 16, 2014

• resolving merge conflict

  oscarperpinan

  committed
  30f6ece

• ...

  oscarperpinan

  committed
  2bf2251

• Fix images position in main page

  oscarperpinan

  committed
  17ac5f1

Commits on Mar 7, 2014

• Fix code URL in spatial.html

  oscarperpinan

  committed
  175c224

• myTooltip uses jQuery UI

  oscarperpinan

  committed
  787af64

Commits on May 8, 2014

• Update info. Style improvement.

  Show description for e661128
  oscarperpinan

  committed
  e661128

Commits on May 11, 2014

• Add favicon

  oscarperpinan

  committed
  eaeda9f

Commits on Jun 20, 2014

• New 3D stl; geojson embeded in a webpage

  oscarperpinan

  committed
  5270191

Commits on Jun 21, 2014

• Recover DEM.stl

  oscarperpinan

  committed
  d1cd5db

Commits on May 7, 2015

• Trying to get a mobile-friendly webpage

  

  Oscar Perpiñán Lamigueiro

  authored and

  Oscar Perpiñán Lamigueiro

  committed
  b6e8300

• Using ReadTheOrg for inner chapters of the web

  oscarperpinan

  committed
  3d75af7

• Improve main web page

  oscarperpinan

  committed
  bfbb9f3

Commits on May 12, 2015

• Recover CSS styles related to images

  oscarperpinan

  committed
  85a9cff

Commits on Mar 15, 2016

• Update CRC link

  

  Oscar Perpiñan Lamigueiro

  authored and

  Oscar Perpiñan Lamigueiro

  committed
  0afc4cd

Commits on Apr 5, 2018

• Add 2nd edition url

  oscarperpinan

  committed
  03a1fc0