Skip to content

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

Merged
merged 118 commits into from Apr 22, 2013

3 participants

@b1tr0t
Mobify Research & Development Inc. 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 4, 2013
@b1tr0t b1tr0t Initial commit of working features. Needs tests.
Signed-off-by: Peter McLachlan <peter@mobify.com>
1e49a3f
@b1tr0t b1tr0t Merge branch 'v2.0' into v2.0-swift-feature-branch 71268c5
@b1tr0t b1tr0t Merge branch 'v2.0' into v2.0-swift-feature-branch 2f4aeef
@b1tr0t b1tr0t * begin port of jazzcat to Mobify-2.0 c06d772
@b1tr0t b1tr0t Merge branch 'v2.0' into v2.0-swift-feature-branch
Conflicts:
	examples/headtag-capture/main.js
	src/capture.js
	src/mobify-full.js
c15ae41
@b1tr0t b1tr0t * Swift features 8cf1eed
@jansepar jansepar Merge branch 'v2.0' into v2.0-swift-feature-branch
Conflicts:
	examples/headtag-capture/index.html
eb68744
@jansepar jansepar Creating SWIFT into it's own custom library that gets built 8b1a0a7
@jansepar jansepar Hooowww did all these old files creep back?! Removing! c035ad6
@jansepar jansepar MOAR killing of old files bc8de0c
@b1tr0t b1tr0t * jc updates 7cf581f
@jansepar jansepar Adding forgotten swift build file e52a3d1
@jansepar jansepar Removing some examples 4c3adb8
@jansepar jansepar 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
42a24fe
@b1tr0t b1tr0t Merge branch 'v2.0-swift-feature-branch' of github.com:mobify/mobifyj…
…s into v2.0-swift-feature-branch
969a7f5
@jansepar jansepar 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
8f1a6a4
@b1tr0t b1tr0t * update swift tag
* fix tag bootstrap file
acacf53
@b1tr0t b1tr0t * jazzcat appears to be working e11466d
@b1tr0t b1tr0t Merge branch 'v2.0-swift-feature-branch' of github.com:mobify/mobifyj…
…s into v2.0-swift-feature-branch

Conflicts:
	tag/bootstrap.html
df26304
@jansepar jansepar Merge branch 'v2.0-documentation' into v2.0-swift-feature-branch
Conflicts:
	examples/assets/css/stylesheet.css
cb96e73
@jansepar jansepar Removing build folder (added to gitignore in v2.0-documentation, whic…
…h has been merged into here)
bdd5f91
@jansepar jansepar More cleanup 36d2f4e
@jansepar jansepar Merge branch 'v2.0' into v2.0-swift-feature-branch
Conflicts:
	Gruntfile.js
	src/mobify-capture.js
65c9ae7
@jansepar jansepar Removing file that somehow lives e7683fa
@jansepar jansepar Merge branch 'v2.0' into v2.0-swift-feature-branch 2855352
@jansepar jansepar Moooore crazyness with accidental files 6a65592
@jansepar jansepar Last files of old to remove 25ef708
@b1tr0t b1tr0t * parameter rename 6417161
@b1tr0t b1tr0t Merge branch 'v2.0-swift-feature-branch' of github.com:mobify/mobifyj…
…s into v2.0-swift-feature-branch
530c8ef
@jansepar jansepar Jazzcat object renaming and indentation madness ad25ab2
@jansepar jansepar Adding options parameter to the combineScripts method, adds consisten…
…cy between resizeImages and jazzcat
08c36aa
@jansepar jansepar Progress on swift mvp 6dff1e4
@jansepar jansepar Fixing stash merge conflict 21fb181
@jansepar jansepar Adding necessary adjustments to get Swift integrated into Cloud fff56eb
@jansepar jansepar Adding Roman's code for auto-detecting screen width/height into Resiz…
…eImage library
d36fa0f
@jansepar jansepar Basic test added! Just in the nick of time. 6f21ec8
@jansepar jansepar Fixing comment 287c0dc
@jansepar jansepar Merge branch 'v2.0' into v2.0-swift-studio-integration a92caf1
@jansepar jansepar Merge branch 'v2.0' into v2.0-swift-feature-branch a58e864
@jansepar jansepar Merge branch 'v2.0-swift-studio-integration' into v2.0-swift-feature-…
…branch
b0a8b6b
@jansepar jansepar Merge branch 'v2.0' into v2.0-swift-feature-branch 52bec68
@jansepar jansepar Adding Roman's code for auto-detecting screen width/height into Resiz…
…eImage library
e81e3d0
@jansepar jansepar Basic test added! Just in the nick of time. a85f2ff
@jansepar jansepar Fixing comment a109658
@jansepar jansepar Merge branch 'v2.0-swift-cloud-integration' into v2.0-swift-feature-b…
…ranch
038ea29
@jansepar jansepar Merge branch 'v2.0' into v2.0-swift-feature-branch
Conflicts:
	tests/old/index.html
