fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-06-29 14:06:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
639 commits 16 branches 99 tags 14 MiB
Commit graph

50 commits

Author SHA1 Message Date
Manuel Ebert
ca76077e09 Merge branch 'pr/326' into 2.0-rc1 2015-04-20 14:59:47 +02:00
Gregory Crosswhite
60194c7043 Now the list of import types in --help is generated from the plugins. 2015-04-20 14:57:33 +02:00
Manuel Ebert
0d1b381bd1 Merge pull request #347 from MinchinWeb/2.0-rc1-markdown-export-fix 
2.0 rc1 markdown export fix
 2015-04-20 14:29:17 +02:00
Manuel Ebert
c4b16b7577 Warn user if attempting to write to default journal but not configured 
Fixes #343
 2015-04-20 14:25:44 +02:00
MinchinWeb
95d920b0bf Unable to run cli.py as a standalone script due to relative imports 2015-04-14 11:07:56 -06:00
flight16
ebee196444 Add single letter alias -s for option --short 
--short was being used in a test for date logic, but I added a second
test for explicitness.
 2015-04-13 09:08:43 +09:00
Manuel Ebert
76c9006ed3 Python 3 fixes :) 2015-04-05 06:05:46 +04:00
Manuel Ebert
54f8382450 Fix creating non-existent journals 2015-04-05 03:25:17 +04:00
Manuel Ebert
b8ef404453 Cleanup and more logging 2015-04-05 02:28:04 +04:00
Manuel Ebert
a5f08e6081 Introduce legacy classes 2015-04-05 07:25:22 +10:00
Manuel Ebert
df82ad1f4d Properly initialise journal files after creating them 2015-04-04 18:58:33 +11:00
Manuel Ebert
c0ec95679b Make backup of config when upgrading 
Fixes #307
 2015-04-04 18:36:34 +11:00
Manuel Ebert
2615070df0 Hardcoded salt to fix crypto 2015-04-04 17:50:44 +11:00
Pablo Carranza
640d426b71 Added basic logging feature to understand how is configuration loaded 
Conflicts:

	jrnl/cli.py
	jrnl/util.py
 2014-11-09 15:55:52 -05:00
Manuel Ebert
163dc04481 Merge pull request #300 from gcgoogle/add-import-plugin-support 
Added support for importing entries for 2.0rc1.
 2014-10-30 15:03:47 +01:00
Gregory Crosswhite
6258465f5d Added support for importing entries. 2014-10-24 15:21:10 -07:00
Gregory Crosswhite
a1dcb3ed87 Now the list of export types in --help is generated from the plugins. 2014-10-24 14:56:24 -07:00
Manuel Ebert
6fed042b8b Plugin architecture 2014-09-27 15:07:22 -07:00
Manuel Ebert
a1b5a4099e Work on cryptography 2014-09-27 13:15:46 -07:00
Manuel Ebert
51a6ac2d51 Upgrade scaffolding 2014-09-12 14:28:03 -07:00
Manuel Ebert
4563651b71 Deprecate config.password 2014-09-12 14:28:03 -07:00
Matthias Vogelgesang
ae47c5bb80 Fix failing behave tests 2014-09-12 14:27:34 -07:00
Matthias Vogelgesang
9d589f3e64 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-09-12 14:26:22 -07:00
Matthias Vogelgesang
afae3d16a7 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-09-12 14:20:05 -07:00
Matthias Vogelgesang
fca3d131bd Require config arguments 2014-09-12 14:18:52 -07:00
Manuel Ebert
4301927b72 Use unicode literals 
Fixes #273
 2014-09-02 13:26:50 -07:00
Manuel Ebert
2e75713a91 Sort journal entries after editing 
Fixes #269
 2014-08-12 10:10:15 +02:00
Manuel Ebert
6a16edb67b Introduces -on option 
Fixes #246
 2014-07-21 13:30:25 +09:00
Manuel Ebert
fadbdc27b9 Restrict --export argument 
Fixes #187
 2014-06-28 17:55:10 +02:00
Jonathon Scanes
065f98dda8 Printed message aborted on ctrl+c. 2014-06-27 14:01:16 +02:00
Chris Sexton
7d782261e0 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
Phil Tysoe
65e45701d9 Add export options to help message 2014-06-25 10:24:39 +01:00
Patrice Peterson
6f5b3f52f3 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
e592e81f6f Split DayOne into separate file 2014-05-22 12:17:54 -07:00
Manuel Ebert
6da4e44e39 Warns if using --edit without editor 
Closes #151
 2014-04-16 13:14:16 -04:00
Manuel Ebert
36ce1fe3a8 Don't decode unicode 2014-03-28 14:40:58 -07:00
Manuel Ebert
14d249c3c9 Even more unicode fixes 2014-03-28 13:43:58 -07:00
Manuel Ebert
3ff1e43e03 More unicode fixes for #119 2014-03-27 16:12:03 -07:00
Josh Tan
bb3778a099 Simplified syntax for joining journal names with new lines. 2014-02-23 22:46:28 -06:00
Josh Tan
3450967eb3 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
Manuel Ebert
ff3c2ecdc3 Allows -3 as a shortcut for -n 3 2014-02-05 10:16:40 -08:00
Manuel Ebert
9cc37f964f Fix a logic bug so that jrnl -h and jrnl -v are possible even if jrnl not configured yet. 2014-01-26 14:15:46 +01:00
Manuel Ebert
46951cbe12 More unicode support 2014-01-23 15:14:20 +01:00
Manuel Ebert
d35502423a Cleaned up imports to work with Python2.6 and Python 3.3 2014-01-23 14:33:14 +01:00
Manuel Ebert
0e637d26d0 DayOne support for --edit 2013-12-21 15:00:26 +01:00
Manuel Ebert
ca6b16a5a1 Cleaner parsing 2013-12-21 14:59:24 +01:00
Manuel Ebert
4d8949bbed Get rid of --delete 2013-12-20 16:16:48 +01:00
Manuel Ebert
abe586d84e Deleting the last entry 2013-11-30 14:55:37 -08:00
Manuel Ebert
83702fab98 py2.6 2013-11-29 11:13:12 -08:00
Manuel Ebert
f22ddd706b jrnl.py:cli -> cli.py:run 2013-11-29 10:23:09 -08:00
Renamed from jrnl/jrnl.py (Browse further)