Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Latest #2

Merged
merged 71 commits into from
@pombredanne
Owner

No description provided.

akaihola and others added some commits
@akaihola akaihola Fixes ticket #66: customize output colors only if colors supported 32b1beb
@akaihola akaihola Fixes ticket #68: show_urls prints class instances and other 'exotic'…
… view objects in a nicer form
c52f07f
@akaihola akaihola Merge branch 'official'
Resolved whitespace conflict in:
	django_extensions/management/commands/show_urls.py
718cbb1
@akaihola akaihola Merge branch 'gdoermann' 304771c
@akaihola akaihola Merge branch 'django-extensions' 7c59200
@akaihola akaihola Merge branch 'django-extensions' d81f7e7
@darkpixel darkpixel Search in HTML files and handle Django comments e339a40
@trbs trbs added comment about name clashes a4a03a1
@akaihola akaihola Fix #233 Add support for IPython Notebook into shell_plus. Refactored…
… auto-importing Django settings and model classes into a separate module so the notebook extension can use it too.
770c15a
@akaihola akaihola Merge branch 'master' of github.com:akaihola/django-extensions 3c4c65d
@akaihola akaihola Refs #233: Added the IPYTHON_ARGUMENTS Django setting for customizing…
… the arguments passed to IPython Notebook
c6998fa
@trbs trbs Merge pull request #234 from akaihola/master
Added support for IPython Notebook
de13df7
Martino Pizzol add tests for AutoSlugField (test also issue #34) 39fe2a1
Martino Pizzol fix issue #34 9abece6
@trbs trbs Merge pull request #236 from ahref/master
Possible fix for issue #34
38048f5
@trbs trbs in django 1.4 settings is_safe attribute on the function is deprecated 81a81dc
Kris Kumler Changed mail_debug output to use logging module (for stdout/stderr as…
… well as file output)
e7e68d3
Kris Kumler Included '--use-settings' option 87160ba
@trbs trbs Merge pull request #237 from kkumler/master
mail_debug: output file and settings option
332cb31
Martino Pizzol Fixed issue with updating slugs with empty source 5ba17cf
@trbs trbs Merge pull request #238 from ahref/master
Fixed bug on AutoSlugField with empty populate_from field
31575b0
@twigs twigs added support for output redirection to dumpscript bd0d036
@trbs trbs Merge pull request #239 from twigs/master
Ouput redirection for dumpscript
21a85ad
Dominique Guardiola From Django 1.3 and above we should be using the jQuery library
bundled in Django admin, or it'll create Jquery conflict in some cases.
JS files are modified to handle both case, and media files are linked
conditionally based on django version
I borrowed the JS patch from django-chosen project, it's stable.
+ incorporated django 1.4 widgets __init__() signature change by ZlobnyiSerg
50adcd8
Dominique Guardiola forgotten if dcba79b
@trbs trbs Merge pull request #242 from quinode/use_django_admin_jquery
From Django 1.3 and above we should be using the jQuery library bundled with django admin
7631e70
@gustavodiazjaimes gustavodiazjaimes Update django_extensions/db/fields/__init__.py
Issue #243
UUID start like a blank string "" not like None
ac52258
@cborgolte

One '+' too much here! :-)

@domguard

ooops I forgot a plus here...

Jason Mayfield and others added some commits
Jason Mayfield Update ActivatorModel to use timezone-aware datetime if available and…
… active
e8adaf6
bas fix imports 7f99f9d
@trbs trbs Merge pull request #246 from jwmayfield/master
Update ActivatorModel to use timezone-aware datetime if available and active
14f0520
@trbs trbs Merge pull request #244 from gustavodiazjaimes/patch-1
Update django_extensions/db/fields/__init__.py
1101b87
@clarete clarete Adding the "--invalidate" flag to sync_media_s3
When this flag is true, the sync command invalidates the list of
uploaded files in CloudFront. This patch introduces a new settings
variable: AWS_CLOUDFRONT_DISTRIBUTION
d71b77c
@trbs trbs Merge pull request #248 from clarete/master
Adding the "--invalidate" flag to sync_media_s3
15d172b
@kkumler kkumler Added database alias output for shell_plus --print-sql 69912b7
@kkumler kkumler Added --print-sql option to runserver_plus 5a20ed6
@trbs trbs fix for issue #27 automatically convert the default value to json if …
…its a list or dict
a108463
@trbs trbs Merge pull request #250 from kkumler/master
Added database alias output for shell_plus --print-sql
fc5306a
@trbs trbs Merge pull request #175 from darkpixel/feature/notes-search-html
Search in HTML files and handle Django comments
a076ca6
@thibault thibault Move media to static directory.
Makes the autocomplete files be served by the test server, and managed
by the 'collectstatic' command.