10e770f
@jansepar jansepar Removing old tests 53f84c8
@jansepar jansepar Adding a few tag backwards compatibility changes 8cd5be4
@jansepar jansepar More v6 backwards compatibility changes 4e4f903
Roman Rudenko Merge move to inline scripts by default and enable()-time loader gene…
…ration into jazzcat.
2d8b2e9
@jansepar jansepar Merge branch 'v2.0' into v2.0-swift-jazzcat-merge
Conflicts:
	tests/old/index.html
fe7e442
@jansepar jansepar Cleaning up merge, but Roman's regular expression is not functioning.…
… Committing and passing onto him to fix.

Merge branch 'v2.0-swift-feature-branch' into v2.0-swift-jazzcat-merge

Conflicts:
	src/jazzcat.js
fa630ac
@jansepar jansepar Some jazzcat cleanup, fixing swift example 2f1794e
@jansepar jansepar Fix Jazzcat thx to Roman! 973cc1c
@jansepar jansepar Bringing in old jazzcat tests. 4/6 pass for now. 380e48d
@jansepar jansepar Migrating existing 1.1 jazzcat tests into 2.0. fb288e6
@jansepar jansepar Some initial work on cold cache test. aa7fc30
@jansepar jansepar Remove debugger 547eaba
@jansepar jansepar Sorry Zepto, I forgot to add you. It was me, not you. 636a52f
@jansepar jansepar Fixing cold cache test in a way that bring shame upon my village. The…
…se tests will need some love in the future, but for now, at least the cover the basics.
49bec13
@jansepar jansepar Merge pull request #117 from mobify/v2.0-swift-jazzcat-merge
V2.0 swift jazzcat merge
f44bcdf
@jansepar jansepar Swift -> experimental 5b2810e
@jansepar jansepar Adding forgotten file 3b86868
@jansepar jansepar Committing build files to repo a5537cd
@noahadams noahadams add grunt qunit module as dev dependency 2e6d938
@noahadams noahadams construct urls using projectName if present in defaults 2102d4f
@noahadams noahadams test url creation ccf7b75
@noahadams noahadams just update version on qunit dependency 35b5f48
@jansepar jansepar Updating the minimum version requirement for node engine and other th…
…ings
597f21d
@jansepar jansepar Renaming example 599fe93
@jansepar jansepar Merge branch 'v2.0-swift-feature-branch' into v2.0-swift-jazzcat-proj…
…ect-parameter
67dd03d
@jansepar jansepar Updating example and build file 071582d
@jansepar jansepar Adding project names to options argument in resizeImages and combineS…
…cripts
6fd7096
@jansepar jansepar Merge pull request #119 from mobify/v2.0-swift-jazzcat-project-parameter
V2.0 swift jazzcat project parameter
a89fc50
@jansepar jansepar Initial pass of adding unblocking abilities to mobifyjs 0177e12
@jansepar jansepar Changing unblockify to override a method in capture in order to move …
…scripts to the bottom of the body at the right time.
3fde599
@jansepar jansepar Fixes based on Noah's feedback, and some cleanup. 57b7e83
@jansepar jansepar Adds unblockify tests, and small refactor 5378de1
@jansepar jansepar Adding unblockify tests to grunt test runner 6295dfc
@jansepar jansepar Removing test from Utils for function that no longer exists 6d8e619
@noahadams noahadams clean up big terrible testing string a little 7aba730
@jansepar jansepar Merge pull request #122 from mobify/v2.0-unblockify
V2.0 unblockify
0b3df14
@noahadams noahadams change hosts for jazzcat and image resizer to jazzcat.mobify.net and …
…ir.mobify.net, respectively, new happy fun cookie free domains
a90c319
@noahadams noahadams fix some expected values for url generation testing with jazzcat dd06104
@noahadams noahadams adding built version for this branch 129c072
@jansepar jansepar Merge pull request #123 from mobify/v2.0-cookie-free-services
change hosts for jazzcat and image resizer to jazzcat.mobify.net and ir....
27b7358
@jansepar jansepar Adding resizeImages tests 38ba932
@jansepar jansepar Adding resizeImages tests to automated tests e28c639
@jansepar jansepar Updating grunt-saucelabs and grunt-s3 4198a28
@noahadams noahadams ir.mobify.net -> ir0.mobify.com 1fd317f
@noahadams noahadams jazzcat.mobify.net -> jazzcat.mobify.com 94fa590
@noahadams noahadams add built libraries 717ead4
@jansepar jansepar Merge pull request #126 from mobify/v2.0-remove-mobify-net-hostnames
V2.0 remove mobify net hostnames
1a1ee2c
@jansepar jansepar Fixing what we call apply on when overriding enable 5c168a1
@jansepar jansepar Merge branch 'v2.0' into v2.0-swift-feature-branch
Conflicts:
	examples/capturing-grumpycat/index.html
	package.json
