summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-04-13Merge pull request #3486 from stevepiercy/masterMichael Merickel
Refactor base_version to branch_version.
2019-04-13lintSteve Piercy
2019-04-12refactor major_version to branch_versionSteve Piercy
2019-04-11Don't play with _privatesSteve Piercy
2019-04-11Refactor base_version to major_version.Steve Piercy
- base_version includes the minor version number, and we want the major version which is only the first two bits of the version number.
2019-04-11Merge pull request #3483 from luhn/better-action-infoMichael Merickel
Improve debugging info from view_config decorator
2019-04-04Use depth argument for view_config info.Theron Luhn
2019-04-01Use inspect.stack() instead of sys._getframe()Theron Luhn
2019-04-01Fix docs build.Theron Luhn
2019-04-01Improve debugging info from view_config decorator.Theron Luhn
Grab a frame when instanciating view_config, rather than pulling info from venusian's AttachInfo. See discussion at https://github.com/Pylons/pyramid/issues/3471 This fixes the build for Python 3.8.
2019-03-30Merge pull request #3480 from luhn/sphinx-2.0Steve Piercy
Fix docs build on Sphinx 2.0.0
2019-03-30Changelog entry.Theron Luhn
2019-03-30Revert "Pin Sphinx to Read the Docs version."Theron Luhn
This reverts commit 4f9b54116c8867505e7b4de526795fc222909983.
2019-03-30Pin Sphinx to Read the Docs version.Theron Luhn
2019-03-30Fix epub build.Theron Luhn
2019-03-30Merge pull request #3476 from mmerickel/forward-port-3464-to-masterMichael Merickel
add ignore_files to pserve configuration section
2019-03-30Sign CONTRIBUTORS.txtTheron Luhn
2019-03-30Fix docs build on Sphinx 2.0.0Theron Luhn
Sphinx 2.0.0 was released, which triggered some warnings when building the docs and caused the build to fail.
2019-03-26Merge pull request #3478 from stevepiercy/masterSteve Piercy
Fixing typo in the description
2019-03-25Fixing typo in the descriptionBen
2019-03-21Add ignore_files to pserve configuration sectionEric Atkin
2019-03-21Merge pull request #3474 from stevepiercy/masterSteve Piercy
Add changelog entry for #3469 and #3470
2019-03-21Add changelog entrySteve Piercy
2019-03-21Group settings together.Steve Piercy
2019-03-20Merge pull request #3470 from stevepiercy/masterSteve Piercy
Test RTD latex_engine setting take 2
2019-03-20Merge branch 'master' of https://github.com/Pylons/pyramidSteve Piercy
2019-03-20Test RTD latex_engine setting take 2Steve Piercy
2019-03-19Merge pull request #3469 from stevepiercy/masterSteve Piercy
Test RTD latex_engine setting
2019-03-19Test RTD latex_engine settingSteve Piercy
2019-02-19fix grammarSteve Piercy
2019-02-19Merge pull request #3466 from sayanarijit/routes-to-rootSteve Piercy
doc update: firstapp, project
2019-02-19no change in caseArijit Basu
2019-02-19doc update: firstapp: routes to rootArijit Basu
https://docs.pylonsproject.org/projects/pyramid/en/latest/narr/firstapp.html#adding-configuration
2019-01-29Merge pull request #3459 from mmerickel/fix-logging-setupMichael Merickel
do not configure logging in the master process when using the reloader
2019-01-29Merge pull request #3456 from mmerickel/fix-non-sortable-discriminatorsMichael Merickel
Fix non sortable discriminators
2019-01-29do not configure logging in the master process when using the reloaderMichael Merickel
2019-01-28stop sorting discriminators in exception outputMichael Merickel
2019-01-28test unsortable discriminatorsMichael Merickel
2019-01-10Merge pull request #3442 from Estartu/masterMichael Merickel
changed principals_allowed_by_permission to act differently if permissive is True or False
2019-01-10Merge pull request #3448 from mmerickel/drop-mimetypes-shimMichael Merickel
drop mimetypes bugfix for 2.6.x that is no longer needed
2019-01-05Merge pull request #3449 from mmerickel/reformat-setup.pyMichael Merickel
use the dict form of entry_points in setup.py
2019-01-05we tend to not have bug fixes in major versions, they're all backportedMichael Merickel
2019-01-05use the dict form of entry_points in setup.pyMichael Merickel
2019-01-05drop mimetypes bugfix for 2.6.x that is no longer neededMichael Merickel
2019-01-05Merge pull request #3447 from mmerickel/drop-json-shimMichael Merickel
stop overriding request.json_body from webob
2019-01-05stop overriding request.json_body from webobMichael Merickel
2018-12-31Merge pull request #3446 from stevepiercy/masterSteve Piercy
highlight docutil instead of bcrypt
2018-12-31Merge remote-tracking branch 'upstream/master'Steve Piercy
2018-12-31highlight docutil instead of bcryptAlexander McNulty
2018-12-26added unittest for the not permissive partGerhard Schmidt
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-31 05:00:05 +0000