Skip to content

Commit

Permalink
Merge back develop branch
Browse files Browse the repository at this point in the history
  • Loading branch information
ptrourke committed Dec 16, 2014
2 parents 1fcda2e + aece8d5 commit 2c7f07d
Show file tree
Hide file tree
Showing 2,106 changed files with 100,660 additions and 97,794 deletions.
22 changes: 22 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@

# top-most EditorConfig file
root = true

[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
indent_style = space

# 4 space indentation
[*.{py,rst,js}]
indent_style = space
indent_size = 4

[*.html]
indent_style = space
indent_size = 2

[*.txt]
insert_final_newline = false
8 changes: 7 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ downloads
.pydevproject
.settings
lib/python*
.Python
.Pythonpl
include/python*
*.egg-info
*.swp
Expand All @@ -31,5 +31,11 @@ MANIFEST
/build/*
.hg/*
.hgtags
*~
*#
celerybeat-schedule
celerybeat.pid
.python-version
.idea
Vagrantfile
.vagrant
177 changes: 116 additions & 61 deletions LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ The license below applies to the following dependencies:
Eric Seidel - [email protected]
The Mozilla Foundation (contributions from Henri Sivonen since 2008)
* httplib2: Copyright (c) 2006 by Joe Gregorio
* jquery.autocomplete.js: Copyright (c) 2009 J�rn Zaefferer
* jquery.autocomplete.js: Copyright (c) 2009 J�rn Zaefferer
* jquery.bgiframe.min.js: Copyright 2010, Brandon Aaron (http://brandonaaron.net/)
* jquery.form.js: Contributors list taken from http://malsup.com/jquery/form/#download:
John Resig
Expand All @@ -61,21 +61,17 @@ The license below applies to the following dependencies:
Klaus Hartl
Matt Grimm
Yehuda Katz
J�rn Zaefferer
J�rn Zaefferer
Sam Collett
Gilles van den Hoven
Kevin Glowacz
Alex Andrienko
* jquery.highlight.js: Johann Burkard <http://johannburkard.de>
* jquery.jeditable.js: Copyright (c) 2006-2009 Mika Tuupola, Dylan Verheul
* jquery.json.js: Brantley Harris (2009-08-14)
* jquery.machineTag.js: Copyright (c) 2009 Gabriel Horner
* jquery-1.4.2.js: Copyright (c) 2011 John Resig, http://jquery.com/
* jquery-ui-1.8.min.js: Copyright (c) 2011 Paul Bakaus, http://jqueryui.com/
* Pinax: Copyright (c) 2008-2010 James Tauber and contributors
* pytz: Copyright (c) 2003-2005 Stuart Bishop <[email protected]>
* ui.multiselect.js: Copyright (c) 2009 Michael Aufreiter, http://www.quasipartikel.at
* simplejson: Copyright (c) 2006 Bob Ippolito


Permission is hereby granted, free of charge, to any person obtaining a copy
Expand Down Expand Up @@ -291,33 +287,33 @@ The license below applies to the following bundled dependencies:
Copyright (c) 1997-2011 by Secret Labs AB
Copyright (c) 1995-2011 by Fredrik Lundh

By obtaining, using, and/or copying this software and/or its associated
documentation, you agree that you have read, understood, and will comply
with the following terms and conditions:

Permission to use, copy, modify, and distribute this software and its
associated documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appears in all copies, and that
both that copyright notice and this permission notice appear in supporting
documentation, and that the name of Secret Labs AB or the author not be
used in advertising or publicity pertaining to distribution of the software
without specific, written prior permission.

SECRET LABS AB AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
IN NO EVENT SHALL SECRET LABS AB OR THE AUTHOR BE LIABLE FOR ANY SPECIAL,
INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
By obtaining, using, and/or copying this software and/or its associated
documentation, you agree that you have read, understood, and will comply
with the following terms and conditions:

Permission to use, copy, modify, and distribute this software and its
associated documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appears in all copies, and that
both that copyright notice and this permission notice appear in supporting
documentation, and that the name of Secret Labs AB or the author not be
used in advertising or publicity pertaining to distribution of the software
without specific, written prior permission.

SECRET LABS AB AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
IN NO EVENT SHALL SECRET LABS AB OR THE AUTHOR BE LIABLE FOR ANY SPECIAL,
INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.


--------------------------------------------------------------------

lightbox.js is distributed under the Creative Commons Attribution 2.5 License
lightbox.js is distributed under the Creative Commons Attribution 2.5 License
(http://creativecommons.org/licenses/by/2.5/).

Lightbox JS: Fullsize Image Overlays
Lightbox JS: Fullsize Image Overlays
by Lokesh Dhakar - http://www.huddletogether.com

For more information on this script, visit:
Expand All @@ -339,9 +335,7 @@ The license below applies to the following bundled dependencies:
* django-pagination: Copyright (c) 2008, Eric Florenzano
* django-template-utils: Copyright (c) 2007, James Bennett
* django-classy-tags: Copyright (c) 2010, Jonas Obrist
* django-cms: Copyright (c) 2008, Batiste Bieler
* django-registration: Copyright (c) 2007-2011, James Bennett
* django-sekizai: Copyright (c) 2010, Jonas Obrist


All rights reserved.
Expand Down Expand Up @@ -375,7 +369,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------

The django-ajax-validation dependency is distributed under the following
The django-ajax-validation dependency is distributed under the following
license terms:

Copyright (c) 2009, Alex Gaynor
Expand Down Expand Up @@ -414,61 +408,94 @@ The django-redmine dependency is distributed under the following license terms:
Copyright (c) 2010, Zepheira, LLC
All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright notice,
* Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
* Neither the name of Zepheira, LLC nor the names of its contributors may be
used to endorse or promote products derived from this software without
* Neither the name of Zepheira, LLC nor the names of its contributors may be
used to endorse or promote products derived from this software without
specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.


--------------------------------------------------------------------

The jquery.dataTables.js dependency is distributed under the following
The jquery.dataTables.js dependency is distributed under the following
license terms:

Copyright (c) 2008-2010, Allan Jardine
All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright notice,
* Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
* Neither the name of Allan Jardine nor SpryMedia UK may be used to endorse
or promote products derived from this software without specific prior
* Neither the name of Allan Jardine nor SpryMedia UK may be used to endorse
or promote products derived from this software without specific prior
written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS "AS IS" AND ANY EXPRESS OR
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS "AS IS" AND ANY EXPRESS OR
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
OF SUCH DAMAGE.

--------------------------------------------------------------------

The django-reversion dependency is distributed under the following license terms:

Copyright (c) 2009, David Hall.
All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.

3. Neither the name of David Hall nor the names of its contributors may be
used to endorse or promote products derived from this software without
specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


--------------------------------------------------------------------

The OpenLayers dependency is distributed under the following license terms:
Expand Down Expand Up @@ -510,7 +537,6 @@ either expressed or implied, of OpenLayers Contributors.
The following dependencies are distributed under the following license terms:

* Simile Exhibit and Timeline (c) Copyright The SIMILE Project 2008. All rights reserved.
* Exhibit Piechart extension (c) Copyright Eric Abouaf 2009. All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
Expand All @@ -536,3 +562,32 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------

The license below applies to the following dependencies:
* jquery-sortable

Copyright (c) 2012 Jonas von Andrian
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* The name of the author may not be used to endorse or promote products
derived from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
7 changes: 0 additions & 7 deletions NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ This software uses code from the following projects:
* django-announcements (http://code.google.com/p/django-announcements)
* django-atompub (http://code.google.com/p/django-atompub/)
* django-classy-tags (https://github.com/ojii/django-classy-tags)
* django-cms (http://github.com/divio/django-cms/)
* django-compressor (http://github.com/mintchaos/django_compressor)
* django-email-confirmation (http://code.google.com/p/django-email-confirmation/)
* django-extensions (http://code.google.com/p/django-command-extensions/)
Expand All @@ -25,7 +24,6 @@ This software uses code from the following projects:
* django-piston (http://bitbucket.org/jespern/django-piston/wiki/Home)
* django-registration (https://bitbucket.org/ubernostrum/django-registration)
* django-robots (http://bitbucket.org/jezdez/django-robots/)
* django-sekizai (https://github.com/ojii/django-sekizai)
* django-sorting (http://github.com/directeur/django-sorting/tree/master)
* django-staticfiles (http://bitbucket.org/jezdez/django-staticfiles/)
* django-template-utils (http://code.google.com/p/django-template-utils/)
Expand All @@ -40,10 +38,7 @@ This software uses code from the following projects:
* jquery.bgiframe.min.js (http://brandonaaron.net)
* jquery.dataTables.js (http://www.datatables.net)
* jquery.form.js (http://malsup.com/jquery/form/)
* jquery.highlight.js (http://johannburkard.de/blog/programming/javascript/highlight-javascript-text-higlighting-jquery-plugin.html)
* jquery.jeditable.js (http://www.appelsiini.net/projects/jeditable)
* jquery.json.js (http://code.google.com/p/jquery-json/)
* jquery.machineTag.js (http://tagaholic.me/2009/04/14/i-am-machine-tag-and-so-can-you.html)
* jquery (http://jquery.com/)
* jquery UI (http://jqueryui.com/)
* lightbox.js (http://www.huddletogether.com/projects/lightbox/)
Expand All @@ -52,9 +47,7 @@ This software uses code from the following projects:
* Pinax (http://pinaxproject.com/)
* pytz (http://pytz.sourceforge.net)
* Simile (http://simile-widgets.org/)
* simplejson (http://undefined.org/python/#simplejson)
* South (http://south.aeracode.org/)
* ui.multiselect.js (http://www.quasipartikel.at/multiselect/)


Please see LICENSE.txt for the licenses that apply to these dependencies.
Expand Down
Loading

0 comments on commit 2c7f07d

Please sign in to comment.