IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity
8,402 Commits 4 Branches 526 Tags 1.1 GiB
ac0e2c9885
Commit Graph

8402 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Cole
ac0e2c9885
Merge branch 'develop' of https://github.com/firefly-iii/firefly-iii into develop 
* 'develop' of https://github.com/firefly-iii/firefly-iii:
  New translation strings.
  Update JournalRepository.php
  Update Amount.php
  Update ImportStorage.php
  Fix #854
  Enable mod_ssl by default
 2017-09-24 21:18:57 +02:00
James Cole
260ef1a07e
Tag view update. 2017-09-24 21:18:43 +02:00
James Cole
9f1ea0807b Merge branch 'develop' of github.com:JC5/firefly-iii into develop 2017-09-21 06:51:31 +02:00
James Cole
9c5b639986 New translation strings. 2017-09-21 06:50:58 +02:00
James Cole
ec73607974 Update JournalRepository.php 
Fix #860
 2017-09-20 08:35:20 +02:00
James Cole
e442eb6ce2 Update Amount.php 
Fix null pointer #854
 2017-09-20 08:31:00 +02:00
James Cole
db9c0600a8 Update ImportStorage.php 
Fix for #854
 2017-09-19 07:51:16 +02:00
James Cole
3f93941dd9 Fix #854 2017-09-17 19:21:03 +02:00
James Cole
4fa33c892a Merge pull request #855 from ms32035/mod_ssl 
Enable mod_ssl in docker container
 2017-09-17 19:14:26 +02:00
Marcin Szymanski
fb3230845d Enable mod_ssl by default 2017-09-17 14:42:29 +01:00
James Cole
37250cbde3
Various code cleanup. 2017-09-16 09:24:48 +02:00
James Cole
3424ec1c27
Various code cleanup. 2017-09-16 07:41:03 +02:00
James Cole
fe9adba7fb
Reinstate secure pw check and single user verification. 2017-09-16 07:18:15 +02:00
James Cole
b1135cee60
Various code cleanup 2017-09-16 07:17:58 +02:00
James Cole
bbab89d884
Fixes #848 2017-09-16 06:52:53 +02:00
James Cole
6fd040d420
Fix null pointer exception. #846 2017-09-15 17:35:44 +02:00
James Cole
c8cec91a93
Add debug info to job change status [skip ci] 2017-09-15 07:00:53 +02:00
James Cole
38bb074751
Fix storage bug in #845 2017-09-15 06:26:09 +02:00
James Cole
519ca4b2af
Improve export routine and cron job for #837 2017-09-14 21:17:19 +02:00
James Cole
f54b4c3abc
Implement access token for command line things. 2017-09-14 18:27:22 +02:00
James Cole
43a66fd378
Export job. 2017-09-14 18:10:38 +02:00
James Cole
f4938cfed7
Debug text in import routine. 2017-09-14 18:10:31 +02:00
James Cole
6badf101d7
Small cosmetic changes to export routine. 2017-09-14 18:03:39 +02:00
James Cole
fc67c9a476
Add missing translation for #843 2017-09-14 17:45:43 +02:00
James Cole
5e900736f8
Various code cleanup. 2017-09-14 17:40:02 +02:00
James Cole
761e9effae
Fix tests 2017-09-14 17:34:22 +02:00
James Cole
e0f1211896
Update config to account for namespace. 2017-09-14 17:29:21 +02:00
James Cole
fc5494e7f4
Restore test env. file. 2017-09-14 17:10:33 +02:00
James Cole
afe9d109b3
Small layout change [skip ci] 2017-09-14 16:13:25 +02:00
James Cole
768c7e53b4
Show message when locale is invalid. 2017-09-14 16:12:07 +02:00
James Cole
a20d9fa8f1
Add missing translations #843 2017-09-14 16:11:55 +02:00
James Cole
c9e7018490
Fix null pointer 2017-09-14 16:11:10 +02:00
James Cole
e250ffbd18
Add missing translations #843 2017-09-14 16:03:27 +02:00
James Cole
4b5f500dc1
Filter out opening balances. #839 2017-09-14 10:39:24 +02:00
James Cole
6d69832711
Extra big buttons for ##838 2017-09-14 10:32:58 +02:00
James Cole
233305ecb4
Change namespace of rules. 2017-09-13 07:49:58 +02:00
James Cole
0583aa53a9
Fix typo [skip ci] #836 2017-09-12 22:30:48 +02:00
James Cole
1d3ace5f21
Fix for #835 2017-09-12 22:28:14 +02:00
James Cole
3e8fe70915
Update error handler. 2017-09-12 22:14:43 +02:00
James Cole
bf8ce5471e
Fix bug in #836 2017-09-12 22:11:45 +02:00
James Cole
262f8a33c6
Fixed validation rules. 2017-09-12 21:44:31 +02:00
James Cole
4f934e54cf
Easier upgrade, include FF version in JS 2017-09-12 19:59:07 +02:00
James Cole
158bf06efb
Update version (is also a test) 2017-09-12 19:57:56 +02:00
James Cole
436017baee
Introduce version to template. Rename Javascript URI 2017-09-12 19:57:41 +02:00
James Cole
6e80b2f4c8
Update tests. 2017-09-12 19:47:29 +02:00
James Cole
ce205ab413
Various small fixes. 2017-09-12 18:24:42 +02:00
James Cole
626a9aac4b
Update gitignore. 2017-09-12 18:24:19 +02:00
James Cole
73d85ca8c6
Update kernel so it works. 2017-09-12 18:24:12 +02:00
James Cole
9bc9aa0bb0
Add bcscale again. 2017-09-10 09:54:00 +02:00
James Cole
24ea20f769
Various changes to make things work again. 2017-09-10 09:46:50 +02:00