Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Jun 20, 2011
@paltman paltman added model changes to support multiple blogs 0975cfc
@paltman paltman added admin for Blog 8f2c92e
@paltman paltman 0.2.dev1 a3811ba
Commits on Jun 21, 2011
@brosner brosner removed custom function for doing a simple map/itemgetter operation 457dad2
@brosner brosner fixed some single quotes 167c9c3
Commits on Jun 22, 2011
@brosner brosner fixed some bugs and updated views 4fd7282
Commits on Aug 30, 2011
@paltman paltman made sections model based instead of configured through settings 9a469fb
@paltman paltman 0.2.dev2 370ac43
Commits on Sep 06, 2011
@paltman paltman Add related name to the blog foreign key f1aebd1
@paltman paltman Merge branch 'master' into multi-blog
Conflicts:
	biblion/settings.py
	setup.py
6407387
Commits on Sep 19, 2011
@paltman paltman Just use slug instead of section_slug d1a412d
Commits on Oct 14, 2011
@jtauber jtauber added new blog list page ee2a471
@jtauber jtauber blog list is now a generic class-based view a115384
@jtauber jtauber removed unnecessary ListView overrides d72f89b
@jtauber jtauber implemented new blog creation 06d9002
Commits on Oct 19, 2011
@brosner brosner WIP: changed Blog to Biblion and removed Section bits f4ca882
Commits on Oct 25, 2011
@davelowe davelowe Enable frontend adding/editing of blog posts 9329bf2
Commits on Oct 27, 2011
@davelowe davelowe Edit posts via front-end + Upload images for inclusion in post conten…
…t + Markdown parser option

Provide url+view for editing existing posts, provide url+view to upload images (not directly connected to a Post) as part of a post's teaser and/or body content (assumed to be done inline, via ajax or iframe).
5ca642b
Commits on Oct 29, 2011
@jtauber jtauber Merge pull request #8 from davelowe/feature/front-end-editing
Feature/front end editing
d6c7a39
Commits on Nov 01, 2011
@davelowe davelowe Delete posts via front-end
* View (and url) for deleting posts
* Refinements for PostForm to accept user on __init__ and set author by it
65f3305
@davelowe davelowe Merge branch 'multi-blog' of https://github.com/eldarion/biblion into…
… feature/front-end-editing
6ea6670
@davelowe davelowe Merge branch 'feature/front-end-editing' into multi-blog d4e2275
Commits on Nov 02, 2011
@davelowe davelowe URL restructure for multiple blogs
* And other small fixes
31289f5
Commits on Nov 04, 2011
@jtauber jtauber Merge pull request #10 from davelowe/multi-blog
Multi-blog urls and front-end delete option
500ead4
Commits on Nov 07, 2011
@paltman paltman Add blog_slug to post absolute url 41b2839
@paltman paltman Remove unnecessary imports de18fdd
@paltman paltman Whitespace nits 62e9584
@paltman paltman Fix undefined bugs 738aa32
@paltman paltman Add messages on edit/add of a post 4eec455
Commits on Nov 08, 2011
@paltman paltman Exclude future published dates bdc0176
@paltman paltman Return pk url if published in future 8befae6
Commits on Nov 10, 2011
@brosner brosner Merge remote-tracking branch 'origin/multi-blog' into biblia
Conflicts:
	biblion/forms.py
	biblion/models.py
	biblion/views.py

