Commit graph

  • 2dcb3f215d Minor typo in installation.rst Steven Maude 2014-07-12 00:06:11 +01:00
  • 811167704b Minor typo in installation.rst #239 Steven Maude 2014-07-12 00:06:11 +01:00
  • 8352855d8a Merge branch 'master' into plain-and-match #235 vietjtnguyen 2014-07-04 02:40:36 -07:00
  • a25ea22e70 Added plain and shortmatch options. vietjtnguyen 2014-07-04 02:31:01 -07:00
  • 5a2460a12d Merge pull request #232 from grplyler/fromfix Manuel Ebert 2014-07-03 09:13:51 +02:00
  • ad2d278ae5 Merge pull request #232 from grplyler/fromfix Manuel Ebert 2014-07-03 09:13:51 +02:00
  • 8ee51a6db0 Version bump to 1.8.7 Manuel Ebert 2014-07-03 09:13:07 +02:00
  • fd529a485c Version bump to 1.8.7 Manuel Ebert 2014-07-03 09:13:07 +02:00
  • 1c5ff1d5b8 'jrnl -from' times now match greater/less than or equal to start and end times Ryan Plyler 2014-07-02 21:43:38 +08:00
  • 85826ca77b 'jrnl -from' times now match greater/less than or equal to start and end times Ryan Plyler 2014-07-02 21:43:38 +08:00
  • 08da5e01d8 Added PyCharm project files to .gitignore Ryan Plyler 2014-07-02 21:34:31 +08:00
  • f3871aab02 Added PyCharm project files to .gitignore Ryan Plyler 2014-07-02 21:34:31 +08:00
  • b2aeb04b78 'jrnl -from' times now match greater/less than or equal to start and end times Ryan Plyler 2014-07-02 21:43:38 +08:00
  • 6f4ab856d3 'jrnl -from' times now match greater/less than or equal to start and end times #232 Ryan Plyler 2014-07-02 21:43:38 +08:00
  • a9cef019ad Merge branch 'master' of https://github.com/maebert/jrnl into fromfix Ryan Plyler 2014-07-02 21:36:49 +08:00
  • 0618082aae Merge branch 'master' of https://github.com/maebert/jrnl into fromfix Ryan Plyler 2014-07-02 21:36:49 +08:00
  • d8e0bab3ab Version bump 1.8.6 Manuel Ebert 2014-07-02 15:36:04 +02:00
  • 53e947ac18 Version bump Manuel Ebert 2014-07-02 15:36:04 +02:00
  • 88d4c52568 Tests for tagging Manuel Ebert 2014-07-02 15:34:08 +02:00
  • c05fdfdad7 Tests for tagging Manuel Ebert 2014-07-02 15:34:08 +02:00
  • b2fdc1ceae Added PyCharm project files to .gitignore Ryan Plyler 2014-07-02 21:34:31 +08:00
  • 4df3571b47 Added PyCharm project files to .gitignore Ryan Plyler 2014-07-02 21:34:31 +08:00
  • e20ae39bf3 Merge pull request #217 from chaitan94/tag-regex Manuel Ebert 2014-07-02 15:29:02 +02:00
  • 919b9ae3e4 Merge pull request #217 from chaitan94/tag-regex Manuel Ebert 2014-07-02 15:29:02 +02:00
  • 92e6263bd5 Fix config writing for python 3 #253 Manuel Ebert 2014-07-02 12:20:29 +02:00
  • b467199a62 Fixes config tests Manuel Ebert 2014-07-02 12:11:11 +02:00
  • 6515ab7c0a YAML configs Manuel Ebert 2014-07-02 11:47:56 +02:00
  • c159610723 Merge pull request #226 from grplyler/master Manuel Ebert 2014-06-30 21:11:47 +02:00
  • 8be672a1d9 Merge pull request #226 from grplyler/master Manuel Ebert 2014-06-30 21:11:47 +02:00
  • e0a603bcb8 Notes on encryption Manuel Ebert 2014-06-30 18:00:38 +02:00
  • 15b7d2603c Notes on encryption Manuel Ebert 2014-06-30 18:00:38 +02:00
  • 5dae85370f Fixed typo in CONTRIBUTING.md grplyler 2014-06-30 18:39:06 +08:00
  • 9871221fb2 Fixed typo in CONTRIBUTING.md #226 grplyler 2014-06-30 18:39:06 +08:00
  • 5b4e89f081 New make options Manuel Ebert 2014-06-30 11:14:25 +02:00
  • 2332fca6fe New make options Manuel Ebert 2014-06-30 11:14:25 +02:00
  • add0aea46d Unescaped -, + and * in regex B Krishna Chaitanya 2014-06-30 14:38:00 +05:30
  • a2be5d25fc Unescaped -, + and * in regex #217 B Krishna Chaitanya 2014-06-30 14:38:00 +05:30
  • be1a90db3d Version bump & new recipes Manuel Ebert 2014-06-30 10:26:54 +02:00
  • 3a65ce227d Version bump & new recipes Manuel Ebert 2014-06-30 10:26:54 +02:00
  • 9c592cfd36 Merge pull request #225 from jdevera/patch-1 Manuel Ebert 2014-06-30 10:06:02 +02:00
  • 07f2e2be34 Merge pull request #225 from jdevera/patch-1 Manuel Ebert 2014-06-30 10:06:02 +02:00
  • 18994f1aa1 Include the year in exported file name Jacobo de Vera 2014-06-30 07:01:33 +02:00
  • b423bfc963 Include the year in exported file name #225 Jacobo de Vera 2014-06-30 07:01:33 +02:00
  • fadbdc27b9 Restrict --export argument Manuel Ebert 2014-06-28 17:55:08 +02:00
  • 3f5b5ff3c3 Restrict --export argument Manuel Ebert 2014-06-28 17:55:08 +02:00
  • e820bf494e Merge afbc1b3f83 into 800a373462 #219 Matthias Vogelgesang 2014-06-28 09:38:23 +00:00
  • afbc1b3f83 Fix failing behave tests #219 Matthias Vogelgesang 2014-06-28 11:38:06 +02:00
  • 439ef53fbe Remove circular dependency Matthias Vogelgesang 2014-06-26 13:13:33 +02:00
  • e46632003d Move and remove imports in utils Matthias Vogelgesang 2014-06-26 12:51:18 +02:00
  • b40e619ba4 Make Journal a general interface Matthias Vogelgesang 2014-06-26 12:41:30 +02:00
  • ef0e192d79 Include [-+/*#] in tag characters B Krishna Chaitanya 2014-06-27 21:08:10 +05:30
  • 8b45458f90 Include [-+/*#] in tag characters B Krishna Chaitanya 2014-06-27 21:08:10 +05:30
  • 69d5c5d844 Merge pull request #218 from maebert/readline Manuel Ebert 2014-06-27 16:08:25 +02:00
  • 8314c85463 Merge pull request #218 from maebert/readline Manuel Ebert 2014-06-27 16:08:25 +02:00
  • f347b0deca Installs readline on non-windows if not available Manuel Ebert 2014-06-27 15:56:12 +02:00
  • f5a3d7328c Installs readline on non-windows if not available #218 Manuel Ebert 2014-06-27 15:56:12 +02:00
  • 800a373462 Merge branch 'pr/211' into 2.0-rc1 Manuel Ebert 2014-06-27 14:51:03 +02:00
  • 13071edb3a Docs Manuel Ebert 2014-06-27 14:50:50 +02:00
  • a4bd1ee379 Cleans up entry Manuel Ebert 2014-06-27 14:50:21 +02:00
  • 7934dea485 Fixes unicode errors in XML export Manuel Ebert 2014-06-27 14:50:06 +02:00
  • 19572625ac Better unicode mock support Manuel Ebert 2014-06-27 14:49:45 +02:00
  • 2b62fb42f6 Merge ee944bc379 into fa243065d9 #211 Krishna Chaitanya 2014-06-27 12:20:17 +00:00
  • f1637613b5 Merge branch 'pr/213' Manuel Ebert 2014-06-27 14:11:54 +02:00
  • fa243065d9 Merge branch 'pr/213' Manuel Ebert 2014-06-27 14:11:54 +02:00
  • 66ec554637 Link to advanced usage Manuel Ebert 2014-06-27 14:11:42 +02:00
  • b4944c808d Link to advanced usage Manuel Ebert 2014-06-27 14:11:42 +02:00
  • 04b5a671b8 Merge branch 'pr/198' Manuel Ebert 2014-06-27 14:01:53 +02:00
  • a593ed80b9 Merge branch 'pr/198' Manuel Ebert 2014-06-27 14:01:53 +02:00
  • 065f98dda8 Printed message aborted on ctrl+c. Jonathon Scanes 2014-06-27 10:42:15 +10:00
  • 3f4b873ec9 Printed message aborted on ctrl+c. Jonathon Scanes 2014-06-27 10:42:15 +10:00
  • b0fe7cd330 Prevent printing stack trace in compose mode on ctrl+c. Jonathon Scanes 2014-06-26 08:45:58 +10:00
  • 948d031777 Prevent printing stack trace in compose mode on ctrl+c. Jonathon Scanes 2014-06-26 08:45:58 +10:00
  • af222fd526 Changed regex to accept symbols B Krishna Chaitanya 2014-06-27 11:58:59 +05:30
  • f9af744a29 Changed regex to accept symbols B Krishna Chaitanya 2014-06-27 11:58:59 +05:30
  • 8fdbe8c177 Printed message aborted on ctrl+c. #198 Jonathon Scanes 2014-06-27 10:42:15 +10:00
  • 93b1edff9d Note for editing constraints on one line. FIX #199 karl 2014-06-27 09:12:04 +09:00
  • 6f8755ab55 Note for editing constraints on one line. FIX #199 #213 karl 2014-06-27 09:12:04 +09:00
  • ee944bc379 Export to xml #211 B Krishna Chaitanya 2014-06-27 01:34:36 +05:30
  • 362107f853 Update encryption.feature #209 Michael Parks 2014-06-26 11:43:47 -06:00
  • 4bfe4d9ddc Update encryption.feature for pw confirmation Michael Parks 2014-06-26 11:41:37 -06:00
  • 1272e1395d Add password confirmation to cli --encrypt Michael Parks 2014-06-26 11:24:38 -06:00
  • 10570ec5dd Add password confirmation to encryption Michael Parks 2014-06-26 11:16:51 -06:00
  • f4632762aa Merge 0280d22ba7 into 8eeba1481d #198 Jon Scanes 2014-06-26 13:47:35 +00:00
  • fa886151f6 Version bump 1.8.4 Manuel Ebert 2014-06-26 15:30:39 +02:00
  • 8eeba1481d Version bump Manuel Ebert 2014-06-26 15:30:39 +02:00
  • 0c415924aa Merge pull request #206 from matze/integrate-pyxdg Manuel Ebert 2014-06-26 15:23:05 +02:00
  • 0a59dc198d Merge pull request #204 from chrissexton/parallel_edits Manuel Ebert 2014-06-26 15:19:38 +02:00
  • fe41e41a6f Merge pull request #204 from chrissexton/parallel_edits Manuel Ebert 2014-06-26 15:19:38 +02:00
  • 800c947155 Merge 485486117e into 828ea4d427 #200 Matthias Vogelgesang 2014-06-26 13:03:37 +00:00
  • cb1561481b Fixes error when exporting txt files Manuel Ebert 2014-06-26 15:03:27 +02:00
  • 828ea4d427 Fixes error when exporting txt files Manuel Ebert 2014-06-26 15:03:27 +02:00
  • d8ccb928e0 Allow 'text' and 'markdown' aliases in export to dir Manuel Ebert 2014-06-26 15:00:38 +02:00
  • 872cab6cb4 Allow 'text' and 'markdown' aliases in export to dir Manuel Ebert 2014-06-26 15:00:38 +02:00
  • 7d782261e0 Allow parallel edits Chris Sexton 2014-06-26 08:23:37 -04:00
  • 9276a92a0b Allow parallel edits #204 Chris Sexton 2014-06-26 08:23:37 -04:00
  • 485486117e Use PyXDG to save config and journal in XDG dirs #206 #200 Matthias Vogelgesang 2014-06-24 23:13:41 +02:00
  • d981a74d06 Require config arguments Matthias Vogelgesang 2014-06-26 10:47:59 +02:00
  • 0280d22ba7 Prevent printing stack trace in compose mode on ctrl+c. Jonathon Scanes 2014-06-26 08:45:58 +10:00
  • 3eb911f11b Dynamically load 3L library Manuel Ebert 2014-06-25 16:38:02 +02:00
  • b8b928f277 Dynamically load 3L library Manuel Ebert 2014-06-25 16:38:02 +02:00