[python-djblets/el6: 14/14] Merge branch 'master' into el6
Stephen Gallagher
sgallagh at fedoraproject.org
Thu Apr 11 20:35:56 UTC 2013
commit 5130ba5b457e216362989ffe908eb00dc28237a8
Merge: 284490c c29320d
Author: Stephen Gallagher <sgallagh at redhat.com>
Date: Thu Apr 11 16:35:38 2013 -0400
Merge branch 'master' into el6
Conflicts:
.gitignore
python-djblets.spec
sources
.gitignore | 8 +++
python-djblets.spec | 131 +++++++++++++++++++++++++++++++++++++++++++++++++--
sources | 2 +-
3 files changed, 135 insertions(+), 6 deletions(-)
---
diff --cc .gitignore
index 0e4a836,c0c79ff..dedd21f
--- a/.gitignore
+++ b/.gitignore
@@@ -14,6 -13,11 +14,14 @@@ Djblets-0.6.3.tar.g
/Djblets-0.6.18.tar.gz
/Djblets-0.6.19.tar.gz
/Djblets-0.6.22.tar.gz
+/Djblets-0.6.24.tar.gz
+/Djblets-0.6.27.tar.gz
+/Djblets-0.6.28.tar.gz
+ /Djblets-0.7.tar.gz
+ /Djblets-0.7.1.tar.gz
+ /Djblets-0.7.2.tar.gz
+ /Djblets-0.7.6.tar.gz
+ /Djblets-0.7.7.tar.gz
+ /Djblets-0.7.8.tar.gz
+ /Djblets-0.7.9.tar.gz
+ /Djblets-0.7.11.tar.gz
diff --cc python-djblets.spec
index ee90e72,c0cf10a..1d1b93e
--- a/python-djblets.spec
+++ b/python-djblets.spec
@@@ -21,14 -21,23 +21,22 @@@ BuildArch: noarc
BuildRequires: python
BuildRequires: python-devel
BuildRequires: python-setuptools
-BuildRequires: python-django-pipeline >= 1.2.16
++BuildRequires: python-django-pipeline
%if 0%{?fedora} > 17
- Requires: python-django >= 1.3.7
+ BuildRequires: python-django14
+ Requires: python-django >= 1.4.5
+ Conflicts: python-django >= 1.5
%else
- Requires: Django >= 1.3.7
+ BuildRequires: Django14
+ Requires: Django >= 1.4.5
+ Conflicts: Django >= 1.5
%endif
Requires: python-imaging
+ Requires: pytz
-Requires: python-feedparser >= 5.1.2
+Requires: python-feedparser
+ Requires: python-django-pipeline >= 1.2.16
+ Conflicts: python-django-pipeline >= 1.3.0
-
%description
A collection of useful classes and functions for Django
@@@ -64,56 -73,137 +73,168 @@@ rm -rf $RPM_BUILD_ROO
%{python_sitelib}/djblets/
%changelog
+ * Wed Apr 10 2013 Stephen Gallagher <sgallagh at redhat.com> - 0.7.11-2
+ - Guarantee that Djblets builds against the correct version of Django
-
-* Thu Feb 21 2013 Stephen Gallagher <sgallagh at redhat.com> - 0.7.11-1
+ - New upstream release 0.7.11
+ - djblets.util.fields:
+ * CounterField was failing to use the initializers for brand new
+ instances of a model, defaulting to None instead
+ - General:
+ * Require Django 1.4.5 as a minimum
+ - djblets.extensions:
+ * "config/" and "db/" links for extensions are now generated
+ properly when specifying a custom SITE_ROOT
+ - djblets.log:
+ * Added an Admin UI setting for changing log levels
+ - djblets.siteconfig:
+ * Added new 'list-siteconfig', 'get-siteconfig', and 'set-siteconfig'
+ management commands for manipulating siteconfig configuration
+ from the shell
-
-* Thu Feb 07 2013 Stephen Gallagher <sgallagh at redhat.com> - 0.7.9-2
+ - Fix version requirement to protect against django-pipeline 1.3.0
-
-* Mon Jan 28 2013 Stephen Gallagher <sgallagh at redhat.com> - 0.7.9-1
+ - New upstream release 0.7.9
+ - JavaScript:
+ * modalBoxes now use z-indexes of 99 and 100 for the box and content,
+ instead of 11000 and 11001.
+ - djblets.datagrid:
+ * Columns data by way of field access can now span field relationships.
+ - djblets.extensions:
+ * Fixed a failure when clearing extension info.
+ - djblets.siteconfig:
+ * When loading the stored timezone, we're now longer setting
+ os.environ['TZ'] to that timezone. Instead, we're just activating
+ that timezone for Django only.
+ - djblets.webapi:
+ * Fixed a bug where list resources that had an unknown ID in the URL
+ could end up throwing an exception instead of returning a 404.
-
-* Thu Dec 20 2012 Stephen Gallagher <sgallagh at redhat.com> - 0.7.8-1
+ - New upstream release 0.7.8
+ - JavaScript:
+ * Fixed a crash when enabling/disabling an inlineEditor without an edit
+ icon.
-
-* Wed Dec 19 2012 Stephen Gallagher <sgallagh at redhat.com> - 0.7.7-1
+ - New upstream release 0.7.7
+ - djblets.datagrid:
+ * Fixed a possible XSS exploit in datagrids
+ * Failures during rendering the datagrid now results in a traceback
+ - JavaScript:
+ * The second display of an inlineEditor no longer breaks the size of the
+ editor
-
-* Thu Dec 13 2012 Stephen Gallagher <sgallagh at redhat.com> - 0.7.6-1
+ - New upstream release 0.7.6
+ - General:
+ - * Django 1.4.2 is now required
+ - * All admin-related templates have been changed to better fit the admin
+ template structure and styles. This includes siteconfig and logs.
+ - djblets.extensions:
+ - * Extension lists and state are now synchronized across
+ threads/processes/servers
+ - * Extension subclasses now must capture all variable arguments
+ (*args, **kwargs) and pass them to the parent constructor
+ - * URLHook, admin URLs, and API resource URLs are all now added and removed
+ properly when an extension is enabled or disabled
+ - djblets.util:
+ - * Cache keys are now bound to the SITE_ROOT, if one is set, to prevent
+ leakage across instances
+ - * Added DynamicURLResolver in djblets.util.urlresolvers
+ - djblets.util.cache:
+ - * Added normalize_cache_backend
+ - djblets.webapi:
+ - * API handler functions that specify allow_unknown=True in
+ @webapi_request_fields can now retrieve all extra fields as an
+ 'extra_fields' argument
+ - * Added unregister_resource_for_model
+ - djblets.siteconfig:
+ - * The stored cache_backend setting is now deserialized into
+ settings.CACHES['backend']
+ - * Fixed a couple missing imports
+ - * Siteconfig now handles old-style CACHE_BACKEND values and new-style
+ CACHES[cachename] dictionaries in the 'cache_backend' setting
+ - JavaScript:
+ - * The jQuery dependency has been updated to 1.8.2, and jQuery-UI to 1.8.24
+ - * inlineEditor's animation speed has increased, and is now customizable
+ through options.fadeSpeedMS
+ - * inlineEditor now does a better job of matching the parent container's
+ bounds
+ - * inlineEditor no longer activates when simply selecting text
+ - * Added a $.fn.retinaGravatar function that, on Retina-capable displays,
+ requests a larger gravatar for the given URL specified in an <img/>\
+ - * inlineEditor now supports changing an "enabled" option, allowing editors
+ to start out enabled or disabled, or dynamically change that state
-
-* Wed Oct 03 2012 Stephen Gallagher <sgallagh at redhat.com> - 0.7.2-1
+ - New upstream release 0.7.2
+ - Drop upstreamed patch to use system feedparser
+ - General:
+ - Styled all admin UI templates to add a "title" class to <h1> page
+ titles. This affects extensions, log viewer, and siteconfig.
+ - djblets.log:
+ - Fixed the columns to match the style of other admin UI columns.
+ - djblets.pipeline:
+ - Our 'bless' compiler is now compatible with the latest versions
+ of pipeline
+ - JavaScript:
+ - modalBox's positioning is now properly centered
-
-
-* Wed Aug 08 2012 Stephen Gallagher <sgallagh at redhat.com> - 0.7.1-3
+ - Use the system feedparser.py
-
-* Fri Aug 03 2012 Stephen Gallagher <sgallagh at redhat.com> - 0.7.1-1
+ - New upstream release 0.7.1
+ - Support for ReviewBoard 1.7beta1
+ - General:
+ - Djblets now requires Django 1.4.1+
+ - Added localized timezone awareness
+ - Djblets now uses Django's standard static media support
+ - djblets.datagrid:
+ - DateTimeColumn and DateTimeSinceColumn are now timezone-aware
+ - djblets.extensions:
+ - Added a framework for supporting loadable, configurable extensions in
+ Django-based sites
+ - djblets.util:
+ - ModificationTimestampField, http_date, and the the ageid filter have
+ been made timezone-aware
+
+* Thu Feb 21 2013 Stephen Gallagher <sgallagh at redhat.com> - 0.6.28-1
+- New upstream release 0.6.28
+- General:
+ * Require Django 1.3.7 as a minimum
+- djblets.datagrid:
+ * Fixed a possible XSS exploit in datagrids
+ * Failures during rendering the datagrid now results in a traceback
+- djblets.util.fields:
+ * CounterField was failing to use the initializers for brand new
+ instances of a model, defaulting to None instead
+
+* Tue Dec 18 2012 Stephen Gallagher <sgallagh at redhat.com> - 0.6.27-1
+- New upstream release 0.6.27
+- General:
+ * We now require Django 1.3.4
+- djblets.gravatars:
+ * Added a get_gravatar_url() function, which can be used to get
+ the URL for a user's gravatar without generating HTML
+ * The gravatar URL used for HTTPS connections now uses
+ https://secure.gravatar.com and not https://www.gravatar.com
+- djblets.webapi:
+ * generate_etag() and serialize_*_field() functions now take a request
+ parameter
+ * Resource handler functions that provide default values for parameters
+ can now expect those to be used
+ * The allowed_mimetypes list in WebAPIResource is no longer getting
+ polluted with every WebAPIResource's allowed item and list mimetypes
+
+* Wed Oct 24 2012 Stephen Gallagher <sgallagh at redhat.com> - 0.6.24-1
+- New upstream release 0.6.24
+- Drop upstreamed patches
+- Include tests in djblets directory
+- Include README
+- djblets.feedview:
+ * We now use the latest upstream of feedparser instead of an older
+ bundled version
+- General:
+ * We now require Django 1.3.3
+- djblets.util:
+ * Added djblets.util.humanize
+- djblets.webapi:
+ * Added an Item-Content-Type header to web API responses for list
+ resources
+
+* Wed Aug 08 2012 Stephen Gallagher <sgallagh at redhat.com> - 0.6.22-2
+- Use the system feedparser.py
+- Resolves: rhbz#846762 - Current version of python-djblets in Fedora EPEL-6
+ contains embeded copy of python-feedparser, vulnerable to CVE-2009-5065,
+ CVE-2011-1156, CVE-2011-1157, and CVE-2011-1158
+
* Tue Jul 31 2012 Stephen Gallagher <sgallagh at redhat.com> - 0.6.22-1
- New upstream releae 0.6.22
- Fixes to support Review Board 1.6.11
More information about the scm-commits
mailing list