fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-05-12 17:38:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
602 commits 10 branches 99 tags 14 MiB
Commit graph

602 commits

This branch
This branch
All branches
Author SHA1 Message Date
Manuel Ebert
10eb36076f Consolidate requirements 2015-04-20 14:15:48 +02:00
Manuel Ebert
08fbd0d960 Split tests 2015-04-20 14:13:34 +02:00
flight16
35b9827eb1 Fix breaking test submitted in b2a7d1f30e. 2015-04-13 23:23:54 +09:00
flight16
b2a7d1f30e 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
flight16
00a5657c1b Fix: dateutil conflict because python-dateutils was already added to the conditional section. 2015-04-13 09:01:10 +09:00
flight16
6bcd5be7d4 Merge remote-tracking branch 'maebert/2.0-rc1' into 2.0-rc1 
Conflicts:
	setup.py
 2015-04-13 08:46:43 +09:00
flight16
41bec199a2 Add missing dependencies pyyaml and pyxdg 2015-04-11 13:03:15 +09:00
Manuel Ebert
8e627b01c0 TXT extension for temp files 2015-04-05 23:55:04 +02:00
Manuel Ebert
b41b5d3376 Tests for parsing issue fix 2015-04-05 18:38:37 +02:00
Manuel Ebert
cca630059f Fix parsing issue 2015-04-05 18:38:30 +02:00
Manuel Ebert
c720c15787 More encoding madness 2015-04-05 06:38:38 +04:00
Manuel Ebert
109a11d18e Encryption reads and writes in binary mode 2015-04-05 06:14:18 +04:00
Manuel Ebert
94964dc31c Python 3 fixes :) 2015-04-05 06:05:46 +04:00
Manuel Ebert
b7d8e1a9a5 Bilingual meta classes 2015-04-05 05:50:30 +04:00
Manuel Ebert
f459dd5bc2 Tests for #333 2015-04-05 03:27:09 +04:00
Manuel Ebert
1543a93799 Export DayOne UUID in json 
Fixes #333
 2015-04-05 03:26:52 +04:00
Manuel Ebert
812d289740 Update all tests to new time format 2015-04-05 03:25:39 +04:00
Manuel Ebert
4010d38af2 Fix creating non-existent journals 2015-04-05 03:25:17 +04:00
Manuel Ebert
7dc2ccbd3a Cleanup and more logging 2015-04-05 02:28:04 +04:00
Manuel Ebert
367b13b849 Fix conflicting requirements 
Fixes #296
 2015-04-05 02:27:47 +04:00
Manuel Ebert
24ada92787 Upgrade old time stamps to fix #317 2015-04-05 02:23:10 +04:00
Manuel Ebert
9c7d5af152 Legacy Journal with old timestamps 2015-04-05 02:23:09 +04:00
Manuel Ebert
f68ca1221e Cuddle timestamp in brackets to fix #318 2015-04-05 02:22:49 +04:00
Manuel Ebert
c31e62d9d6 Introduce legacy classes 2015-04-05 07:25:22 +10:00
Manuel Ebert
75ecc0dbbd Properly initialise journal files after creating them 2015-04-04 18:58:33 +11:00
Manuel Ebert
4955902702 Return config after install 
Fixes #297
 2015-04-04 18:47:09 +11:00
Manuel Ebert
b90a4b16bb Make backup of config when upgrading 
Fixes #307
 2015-04-04 18:36:34 +11:00
Manuel Ebert
dd79639095 Hardcoded salt to fix crypto 2015-04-04 17:50:44 +11:00
Manuel Ebert
003fb507ae Merge pull request #306 from pcarranza/2.0-r1-logging 
Added basic logging feature to understand how is configuration loaded
 2014-11-10 11:53:14 +01:00
Pablo Carranza
cc22fd8e60 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
6b8cbe52b5 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
Manuel Ebert
1771ff4e27 Merge pull request #299 from gcgoogle/fix-hard-coded-export-type-list 
Now the list of export types in --help is generated from the plugins.
 2014-10-30 15:01:32 +01:00
Gregory Crosswhite
cfd8856989 Now the importer reads from standard input using util.py23_read(). 2014-10-29 13:02:11 -07:00
Gregory Crosswhite
5685952a73 Made Journal.import_ more concise. 2014-10-29 13:02:05 -07:00
Gregory Crosswhite
584f0a969e Added support for importing entries. 2014-10-24 15:21:10 -07:00
Gregory Crosswhite
9e766d7ad0 Now the list of export types in --help is generated from the plugins. 2014-10-24 14:56:24 -07:00
Manuel Ebert
5e68b97e59 Plugin architecture 2014-09-27 15:07:22 -07:00
Manuel Ebert
359eabd56d Work on cryptography 2014-09-27 13:15:46 -07:00
Manuel Ebert
be009b08b4 Converts tests to YAML 2014-09-12 15:28:12 -07:00
Manuel Ebert
79f87abd76 Use 'version' in configs 2014-09-12 15:27:48 -07:00
Manuel Ebert
c5c6676bab Uses PBKDF2-SHA256 instead of plain SHA256 
Fixes #192
 2014-09-12 14:28:37 -07:00
Manuel Ebert
dc03c47da8 Upgrade prompt for encrypted jrnls 2014-09-12 14:28:03 -07:00
Manuel Ebert
0a28a9807b Doc changes 2014-09-12 14:28:03 -07:00
Manuel Ebert
84d886d0ef Basic support for cryptography.io 
Still needs better hash function
 2014-09-12 14:28:03 -07:00
Manuel Ebert
4ea5ae80b5 Upgrade scaffolding 2014-09-12 14:28:03 -07:00
Manuel Ebert
293204040b Remove deprecated tests 2014-09-12 14:28:03 -07:00
Manuel Ebert
9651adcdd0 Deprecate config.password 2014-09-12 14:28:03 -07:00
Matthias Vogelgesang
044accff6d Fix failing behave tests 2014-09-12 14:27:34 -07:00
Matthias Vogelgesang
84002574e6 Remove circular dependency 2014-09-12 14:26:23 -07:00
Matthias Vogelgesang
37d3f93b8a Move and remove imports in utils 2014-09-12 14:26:22 -07:00