Code

Media plugin#25

Code

Open

therealmarv wants to merge 82 commits intomasterwysiwhat/Aloha-Editor:masterfrom media-pluginwysiwhat/Aloha-Editor:media-pluginCopy head branch name to clipboard

+1,243-53

Commits

Commits on Feb 2, 2013

• preliminary work on video plugin, based on image plugin

  agrippa

  committed
  e4ccd64

  Copy full SHA for e4ccd64

• push visual changes to editor

  agrippa

  committed
  4453e6f

  Copy full SHA for 4453e6f

• visual portion of the video plugin

  agrippa

  committed
  a12590e

  Copy full SHA for a12590e

• Adding js for processing video urls

  Iventio

  committed
  2c7147a

  Copy full SHA for 2c7147a

• remove unused code from video dialog

  agrippa

  committed
  94cec3c

  Copy full SHA for 94cec3c

• add separate video plugin files

  agrippa

  committed
  928c345

  Copy full SHA for 928c345

Commits on Feb 3, 2013

• video plugin setup

  agrippa

  committed
  c24ea9f

  Copy full SHA for c24ea9f

• remove badly placed video plugin, probably not what we need yet

  agrippa

  committed
  aa83893

  Copy full SHA for aa83893

• remove a couple of console prints

  agrippa

  committed
  4ae23bb

  Copy full SHA for 4ae23bb

• Merge branch 'video-plugin' of git://github.com/wysiwhat/Aloha-Editor into video-plugin

  Iventio

  committed
  3d8bd43

  Copy full SHA for 3d8bd43

• Updated the js to support rudimentary video inserts

  Iventio

  committed
  ed34c32

  Copy full SHA for ed34c32

• Removed debugging code

  Iventio

  committed
  bb77393

  Copy full SHA for bb77393

Commits on Feb 6, 2013

• Gbenga's fix for youtube iframes covering toolbar

  agrippa

  committed
  f4d4116

  Copy full SHA for f4d4116

• input validation on url field while inserting video

  agrippa

  committed
  b79c846

  Copy full SHA for b79c846

Commits on Feb 8, 2013

• changes to video plugin, not sure what

  agrippa

  committed
  822602d

  Copy full SHA for 822602d

• Stashing local changes( which the most recent version is a superset of mine)

  Iventio

  committed
  3efe96e

  Copy full SHA for 3efe96e

• Stashin changes

  Iventio

  committed
  ef1287b

  Copy full SHA for ef1287b

• Merge branch 'video-plugin' of git://github.com/wysiwhat/Aloha-Editor into video-plugin

  Iventio

  committed
  2f6e794

  Copy full SHA for 2f6e794

• Added marvin's google picker code

  Iventio

  committed
  a93794e

  Copy full SHA for a93794e

Commits on Mar 25, 2013

• Added video plugin file to the newly created media-plugin branch

  Iventio

  committed
  4fc87f3

  Copy full SHA for 4fc87f3

• no idea what changes these are, but they're going to the defunct video-plugin branch anyway

  Show description for 6bf9610
  

  Max

  authored and

  Max

  committed
  6bf9610

  Copy full SHA for 6bf9610

• update assorted-plugin with info on video plugin

  

  Max

  authored and

  Max

  committed
  460bb25

  Copy full SHA for 460bb25

• some CSS additions for the media plugin

  

  Max

  authored and

  Max

  committed
  962bee1

  Copy full SHA for 962bee1

• Added video button to new branch

  Iventio

  committed
  9c6c1b9

  Copy full SHA for 9c6c1b9

• Merge branch 'media-plugin' of github.com:wysiwhat/Aloha-Editor into media-plugin

  Iventio

  committed
  bd81dc5

  Copy full SHA for bd81dc5

• video plugin working in new media-plugin branch

  

  Max

  authored and

  Max

  committed
  d2c7c74

  Copy full SHA for d2c7c74

• Adding coffeescript which uses gpicker

  Iventio

  committed
  e795066

  Copy full SHA for e795066

• The Google picker now pops up, however has incorrect z-index b/c of the aloha toolbar

  Iventio

  committed
  f577cfc

  Copy full SHA for f577cfc