Most likely not functioning after merge; more commits to fix coming.
0282895
@brosner brosner various clean ups after the merge 3a83485
@brosner brosner fixed Post.blog foreign key 1ea945a
@brosner brosner fixed PostAdmin to work with changed fields 1a69787
@brosner brosner added description and logo to Biblion and added BiblionContributor d38f322
@brosner brosner started over on URLs (removed the urls package) and will build up f1c1db4
@brosner brosner fixed imports in biblion.views 520833e
@brosner brosner hooked up BiblionCreate ec85725
@brosner brosner added login_required to BiblionCreate view d46f6ab
Commits on Nov 14, 2011
@brosner brosner added Biblion contributors to BiblionForm (does not persist yet) 89a57d0
@brosner brosner added BiblionDetail view dff7308
@brosner brosner fixed biblion_detail URL from not matching anything 5aef9fb
@brosner brosner added unique constraint to Biblion.slug 8f4a57c
@brosner brosner added BiblionUpdate view 8a379e6
@brosner brosner pass biblion posts to template in BiblionDetail b06ff6a
@brosner brosner removed posts from view as it will be better to handle it from templa…
…tetags
c9c2193
@brosner brosner updated templatetags to take biblion f9b3a10
@brosner brosner removed unused import d31ae38
@brosner brosner removed templatetags 1085397
@brosner brosner added PostCreate view to handle post creation in a biblion 5dff34c
@brosner brosner added biblion object to context of PostCreate d94f7af
@brosner brosner added PostDetail view 0828c45
@brosner brosner moved Post.get_absolute_url below existing one for now (will be fixed…
… later)
d70831b
Commits on Nov 15, 2011
@lukeman lukeman removing templatetags from setup.py 7f4d5ca
@nrb nrb Fix bug with parameters for pluggable parser.
load_path_attr does not take keyword arguments; rather, the callable
that it returns does.
d84fd63
Commits on Nov 22, 2011
@brosner brosner changed biblion creation and updating to use different suffixes 5439e30
@brosner brosner added missing space 861f4db
@brosner brosner added contributors support to BiblionForm 05fc9a2
@brosner brosner removed slug when editing a biblion 9ee0e71
Commits on Nov 23, 2011
@lukeman lukeman Merge pull request #12 from nrb/biblia
Loading parser has incorrect arguments.
8fa79cf
Commits on Dec 06, 2011
@nrb nrb Add PostUpdate view. bf91cca
@nrb nrb Change name of biblion_post_edit to update. 636eace
@nrb nrb Remove debug statement. e3f4ace
@nrb nrb Explicitly set the template for PostUpdate. 34fc673
@brosner brosner added multi-site support e9bf85b
@brosner brosner fixed published bit (worked in previous commit; i changed it and caus…
…ed the bug)
9f07ce5
@brosner brosner fixed PostDetail to only show current posts unless staff c78acf8
@brosner brosner fixed two site bugs with posts f05322c
@brosner brosner Merge pull request #13 from nrb/biblia-edit-posts
Added post editing
bd1da35
@brosner brosner fixed up post create and edit 03caef4
@brosner brosner removed old views fcb2d05
@nrb nrb Add form fields for future date publishing. 4ae02f4
Commits on Dec 19, 2011
@lukeman lukeman autogenerate slugs for biblia and posts 23c9c45
Commits on Dec 20, 2011
@lukeman lukeman Merge pull request #14 from nrb/biblia-future-publish
Biblia future publish
386f45f
Commits on Jan 02, 2012
Thomas Schreiber python utf-8 shebang was missing the hypen, causing a warning in emacs: be270b2
Thomas Schreiber multi-markup: HTML, Creole, Markdown, reStructuredText, & Textile 0a149be
Commits on Jan 03, 2012
Thomas Schreiber Internationalize biblia models
* Remove 'null' from subtitle char field. Char fields can't be null.
* Added internationalization ready verbose names for all fields and models.
* Marked any other model strings for translation.
a23a738
Thomas Schreiber remove underscores from verbose_names eccb734
Thomas Schreiber Use django.utils.formats for the datetime objects a185391
Thomas Schreiber it is setuptools that has find_packages not distutils f691d8c
Commits on Jan 04, 2012
Thomas Schreiber fix typo ae22abf
Thomas Schreiber BIBLION_PARSER is no longer a global fec2035
Thomas Schreiber update readme to refect multi-markup f2bfc83
Thomas Schreiber fix typo 1e37dd4
Thomas Schreiber add a post_published signal 3a0f116
Thomas Schreiber sites field was missing from the admin adc58f7
Commits on Jan 05, 2012
Thomas Schreiber fix variable referenced before assignment 653cc8e
Commits on Jan 24, 2013
@rizumu rizumu add back the lost show_post_brief templatetag 5eee15b
Commits on Jan 02, 2015
@paltman paltman Merge pull request #16 from rizumu/biblia
multi-markup, internationalized models, post_published signal
bc64605
Something went wrong with that request. Please try again.