Commit graph

216 commits

Author SHA1 Message Date
Matthias Vogelgesang
afbc1b3f83 Fix failing behave tests 2014-06-28 11:38:06 +02:00
Matthias Vogelgesang
439ef53fbe Remove circular dependency 2014-06-27 17:43:47 +02:00
Matthias Vogelgesang
e46632003d Move and remove imports in utils 2014-06-27 17:43:47 +02:00
Matthias Vogelgesang
b40e619ba4 Make Journal a general interface
This change moves the loading and saving mechanisms into its own
Plain- and EncryptedJournal subclasses for easier maintenance and lazy loading
of all the crypto modules.
2014-06-27 17:43:25 +02:00
Manuel Ebert
800a373462 Merge branch 'pr/211' into 2.0-rc1 2014-06-27 14:51:03 +02:00
Manuel Ebert
a4bd1ee379 Cleans up entry 2014-06-27 14:50:21 +02:00
Manuel Ebert
7934dea485 Fixes unicode errors in XML export 2014-06-27 14:50:06 +02:00
Manuel Ebert
19572625ac Better unicode mock support 2014-06-27 14:49:45 +02:00
B Krishna Chaitanya
ee944bc379 Export to xml 2014-06-27 01:34:36 +05:30
Manuel Ebert
8eeba1481d Version bump 2014-06-26 15:30:39 +02:00
Manuel Ebert
fe41e41a6f Merge pull request #204 from chrissexton/parallel_edits
Allow parallel edits
2014-06-26 15:19:38 +02:00
Manuel Ebert
828ea4d427 Fixes error when exporting txt files
Fixes #202
2014-06-26 15:03:27 +02:00
Manuel Ebert
872cab6cb4 Allow 'text' and 'markdown' aliases in export to dir
Fixes #201
2014-06-26 15:00:38 +02:00
Chris Sexton
9276a92a0b Allow parallel edits
* Wait to open the journal until after getting text
* Use mktemp so that editors like vim get separate files for editing
2014-06-26 08:29:42 -04:00
Matthias Vogelgesang
485486117e Use PyXDG to save config and journal in XDG dirs
This change also hides the CONFIG_PATH state information entirely within
the install module. Therefore, the cli module does not have to care about
checking existence of files and paths.
2014-06-26 11:37:36 +02:00
Matthias Vogelgesang
d981a74d06 Require config arguments 2014-06-26 11:37:36 +02:00
Phil Tysoe
9878b6e350 Add export options to help message 2014-06-25 10:24:39 +01:00
Matthias Vogelgesang
562f700615 Try $VISUAL and $EDITOR for config['editor']
On UNIX derivates they expand to the default or preferred editor and avoid
unnecessary first time edits of the config file.
2014-06-24 22:52:04 +02:00
Patrice Peterson
3639e00183 Allow use of environment variables in config paths
This patch simply adds several calls to `os.expandvars` to functions
that parse paths in the config file.
2014-06-23 16:12:41 +02:00
Manuel Ebert
8a4401b670 Mark jrnl as 3.4 compatible 2014-05-22 14:18:15 -07:00
Manuel Ebert
7b2c47cbbe Catch proper exceptions in python3.4 2014-05-22 13:24:19 -07:00
Manuel Ebert
db99510720 Split DayOne into separate file 2014-05-22 12:17:54 -07:00
Manuel Ebert
6953e340c4 Official support for python 3.4 2014-05-22 11:56:28 -07:00
Manuel Ebert
c2692d88fe Changelog & version bump to 1.7.22 2014-05-19 14:43:56 -07:00
Manuel Ebert
b9685a55b0 Export to files using UTF-8
Fixes #162
2014-05-19 14:43:38 -07:00
Craig Moyer
4442829306 Re-fix Issue #56 by changing Regex to discriminate between title and entry.
Added BDD tests to cover this feature.
2014-04-24 21:34:30 -04:00
Manuel Ebert
16e09a8095 byte2int for PY3 2014-04-16 17:14:57 -04:00
Manuel Ebert
91f677d825 Version bump & docs 2014-04-16 17:03:29 -04:00
Manuel Ebert
0b678ce69c Use PKCS#7 for encryption
Closes #156
2014-04-16 17:03:24 -04:00
Manuel Ebert
8604bf8455 Ignore unreadably DayOne entries 2014-04-16 14:34:39 -04:00
Manuel Ebert
a5d345173a version bump 2014-04-16 14:28:21 -04:00
Manuel Ebert
b7479860a1 Assumes no DST in case of ambiguous dates
Fixes #153
2014-04-16 14:25:56 -04:00
Manuel Ebert
db4d2ddc54 Warns if using --edit without editor
Closes #151
2014-04-16 13:14:16 -04:00
Manuel Ebert
a78d8d6337 Version bump 2014-04-10 15:58:06 -04:00
Manuel Ebert
052f571e0b Create path to journal during installation
Fixes #152
2014-04-10 15:57:24 -04:00
Manuel Ebert
915bb99607 Small update to parsing regex 2014-04-01 20:14:49 -07:00
Manuel Ebert
b8c1360f2d Fixes writing new lines between entries 2014-03-31 12:37:37 -07:00
Manuel Ebert
e9e9b1611b Don't decode unicode 2014-03-28 14:40:58 -07:00
Manuel Ebert
9d4c1a23b1 Even more unicode fixes 2014-03-28 13:43:58 -07:00
Manuel Ebert
599c5a9ea1 More unicode fixes for #119 2014-03-27 16:12:03 -07:00
Manuel Ebert
040c09dbd4 Changelog & version bump 2014-03-24 10:48:57 -07:00
Manuel Ebert
aa70bb3274 Fixes white spaces at the beginning of lines, fixes #134 2014-03-24 10:48:51 -07:00
Manuel Ebert
9ba6b71a61 Changelog & version bump 2014-03-24 08:46:20 -07:00
Manuel Ebert
4d4a85b4b8 Small fix for unicode in DayOne, fixes #119 2014-03-24 08:45:48 -07:00
Manuel Ebert
ed43ae9bc4 Version bump 2014-03-19 15:21:52 -07:00
Manuel Ebert
f03d7a3bf9 Adds the tag symbol to day one entries on load 2014-03-19 14:44:47 -07:00
Josh Tan
36601cba39 Simplified syntax for joining journal names with new lines. 2014-02-23 22:46:28 -06:00
Josh Tan
f1ea01ff9a Added ability to list accessible journals.
Previously, if a user forgot the exact name of a journal, they could check the configuration file to retrieve this information. This patch adds support for performing this task using the jrnl interface.

The newly added '-ls' option retrieves the available journals from the jrnl configuration files and displays each journal name on a separate line.

This patch also updates the jrnl help display and the usage documentation to reflect these changes.
2014-02-23 22:21:54 -06:00
William Minchin
24a5712c4d Fix linewrap
If a line was exactly the length of `linewrap`, the extra space was
causing the next line to be blank. But if the line is empty, we need the
space to maintain the `| ` sidebar.
2014-02-07 08:24:30 -07:00
William Minchin
cac0b722cd Don't replace all double spaces
want to maintain the ability to format with the use of just text.
2014-02-07 08:21:28 -07:00