Permalink
Switch branches/tags
Nothing to show
Commits on Feb 20, 2017
  1. Remove DMCA protected files

    These are apparently protected. However, the license on the head
    of the javascript is actually MIT. So I'm not sure which parts are
    licensed as what but since we've only been given 24hours to remove
    the content I'm just going to purge it all.
    
    This may break some themes/pages/elements. But given that zookeepr
    is largely unmaintained at this point and that most deployments
    write their own theme I'm not too worried.
    jhesketh committed Feb 20, 2017
Commits on Dec 4, 2016
  1. Merge pull request #513 from h4ck3rm1k3/patch-1

    Update ceiling.py
    lod committed on GitHub Dec 4, 2016
Commits on Dec 3, 2016
  1. Update ceiling.py

    h4ck3rm1k3 committed on GitHub Dec 3, 2016
Commits on Sep 30, 2016
  1. Merge pull request #512 from puck/patch-1

    And myself as a past author
    lod committed on GitHub Sep 30, 2016
  2. And myself as a past author

    I hacked on Zookeepr a lot for linux.conf.au 2010.
    puck committed on GitHub Sep 30, 2016
Commits on Feb 14, 2016
  1. Merge pull request #503 from lod/crud_tests

    Added functional testing for CRUD like controllers
    iseppi committed Feb 14, 2016
  2. Merge pull request #506 from lod/unused_templates

    Deleting a stack of templates that aren't used
    iseppi committed Feb 14, 2016
Commits on Feb 10, 2016
  1. Deleting a stack of templates that aren't used

    Most look like they were added at some point and then the functionality
    was implemented differently but the template left behind.
    
    Removing them decreases the maintenance load.
    lod committed Feb 10, 2016
Commits on Feb 8, 2016
  1. Try and fix travis CI - add pwgen

    lod committed Feb 8, 2016
  2. Added functional testing for CRUD like controllers

    The tests are implemented using a CrudHelper class which the tests
    inherit from.
    
    CrudHelper implements the test suite:
     * test_permissions
     * test_new
     * test_index
     * test_view
     * test_edit
     * test_delete
    
    Each function takes as its required parameters: self, app, db_session
    Each function also takes a large variety of optional parameters,
    these allow the function to be tweaked and customised depending on the
    expected output. Common customisations are things like a different form
    of page title or a custom target object to test for.
    
    There are three ways these functions can be used by each test file:
     1. No code written, the generic test in inherited and used
     2. Customisation code written, the generic test is called from
        within the test file function of the same name providing customised
        options and typically extra code before or after.
     3. CrudHelper code overwritten, the test file has a function of the
        same name but does not call the CrudHelper function. This allows
        full custom testing but is typically used to disable the test if the
        controller does not support the function.
    
    Improved diagnostic of mako errors
    ----------------------------------
    
    The best solution is to change the stack trace so you get a nice Mako
    based trace rather than the 30 odd full list
    
    This was the prior behaviour provided by pylons.error handle_mako_error
    
    Unfortunately it doesn't work, I spent hours trying to work it out but
    it seems that the stack trace is being rewritten again by one of the
    third party layers.
    
    So for now we do the stack rewrite - it might start working
    
    We also print out the nice Mako stack trace so we have something to work
    with in the mean time.
    
    Testing improvements
    --------------------
    
    Make login function reentrant
    This simplifies tests by not requiring a logout and state tracking
    
    Bug fixes
    ---------
    
    In addition to implementing the tests a stack of minor bug fixes have
    also been applied as the bugs were uncovered.
    
    This range from the very minor - changing the case of the template title
    string to be consistent.
    
    To the relatively major - existing functionality did not compile and was
    obviously never tested.
    
    Due to the large number of these changes they were not broken out in to
    individually reported issues.
    lod committed Dec 28, 2015