8975921
@jansepar jansepar Consolidating version number change bd0d22e
@jansepar jansepar Updating jazzcatAndImageResize and unblockify examples b578aca
@jansepar jansepar Adding simlinks to latest mobify.js library builds 06329a2
@jansepar jansepar Merge branch 'v2.0' into v2.0-swift-feature-branch
Conflicts:
	.gitignore
854ecfe
@jansepar jansepar Fixing unblockify tests 63e3f28
@jansepar jansepar Adding initial doc file 3ec79d9
@jansepar jansepar Adding image resizing docs! And fixing up the API a little bit 2f73840
@jansepar jansepar Updating docs based on feedback from Noah d177a7c
@jansepar jansepar Changed resize function behaviour to properly deal with device pixel …
…ratio
f9603bb
@jansepar jansepar Fixing not properly using the attribute in options 9cac5db
@jansepar jansepar Adding domain to default projectName. Updating tests acedcda
@jansepar jansepar Adding information about cost of image resizing backend service db16c7e
@jansepar jansepar Add ability to override API in options. Fix broken opts extending (en…
…sure we never add members to defaults object)
bad9566
@jansepar jansepar Adding DPR option in docs 1feeaef
@jansepar jansepar IE10 y u no like Zepto?! 8bb3c38
@noahadams noahadams Merge pull request #132 from mobify/v2.0-image-resize-docs
V2.0 image resize docs
0846d16
@jansepar jansepar Fixing project name to something IR can handle 4a43ab5
@jansepar jansepar Getting rid of encodeURI, and changing up one example 29e8660
@jansepar jansepar Merge branch 'v2.0' into v2.0-swift-feature-branch
Conflicts:
	.gitignore
	src/capture.js
8b5a220
@jansepar jansepar Updating build file 76b4449
@jansepar jansepar Merge branch 'v2.0' into v2.0-swift-feature-branch 381d98e
@jansepar jansepar Adding image resizing example 4f011e7
@jansepar jansepar Adding some comments to docs ebd04dc
@jansepar
Mobify Research & Development Inc. member

:+1:

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

1 check passed

Details default
@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
Something went wrong with that request. Please try again.