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

adding support for optional keys in templates #30

Open
wants to merge 24 commits into
base: master
Choose a base branch
from
Open

adding support for optional keys in templates #30

wants to merge 24 commits into from

Commits on Apr 3, 2016

  1. adding support for optional keys in templates

    johannes committed Apr 3, 2016
    Configuration menu
    Copy the full SHA
    ba97133 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2016

  1. should not react on empty brackets

    johannes committed Apr 4, 2016
    Configuration menu
    Copy the full SHA
    6f18214 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2016

  1. inital commit of key objects

    @nebukadhezer
    nebukadhezer committed Apr 22, 2016
    Configuration menu
    Copy the full SHA
    adfe8cb View commit details
    Browse the repository at this point in the history

  2. adding support for optional keys and key objects

    @nebukadhezer
    nebukadhezer committed Apr 22, 2016
    Configuration menu
    Copy the full SHA
    d709cd1 View commit details
    Browse the repository at this point in the history

  3. Merge github.com:nebukadhezer/lucidity 

    Conflicts:
	source/lucidity/template.py
    @nebukadhezer
    nebukadhezer committed Apr 22, 2016
    Configuration menu
    Copy the full SHA
    6cebe75 View commit details
    Browse the repository at this point in the history

Commits on May 18, 2016

  1. clean up of keys

    @nebukadhezer
    nebukadhezer committed May 18, 2016
    Configuration menu
    Copy the full SHA
    42c35c4 View commit details
    Browse the repository at this point in the history

  2. key resolver defaults to dict so our "is in checks" wont fail

    @nebukadhezer
    nebukadhezer committed May 18, 2016
    Configuration menu
    Copy the full SHA
    aa8e650 View commit details
    Browse the repository at this point in the history

  3. changed default unit tests to match macke base conf

    @nebukadhezer
    nebukadhezer committed May 18, 2016
    Configuration menu
    Copy the full SHA
    6a655b5 View commit details
    Browse the repository at this point in the history

  4. added unit test for key objects

    @nebukadhezer
    nebukadhezer committed May 18, 2016
    Configuration menu
    Copy the full SHA
    14dedae View commit details
    Browse the repository at this point in the history

  5. removed a whee bit ambigous locals from unit test.... slipped through

    @nebukadhezer
    nebukadhezer committed May 18, 2016
    Configuration menu
    Copy the full SHA
    b6975d6 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'tests' into 'master' 

    Tests

@tkaufmann 
zum drauf schauen

mal ein merge request

See merge request !1
    @instinct-vfx
    instinct-vfx committed May 18, 2016
    Configuration menu
    Copy the full SHA
    d3a9009 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2016

  1. initial commit

    @nebukadhezer
    nebukadhezer committed Oct 10, 2016
    Configuration menu
    Copy the full SHA
    0734246 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2016

  1. added db placeholders to key objcts

    @nebukadhezer
    nebukadhezer committed Oct 13, 2016
    Configuration menu
    Copy the full SHA
    b1e7fe8 View commit details
    Browse the repository at this point in the history

  2. only sort template.keys() as this is much more efficient to iterate t… 

    …hen over this than the hassle of a special return dict
    @nebukadhezer
    nebukadhezer committed Oct 13, 2016
    Configuration menu
    Copy the full SHA
    841eadd View commit details
    Browse the repository at this point in the history

  3. change unittest to expect a list from keys instead of a set

    @nebukadhezer
    nebukadhezer committed Oct 13, 2016
    Configuration menu
    Copy the full SHA
    970a605 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2016

  1. updates

    @nebukadhezer
    nebukadhezer committed Nov 16, 2016
    Configuration menu
    Copy the full SHA
    1df5658 View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2017

  1. Add .gitlab-ci.yml

    @instinct-vfx
    instinct-vfx committed Jan 13, 2017
    Configuration menu
    Copy the full SHA
    4af927b View commit details
    Browse the repository at this point in the history

  2. Update .gitlab-ci.yml

    @instinct-vfx
    instinct-vfx committed Jan 13, 2017
    Configuration menu
    Copy the full SHA
    99397f3 View commit details
    Browse the repository at this point in the history

  3. Update .gitlab-ci.yml

    @instinct-vfx
    instinct-vfx committed Jan 13, 2017
    Configuration menu
    Copy the full SHA
    4f1a4a8 View commit details
    Browse the repository at this point in the history

  4. Update .gitlab-ci.yml

    @instinct-vfx
    instinct-vfx committed Jan 13, 2017
    Configuration menu
    Copy the full SHA
    47d4581 View commit details
    Browse the repository at this point in the history

  5. Update .gitlab-ci.yml

    @instinct-vfx
    instinct-vfx committed Jan 13, 2017
    Configuration menu
    Copy the full SHA
    d5a5940 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2017

  1. store regex on the template objects

    @nebukadhezer
    nebukadhezer committed Mar 20, 2017
    Configuration menu
    Copy the full SHA
    a4ac215 View commit details
    Browse the repository at this point in the history

  2. added support for functional keys

    @nebukadhezer
    nebukadhezer committed Mar 20, 2017
    Configuration menu
    Copy the full SHA
    d64c63e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of sv-str-git002.mvision.lan:pipeline/lucidity

    @nebukadhezer
    nebukadhezer committed Mar 20, 2017
    Configuration menu
    Copy the full SHA
    6c2df09 View commit details
    Browse the repository at this point in the history