Commits on Feb 7, 2016
  1. Merge pull request #489 from lod/fix_486

    fix #486 New alembic file populates missing lookup tables
    iseppi committed Feb 7, 2016
  2. Merge pull request #399 from chrisjrn/patch-1

    Changes handling of t-shirt product names
    iseppi committed Feb 7, 2016
  3. Merge pull request #499 from lod/fix_travis

    Fix travis/tox issues on remote server
    iseppi committed Feb 7, 2016
  4. Renamed tox.pip18.ini to tox.pip6.ini

    Name reflects the minimum pip version required to switch files.
    lod committed Feb 7, 2016
  5. Fix travis/tox issues on remote server

    New versions of pip require the --trusted-host parameter
    otherwise they die hard.
    Old versions of pip die hard if --trusted-host is present.
    
    Standard virtualenv such as Debian's uses an old version of pip
    travis-ci.org which we use for acceptance testing uses a new version
    
    The only solution I have managed to come up with is to have two files.
    One providing a config for each system.
      tox.ini is the default and set for the old pip versions
      tox.pip18.ini is for new pip versions and is used by .travis.yml
    lod committed Feb 7, 2016
Commits on Feb 6, 2016
  1. Updated install process and instructions

    Updated the install documentation.
    Mostly just an edit pass.
    Added a few sections and a step for development.ini
    
    Also updated both tox.ini and setup.py to work with obselete
    packages.
    
    venusian was added to requirements, seems to be used by alembic.
    lod committed Feb 6, 2016
Commits on Feb 4, 2016
  1. Merge pull request #446 from stickster/postcode-fix

    Fix missing postal code error
    neillc committed Feb 4, 2016
  2. Merge pull request #494 from iseppi/order-fulfilment-relation

     * Order Fulfilment in FulfilmentGroup by the type_id
    neillc committed Feb 4, 2016
Commits on Jan 26, 2016
Commits on Jan 24, 2016
  1. New alembic file populates missing lookup tables

    Fills provisional data for:
        event_type
        fulfilment_status
        fulfilment_type
        fulfilment_type_status_map
    lod committed Jan 24, 2016
Commits on Dec 13, 2015
  1. Merge pull request #479 from lod/fix_478

    Fix attachment permission bugs
    jhesketh committed Dec 13, 2015
  2. Fix attachment permission bugs

    lod committed Dec 13, 2015
Commits on Oct 7, 2015
Commits on Oct 5, 2015
  1. New deps from updated pillow

    jhesketh committed Oct 5, 2015
Commits on Oct 2, 2015
  1. Merge pull request #444 from lod/fix422

    Create lca2016 themed version of angular.mako
    dtbell91 committed Oct 2, 2015
Commits on Oct 1, 2015
  1. Create lca2016 themed version of angular.mako

    Fixes #422
    lod committed Sep 30, 2015
Commits on Sep 4, 2015
  1. Merge pull request #431 from jhesketh/theme_config

    Move theme into a config variable
    jhesketh committed Sep 4, 2015
  2. Awful hack to fix tests

    This will be updated/fixed when the new auth system is done.
    
    It's hacky, but consistent with the rest of the tests. Rather than
    mocking out the config, assume if a page gets a 500, it's passed the
    auth and is equiv to a 200.
    jhesketh committed Sep 4, 2015
  3. Merge pull request #433 from lod/change_config_reviewer_bug

    Fix bug reported by dtbell - reviewer cannot load
    jhesketh committed Sep 4, 2015
Commits on Sep 2, 2015
  1. Fix bug reported by dtbell - reviewer cannot load

    Angular template did not provide define structures for the reviewer or
    funding reviewer which is used by the toolbox template.
    lod committed Sep 2, 2015
Commits on Aug 30, 2015
  1. Merge pull request #420 from lod/func_testing

    Fix/reenable zkpylons functional testing
    jhesketh committed Aug 30, 2015
Commits on Aug 29, 2015
  1. Fixed issue with inadvertent logging out

    Was hitting the logout page mid-test, invalidating half the results.
    This also fixes the consistency issues I was having.
    lod committed Aug 29, 2015
Commits on Aug 28, 2015
  1. URL permission test/audit

    This extensive (but not comprehensive) test hits a large number of urls
    with each of the different roles that we use.
    
    The response is then compared to a known "good" table to ensure that the
    permissions are correct.
    
    In practice the "good" table is our current permission set. This test is
    designed to provide a backstop and prevent any inadvertant loosening or
    regression in permissions.
    
    It also provides a useful overview of the state of the system.
    lod committed Aug 28, 2015