summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-12-12Merge commit '822898e' (Merge branch 'django14')Luke Shumaker
Conflicts: requirements.txt requirements_prod.txt templates/base.html templates/devel/clock.html templates/public/download.html templates/public/index.html templates/releng/results.html
2012-12-12Merge commit 'ea87160' (update)Luke Shumaker
2012-12-12Merge tag 'release_2012-03-12'Luke Shumaker
Signature stuff and template tweaks Conflicts: templates/public/index.html
2012-12-11allow repo names to contain '~' in the routerLuke Shumaker
2012-11-15Merge commit '7edc58c' (requires new parabolaweb-update)Luke Shumaker
Show signature data on package details page Conflicts: requirements.txt requirements_prod.txt
2012-11-15Merge commit '314608a' (update)parabolaweb-2012-11-15-1Luke Shumaker
2012-11-15update sponsors linksLuke Shumaker
2012-11-15Merge commit '271ae0f' (Add dimensions to most inline images)Luke Shumaker
Conflicts: templates/public/donate.html templates/public/download.html templates/public/index.html
2012-11-15Merge commit 'e368c95' (update)Luke Shumaker
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-23Merge branch 'django14'Dan McGee
Conflicts: templates/releng/result_section.html
2012-03-23releng: ensure links are valid for option names with spacesDan McGee
Can't believe this went unnoticed for so long. Signed-off-by: Dan McGee <dan@archlinux.org>
generated by cgit v1.2.3-2-g168b (git 2.25.1) at 2024-11-03 15:15:56 +0000