Skip to content
This repository has been archived by the owner on Feb 26, 2024. It is now read-only.

Feature/new articles #29

Merged
merged 34 commits into from
Oct 12, 2016
Merged

Feature/new articles #29

merged 34 commits into from
Oct 12, 2016

Commits on Aug 31, 2016

  1. Merge branch 'develop' into glamkit

    Greg Turner committed Aug 31, 2016
    Configuration menu
    Copy the full SHA
    92aae2c View commit details
    Browse the repository at this point in the history

  2. WIP adding glamkit extras set to setup.py

    Greg Turner committed Aug 31, 2016
    Configuration menu
    Copy the full SHA
    71deb4b View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2016

  1. First cut of authors app extracted from SFMOMA, with corresponding Au… 

    …thorListingPage. Also a few publishing tweaks to make publishing work with any model that has placeholders, and models without URLs.
    Greg Turner committed Sep 1, 2016
    Configuration menu
    Copy the full SHA
    0fe4625 View commit details
    Browse the repository at this point in the history

  2. Remove extraneous print statement, and typo.

    Greg Turner committed Sep 1, 2016
    Configuration menu
    Copy the full SHA
    99c9995 View commit details
    Browse the repository at this point in the history

  3. Installing sponsors and press releases

    Greg Turner committed Sep 1, 2016
    Configuration menu
    Copy the full SHA
    22b195d View commit details
    Browse the repository at this point in the history

  4. Merge branch 'feature/124_authors' into glamkit 

    # Conflicts:
#	project_template/icekit_settings.py
    Greg Turner committed Sep 1, 2016
    Configuration menu
    Copy the full SHA
    dbe6a33 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2016

  1. Adding migrations after postgres setup for tests.

    Greg Turner committed Sep 5, 2016
    Configuration menu
    Copy the full SHA
    da9431e View commit details
    Browse the repository at this point in the history

  2. Initial glamkit articles app

    Greg Turner committed Sep 5, 2016
    Configuration menu
    Copy the full SHA
    601e8c4 View commit details
    Browse the repository at this point in the history

  3. Add articles to the glamkit dashboard, and redo initial migration to … 

    …accommodate app_label change.
    Greg Turner committed Sep 5, 2016
    Configuration menu
    Copy the full SHA
    5b912ed View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into glamkit 

    # Conflicts:
#	icekit/project/settings/_base.py
    Greg Turner committed Sep 5, 2016
    Configuration menu
    Copy the full SHA
    2802ddc View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2016

  1. Merge branch 'develop' into glamkit

    Greg Turner committed Sep 15, 2016
    Configuration menu
    Copy the full SHA
    9617316 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2016

  1. Re #122 refactored Article model to allow Polymorphic and nonpolymorp… 

    …hic articles underneath a ListingPage.

Includes a bizarrely-failing test_urls test, to see what travis makes of it.
    Greg Turner committed Sep 27, 2016
    Configuration menu
    Copy the full SHA
    5876315 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into glamkit 

    # Conflicts:
#	icekit/project/settings/_base.py
#	project_template/icekit_settings.py
#	project_template/requirements.txt
    Greg Turner committed Sep 27, 2016
    Configuration menu
    Copy the full SHA
    885d284 View commit details
    Browse the repository at this point in the history

  3. Fixing missed merge conflict

    Greg Turner committed Sep 27, 2016
    Configuration menu
    Copy the full SHA
    3e241f0 View commit details
    Browse the repository at this point in the history

  4. Tweak to tests now Article is refactored.

    Greg Turner committed Sep 27, 2016
    Configuration menu
    Copy the full SHA
    df7c743 View commit details
    Browse the repository at this point in the history

  5. Tweak to articles tests

    Greg Turner committed Sep 27, 2016
    Configuration menu
    Copy the full SHA
    5e4c307 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'develop' into glamkit

    Greg Turner committed Sep 27, 2016
    Configuration menu
    Copy the full SHA
    7c0cfd7 View commit details
    Browse the repository at this point in the history

  7. Refactored articles from the glamkit branch

    Greg Turner committed Sep 27, 2016
    Configuration menu
    Copy the full SHA
    527e166 View commit details
    Browse the repository at this point in the history

  8. Listing template

    Greg Turner committed Sep 27, 2016
    Configuration menu
    Copy the full SHA
    bf28636 View commit details
    Browse the repository at this point in the history

  9. Authors app now uses Article/Listing pattern; authors.page app is no … 

    …more.
    Greg Turner committed Sep 27, 2016
    Configuration menu
    Copy the full SHA
    f968cf5 View commit details
    Browse the repository at this point in the history

  10. Plugin.model_admin isn't normally required. Also updating article docs.

    Greg Turner committed Sep 27, 2016
    Configuration menu
    Copy the full SHA
    1228c36 View commit details
    Browse the repository at this point in the history

  11. Merge article/publishing changes from branch 'glamkit' into feature/n… 

    …ew_articles

# Conflicts:
#	icekit/articles/admin.py
#	icekit/articles/page_type_plugins.py
    Greg Turner committed Sep 27, 2016
    Configuration menu
    Copy the full SHA
    866e5a1 View commit details
    Browse the repository at this point in the history

  12. Adding and enabling Article-based Authors app.

    Greg Turner committed Sep 27, 2016
    Configuration menu
    Copy the full SHA
    0eaad19 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2016

  1. Merge branch 'develop' into feature/new_articles 

    # Conflicts:
#	icekit/articles/abstract_models.py
#	icekit/articles/admin.py
#	icekit/dashboard/static/admin/css/icekit_dashboard.less
#	icekit/tests/models.py
    Greg Turner committed Oct 11, 2016
    Configuration menu
    Copy the full SHA
    7a33213 View commit details
    Browse the repository at this point in the history

  2. WIP new articles refactor

    Greg Turner committed Oct 11, 2016
    Configuration menu
    Copy the full SHA
    318869a View commit details
    Browse the repository at this point in the history

  3. Authors works now.

    Greg Turner committed Oct 11, 2016
    Configuration menu
    Copy the full SHA
    2d23de9 View commit details
    Browse the repository at this point in the history

  4. Move "Preview" button up by "view on site", and made the latter behav… 

    …e like "view published".
    Greg Turner committed Oct 11, 2016
    Configuration menu
    Copy the full SHA
    35a98a9 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2016

  1. Docs updates and removing unnecessary commented code.

    Greg Turner committed Oct 12, 2016
    Configuration menu
    Copy the full SHA
    ade899b View commit details
    Browse the repository at this point in the history

  2. Fix tests

    Greg Turner committed Oct 12, 2016
    Configuration menu
    Copy the full SHA
    c91ae5d View commit details
    Browse the repository at this point in the history

  3. content_collections tests passing

    Greg Turner committed Oct 12, 2016
    Configuration menu
    Copy the full SHA
    f68738c View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' of github.com:ic-labs/django-icekit into develop

    Greg Turner committed Oct 12, 2016
    Configuration menu
    Copy the full SHA
    09acaf7 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' into feature/new_articles 

    # Conflicts:
#	icekit/tests/tests.py
    Greg Turner committed Oct 12, 2016
    Configuration menu
    Copy the full SHA
    b21028f View commit details
    Browse the repository at this point in the history

  6. Repair publishing tests

    Greg Turner committed Oct 12, 2016
    Configuration menu
    Copy the full SHA
    1367e6d View commit details
    Browse the repository at this point in the history

  7. Remove stray code

    Greg Turner committed Oct 12, 2016
    Configuration menu
    Copy the full SHA
    8cd681f View commit details
    Browse the repository at this point in the history