Skip to content
This repository has been archived by the owner on Dec 27, 2023. It is now read-only.

Updated SplitImage branch #198

Closed
wants to merge 392 commits into from
Closed

Updated SplitImage branch #198

wants to merge 392 commits into from

Conversation

breezewish
Copy link
Member

Merged master branch to SplitImage branch. #189

splitimage_show

smcgregor and others added 30 commits October 31, 2014 11:40
With the new merge strategy I think this may be the last time I need to do this.
@breezewish
Copy link
Member Author

Oh, just had dinner with friends and it's late :-(
Might be duplicate with #197

@smcgregor
Copy link
Member

They are duplicates. Do you see any advantage to working from your PR, or should I just look at the first one to climb the hill?

@breezewish
Copy link
Member Author

Well, I just compared two branches.

Other differences are mainly caused by build.py: I ran build.py to rebuild all templates, which inserts SplitImage entry to navigation bar, and makes some other changes like this commit.

However I made a mistake here :-( my SplitImage branch is based on my previous work, which should not be included in this branch. I will fix it later.

Currently my branch builds well and passes all tests :-)

@smcgregor
Copy link
Member

Thanks for the summary.

It would be better to leave base64.js, rawdeflate.js, rawinflate.js, and zerobin.js in the Message directory for the time being. We have modified them, but they are not our libraries so they don't exactly fit in either the vendor or the shared directories. Let's just reference them across apps for the time being. This isn't good style, but I would like to evaluate the more recent options for JS compression before we adopt them as the recommended standard -- particularly for SplitImage.

@smcgregor
Copy link
Member

Closed for #201

Thanks for addressing the comments, but these became very difficult to review.

@smcgregor smcgregor closed this Mar 6, 2015
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.