summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-04-15Merge pull request #1631 from tisdall/1.6-docupdateMichael Merickel
typo
2015-04-15typoTim Tisdall
2015-04-15update releasing.txt to use twine/wheelsMichael Merickel
2015-04-15update releasing.txt to use twine/wheelsMichael Merickel
2015-04-15wip derivationsCasey Duncan
2015-04-15master is now 1.7Chris McDonough
2015-04-15Merge branch '1.6-branch'Chris McDonough
2015-04-14Merge branch 'master' into 1.6-branchChris McDonough
2015-04-14Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2015-04-14Alchemy Scaffold UpdateRandy Topliffe
- Removed the need for a global session object - Moved from the extension to the register method for hooking up the transaction manager - Added the database session to the request object - Set up a `BaseTest` class which is something the developer would end up doing anyways
2015-04-14prep for 1.6a1Chris McDonough
2015-04-144 comes after 3Steve Piercy
2015-04-14use 1.6 branch badgeChris McDonough
2015-04-14no need to explicitly try to build docs, its now part of a tox runChris McDonough
2015-04-14minor wording changeChris McDonough
2015-04-14no longer in-progress on this branchChris McDonough
2015-04-14move 1.5 stuff to HISTORY.txt and label 1.6 in changesChris McDonough
2015-04-14add docs enhancements section and supply more info about scaffolding changesChris McDonough
2015-04-14add a whats new for 1.6Chris McDonough
2015-04-14Merge pull request #1629 from ztane/masterTres Seaver
fixed documentation; wrong line in docs
2015-04-14fixed documentation; wrong line in docsAntti Haapala
2015-04-14Request params starting with '=' may have valueTimur Izhbulatov
2015-04-14Add some validation for the JSONP callbackBert JW Regeer
The callback variable could be used to arbitrarily inject javascript into the response object. This validates that the callback doesn't begin with a number and is standard US ASCII characters, because trying to make sure the JavaScript function name is actually valid would require parsing JavaScript itself...
2015-04-13Ignore more pep8 checks and add to travisJohn Anderson
2015-04-13add convenience shell scriptsChris McDonough
2015-04-13change releasing and hacking docs to reflect new order of using tox to test ↵Chris McDonough
docs and scaffolds
2015-04-13Merge branch 'master' of https://github.com/Pylons/pyramid into start_pep8John Anderson
Conflicts: pyramid/view.py
2015-04-13unbreak toxChris McDonough
2015-04-13make it possible to run scaffold functests using toxChris McDonough
2015-04-12omg how embarrassing, forgot to run tests before merging the request ↵Chris McDonough
subclass fix branch
2015-04-12add change note related to #1529Chris McDonough
2015-04-12Merge branch 'bertjwregeer-bug/request_subclassing'Chris McDonough
2015-04-12merge master back into this PR branchChris McDonough
2015-04-06Merge branch 'fix.view-lookup'Chris McDonough
2015-04-06change excview_tween to use _call_view instead of adapters.lookup; ↵Chris McDonough
parameterize _call_view and _find_views to cope
2015-04-06add comment about not changing view_execution_permitted use of .lookup for ↵Chris McDonough
view finding
2015-04-06convert render_view_to_response to use _call_viewChris McDonough
2015-04-06break out _call_view into separate importable callable for use in scriptsChris McDonough
2015-04-06use _find_views instead of lookup in proutesChris McDonough
2015-04-06unused importsChris McDonough
2015-04-06use _find_views in pviewsChris McDonough
2015-04-03no need to iter() the resultChris McDonough
2015-04-03Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2015-04-03cache view lookups; see #1557Chris McDonough
2015-04-02Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2015-03-30Merge pull request #1622 from stevepiercy/masterSteve Piercy
remove italics from internal references
2015-03-30remove italics from internal referencesSteve Piercy
2015-03-26fix out of date match_param docsMichael Merickel
2015-03-25Merge pull request #1619 from stevepiercy/masterSteve Piercy
Add a badge and link for latest documentation to complement master
2015-03-25Add a badge and link for latest documentation to complement masterSteve Piercy