fixes #107

Signed-off-by: trbs <trbs@trbs.net>
276fd3b
@trbs trbs Merge branch 'master' of https://github.com/django-extensions/django-… 72e48ae
@trbs trbs preparing for 1.0.0 release 5c47faf
@davea davea Fixed typo in JSONField
Fixes #27. Previous fix introduced a typo that caused a NameError when using a dict or list in the 'default' kwarg for JSONField.
1df3366
bas fix function name and variable name 8180152
@trbs trbs Merge pull request #251 from davea/patch-1
Fixed typo in JSONField
356d29a
@clarete clarete Replacing the '.gz' by a variable when renaming a static asset
It's known that safari breaks when you try to load files with the '.gz'
extension. This patch adds a variable that allows the user to override
this extension in the settings.py file.
4801b66
@trbs trbs Merge pull request #252 from kkumler/runserver_sql
Added --print-sql option to runserver_plus
3f6e58b
@trbs trbs Merge pull request #249 from clarete/master
Using the .gz extension in static assets breaks safari
6d55c1d
@trbs trbs improve documentation a little bit for graph_models 7a5182f
@trbs trbs removed references to django-command-extensions 46ad2a8
@trbs trbs ignore .bak files 6f305ae
@trbs trbs v1.0.0 2b874d0
@trbs trbs bump version number 2a6df27
@trbs trbs fix typo in README e0889e1
@davidjstevenson

