Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Alphacrucis/javascript
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: noframeworks
Choose a base ref
...
head repository: Alphacrucis/javascript
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 16 commits
  • 19 files changed
  • 1 contributor

Commits on Mar 4, 2014

  1. Fix the indesign collections extended functions 

    Is the collection is not used before, raises an error. Use _extend_collection before toArray, forEach or forEachR to force instantiation
    @Jaramoshi
    Jaramoshi committed Mar 4, 2014
    Configuration menu
    Copy the full SHA
    83dc467 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2014

  1. Select what fields to import

    @Jaramoshi
    Jaramoshi committed Apr 16, 2014
    Configuration menu
    Copy the full SHA
    5482d12 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2014

  1. - Insertar productos respetando el orden preescrito de los campos. 

    - Configurar qué campos importar
    @Jaramoshi
    Jaramoshi committed Apr 22, 2014
    Configuration menu
    Copy the full SHA
    3202aa0 View commit details
    Browse the repository at this point in the history

  2. Muestra el producto sobre el que se encuentra el foco (insertionPoint… 

    …) en indesign
    @Jaramoshi
    Jaramoshi committed Apr 22, 2014
    Configuration menu
    Copy the full SHA
    fa75507 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2014

  1. Nueva estructura XML de artículos. 

    En cada textframe, los artículos están contenidos en una etiqueta 'Container' que sirve de envoltorio.
    @Jaramoshi
    Jaramoshi committed Apr 25, 2014
    Configuration menu
    Copy the full SHA
    404111f View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2014

  1. Exportar información de artículos en página, sin xml-tags

    @Jaramoshi
    Jaramoshi committed Sep 2, 2014
    Configuration menu
    Copy the full SHA
    e8330f6 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2014

  1. Exportar desde catálogo

    @Jaramoshi
    Jaramoshi committed Sep 3, 2014
    Configuration menu
    Copy the full SHA
    8860f38 View commit details
    Browse the repository at this point in the history

  2. Exportar Articulos Cambios UI

    @Jaramoshi
    Jaramoshi committed Sep 3, 2014
    Configuration menu
    Copy the full SHA
    4ab36b6 View commit details
    Browse the repository at this point in the history

  3. Exportar articulos Mostrar valor en página

    @Jaramoshi
    Jaramoshi committed Sep 3, 2014
    Configuration menu
    Copy the full SHA
    5fb3f2e View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2014

  1. Exportar Artículos 

    Corregir error en parser para detectar algunos códigos con estilos incorrectos. Dar preferencia siempre al partNumber para detectar productos.
    @Jaramoshi
    Jaramoshi committed Sep 9, 2014
    Configuration menu
    Copy the full SHA
    26b3030 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2014

  1. CatalogoXML: corregir error moneda $

    @Jaramoshi
    Jaramoshi committed Sep 24, 2014
    Configuration menu
    Copy the full SHA
    48ac7ea View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2014

  1. New web app server ip --> now using tagger

    @Jaramoshi
    Jaramoshi committed Oct 23, 2014
    Configuration menu
    Copy the full SHA
    990cc6e View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2014

  1. New server

    @Jaramoshi
    Jaramoshi committed Oct 29, 2014
    Configuration menu
    Copy the full SHA
    9cd1c4a View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2014

  1. Función para recuperar fotos de artículos

    @Jaramoshi
    Jaramoshi committed Nov 4, 2014
    Configuration menu
    Copy the full SHA
    05c33bb View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' 

    Conflicts:
	IKEA/catalogoXML/lib/IKEAProducts.jsx
    @Jaramoshi
    Jaramoshi committed Nov 4, 2014
    Configuration menu
    Copy the full SHA
    10d794c View commit details
    Browse the repository at this point in the history

  3. Mensajes de error a alertas

    @Jaramoshi
    Jaramoshi committed Nov 4, 2014
    Configuration menu
    Copy the full SHA
    dd4035b View commit details
    Browse the repository at this point in the history
Loading