Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Get up to date with parent #1

Merged
merged 44 commits into from
Jul 13, 2016
Merged

Get up to date with parent #1

merged 44 commits into from
Jul 13, 2016

Commits on Dec 17, 2015

  1. Merge pull request #2 from dweeves/master 

    Merge with upstream
    tantau-limora committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    99aedaf View commit details
    Browse the repository at this point in the history

  2. Only delete empty values in specified store. 

    (cherry picked from commit 665f528d3f7b0a5be9bfca85f4a0ea22c9344fbb)

Conflicts:

	magmi/engines/magmi_productimportengine.php
    Björn Tantau committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    116b111 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2015

  1. Merge pull request #1 from dweeves/master 

    Merge with master
    @crysix
    crysix committed Dec 18, 2015
    Configuration menu
    Copy the full SHA
    edeac09 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2016

  1. Update attributesetimport.php 

    without "$prefix" param, it fails in Line: 243 as $csvreader can not find the correct "filename" param
    @king-of-the-ring
    king-of-the-ring committed Jan 4, 2016
    Configuration menu
    Copy the full SHA
    5a1c099 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2016

  1. Merge pull request #393 from tantau-limora/delete-fix 

    Delete fix
    @dweeves
    dweeves committed Jan 11, 2016
    Configuration menu
    Copy the full SHA
    7c37073 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #398 from king-of-the-ring/master 

    Update attributesetimport.php
    @dweeves
    dweeves committed Jan 11, 2016
    Configuration menu
    Copy the full SHA
    66900d3 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2016

  1. Merge pull request #2 from dweeves/master 

    Merge with master
    @crysix
    crysix committed Jan 18, 2016
    Configuration menu
    Copy the full SHA
    f296c57 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2016

  1. ADD magmi.cli.php to composer.json bin

    schmuckado.de SSH committed Feb 14, 2016
    Configuration menu
    Copy the full SHA
    4b0a435 View commit details
    Browse the repository at this point in the history

  2. FIX cli path

    @mobilizer
    mobilizer committed Feb 14, 2016
    Configuration menu
    Copy the full SHA
    68a6c63 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2016

  1. Encode more chars to prevent invalid config keys 

    Parentheses in column mapper column names were getting saved into config keys without encoding and generating errors in parse_ini_file when the config file was subsequently loaded.
    @ericmason
    ericmason committed Feb 15, 2016
    Configuration menu
    Copy the full SHA
    019d6d5 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #414 from mobilizer/master 

    ADD CLI magmi.cli.php to composer bin folder
    @dweeves
    dweeves committed Feb 15, 2016
    Configuration menu
    Copy the full SHA
    590eb23 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #415 from ericmason/master 

    Encode more chars to prevent invalid config keys
    @dweeves
    dweeves committed Feb 15, 2016
    Configuration menu
    Copy the full SHA
    39641dd View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2016

  1. fix compatibility of array defination under php5.4

    fangyukun committed Feb 19, 2016
    Configuration menu
    Copy the full SHA
    09d0437 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #418 from abcfyk/fix_compatibility_of_array_defina… 

    …tion

fix compatibility of array defination under php5.4
    @dweeves
    dweeves committed Feb 19, 2016
    Configuration menu
    Copy the full SHA
    7ceb032 View commit details
    Browse the repository at this point in the history

  3. Change default display style of main <div> elements in options panel to 

    "on" to prevent wrong presentation after initial activation of
