summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-11-15Merge commit '14c51a5' (Update to d3 2.8.1)parabolaweb-2012-11-15Luke Shumaker
is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.
2012-11-15Merge commit '3702f7a' (update)Luke Shumaker
2012-11-15Merge tag 'release_2012-02-23'Luke Shumaker
Fix template fragment caching issue
2012-11-15slightly reword the description on the main pageLuke Shumaker
2012-11-15Merge tag 'release_2012-02-18'Luke Shumaker
Defend against bogus URLs, mirrorlist no FTP by default Conflicts: templates/public/index.html
2012-11-15Merge tag 'release_2012-02-11'Luke Shumaker
Quick release Conflicts: requirements.txt requirements_prod.txt
2012-11-15Merge tag 'release_2012-02-06'Luke Shumaker
Quick feature fixups and bugfixes
2012-11-15Merge commit '33fe337' (Encourage bug reports to have a summary)Luke Shumaker
Conflicts: packages/templatetags/package_extras.py
2012-11-15Clean up text in various places.Luke Shumaker
* It's "Arch Linux", not "Archlinux" or "ArchLinux" * Reword the description of what packages we have on the homepage * Add myself to the AUTHORS file * Fix the typo s/instalation/installation/
2012-11-15Merge commit '1f18484' (update)Luke Shumaker
2012-11-15tweak how make cleans filesLuke Shumaker
2012-11-15clean up output from makeLuke Shumaker
2012-11-14Merge tag 'release_2012-01-28'Luke Shumaker
Fix package names with @ symbols
2012-11-14Merge commit '32633d4' (Update D3 JS resources)Luke Shumaker
Conflicts: visualize/static/d3.js visualize/static/d3.layout.js visualize/static/d3.layout.min.js visualize/static/d3.min.js
2012-11-14Merge commit '1a6554d' (update)Luke Shumaker
2012-11-14fix urls.pyparabolaweb-2012-11-14-3Luke Shumaker
2012-11-14Merge tag 'release_2012-01-11'Luke Shumaker
Pkgbase view in todos, other changes related to caching Conflicts: public/views.py
2012-11-14Merge tag 'release_2011-11-09'Luke Shumaker
Too many new things to count Conflicts: templates/public/download.html templates/public/index.html
2012-11-14Merge commit 'c4ca96b' (update)Luke Shumaker
2012-11-14Merge commit '057e25' (Retitle package differences page)Luke Shumaker
Conflicts: templates/packages/differences.html
2012-11-14Merge commit 'd198137' (update)Luke Shumaker
2012-11-14fix bug in templates/todolists/view.html (faulty merge)parabolaweb-2012-11-14-2Luke Shumaker
2012-11-14Merge commit '96fecb1' (Multilib differences report)Luke Shumaker
Conflicts: packages/views/__init__.py templates/packages/differences.html
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-03-02Update d3 to 2.8.1Dan McGee
Signed-off-by: Dan McGee <dan@archlinux.org>
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.