Results 1 to 10 of 3727

Threaded View

  1. #11
    Join Date
    Jan 2007
    Location
    Los Angeles, California, United States
    Posts
    10,021
    Plugin Contributions
    32

    Default Re: Image Display Size Restriction

    Quote Originally Posted by mc12345678 View Post
    Next homework assignment is to provide a new commit to your own branch, create two branches off of yours, make a modification in each branch that is in two different areas, merge the two branches, submit a pull request for your changes, let's see what else? :)
    I'll have to read and try and digest this all after I eat.. I already submitted the pull request for my changes.. (figured out that I missed this all on my own.. just need someone to tell me if I did it "right")

    Quote Originally Posted by mc12345678 View Post
    So, looks like you successfully have updated github to reflect the changes that you have made, which went a step further than provided by Design75 by deleting what looks like the contents of the the jquery file (haven't downloaded the applicable files to see if actually the file itself and associated folders were deleted or just the contents of the file), but then kept a reference to the internet version of the jscript_jquery file. So couple of comments based on a review and I wouldn't call myself a grading teacher:
    Don't see a pull request from niestudio's version (so, yes forked, but no notification back to the main project to request merging).
    It looks like the project was forked from niestudio's version which does not yet include Design75's changes.
    The changes made in both forks are different, as well as similar, this would result in niestudio having to decide/determine a "best" path forward as to which to incorporate and will likely require a manual merge, but that is the way of working in/with github.
    In summary my changes included deleting the outdated v1.4.1 jQuery file that is included with Zen Lightbox in it's entirety, and replacing it with a NEW file that instead pulls the latest version of jQuery from a CDN.. (I followed the same pattern that Picaflor follows in her templates)

    Now going forward should I have simply worked from Design75's repo or niestudios's original repo versus creating my own fork???.. As I said I know what gihub is for, but have never used it in practice.. So I simply followed Design75's lead and created my own fork.. If this was the wrong path, then I would appreciate some tips on best practices here..
    Last edited by DivaVocals; 12 Nov 2013 at 08:42 PM.
    My Site - Zen Cart & WordPress integration specialist
    I don't answer support questions via PM. Post add-on support questions in the support thread. The question & the answer will benefit others with similar issues.

 

 

Similar Threads

  1. Free Shipping Rules addon [Support Thread]
    By numinix in forum Addon Shipping Modules
    Replies: 36
    Last Post: 2 Dec 2016, 01:56 PM
  2. v151 Reviews Reply addon [Support Thread]
    By mikestaps in forum All Other Contributions/Addons
    Replies: 9
    Last Post: 17 Oct 2014, 01:29 AM
  3. Jquery Lightbox [Support thread]
    By yellow1912 in forum All Other Contributions/Addons
    Replies: 257
    Last Post: 2 Aug 2012, 10:57 PM
  4. File Upload Required addon [Support Thread]
    By 1100101 in forum All Other Contributions/Addons
    Replies: 21
    Last Post: 10 Dec 2011, 03:00 AM
  5. [Support Thread] IE only JavaScripts and Stylesheets Addon
    By Meshach in forum All Other Contributions/Addons
    Replies: 16
    Last Post: 31 May 2011, 08:18 PM

Posting Permissions

  • You may not post new threads
  • You may not post replies
  • You may not post attachments
  • You may not edit your posts
  •  
disjunctive-egg