search

jjeaton / wp-veriteco-timeline

WP VeriteCo Timeline integrates NUKnightLab's (formerly VeriteCo's) Timeline JS into the WordPress back-end.
3 stars 2 forks source link

Update to newest TimelineJS release (2.29.1) #11

Closed titaniumbones closed 10 years ago

titaniumbones commented 10 years ago

Very modest changes, there are probably features that the plugin as currently constituted doesn't take advantage of. I am not noticing any breakage, though.

titaniumbones commented 10 years ago

fixes #7 ?

jjeaton commented 10 years ago

Could you squash a9c1ee3, b83736f, 8ef223f and re-push?

There are so many files updated, it's hard for me to tell at a glance, did you just drop in the latest Timeline version, or did you have to make any updates to rest of the plugin (besides the stripslashes change)

titaniumbones commented 10 years ago

google says:

Note: do not squash commits that you’ve already shared with others.

You’re changing history and it will cause trouble for others.

I looked over the commits & all 3 of them are just updates of timelinejs -- I just screwed up the first couple times (hadn't read the timelinejs docs properly), and had never squashed commits before so didn't know how to remove my screwups from the history. I'm reluctant to do it now as I don't want to mess anything up in my own tree; if it's a big deal though I will give it a try.

m

On 02/17/2014 05:09 PM, Josh Eaton wrote:

Could you squash a9c1ee3 https://github.com/jjeaton/wp-veriteco-timeline/commit/a9c1ee3, b83736f https://github.com/jjeaton/wp-veriteco-timeline/commit/b83736f, 8ef223f https://github.com/jjeaton/wp-veriteco-timeline/commit/8ef223f and re-push?

There are so many files updated, it's hard for me to tell at a glance, did you just drop in the latest Timeline version, or did you have to make any updates to rest of the plugin (besides the stripslashes change)

— Reply to this email directly or view it on GitHub https://github.com/jjeaton/wp-veriteco-timeline/pull/11#issuecomment-35327484.

jjeaton commented 10 years ago

@titaniumbones I prefer to have a clean history (OCD) but I can get over that. :) I will merge this once I've had a chance to pull down your branch and test it.