Age | Commit message (Collapse) | Author |
|
|
|
Conflicts:
local_settings.py.example
|
|
|
|
|
|
|
|
|
|
Conflicts:
public/static/logos/legacy/arch-legacy-aqua-blue.png
public/static/logos/legacy/arch-legacy-aqua-blue.svg
public/static/logos/legacy/arch-legacy-aqua-white.png
public/static/logos/legacy/arch-legacy-aqua-white.svg
public/static/logos/legacy/arch-legacy-aqua.png
public/static/logos/legacy/arch-legacy-aqua.svg
public/static/logos/legacy/arch-legacy-blue1.png
public/static/logos/legacy/arch-legacy-blue1.svg
public/static/logos/legacy/arch-legacy-blue2.png
public/static/logos/legacy/arch-legacy-blue2.svg
public/static/logos/legacy/arch-legacy-noodle-blue.png
public/static/logos/legacy/arch-legacy-noodle-blue.svg
public/static/logos/legacy/arch-legacy-noodle-box.png
public/static/logos/legacy/arch-legacy-noodle-box.svg
public/static/logos/legacy/arch-legacy-noodle-cup.png
public/static/logos/legacy/arch-legacy-noodle-cup.svg
public/static/logos/legacy/arch-legacy-noodle-white.png
public/static/logos/legacy/arch-legacy-noodle-white.svg
public/static/logos/legacy/arch-legacy-ribbon1.png
public/static/logos/legacy/arch-legacy-ribbon2.png
public/static/logos/legacy/arch-legacy-ribbon3.png
public/static/logos/legacy/arch-legacy-ribbon4.png
public/static/logos/legacy/arch-legacy-ribbon5.png
public/static/logos/legacy/arch-legacy-ribbon6.png
public/static/logos/legacy/arch-legacy-wombat-lg.png
public/static/logos/legacy/arch-legacy-wombat.png
sitestatic/favicon.ico
sitestatic/jquery-1.4.4.min.js
sitestatic/jquery.tablesorter.min.js
sitestatic/silhouette.png
templates/base.html
templates/devel/clock.html
templates/packages/opensearch.xml
visualize/static/d3.geom.min.js
visualize/static/d3.layout.min.js
visualize/static/d3.min.js
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
public/views.py
settings.py
templates/public/download.html
|
|
|
|
|
|
Conflicts:
media/d3.layout.min.js
media/d3.min.js
This brought out a few bugs in the Makefile, fix them.
|
|
Conflicts:
main/fixtures/groups.json
packages/templatetags/package_extras.py
|
|
Conflicts:
media/Makefile
|
|
Archweb-original .js files
|
|
----
Due to our support of free software, we have two (uncommon) requirements
for .min.js files:
1. They preserve the header comments; for license-identification
2. They can be created with free software; a free minifier, SaaS does not
count.
The only viable way to do this is to use django's compress.py, which
requires the Google Closure Compiler, (or use the closure-compiler
directly), which is not (yet) packaged for Parabola.
So, for now just copy the *.js to *.min.js in order to avoid having to
change URLs to temporarily point to the non-minified versions until we can
properly minify them.
----
Add copyright headers to d3.js files, which by default ship without the
copyright included in the file, despite being free software.
----
Create a Makefile that automatically does this. It fetches the d3 and
jquery .js files, adds the copyright headers to the d3.*.js files, and then
copies .js files to .min.js files.
|
|
|
|
|
|
I'm not sure if any hit Parabolaweb, but I'd rather be safe.
But now they have copyright headers :)
|
|
Create a Makefile that automatically updates d3, and adds copyright
headers to the installed files.
|
|
* media/archweb.js: GPLv2, (c) 2007-2011 The Archweb Team
* media/visualize.js: GPLv2, (c) 2011 Dan McGee
The "Archweb Team" thing is a cop-out, but it was pulled from many
inline-js places, making a full list of edits hard.
|
|
The only way they can be created satisfactorily is with django's
compress.py, which requires the Google Closure Compiler, which is not
packaged for Parabola.
They can be re-added when the Google Closure Compiler is packaged.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
from non-https be bad
|
|
|
|
TODO: make it look better.
But props to johkra (I think?) for getting it done quickly.
|
|
We can't do everything in the upcoming 1.4 release, but we can take care
of a few small bugfixes and changes from the SVN trunk template.
Signed-off-by: Dan McGee <dan@archlinux.org>
|
|
* Don't capitalize things in verbose_name, Django does this
automatically and uses title case
* Add overrides for IP, URL, ISO, etc.
Signed-off-by: Dan McGee <dan@archlinux.org>
|
|
The extra precision is not necessary and just makes entry of the data
harder anyway.
|
|
Signed-off-by: Dan McGee <dan@archlinux.org>
|
|
|
|
I needed this today to get the application working from scratch on
another host. Probably not all there yet, but we'll see how far it gets
us.
Signed-off-by: Dan McGee <dan@archlinux.org>
|
|
Signed-off-by: Dan McGee <dan@archlinux.org>
|
|
This moves our site static files into the sitestatic directory if they
are shared resources, and also moves a handful of things (such as the
artwork logos) into application-specific static/ directories. This
allows the staticfiles contrib app to work after a few settings tweaks,
a run of collectstatic, and massaging the hardcoded '/media/' prefix out
of our templates.
Django 1.4 is going to make this a lot easier to move things to a CDN
and provides better template tags; for now this is setting the stage
before we can move to that.
Signed-off-by: Dan McGee <dan@archlinux.org>
|