Micah Jerome Ellison
|
125d55aa20
|
Merge pull request #729 from wren/715-version-update
[#715] Checkout master branch first before committing
|
2019-11-09 14:11:23 -08:00 |
|
Jonathan Wren
|
397346b0ac
|
[#715] Checkout master branch first before committing
|
2019-11-09 14:09:53 -08:00 |
|
Micah Jerome Ellison
|
a2f0c44021
|
Merge pull request #726 from wren/715-version-update
[#715] Don't use shallow clone for builds
|
2019-11-09 14:05:26 -08:00 |
|
Jonathan Wren
|
21ef8dd8ea
|
[#715] Don't use shallow clone for builds
|
2019-11-09 14:03:26 -08:00 |
|
Jonathan Wren
|
63cc9785c5
|
ugh
|
2019-11-09 13:10:58 -08:00 |
|
Micah Jerome Ellison
|
f5d73f7eb3
|
Merge pull request #722 from wren/715-version-update
[#715] Test for automatically incrementing version in pipeline
|
2019-11-09 12:55:14 -08:00 |
|
Jonathan Wren
|
85c9513f60
|
[#715] Test for automatically incrementing version in pipeline
|
2019-11-09 12:51:25 -08:00 |
|
MinchinWeb
|
b80a5d301c
|
[Upgrade to 2.0] Expand User directory (#704)
|
2019-11-07 17:20:57 -08:00 |
|
Jonathan Wren
|
46fbabd15b
|
Merge pull request #712 from jrnl-org/maebert-patch-1
Update issue templates
|
2019-11-06 09:00:06 -07:00 |
|
Manuel Ebert
|
e3bcfe51aa
|
Updating Issue Template Workflow
|
2019-11-04 15:30:47 -08:00 |
|
Jonathan Wren
|
9378d4db1f
|
Merge pull request #679 from C0DK/master
Create templates for issues and pull requests
|
2019-10-28 13:07:02 -07:00 |
|
Casper Weiss Bang
|
89ce8bead4
|
Create templates for issues and pull requests
|
2019-10-28 20:51:57 +01:00 |
|
Micah Jerome Ellison
|
d3a270d201
|
Merge pull request #688 from wren/deployment-testing
[#681] take out automated pages deployment (for now), since it broke the site
|
2019-10-19 15:01:55 -07:00 |
|
Jonathan Wren
|
7851e921cd
|
[#681] take out automated pages deployment (for now), since it broke the
site
|
2019-10-19 15:00:10 -07:00 |
|
Micah Jerome Ellison
|
50c1b86d21
|
Merge pull request #684 from wren/deployment-testing
[#681] Separate local dev from pipeline releases
|
2019-10-19 14:41:51 -07:00 |
|
Jonathan Wren
|
a25d816fa1
|
[#681] Separate local dev from pipeline releases
|
2019-10-19 14:36:12 -07:00 |
|
Micah Jerome Ellison
|
81c7833f1d
|
Merge pull request #683 from wren/deployment-testing
[#681] Update version handling in source and travis deployments
|
2019-10-19 13:53:58 -07:00 |
|
Jonathan Wren
|
0f59c41712
|
[#681] Appease the poetry gods
|
2019-10-19 13:50:52 -07:00 |
|
Jonathan Wren
|
1840132b76
|
[#681] Update version handling in source and travis deployments
|
2019-10-19 13:41:59 -07:00 |
|
Micah Jerome Ellison
|
631eb32418
|
Merge pull request #682 from wren/deployment-testing
[#681] travis deployment testing
|
2019-10-19 13:09:57 -07:00 |
|
Jonathan Wren
|
27db5e520f
|
¯\_(ツ)_/¯
|
2019-10-19 13:03:57 -07:00 |
|
Micah Jerome Ellison
|
367766c574
|
Merge pull request #670 from jrnl-org/v2.1
v2.1
|
2019-10-05 16:30:03 -07:00 |
|
Jonathan Wren
|
c97e782904
|
remove faulty conditional
|
2019-10-05 16:27:18 -07:00 |
|
Jonathan Wren
|
ff1a8bf6e9
|
update makefile to use poetry for more things
|
2019-10-05 16:07:34 -07:00 |
|
Jonathan Wren
|
69995836ac
|
update version and author emails
|
2019-10-05 16:06:16 -07:00 |
|
Jonathan Wren
|
912653cd10
|
Merge branch 'pr/merge-v2.1'
Conflicts:
setup.py
|
2019-10-05 16:00:52 -07:00 |
|
Jonathan Wren
|
9881e872c5
|
update requirements to include pyyaml >= 5.1
|
2019-10-05 15:59:39 -07:00 |
|
Jonathan Wren
|
59df56d887
|
Merge pull request #660 from etnnth/yaml-version
Change pyYAML required version
|
2019-09-25 17:13:01 -07:00 |
|
etienne
|
57123d1a9f
|
Change pyYAML required version
Full Loader only avalaible from v5.1:
|
2019-09-24 17:13:05 +02:00 |
|
Jonathan Wren
|
60b004b25f
|
Merge pull request #655 from jrnl-org/manu--contributing
Fix references to Sphinx in CONTRIBUTING.md
|
2019-09-21 12:38:23 -07:00 |
|
Jonathan Wren
|
6b2596c2de
|
Merge pull request #637 from jprof/add-not-flag
Add '-not' flag for excluding tags from filter
|
2019-09-21 12:37:34 -07:00 |
|
Jonathan Wren
|
50608b2758
|
Merge pull request #550 from silenc3r/master
Handle KeyboardInterrupt when installing journal
|
2019-09-21 12:36:49 -07:00 |
|
Micah Jerome Ellison
|
64837b8cc1
|
Merge pull request #657 from jrnl-org/v2.0.1
Prep v2.0.1
|
2019-09-21 12:13:44 -07:00 |
|
Manuel Ebert
|
d4d0b7c27c
|
Fix references to Sphinx in contributing.md
|
2019-09-18 10:33:01 -07:00 |
|
Jonathan Wren
|
4542dadf27
|
Merge pull request #650 from micahellison/632-upgrade-tests
[GH-632] confirming that each journal can be parsed during upgrade
|
2019-08-24 15:51:00 -07:00 |
|
Jonathan Wren
|
c4a102f037
|
Merge pull request #649 from jrnl-org/manu--docs
Smaller doc fixes
|
2019-08-24 15:48:19 -07:00 |
|
Micah Jerome Ellison
|
aa0332c2a7
|
[GH-632] adding call to action to report issue when upgrade fails
|
2019-08-24 15:47:13 -07:00 |
|
Micah Jerome Ellison
|
4ff867ee5e
|
[GH-632] removing unreachable return statement
|
2019-08-24 15:25:05 -07:00 |
|
Micah Jerome Ellison
|
261e22b6e0
|
[GH-632] removing unnecessary whitespace
|
2019-08-24 15:14:15 -07:00 |
|
Micah Jerome Ellison
|
b13a411e6f
|
[GH-632] raising exception in upgrade.py on fail
Handling it in install.py to prevent config from being overwritten when upgrade fails
|
2019-08-24 15:01:23 -07:00 |
|
Micah Jerome Ellison
|
12c474ecd8
|
[GH-632] confirming that each journal can be parsed during upgrade, and aborting upgrade if not
|
2019-08-24 13:50:10 -07:00 |
|
Manuel Ebert
|
6127170c88
|
Found and removed another angsty teenager
|
2019-08-23 18:39:49 -07:00 |
|
Manuel Ebert
|
c09d71ad2f
|
Smaller doc fixes, fixes #486
|
2019-08-23 18:38:05 -07:00 |
|
Jonathan Wren
|
8b4e84c914
|
Merge pull request #639 from MinchinWeb/export-md-headers
Switch to hashmark Markdown headers on export (Mk II)
|
2019-08-15 18:45:23 -07:00 |
|
Jonathan Wren
|
51f5ef54aa
|
Merge pull request #612 from jrnl-org/manu--poetry
Use Poetry for dependency management and deployments
|
2019-08-15 17:50:15 -07:00 |
|
Manuel Ebert
|
06a106312f
|
Add deployment through poetry to travis
|
2019-08-15 17:44:27 -07:00 |
|
Manuel Ebert
|
d51225da0f
|
Add Poetry config
|
2019-08-15 17:42:45 -07:00 |
|
Micah Jerome Ellison
|
d29b9c82a9
|
Merge pull request #641 from gregorybodnar/create_encrypted_journal
Fix for #631 Create encrypted journal
|
2019-08-13 12:17:12 -07:00 |
|
Micah Jerome Ellison
|
4ad3eb14d6
|
Merge pull request #644 from wren/escape-dates-GH-631
#631 Escape data in square brackets
|
2019-08-13 12:16:08 -07:00 |
|
Micah Jerome Ellison
|
71ba5dd6db
|
Merge pull request #646 from wren/stalebot-60
change pinned label to a super cool emoji ⭐️
|
2019-08-10 16:49:17 -07:00 |
|