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

Keep galleria compatibility #458

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

Keep galleria compatibility #458

wants to merge 71 commits into from

Commits on Sep 26, 2014

  1. Basics working with Cycle2 (but no tests changed as yet)

    @djowett
    djowett committed Sep 26, 2014
    Configuration menu
    Copy the full SHA
    c3302b4 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2014

  1. Add cycle2 related stuff to the uninstall profile (#442)

    @djowett
    djowett committed Sep 27, 2014
    Configuration menu
    Copy the full SHA
    f44a7a2 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2014

  1. Stop Flash of unstyled content by removing auto-initialization & some… 

    … judicious use of CSS
    @djowett
    djowett committed Sep 29, 2014
    Configuration menu
    Copy the full SHA
    65ba512 View commit details
    Browse the repository at this point in the history

  2. Got autoplay checkbox functioning

    @djowett
    djowett committed Sep 29, 2014
    Configuration menu
    Copy the full SHA
    183d754 View commit details
    Browse the repository at this point in the history

  3. Don't run JSHint on minified Cycle2 Javascript; Fix issues raised by … 

    …Flake8
    @djowett
    djowett committed Sep 29, 2014
    Configuration menu
    Copy the full SHA
    744311d View commit details
    Browse the repository at this point in the history

  4. Added Prev & Next buttons

    @djowett
    djowett committed Sep 29, 2014
    Configuration menu
    Copy the full SHA
    bb1f491 View commit details
    Browse the repository at this point in the history

  5. Use unminified version of cycle2 JS

    @djowett
    djowett committed Sep 29, 2014
    Configuration menu
    Copy the full SHA
    c0ea873 View commit details
    Browse the repository at this point in the history

  6. Stop codeanalysis baulking at cycle2's console.log

    @djowett
    djowett committed Sep 29, 2014
    Configuration menu
    Copy the full SHA
    52a711f View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2014

  1. Merge branch 'master' into carousel_tile_with_cycle2

    @djowett
    djowett committed Sep 30, 2014
    Configuration menu
    Copy the full SHA
    ed05aee View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2014

  1. Merge branch 'master' of https://github.com/collective/collective.cover… 

    … into carousel_tile_with_cycle2
    @djowett
    djowett committed Oct 1, 2014
    Configuration menu
    Copy the full SHA
    f4ef50f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'issue_378' of https://github.com/collective/collective.… 

    …cover into carousel_tile_with_cycle2
    @djowett
    djowett committed Oct 1, 2014
    Configuration menu
    Copy the full SHA
    49f52c6 View commit details
    Browse the repository at this point in the history

  3. Switched carousel tile to use Cycle2 by default (#442)

    @djowett
    djowett committed Oct 1, 2014
    Configuration menu
    Copy the full SHA
    d45e327 View commit details
    Browse the repository at this point in the history

  4. Fixed tests for Cycle2 carousel tile (#442)

    @djowett
    djowett committed Oct 1, 2014
    Configuration menu
    Copy the full SHA
    71b4c54 View commit details
    Browse the repository at this point in the history

  5. Reverted wrong assumption in carousel test about it not updating befo… 

    …re next page load (#378)
    @djowett
    djowett committed Oct 1, 2014
    Configuration menu
    Copy the full SHA
    cdd27ca View commit details
    Browse the repository at this point in the history

  6. Fix for Flake8 again

    @djowett
    djowett committed Oct 1, 2014
    Configuration menu
    Copy the full SHA
    b42d166 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2014

  1. collective.js.galleria should not be installed in default profile

    @djowett
    djowett committed Oct 2, 2014
    Configuration menu
    Copy the full SHA
    5b711ea View commit details
    Browse the repository at this point in the history

  2. Rename interface. Rationalize profiles so installing 'galleriacarouse… 

    …l' uses Galleria & reinstalling default profile uses Cycle2
    @djowett
    djowett committed Oct 2, 2014
    Configuration menu
    Copy the full SHA
    51cdf36 View commit details
    Browse the repository at this point in the history

  3. Add test for Galleria tile (with a separate fixture for running 'gall… 

    …eriacarousel' profile)
    @djowett
    djowett committed Oct 2, 2014
    Configuration menu
    Copy the full SHA
    4c3aba4 View commit details
    Browse the repository at this point in the history

  4. Enable deprecated galleria tiles to be used with adding egg 'collecti… 

    …ve.cover[galleria]' and then use the GS profile: 'galleriacarousel'
    @djowett
    djowett committed Oct 2, 2014
    Configuration menu
    Copy the full SHA
    c1abc00 View commit details
    Browse the repository at this point in the history

  5. Reduce code in GalleriaFixture by relying on superclass methods

    @djowett
    djowett committed Oct 2, 2014
    Configuration menu
    Copy the full SHA
    56cf1d6 View commit details
    Browse the repository at this point in the history

  6. Copy recent fixes from test_carousel_tile.robot to testgalleria_carou… 

    …sel_tile.robot (#442)
    @djowett
    djowett committed Oct 2, 2014
    Configuration menu
    Copy the full SHA
    d877ad6 View commit details
    Browse the repository at this point in the history

  7. Proposed Doc changes for Cycle2 tile #442

    @djowett
    djowett committed Oct 2, 2014
    Configuration menu
    Copy the full SHA
    b6e974a View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2014

  1. Remove redundant lines from carousel template

    @djowett
    djowett committed Oct 3, 2014
    Configuration menu
    Copy the full SHA
    d94dca3 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2014

  1. Make testing of Image drag & drop predictable in list_tile robot test

    @djowett
    djowett committed Oct 10, 2014
    Configuration menu
    Copy the full SHA
    df34622 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2014

  1. Add swipe gesture to Cycle2 slideshow (#442) using dedicated Cycle2 p… 

    …lugin: jquery.cycle2.swipe.min.js
    @djowett
    djowett committed Oct 14, 2014
    Configuration menu
    Copy the full SHA
    e3b7dcd View commit details
    Browse the repository at this point in the history

  2. Add same tal:condition to <script> as is already on slideshow content

    @djowett
    djowett committed Oct 14, 2014
    Configuration menu
    Copy the full SHA
    a60e6ff View commit details
    Browse the repository at this point in the history

  3. Add non-image-fields (Title, Desc & Date) to Carousel tile in such a … 

    …way that they can be hidden & reordered (#442)
    @djowett
    djowett committed Oct 14, 2014
    Configuration menu
    Copy the full SHA
    f7d5ae6 View commit details
    Browse the repository at this point in the history

  4. Fix for content menu dropdowns, which were being hidden by Cycle2 ver… 

    …sion of Carousel tile (#442)
    @djowett
    djowett committed Oct 14, 2014
    Configuration menu
    Copy the full SHA
    33d6514 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2014

  1. Merge branch 'master' into carousel_tile_with_cycle2

    @hvelarde
    hvelarde committed Oct 16, 2014
    Configuration menu
    Copy the full SHA
    bf8f812 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'carousel_tile_with_cycle2' of github.com:collective/col… 

    …lective.cover into carousel_tile_with_cycle2
    @hvelarde
    hvelarde committed Oct 16, 2014
    Configuration menu
    Copy the full SHA
    1f60c33 View commit details
    Browse the repository at this point in the history

  3. Use Cycle2 from collective.js.cycle2

    @hvelarde
    hvelarde committed Oct 16, 2014
    Configuration menu
    Copy the full SHA
    03c3a7f View commit details
    Browse the repository at this point in the history

  4. Remove needless GS file 

    The removal of these resources is managed automatically.
    @hvelarde
    hvelarde committed Oct 16, 2014
    Configuration menu
    Copy the full SHA
    877cc08 View commit details
    Browse the repository at this point in the history

  5. Use HTTPS schema to clone dependency repo

    @hvelarde
    hvelarde committed Oct 16, 2014
    Configuration menu
    Copy the full SHA
    30d7ec7 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2014

  1. Stop Cycle2 slides hiding the nice green loading-mask

    @djowett
    djowett committed Oct 17, 2014
    Configuration menu
    Copy the full SHA
    46fdcf9 View commit details
    Browse the repository at this point in the history

  2. Basics working with Cycle2 (but no tests changed as yet)

    @djowett @hvelarde
    djowett authored and hvelarde committed Oct 17, 2014
    Configuration menu
    Copy the full SHA
    38312da View commit details
    Browse the repository at this point in the history

  3. Add cycle2 related stuff to the uninstall profile (#442)

    @djowett @hvelarde
    djowett authored and hvelarde committed Oct 17, 2014
    Configuration menu
    Copy the full SHA
    557a281 View commit details
    Browse the repository at this point in the history

  4. Stop Flash of unstyled content by removing auto-initialization & some… 

    … judicious use of CSS
    @djowett @hvelarde
    djowett authored and hvelarde committed Oct 17, 2014
    Configuration menu
    Copy the full SHA
    c98f4b0 View commit details
    Browse the repository at this point in the history

  5. Got autoplay checkbox functioning

    @djowett @hvelarde
    djowett authored and hvelarde committed Oct 17, 2014
    Configuration menu
    Copy the full SHA
    3fa0264 View commit details
    Browse the repository at this point in the history

  6. Don't run JSHint on minified Cycle2 Javascript; Fix issues raised by … 

    …Flake8
    @djowett @hvelarde
    djowett authored and hvelarde committed Oct 17, 2014
    Configuration menu
    Copy the full SHA
    1fdf4d2 View commit details
    Browse the repository at this point in the history

  7. Added Prev & Next buttons

    @djowett @hvelarde
    djowett authored and hvelarde committed Oct 17, 2014
    Configuration menu
    Copy the full SHA
    0a33fcd View commit details
    Browse the repository at this point in the history

  8. Use unminified version of cycle2 JS

    @djowett @hvelarde
    djowett authored and hvelarde committed Oct 17, 2014
    Configuration menu
    Copy the full SHA
    d275303 View commit details
    Browse the repository at this point in the history

  9. Stop codeanalysis baulking at cycle2's console.log

    @djowett @hvelarde
    djowett authored and hvelarde committed Oct 17, 2014
    Configuration menu
    Copy the full SHA
    bdb3410 View commit details
    Browse the repository at this point in the history

  10. Switched carousel tile to use Cycle2 by default (#442)

    @djowett @hvelarde
    djowett authored and hvelarde committed Oct 17, 2014
    Configuration menu
    Copy the full SHA
    63fa50f View commit details
    Browse the repository at this point in the history

  11. Fixed tests for Cycle2 carousel tile (#442)

    @djowett @hvelarde
    djowett authored and hvelarde committed Oct 17, 2014
    Configuration menu
    Copy the full SHA
    f56cc35 View commit details
    Browse the repository at this point in the history

  12. Reverted wrong assumption in carousel test about it not updating befo… 

    …re next page load (#378)
    @djowett @hvelarde
    djowett authored and hvelarde committed Oct 17, 2014
    Configuration menu
    Copy the full SHA
    003a311 View commit details
    Browse the repository at this point in the history

  13. Fix for Flake8 again

    @djowett @hvelarde
    djowett authored and hvelarde committed Oct 17, 2014
    Configuration menu
    Copy the full SHA
    f2f0b91 View commit details
    Browse the repository at this point in the history

  14. collective.js.galleria should not be installed in default profile

    @djowett @hvelarde
    djowett authored and hvelarde committed Oct 17, 2014
    Configuration menu
    Copy the full SHA
    241c30d View commit details
    Browse the repository at this point in the history

  15. Rename interface. Rationalize profiles so installing 'galleriacarouse… 

    …l' uses Galleria & reinstalling default profile uses Cycle2
    @djowett @hvelarde
    djowett authored and hvelarde committed Oct 17, 2014
    Configuration menu
    Copy the full SHA
    0aa0c84 View commit details
    Browse the repository at this point in the history

  16. Add test for Galleria tile (with a separate fixture for running 'gall… 

    …eriacarousel' profile)
    @djowett @hvelarde
    djowett authored and hvelarde committed Oct 17, 2014
    Configuration menu
    Copy the full SHA
    50eaa9e View commit details
    Browse the repository at this point in the history

  17. Enable deprecated galleria tiles to be used with adding egg 'collecti… 

    …ve.cover[galleria]' and then use the GS profile: 'galleriacarousel'
    @djowett @hvelarde
    djowett authored and hvelarde committed Oct 17, 2014
    Configuration menu
    Copy the full SHA
    a4fafbd View commit details
    Browse the repository at this point in the history

  18. Reduce code in GalleriaFixture by relying on superclass methods

    @djowett @hvelarde
    djowett authored and hvelarde committed Oct 17, 2014
    Configuration menu
    Copy the full SHA
    08b34c0 View commit details
    Browse the repository at this point in the history

  19. Copy recent fixes from test_carousel_tile.robot to testgalleria_carou… 

    …sel_tile.robot (#442)
    @djowett @hvelarde
    djowett authored and hvelarde committed Oct 17, 2014
    Configuration menu
    Copy the full SHA
    6fc06a9 View commit details
    Browse the repository at this point in the history

  20. Proposed Doc changes for Cycle2 tile #442

    @djowett @hvelarde
    djowett authored and hvelarde committed Oct 17, 2014
    Configuration menu
    Copy the full SHA
    6a85770 View commit details
    Browse the repository at this point in the history

  21. Remove redundant lines from carousel template

    @djowett @hvelarde
    djowett authored and hvelarde committed Oct 17, 2014
    Configuration menu
    Copy the full SHA
    a5f908f View commit details
    Browse the repository at this point in the history

  22. Make testing of Image drag & drop predictable in list_tile robot test

    @djowett @hvelarde
    djowett authored and hvelarde committed Oct 17, 2014
    Configuration menu
    Copy the full SHA
    a9e9476 View commit details
    Browse the repository at this point in the history

  23. Add swipe gesture to Cycle2 slideshow (#442) using dedicated Cycle2 p… 

    …lugin: jquery.cycle2.swipe.min.js
    @djowett @hvelarde
    djowett authored and hvelarde committed Oct 17, 2014
    Configuration menu
    Copy the full SHA
    aafcadf View commit details
    Browse the repository at this point in the history

  24. Add same tal:condition to <script> as is already on slideshow content

    @djowett @hvelarde
    djowett authored and hvelarde committed Oct 17, 2014
    Configuration menu
    Copy the full SHA
    3dce18c View commit details
    Browse the repository at this point in the history

  25. Add non-image-fields (Title, Desc & Date) to Carousel tile in such a … 

    …way that they can be hidden & reordered (#442)
    @djowett @hvelarde
    djowett authored and hvelarde committed Oct 17, 2014
    Configuration menu
    Copy the full SHA
    4e0e833 View commit details
    Browse the repository at this point in the history

  26. Fix for content menu dropdowns, which were being hidden by Cycle2 ver… 

    …sion of Carousel tile (#442)
    @djowett @hvelarde
    djowett authored and hvelarde committed Oct 17, 2014
    Configuration menu
    Copy the full SHA
    5d1fe98 View commit details
    Browse the repository at this point in the history

  27. Use Cycle2 from collective.js.cycle2

    @hvelarde
    hvelarde committed Oct 17, 2014
    Configuration menu
    Copy the full SHA
    efd8b4d View commit details
    Browse the repository at this point in the history

  28. Remove needless GS file 

    The removal of these resources is managed automatically.
    @hvelarde
    hvelarde committed Oct 17, 2014
    Configuration menu
    Copy the full SHA
    47f5736 View commit details
    Browse the repository at this point in the history

  29. Use HTTPS schema to clone dependency repo

    @hvelarde
    hvelarde committed Oct 17, 2014
    Configuration menu
    Copy the full SHA
    9fc35e2 View commit details
    Browse the repository at this point in the history

  30. Stop Cycle2 slides hiding the nice green loading-mask

    @djowett @hvelarde
    djowett authored and hvelarde committed Oct 17, 2014
    Configuration menu
    Copy the full SHA
    bacce56 View commit details
    Browse the repository at this point in the history

  31. Clean up code

    @hvelarde
    hvelarde committed Oct 17, 2014
    Configuration menu
    Copy the full SHA
    be9882f View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2014

  1. Merge branch 'master' into carousel_tile_with_cycle2

    @hvelarde
    hvelarde committed Oct 20, 2014
    Configuration menu
    Copy the full SHA
    13d84ce View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2014

  1. Hide autoplay field on Tile Configuration popup

    @djowett
    djowett committed Oct 21, 2014
    Configuration menu
    Copy the full SHA
    a144950 View commit details
    Browse the repository at this point in the history

  2. Move carousel pager outside of carousel & align over bottom of slides… 

    …; also a little tidy up of carousel.pt
    @djowett
    djowett committed Oct 21, 2014
    Configuration menu
    Copy the full SHA
    bc0e77d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'carousel_tile_with_cycle2' of https://github.com/collec… 

    …tive/collective.cover into carousel_tile_with_cycle2

Conflicts:
	src/collective/cover/profiles/default/jsregistry.xml
	src/collective/cover/static/cycle2-theme/cycle2.cover_theme.css
	src/collective/cover/tiles/templates/carousel.pt
    @djowett
    djowett committed Oct 21, 2014
    Configuration menu
    Copy the full SHA
    07414b8 View commit details
    Browse the repository at this point in the history

  4. Removed jquery.cycle2.caption2 plugin - we are not using it

    @djowett
    djowett committed Oct 21, 2014
    Configuration menu
    Copy the full SHA
    2389d76 View commit details
    Browse the repository at this point in the history

  5. Use released version of collective.js.cycle2

    @hvelarde
    hvelarde committed Oct 21, 2014
    Configuration menu
    Copy the full SHA
    8236c02 View commit details
    Browse the repository at this point in the history

  6. Install collective.js.cycle2 only if not previously installed

    @hvelarde
    hvelarde committed Oct 21, 2014
    Configuration menu
    Copy the full SHA
    79b77db View commit details
    Browse the repository at this point in the history