This creates a syntax error. Opening ( should be matched with an additional bracket on the following line

Oops! Sorry for that, I made this change after testing! :(

trbs and others added some commits
@trbs trbs keep it on one line 67f37ba
@trbs trbs show project root when verbose is enabled as well df75aa8
@trbs trbs fix typo 2affaec
@trbs trbs add shbang line 52d066f
@theospears theospears Fix compatibility with python 2.6
logging.Handler is an old-style class in python 2.6 thus you cannot
use super() with it. Using old-style calling works, and should also
work in newer python versions.
0e7bd7e
@poligarcia poligarcia As the media directory was renamed to static, that directory should b…
…e packaged instead of the former.

references #107
0504d82
Andrew McCloud Don't use $ because it's declared as a global elsewhere and gets set …
…to undefined.
bb1561d
@trbs trbs Merge pull request #260 from amccloud/fixed-ajaxqueue
Don't use $ because it's declared as a global elsewhere and gets set to undefined
eeefb62
@trbs trbs Merge pull request #258 from theospears/patch-1
Fix compatibility with python 2.6
390e9cd
@trbs trbs Merge pull request #259 from devartis/master
"static" directory should be included in the package instead of "media"
9df8c66
@trbs trbs v1.0.1 294fbc2
@trbs trbs bumped version number e386df4
@trbs trbs removed test which a lot of people report are breaking there test suite 3f5ea97
@trbs trbs Merge branch 'master' of github.com:django-extensions/django-extensions 45d0b61
@theospears theospears Use filesystem loader to load templates 5bb8fb1
@theospears theospears Add option to validate url tags
The quoting of view names in url tags is checked based on whether old or
new style url tags are in place
35580b2
@theospears theospears Option to require new style urls
To help with migrating away from old style URLs, there is an option that
can error on every file containing an old style url
8577559
@trbs trbs Merge pull request #262 from theospears/validate_url_tag
Enhance validate_templates to check url tags
7f2d542
@pombredanne pombredanne merged commit bae0c10 into from
@mbox

Line 273 is missing a "return" - it should read "return super(UUIDField, self).formfield(**kwargs)"

Otherwise a UUIDField can never appear on an admin form

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jan 24, 2011
  1. @akaihola
  2. @akaihola

    Fixes ticket #68: show_urls prints class instances and other 'exotic'…

    akaihola authored
    … view objects in a nicer form
Commits on Apr 5, 2011
  1. @akaihola

    Merge branch 'official'

    akaihola authored
    Resolved whitespace conflict in:
    	django_extensions/management/commands/show_urls.py
  2. @akaihola

    Merge branch 'gdoermann'

    akaihola authored
Commits on Aug 25, 2011
  1. @akaihola
Commits on Jan 24, 2012
  1. @akaihola
Commits on Feb 20, 2012
  1. @darkpixel
Commits on Aug 17, 2012
  1. @trbs

    added comment about name clashes

    trbs authored
Commits on Aug 26, 2012
  1. @akaihola

    Fix #233 Add support for IPython Notebook into shell_plus. Refactored…

    akaihola authored
    … auto-importing Django settings and model classes into a separate module so the notebook extension can use it too.
Commits on Aug 30, 2012
  1. @akaihola
Commits on Sep 3, 2012
  1. @akaihola

    Refs #233: Added the IPYTHON_ARGUMENTS Django setting for customizing…

    akaihola authored
    … the arguments passed to IPython Notebook
  2. @trbs

    Merge pull request #234 from akaihola/master

    trbs authored
    Added support for IPython Notebook
Commits on Sep 11, 2012
  1. add tests for AutoSlugField (test also issue #34)

    Martino Pizzol authored
  2. fix issue #34

    Martino Pizzol authored
Commits on Sep 15, 2012
  1. @trbs

    Merge pull request #236 from ahref/master

    trbs authored
    Possible fix for issue #34
Commits on Sep 17, 2012
  1. @trbs
  2. Changed mail_debug output to use logging module (for stdout/stderr as…

    Kris Kumler authored
    … well as file output)
  3. Included '--use-settings' option

    Kris Kumler authored
  4. @trbs

    Merge pull request #237 from kkumler/master

    trbs authored
    mail_debug: output file and settings option
Commits on Sep 18, 2012
  1. Fixed issue with updating slugs with empty source

    Martino Pizzol authored
  2. @trbs

    Merge pull request #238 from ahref/master

    trbs authored
    Fixed bug on AutoSlugField with empty populate_from field
Commits on Sep 19, 2012
  1. @twigs
  2. @trbs

    Merge pull request #239 from twigs/master

    trbs authored
    Ouput redirection for dumpscript
Commits on Sep 20, 2012
  1. From Django 1.3 and above we should be using the jQuery library

    Dominique Guardiola authored
    bundled in Django admin, or it'll create Jquery conflict in some cases.
    JS files are modified to handle both case, and media files are linked
    conditionally based on django version
    I borrowed the JS patch from django-chosen project, it's stable.
    + incorporated django 1.4 widgets __init__() signature change by ZlobnyiSerg
  2. forgotten if

    Dominique Guardiola authored Dom committed
  3. @trbs

    Merge pull request #242 from quinode/use_django_admin_jquery

    trbs authored
    From Django 1.3 and above we should be using the jQuery library bundled with django admin
Commits on Sep 21, 2012
  1. @gustavodiazjaimes

    Update django_extensions/db/fields/__init__.py

    gustavodiazjaimes authored
    Issue #243
    UUID start like a blank string "" not like None
Commits on Sep 22, 2012
  1. Update ActivatorModel to use timezone-aware datetime if available and…

    Jason Mayfield authored
    … active
Commits on Sep 23, 2012
  1. fix imports

    bas authored
  2. @trbs

    Merge pull request #246 from jwmayfield/master

    trbs authored
    Update ActivatorModel to use timezone-aware datetime if available and active
  3. @trbs

    Merge pull request #244 from gustavodiazjaimes/patch-1

    trbs authored
    Update django_extensions/db/fields/__init__.py
Commits on Oct 1, 2012
  1. @clarete

    Adding the "--invalidate" flag to sync_media_s3

    clarete authored
    When this flag is true, the sync command invalidates the list of
    uploaded files in CloudFront. This patch introduces a new settings
    variable: AWS_CLOUDFRONT_DISTRIBUTION
  2. @trbs

    Merge pull request #248 from clarete/master

    trbs authored
    Adding the "--invalidate" flag to sync_media_s3
Commits on Oct 11, 2012
  1. @kkumler
  2. @kkumler
Commits on Oct 14, 2012
  1. @trbs
  2. @trbs

    Merge pull request #250 from kkumler/master

    trbs authored
    Added database alias output for shell_plus --print-sql
  3. @trbs

    Merge pull request #175 from darkpixel/feature/notes-search-html

    trbs authored
    Search in HTML files and handle Django comments
  4. @thibault @trbs

    Move media to static directory.

    thibault authored trbs committed
    Makes the autocomplete files be served by the test server, and managed
    by the 'collectstatic' command.
    
    fixes #107
    
    Signed-off-by: trbs <trbs@trbs.net>
  5. @trbs
  6. @trbs

    preparing for 1.0.0 release

    trbs authored
Commits on Oct 15, 2012
  1. @davea

    Fixed typo in JSONField

    davea authored
    Fixes #27. Previous fix introduced a typo that caused a NameError when using a dict or list in the 'default' kwarg for JSONField.
  2. fix function name and variable name

    bas authored
  3. @trbs

    Merge pull request #251 from davea/patch-1

    trbs authored
    Fixed typo in JSONField
  4. @clarete

    Replacing the '.gz' by a variable when renaming a static asset

    clarete authored
    It's known that safari breaks when you try to load files with the '.gz'
    extension. This patch adds a variable that allows the user to override
    this extension in the settings.py file.
  5. @trbs

    Merge pull request #252 from kkumler/runserver_sql

    trbs authored
    Added --print-sql option to runserver_plus
  6. @trbs

    Merge pull request #249 from clarete/master

    trbs authored
    Using the .gz extension in static assets breaks safari
Commits on Oct 22, 2012
  1. @trbs
  2. @trbs
  3. @trbs

    ignore .bak files

    trbs authored
  4. @trbs

    v1.0.0

    trbs authored
  5. @trbs

    bump version number

    trbs authored
  6. @trbs

    fix typo in README

    trbs authored
Commits on Oct 23, 2012
  1. @trbs

    keep it on one line

    trbs authored
  2. @trbs
Commits on Oct 25, 2012
  1. @trbs

    fix typo

    trbs authored
  2. @trbs

    add shbang line

    trbs authored
Commits on Oct 31, 2012
  1. @theospears

    Fix compatibility with python 2.6

    theospears authored
    logging.Handler is an old-style class in python 2.6 thus you cannot
    use super() with it. Using old-style calling works, and should also
    work in newer python versions.
  2. @poligarcia

    As the media directory was renamed to static, that directory should b…

    poligarcia authored
    …e packaged instead of the former.
    
    references #107
Commits on Nov 6, 2012
  1. Don't use $ because it's declared as a global elsewhere and gets set …

    Andrew McCloud authored
    …to undefined.
  2. @trbs

    Merge pull request #260 from amccloud/fixed-ajaxqueue

    trbs authored
    Don't use $ because it's declared as a global elsewhere and gets set to undefined
Commits on Nov 8, 2012
  1. @trbs

    Merge pull request #258 from theospears/patch-1

    trbs authored
    Fix compatibility with python 2.6
  2. @trbs

    Merge pull request #259 from devartis/master

    trbs authored
    "static" directory should be included in the package instead of "media"
  3. @trbs

    v1.0.1

    trbs authored
  4. @trbs

    bumped version number

    trbs authored
  5. @trbs
  6. @trbs
Commits on Nov 16, 2012
  1. @theospears
  2. @theospears

    Add option to validate url tags

    theospears authored
    The quoting of view names in url tags is checked based on whether old or
    new style url tags are in place
  3. @theospears

    Option to require new style urls

    theospears authored
    To help with migrating away from old style URLs, there is an option that
    can error on every file containing an old style url
  4. @trbs

    Merge pull request #262 from theospears/validate_url_tag

    trbs authored
    Enhance validate_templates to check url tags
Something went wrong with that request. Please try again.