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

Add a GLAM flavour of ICEkit. #34

Closed
wants to merge 22 commits into from
Closed

Add a GLAM flavour of ICEkit. #34

wants to merge 22 commits into from

Conversation

mrmachine
Copy link
Member

No description provided.

Greg Turner and others added 9 commits October 5, 2016 13:33
Merge branch 'develop' into glamkit
ac4ca36 
# Conflicts:
#	icekit/articles/abstract_models.py
#	icekit/articles/admin.py
#	icekit/dashboard/static/admin/css/icekit_dashboard.less
#	icekit/tests/models.py
#	project_template/icekit_settings.py
Merge branch 'develop' into glamkit
6c6f46a 
# Conflicts:
#	icekit/tests/tests.py
Merge branch 'develop' into glamkit
ed5e6b2 
# Conflicts:
#	icekit/articles/admin.py
#	icekit/content_collections/abstract_models.py
#	icekit/tests/models.py
#	icekit/tests/tests.py
#	project_template/icekit_settings.py
Reintroducing glamkit articles app
6c8d7a6
Making article slug unique; preventing delete of article category if …
3f19ac0 
…it has articles.
I think this obsolete test crept back in during a conflict resolve.
6920096
Bah, these tests got moved to icekit.content_collections.tests.
bdd8e5d
Add press releases to dashboard panel
1e14cf9
@mrmachine
Merge origin/develop into glamkit
b5ef737
@coveralls
Copy link

Coverage Status

Coverage increased (+0.01%) to 74.509% when pulling 1e14cf9 on glamkit into 645b559 on develop.

@mrmachine
Move articles app to icekit.page_types.articles.
97eaa01
@mrmachine
Code style. White space, line length, prefer single quotes.
db38559
@mrmachine
Rename glamkit_articles app label to icekit_articles.
c746de6 
It's part of the `icekit` package. GLAMkit is just (currently) a
different configuration/flavour (settings).
@mrmachine
Remove vestigial (?) "woo" default for article slug and title fields.
131033f
@mrmachine
Add icekit and glamkit settings modules, to be imported by `proje…
7cfebe5 
…ct_settings` (formerly `icekit_settings`).
@mrmachine
Remove vestigial hard coded production settings. These should be defi…
6b9cc51 
…ned in a dotenv file, now.
@mrmachine
Update unique_together. Order matters. Fields are scanned by Postgr…
51c0ae7 
…eSQL in order.

The first field should be the one most likely to uniquely identify an
object.
@mrmachine
Install GLAMkit dependencies with ICEkit.
0e8265b 
We switch to GLAMkit by loading different settings. The apps should
already be available in the Docker image (and when run via `go.sh`).
@mrmachine
Code style. Sort extras.
3f47392
@mrmachine
Use absolute imports.
00c38ac
@mrmachine
Code style. Remove redundant __author__ statements.
fa8d88f
@mrmachine
Reset migrations. No need to start off with several when we can start…
ae83763 
… off with one.
@mrmachine
Use GLAMkit settings in default project template.
8b5ccf9
@coveralls
Copy link

Coverage Status

Coverage increased (+0.2%) to 74.648% when pulling 8b5ccf9 on glamkit into 645b559 on develop.

@mrmachine
Copy link
Member Author

Merged in ae83763. The glamkit branch remains because it uses glamkit settings by default, so we can do startproject.sh foo_project glamkit to create a new project from the template that uses glamkit settings right away. We should merge master into glamkit after each release to keep it up to date.

@mrmachine mrmachine closed this Oct 14, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@mrmachine @coveralls