summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-11-14Merge commit '604c748' (update)Luke Shumaker
2012-11-14Merge commit '09e7d27' (tweaks to default local_settings)Luke Shumaker
Conflicts: local_settings.py.example
2012-11-14Move the uploads folder to another directory (outside of this repo)parabolaweb-2012-11-14Parabola
2012-10-27update local_settings.py.exampleparabolaweb-2012-10-27Luke Shumaker
2012-10-27fix thingsLuke Shumaker
2012-10-27don't bundle the autogenerated js filesLuke Shumaker
2012-10-26Merge commit '943ef2e8e4'Luke Shumaker
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
2012-10-26mirror changes from commit '943ef2e8e4'Luke Shumaker
2012-05-06relax version requirements for south and pyinotifyLuke Shumaker
2012-05-06Merge branch 'master' of git://parabolagnulinux.org/parabolawebParabola
2012-05-06Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/parabolawebLuke Shumaker
2012-05-06Change README to recommend PostgreSQLLuke Shumaker
2012-04-04Merge branch 'master' of git://parabolagnulinux.org/parabolawebParabola
2012-04-04Skip missing pkgdesParabola
2012-04-04Changed to labs, issue #65Nicolás Reynolds
2012-04-04SOPA is no moreNicolás Reynolds
2012-02-28Remove the SOPA banner.Luke Shumaker
2012-02-28Change the requirements for markdown and python-memcached to be minimum versionsLuke Shumaker
2012-02-28Merge commit '1c23308' from archwebLuke Shumaker
Conflicts: public/views.py settings.py templates/public/download.html
2012-02-28Merge commit 'ffdaac4' from archweb: Add D3 geometry packageLuke Shumaker
2012-02-28Merge commit 'f3a3ce' from archwebLuke Shumaker
2012-02-28Merge commit '9c6fd0' from archweb: upgrade to d3-2.6.1Luke Shumaker
Conflicts: media/d3.layout.min.js media/d3.min.js This brought out a few bugs in the Makefile, fix them.
2012-02-28Merge commit '20e9a83' from ArchwebLuke Shumaker
Conflicts: main/fixtures/groups.json packages/templatetags/package_extras.py
2012-02-28Merge branch 'master' into phonyjsLuke Shumaker
Conflicts: media/Makefile
2012-02-28Merge commit 'cc202e923': Add copyright/authorship headers to ↵Luke Shumaker
Archweb-original .js files
2012-02-28(1) Use phony %.min.js files (2) copyright headers in d3.*.js (3) Makefile!Luke Shumaker
---- 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.
2012-02-15Don't fail on missing descNicolás Reynolds
2011-12-30Merge branch 'master' of /srv/git/repositories/parabolawebroot
2011-12-29Revert back to d3-2.4.3; There are some backward-incompatible changes.Luke Shumaker
I'm not sure if any hit Parabolaweb, but I'd rather be safe. But now they have copyright headers :)
2011-12-29Upgrade d3 to version 2.7.0, add copyright headers.Luke Shumaker
Create a Makefile that automatically updates d3, and adds copyright headers to the installed files.
2011-12-29Add copyright/authorship headers to Archweb-original .js filesLuke Shumaker
* 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.
2011-12-29Remove .min.js files.Luke Shumaker
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.
2011-12-15Merge branch 'master' of ssh://parabolagnulinux.org:1863/parabolawebLuke Shumaker
2011-12-15Fix spelling error (thanks encyclomundi!)Luke Shumaker
2011-12-15Update comment in local_settings.py.exampleLuke Shumaker
2011-12-15Merge branch 'master' of /srv/git/repositories/parabolawebParabola
2011-12-15Fixed quotingNicolás Reynolds
2011-12-15Merge branch 'master' of /srv/git/repositories/parabolawebParabola
2011-12-14add a censored logo, to help fight SOPALuke Shumaker
2011-12-11I take it back, using // instead of https:// was a bad idea, it makes links ↵Luke Shumaker
from non-https be bad
2011-12-08add the i586 architecture to arches.jsonLuke Shumaker
2011-12-08Replace the arch silhouette with a (low quality) parabola.Luke Shumaker
TODO: make it look better. But props to johkra (I think?) for getting it done quickly.
2011-12-07Admin index template updatesDan McGee
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>
2011-12-07Various small admin touchupsDan McGee
* 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>
2011-12-07Convert master key datetimes to datesDan McGee
The extra precision is not necessary and just makes entry of the data harder anyway.
2011-12-07Enhance devel model adminDan McGee
Signed-off-by: Dan McGee <dan@archlinux.org>
2011-12-06Parabola silhouetteParabola
2011-12-05Add a stub admin command to help fix permissions/content typesDan McGee
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>
2011-12-05Slight tweaks to default local_settingsDan McGee
Signed-off-by: Dan McGee <dan@archlinux.org>
2011-12-05Convert to and enable staticfiles contrib applicationDan McGee
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>