Commits on Mar 28, 2013

• Google picker now inserting videos into Aloha

  Iventio

  committed
  47ac2d3

  Copy full SHA for 47ac2d3

• Merge branch 'video-plugin' of github.com:wysiwhat/Aloha-Editor into media-plugin

  

  Max

  authored and

  Max

  committed
  c902bea

  Copy full SHA for c902bea

• Revert "Merge branch 'video-plugin' of github.com:wysiwhat/Aloha-Editor into media-plugin"

  Show description for 4b8d323
  

  Max

  authored and

  Max

  committed
  4b8d323

  Copy full SHA for 4b8d323

Commits on Apr 3, 2013

• Correct image for video button

  

  Max

  authored and

  Max

  committed
  873fc86

  Copy full SHA for 873fc86

• CHECK: Committing current changes, Max doesn't see the changes

  Iventio

  committed
  f5d307e

  Copy full SHA for f5d307e

• Merge branch 'media-plugin' of github.com:wysiwhat/Aloha-Editor into media-plugin

  Iventio

  committed
  711814d

  Copy full SHA for 711814d

• decrease toolbar z-index un poco to keep it behind google picker

  agrippa

  committed
  d892a3d

  Copy full SHA for d892a3d

• Attempting to use iframe

  Iventio

  committed
  80c10d8

  Copy full SHA for 80c10d8

• Video now the correct size

  Iventio

  committed
  7cec7ae

  Copy full SHA for 7cec7ae

• make video transparent

  agrippa

  committed
  6e50e57

  Copy full SHA for 6e50e57

Commits on Apr 6, 2013

• Stashing changes which will be overwritten

  Iventio

  committed
  29a7534

  Copy full SHA for 29a7534

• Merge branch 'media-plugin' of github.com:wysiwhat/Aloha-Editor into media-plugin

  Iventio

  committed
  bdea849

  Copy full SHA for bdea849

• switch back to older picker

  agrippa

  committed
  ed875e8

  Copy full SHA for ed875e8

• pretty dialog for video

  agrippa

  committed
  b55b9fb

  Copy full SHA for b55b9fb

• Merge branch 'media-plugin' of https://github.com/wysiwhat/Aloha-Editor into media-plugin

  Iventio

  committed
  37dcf83

  Copy full SHA for 37dcf83

Commits on Apr 7, 2013

• working video insertion by search and selection

  agrippa

  committed
  a265609

  Copy full SHA for a265609

Commits on Apr 9, 2013

• some highlighting in search results

  agrippa

  committed
  f1583f9

  Copy full SHA for f1583f9

Commits on Apr 10, 2013

• add more information to videos in search results

  agrippa

  committed
  4378ff8

  Copy full SHA for 4378ff8

• better video duration printing

  agrippa

  committed
  c98e6c0

  Copy full SHA for c98e6c0

• starting to set up vimeo embedder, extract out embedders into separate objects, add radio buttons and switching of active embedder based on radio button values

  agrippa

  committed
  e335f4b

  Copy full SHA for e335f4b

