Merge split tagfields from staging to live #155

Merged
merged 36 commits into from Mar 7, 2013

Projects

None yet

2 participants

@ryanpitts
Contributor

No description provided.

ryanpitts and others added some commits Feb 4, 2013
@ryanpitts ryanpitts add "learning" as optional category for Article model e895f3a
@ryanpitts ryanpitts toc links for articles in learning category 67de014
@ryanpitts ryanpitts add new tags app for split tagfields 743885d
@ryanpitts ryanpitts add split tagfields to Code model 0db071e
@ryanpitts ryanpitts support for split tagfields in code list view 0f91d8e
@ryanpitts ryanpitts template support for split tagfields 2d72311
@ryanpitts ryanpitts Merge pull request #149 from ryanpitts/development
Adding "Learning" category for articles
c1cc682
@ryanpitts ryanpitts remove original django-taggit bf13fde
@ryanpitts ryanpitts add forked version of django-taggit 5d95243
@ryanpitts ryanpitts update django-taggit fork e6aa49a
@ryanpitts ryanpitts add split tag fields to Article model and admin 71608bc
@ryanpitts ryanpitts split tag handling in article queryset 78675fc
@ryanpitts ryanpitts split tag support for article rss 0a7ef76
@ryanpitts ryanpitts split tag queries in Code view 73039e8
@ryanpitts ryanpitts split tag support for Article and Code feeds 4ad44e2
@ryanpitts ryanpitts add filter_queryset_by_tags util a4deaab
@ryanpitts ryanpitts switch Article and Code list views to use filter_queryset_by_tags 7e7d2ac
@ryanpitts ryanpitts get rid of stray print statement 4028c27
@ryanpitts ryanpitts patches to django-taggit e5c3f9d
@ryanpitts ryanpitts split tag queryset utils into smaller pieces e85e11a
@ryanpitts ryanpitts better related names for split tags 190bcc0
@ryanpitts ryanpitts self.tags fixes for views and feeds 7319d92
@ryanpitts ryanpitts better help texts for tag fields on article and code models 7cb4e61
@ryanpitts ryanpitts admin handling for auto concatenation of tech and concept tags into o…
…ld tag field
5a6d9c6
@ryanpitts ryanpitts remove stray print statement from tag util 4f55290
@ryanpitts ryanpitts article and code feeds use tag utils to filter queries f5e09f2
@ryanpitts ryanpitts comments for future on code, article tag list snippets 2ceede6
@ryanpitts ryanpitts better docstrings in tag utils 822905e
@ryanpitts ryanpitts add tests for tags app 5296c0d
@ryanpitts ryanpitts Merge pull request #151 from ryanpitts/development
Support for split tagfields on Article, Code models
7bf890e
@rossbruniges rossbruniges Adding a few additional, and I think useful steps to the update script. 8fea7b2
@ryanpitts ryanpitts Merge pull request #153 from rossbruniges/update-update
Adding a few additional, and I think useful steps to the update script.
a2e0794
@ryanpitts ryanpitts fix self.tags error on CodeFeed 186ffa5
@ryanpitts ryanpitts Merge pull request #154 from ryanpitts/development
fix self.tags error on CodeFeed
ba01f45
@rossbruniges rossbruniges This probably wouldn't work... 68ea72d
@rossbruniges rossbruniges Merge pull request #159 from rossbruniges/development
This probably wouldn't work...
4791b2a
@rossbruniges rossbruniges merged commit f9fecb2 into master Mar 7, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment