summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-06-08Adding a warning discouraging use of __acl__ properties attributesJulien MIOTTE
2016-06-07Merge pull request #2639 from stevepiercy/masterSteve Piercy
update links in readme
2016-06-07update links in readmeSteve Piercy
2016-06-04Merge pull request #2635 from stevepiercy/masterSteve Piercy
We got our Bobo back!
2016-06-04We got our Bobo back!Steve Piercy
2016-06-03Merge pull request #2630 from stevepiercy/masterSteve Piercy
fix up numbering
2016-06-03fix up numberingSteve Piercy
2016-06-03Merge pull request #2627 from cewing/issue.2617Steve Piercy
update contributing docs to reflect current practice and clarify steps
2016-06-03make term less specific to one implementationcewing
2016-06-03update contributing docs to reflect current practice and clarify stepscewing
2016-06-02Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2016-06-02Merge pull request #2618 from stevepiercy/masterSteve Piercy
fix broken links in msg and update summary in scaffold base class Pyr…
2016-06-02fix broken decorator.Amos Latteier
2016-06-02Merge pull request #2615 from zrayn/stip_pserve_daemon_supportMichael Merickel
Ripping daemonization out of pserve
2016-06-02fix broken links in msg and update summary in scaffold base class ↵Steve Piercy
PyramidTemplate. - Closes #2604
2016-06-02Add exception_view_config decorator.Amos Latteier
2016-06-02Merge branch 'master' into stip_pserve_daemon_supportzrayn
2016-06-02Adding daemon support remove to CHANGES.txtzrayn
2016-06-02Add add_exception_viewAmos Latteier
2016-06-02Merge pull request #2616 from m-martinez/issue-2609Michael Merickel
Add route name to view deriver options. Closes: #2609
2016-06-02Sign CONTRIBUTORS.txtMarco M
2016-06-02Add route name to view deriver options. Closes: #2609Marco M
2016-06-02Removing changing user/group optionzrayn
2016-06-02Ripping daemonization out of pservezrayn
2016-06-02add exception_only argument to add_view to only register exception views.Amos Latteier
2016-06-01Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2016-05-23Merge pull request #2602 from stevepiercy/masterSteve Piercy
revert column type change in alchemy scaffold and related docs
2016-05-23Merge pull request #2601 from stevepiercy/1.7-branchSteve Piercy
revert column type change in alchemy scaffold and related docs
2016-05-23Merge pull request #2598 from stevepiercy/masterSteve Piercy
add optional latexpdf build for PDF to tox
2016-05-23add optional latexpdf build for PDF to toxSteve Piercy
- Closes #2575
2016-05-22Merge pull request #2593 from stevepiercy/masterSteve Piercy
moar updates of sqlite types Integer to Text
2016-05-22change type integer to type text, and update output of db init scriptSteve Piercy
- update output of running pytest coverage
2016-05-22Change type to Text from Integer. See #2591Steve Piercy
2016-05-21Merge remote-tracking branch 'upstream/master'Steve Piercy
2016-05-21Change type to Text from Integer. See #2591Steve Piercy
2016-05-20Merge pull request #2591 from viniciusban/masterSteve Piercy
Change column `Page.data` to `Text` in wiki2 tutorial
2016-05-20Change column `Page.data` to `Text`viniciusban
2016-05-19Merge pull request #2587 from stevepiercy/masterSteve Piercy
update link to canonical location for support and documentation
2016-05-19update link to canonical location for support and documentationSteve Piercy
2016-05-19oops, encode the password in the authorization tutorial as wellMichael Merickel
2016-05-19update master's history with the changelog from 1.7Michael Merickel
2016-05-19update contributing to reference 1.7 as stableMichael Merickel
2016-05-18Merge pull request #2586 from berkerpeksag/remove-duplicate-importMichael Merickel
Delete duplicate getargspec imports
2016-05-18Merge pull request #2585 from berkerpeksag/simplify-win-checkMichael Merickel
Simplify Windows detection code
2016-05-18Merge pull request #2576 from mmerickel/fix/unicode-password-hashMichael Merickel
password_hash is unicode, needs to be encoded
2016-05-16Delete duplicate getargspec importsBerker Peksag
2016-05-16Simplify Windows detection codeBerker Peksag
2016-05-16Merge pull request #2582 from stevepiercy/masterSteve Piercy
remove stray /
2016-05-16remove stray /Steve Piercy
2016-05-16Merge pull request #2580 from stevepiercy/masterSteve Piercy
Change link from pylonsproject.org to trypyramid.com