• more separation of concerns (video embed code generation. still need to fill in the vimeo embed code generator and search results parser

  agrippa

  committed
  d13095d

  Copy full SHA for d13095d

• tried to get vimeo working, but looks like we might have to do oauth stuff...

  agrippa

  committed
  d66484e

  Copy full SHA for d66484e

Commits on Apr 11, 2013

• commented code for wrapping iframes in a div

  agrippa

  committed
  a4990e1

  Copy full SHA for a4990e1

Commits on Apr 17, 2013

• working vimeo url validator

  agrippa

  committed
  485d5ce

  Copy full SHA for 485d5ce

• support for vimeo URLs (though still not searches)

  agrippa

  committed
  c77283a

  Copy full SHA for c77283a

• more robust vimeo url validator

  agrippa

  committed
  0a1146a

  Copy full SHA for 0a1146a

• working URL input for slideshare and vimeo

  agrippa

  committed
  3a0f1f0

  Copy full SHA for 3a0f1f0

• Merge branch 'media-plugin' of github.com:wysiwhat/Aloha-Editor into media-plugin

  Iventio

  committed
  c871515

  Copy full SHA for c871515

• remove old code

  agrippa

  committed
  a9c0b45

  Copy full SHA for a9c0b45

• Merge branch 'media-plugin' of github.com:wysiwhat/Aloha-Editor into media-plugin

  Iventio

  committed
  61456c1

  Copy full SHA for 61456c1

• support for concord labs embedding

  agrippa

  committed
  a7109a9

  Copy full SHA for a7109a9

Commits on Apr 23, 2013

• fix chrome support

  agrippa

  committed
  473a538

  Copy full SHA for 473a538

• solve merge conflicts

  therealmarv

  committed
  aed3e80

  Copy full SHA for aed3e80

• Merge branch 'oerpub-math-example-fix' into media-plugin

  therealmarv

  committed
  fec2d88

  Copy full SHA for fec2d88

Commits on Apr 24, 2013

• resize vimeo videos the same size as youtube

  therealmarv

  committed
  0a7559a

  Copy full SHA for 0a7559a

• deactivate Vimeo search option for now

  therealmarv

  committed
  8c8b77b

  Copy full SHA for 8c8b77b

Commits on May 2, 2013

• Merge branch 'media-plugin' of https://github.com/wysiwhat/Aloha-Editor into media-plugin

  Iventio

  committed
  74a0f18

  Copy full SHA for 74a0f18

• Cleaned up some of the extra code left over from our debugging

  Iventio

  committed
  ef45dc5

  Copy full SHA for ef45dc5

• Removed debugging comments

  Iventio

  committed
  c201c40

  Copy full SHA for c201c40

• Formatted url strings to look cuter

  Iventio

  committed
  f4a46d5

  Copy full SHA for f4a46d5

Commits on May 3, 2013

• Updated the js to use css classes instead of hardcoding styling

  Iventio

  committed
  dc4f0a3

  Copy full SHA for dc4f0a3

Commits on May 6, 2013

• Removed unnecessary code and fixed youtube search results html - added quotes

  Iventio

  committed
  27743e4

  Copy full SHA for 27743e4

Commits on May 7, 2013

• Commented out all unnecessary code and now trying to fix error where input box won't highlight when url is correct

  Iventio

  committed
  2aa9e08

  Copy full SHA for 2aa9e08

Commits on May 14, 2013

• Merge branch 'master' into media-plugin

  bnwest

  committed
  bbdf69d

  Copy full SHA for bbdf69d

• mod the coffee file to match the js file. create the js file using coffee and the coffee file. go team

  bnwest

  committed
  4f61c87

  Copy full SHA for 4f61c87

Commits on May 15, 2013

• Ensure .js and .coffee files for media plugin are up to date. Comment out pointless radio buttons until search support for other sites is added.

  agrippa

  committed
  3876401

  Copy full SHA for 3876401

• Trying to fix invalid url highlight by adding more specific css rule

  Iventio

  committed
  193eb54

  Copy full SHA for 193eb54

• Merge branch 'media-plugin' of github.com:wysiwhat/Aloha-Editor into media-plugin

  Iventio

  committed
  cac374e

  Copy full SHA for cac374e

• Fixed input box highlighting issue, will now do full test before removing commented out code

  Iventio

  committed
  9b917ee

  Copy full SHA for 9b917ee

• Commiting updated css file

  Iventio

  committed
  84a3e6c

  Copy full SHA for 84a3e6c

• Changed the ajax request for slideshare embedder to be async b/c requests for 'jsonp' are inheretnly so

  Iventio

  committed
  85c2e3b

  Copy full SHA for 85c2e3b

• Removed commented out code and changed concord url to reflect the changed url.

  Iventio

  committed
  32e8d38

  Copy full SHA for 32e8d38

• Adding js file

  Iventio

  committed
  2032acc

  Copy full SHA for 2032acc

Commits on May 25, 2013

• Use jquery to process ajax loaded html

  Show description for f01ee81
  izak

  committed
  f01ee81

  Copy full SHA for f01ee81