plugin.
    @5b5
    5b5 committed Feb 19, 2016
    Configuration menu
    Copy the full SHA
    a026ea7 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #419 from 5b5/fix_configuration 

    Enable options correctly on initial activation of attribute(set)importer plugin
    @dweeves
    dweeves committed Feb 19, 2016
    Configuration menu
    Copy the full SHA
    7ca733a View commit details
    Browse the repository at this point in the history

  5. Fix for NOT LOGGED IN group name. Referencing #199. This is a priorit… 

    …y bug fix if possible.
    @damien42c
    damien42c committed Feb 19, 2016
    Configuration menu
    Copy the full SHA
    d35f578 View commit details
    Browse the repository at this point in the history

  6. fixes 'Undefined index: price_type' notice in Custom Options v0.0.7a

    @psdevhh
    psdevhh committed Feb 19, 2016
    Configuration menu
    Copy the full SHA
    c0d3437 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2016

  1. Merge pull request #420 from damien42c/master 

    Fix for NOT LOGGED IN group name in grouppriceprocessor
    @dweeves
    dweeves committed Feb 20, 2016
    Configuration menu
    Copy the full SHA
    7cc7820 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #421 from pschnell/master 

    fixes 'Undefined index: price_type' notice in Custom Options v0.0.7a
    @dweeves
    dweeves committed Feb 20, 2016
    Configuration menu
    Copy the full SHA
    20073ad View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2016

  1. fix UTF-8 encoding / non-alphanumeric filename handling in Image Attr… 

    …ibutes Processor
    @psdevhh
    psdevhh committed Mar 6, 2016
    Configuration menu
    Copy the full SHA
    f7e8c10 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2016

  1. Merge pull request #3 from dweeves/master 

    Merge with master
    @crysix
    crysix committed Mar 7, 2016
    Configuration menu
    Copy the full SHA
    416250b View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2016

  1. Merge pull request #427 from pschnell/master 

    fix UTF-8 encoding / non-alphanumeric filename handling in Image Attributes Processor
    @dweeves
    dweeves committed Mar 12, 2016
    Configuration menu
    Copy the full SHA
    a212c2e View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2016

  1. Merge pull request #4 from dweeves/master 

    Merge with master
    @crysix
    crysix committed Mar 24, 2016
    Configuration menu
    Copy the full SHA
    efea1ab View commit details
    Browse the repository at this point in the history

  2. Added timeout for remote CSV download of big files

    @crysix
    crysix committed Mar 24, 2016
    Configuration menu
    Copy the full SHA
    67b961e View commit details
    Browse the repository at this point in the history

  3. Added timeout for remote CSV download of big files

    @crysix
    crysix committed Mar 24, 2016
    Configuration menu
    Copy the full SHA
    c853512 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2016

  1. Add Attribute Deleter Plugin. 

    refs #2386
    Björn Tantau committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    52b5cd4 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2016

  1. Fix Polish accented leters transliteration in Slugger 

    Fixes: #442
    @tmotyl
    tmotyl committed Apr 4, 2016
    Configuration menu
    Copy the full SHA
    86313ea View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2016

  1. fix: js statements

    @dweeves
    dweeves committed Apr 6, 2016
    Configuration menu
    Copy the full SHA
    7b767fb View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2016

  1. feature: add parsing info method

    @dweeves
    dweeves committed Apr 15, 2016
    Configuration menu
    Copy the full SHA
    8440140 View commit details
    Browse the repository at this point in the history

  2. feature: item generator plugin

    @dweeves
    dweeves committed Apr 15, 2016
    Configuration menu
    Copy the full SHA
    6a6d5ae View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2016

  1. fix: remove extra enclosing

    @dweeves
    dweeves committed Apr 17, 2016
    Configuration menu
    Copy the full SHA
    ee8cce9 View commit details
    Browse the repository at this point in the history

  2. fix: multiple level special chars decoding

    @dweeves
    dweeves committed Apr 17, 2016
    Configuration menu
    Copy the full SHA
    5536853 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2016

  1. Formatted README; Apache mod_prox_fcgi info 

    Added additional details regarding Apache mod_proxy_fcgi auth/login issues.
Cleaned up and formatted the README using GitHub Markdown.
    @sarog
    sarog committed Apr 19, 2016
    Configuration menu
    Copy the full SHA
    030d2f8 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #446 from sarog/patch-1 

    Formatted README; Apache mod_proxy_fcgi info
    @dweeves
    dweeves committed Apr 19, 2016
    Configuration menu
    Copy the full SHA
    ad478e0 View commit details
    Browse the repository at this point in the history

  3. Update README.md

    @dweeves
    dweeves committed Apr 19, 2016
    Configuration menu
    Copy the full SHA
    7671c02 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #443 from macopedia/polish_transliteration 

    Fix Polish accented leters transliteration in Slugger
    @dweeves
    dweeves committed Apr 19, 2016
    Configuration menu
    Copy the full SHA
    49da82e View commit details
    Browse the repository at this point in the history

Commits on May 5, 2016

  1. Fixed Configurable plugin bug when mixed products are imported (confi… 

    …gurable and simple) in the "options_container"
    Dario Cancelliere committed May 5, 2016
    Configuration menu
    Copy the full SHA
    8768612 View commit details
    Browse the repository at this point in the history

  2. Spaces instead of tabs

    Dario Cancelliere committed May 5, 2016
    Configuration menu
    Copy the full SHA
    9f3a83f View commit details
    Browse the repository at this point in the history

  3. Merge pull request #449 from Emulator000/master 

    Bugfix in configurable item processor plugin
    @dweeves
    dweeves committed May 5, 2016
    Configuration menu
    Copy the full SHA
    0ab191e View commit details
    Browse the repository at this point in the history

Commits on May 27, 2016

  1. First image can be excluded during magmi re-import with no reason. Vi… 

    …sibly image processor is waiting for images fields before gallery fields. Patch is to make sure they are always in the right order
    @clemrvt
    clemrvt committed May 27, 2016
    Configuration menu
    Copy the full SHA
    b97d4a7 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #454 from canal-web/master 

    First image can be excluded during magmi re-import with no reason.
    @dweeves
    dweeves committed May 27, 2016
    Configuration menu
    Copy the full SHA
    7d5ff16 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2016

  1. Merge pull request #438 from tantau-limora/attribute-deleter 

    Add Attribute Deleter Plugin.
    @dweeves
    dweeves committed May 31, 2016
    Configuration menu
    Copy the full SHA
    e3a4df2 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #434 from crysix/master 

    Added timeout for big files on remote download mode
    @dweeves
    dweeves committed May 31, 2016
    Configuration menu
    Copy the full SHA
    5879cb2 View commit details
    Browse the repository at this point in the history