summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-03-22Merge pull request #936 from tshepang/unusedChris McDonough
remove unused 'ignore-next-block' directive
2013-03-22Merge pull request #937 from tshepang/rmChris McDonough
rm unused glossary entry
2013-03-22rm unused glossary entryTshepang Lekhonkhobe
2013-03-22remove unused ignore-next-block directiveTshepang Lekhonkhobe
2013-03-21Merge pull request #935 from tshepang/consistencyMichael Merickel
some consistency fixes
2013-03-22some consistency fixesTshepang Lekhonkhobe
2013-03-21Merge pull request #933 from stevepiercy/masterMichael Merickel
Generalize Python versions in Windows section
2013-03-21Generalize Python versions in Windows section.Steve Piercy
2013-03-21Merge pull request #921 from pzatrick/masterTres Seaver
Updates to Wiki2
2013-03-21Merge pull request #932 from stevepiercy/masterTres Seaver
Clean up SQLite3 language; cd into venv; minor heading renames
2013-03-21Meh. git hate me.Steve Piercy
2013-03-21Update definingviews.rst to clarify that a template is a rendererPatrick Canfield
2013-03-21Update definingviews.rst to use active voice, reduce redundancy.Patrick Canfield
2013-03-21Update definingviews.rst to be more explicit, concise (?)Patrick Canfield
A make the first sentence a litte more explicit, default to present tense, remove unnecessary details and use python instead of english when it's cleared to do so.
2013-03-21Update definingviews.rst explain matchdict more explicitly, conciselyPatrick Canfield
2013-03-21Merge remote-tracking branch 'upstream/master'Steve Piercy
Conflicts: docs/tutorials/wiki2/installation.rst
2013-03-21Clean up:Steve Piercy
* SQLite3 language * cd into venv * minor heading names
2013-03-21Update basiclayout.rst, more deductive concept ordering, singular form of termsPatrick Canfield
2013-03-21Resolve conflict.Tres Seaver
2013-03-21Merge pull request #917 from tshepang/patch-2Tres Seaver
wiki2 tutorial: no need to re-install
2013-03-21Merge pull request #929 from tshepang/re-orgTres Seaver
slightly re-organise
2013-03-21update repoze.who to latest symlinkMichael Merickel
2013-03-21Merge pull request #931 from tshepang/sqlaMichael Merickel
add hyperlinks to SQLAlchemy docs
2013-03-21Merge pull request #928 from tshepang/revertTres Seaver
revert to a better paragraph
2013-03-21four spaces is standardTshepang Lekhonkhobe
2013-03-21use version-agnostic link, to avoid maintenanceTshepang Lekhonkhobe
2013-03-21add hyperlinks for SQLAlchemyTshepang Lekhonkhobe
2013-03-21Merge branch 'pull.930'Michael Merickel
2013-03-21Merge branch 'master' of madjar/pyramid into pull.930Michael Merickel
2013-03-21Update CONTRIBUTORS.txtGeorges Dubus
2013-03-20update CHANGES.txtMichael Merickel
2013-03-20Merge branch 'pull.911'Michael Merickel
2013-03-20add some tests for options within ini filesMichael Merickel
2013-03-21slightly re-organiseTshepang Lekhonkhobe
2013-03-21revert to a better paragraphTshepang Lekhonkhobe
2013-03-20Merge pull request #927 from stevepiercy/masterTres Seaver
Add special section for Mac OS X users to Pyramid Install; Make installation explicit and discrete, combining suggestions from @thesteve0, @tshepang, @mcdonc
2013-03-20Merge commit '2ca9bde9d2862655ddee276cd14a375e6a5adec6'Steve Piercy
2013-03-20Make installation explicit and discrete, combining suggestions from ↵Steve Piercy
@thesteve0, @tshepang, @mcdonc.
2013-03-20Add special section for Mac OS X users.Steve Piercy
2013-03-20Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-03-20Merge pull request #926 from stevepiercy/masterChris McDonough
Add "Before You Begin"; fix whitespace in CHANGES.txt so it builds
2013-03-19Fix whitespace in CHANGES.txt to permit build.Steve Piercy
Add "Before You Begin" section.
2013-03-19Merge branch 'master' of madjar/pyramid into pull.911Michael Merickel
2013-03-19Merge pull request #925 from tshepang/patch-1Chris McDonough
some improvements/fixes to a paragraph
2013-03-19Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-03-19Merge branch 'fix.831'Michael Merickel
2013-03-19update CHANGES.txtMichael Merickel
2013-03-19enhance the docstring on include_ip in auth tkt to explain compatabilityMichael Merickel
2013-03-19Merge branch 'bugfix/ipv6_compat' of bertjwregeer/pyramid into fix.831Michael Merickel
2013-03-19some improvements/fixes to a paragraphTshepang Lekhonkhobe
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-29 18:53:52 +0000