V2.0 swift feature branch for merge into v2.0 #103

Merged
merged 118 commits into from Apr 22, 2013

Conversation

3 participants
@b1tr0t
Member

b1tr0t commented Feb 24, 2013

TODO for this PR to get merged:

  • Add documentation for Image Resizer, Jazzcat, and Unblockify
  • Add project slug as arguments to resizeImages and combineScripts
  • Add tests for Jazzcat
  • Add tests for Image Resizer
  • Merge in cache parameter for resizeImages

b1tr0t and others added some commits Feb 5, 2013

Initial commit of working features. Needs tests.
Signed-off-by: Peter McLachlan <peter@mobify.com>
Merge branch 'v2.0' into v2.0-swift-feature-branch
Conflicts:
	examples/headtag-capture/main.js
	src/capture.js
	src/mobify-full.js
Merge branch 'v2.0' into v2.0-swift-feature-branch
Conflicts:
	examples/headtag-capture/index.html
Merge branch 'v2.0' into v2.0-swift-feature-branch
Conflicts:
	examples/capturing-grumpycat/performance-test.html
	examples/headtag-capture/performance-test.html
	examples/swift/performance-test.html
Merge branch 'v2.0-documentation' into v2.0-swift-feature-branch
Conflicts:
	examples/headtag-capture/performance-test.html
	examples/resizeImages/bigscript.js
	examples/resizeImages/index.html
	examples/resizeImages/main.js
	examples/resizeImages/performance-test.html
	examples/resizeImages/smallscript.js
	examples/swift/performance-test.html
* update swift tag
* fix tag bootstrap file
Merge branch 'v2.0-swift-feature-branch' of github.com:mobify/mobifyj…
…s into v2.0-swift-feature-branch

Conflicts:
	tag/bootstrap.html
Merge branch 'v2.0-documentation' into v2.0-swift-feature-branch
Conflicts:
	examples/assets/css/stylesheet.css
Merge branch 'v2.0' into v2.0-swift-feature-branch
Conflicts:
	Gruntfile.js
	src/mobify-capture.js

noahadams and others added some commits Apr 4, 2013

change hosts for jazzcat and image resizer to jazzcat.mobify.net and …
…ir.mobify.net, respectively, new happy fun cookie free domains
Merge pull request #123 from mobify/v2.0-cookie-free-services
change hosts for jazzcat and image resizer to jazzcat.mobify.net and ir....
Merge branch 'v2.0' into v2.0-swift-feature-branch
Conflicts:
	examples/capturing-grumpycat/index.html
	package.json
Add ability to override API in options. Fix broken opts extending (en…
…sure we never add members to defaults object)
Merge branch 'v2.0' into v2.0-swift-feature-branch
Conflicts:
	.gitignore
	src/capture.js
@jansepar

This comment has been minimized.

Show comment
Hide comment
@jansepar

jansepar Apr 22, 2013

Contributor

👍

Contributor

jansepar commented Apr 22, 2013

👍

jansepar added a commit that referenced this pull request Apr 22, 2013

Merge pull request #103 from mobify/v2.0-swift-feature-branch
V2.0 swift feature branch for merge into v2.0

@jansepar jansepar merged commit 8b476bd into v2.0 Apr 22, 2013

1 check passed

default
Details

@tedtate tedtate deleted the v2.0-swift-feature-branch branch Dec 8, 2014

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment