kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-31 10:47:00 +00:00
Code Issues Projects Releases Wiki Activity
11,963 Commits 4 Branches 773 Tags
34c19b145c6a0aa84bf142ded1c11d4450a6504c
Commit Graph

11963 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Cole
0a2bc99630 Republish configuration file, and edit it. 2019-08-03 19:49:32 +02:00
James Cole
7f1bd19e45 remove "twoFactorAuthEnabled" from preferences. Kill switches for all code that references them (easier for refactor) 2019-08-03 19:46:12 +02:00
James Cole
f8d2292fa8 Upgrade libraries. 2019-08-03 19:35:20 +02:00
James Cole
b0bd35503f Add MFA code in prep of new MFA routine 2019-08-03 19:19:55 +02:00
James Cole
0b8427f881 Add some TODO's, refactor some code. 2019-08-03 19:17:59 +02:00
James Cole
cf121fea50 Improve test coverage. 2019-08-03 14:45:37 +02:00
James Cole
75c2529d3e Improve test coverage. 2019-08-03 10:50:43 +02:00
James Cole
b8b59b13a7 Allow bread crumb for bills. 2019-08-03 08:33:05 +02:00
James Cole
12c1fa2367 Add new search keywords 2019-08-03 08:32:55 +02:00
James Cole
febaab62f7 Various fixes. Sorry, lazy day. 2019-08-03 06:27:56 +02:00
James Cole
43dbad4e4c Merge tag '4.7.17.6' into develop 
4.7.17.6

# Conflicts:
#	.travis.yml
#	app/Http/Controllers/Import/JobConfigurationController.php
#	app/Http/Controllers/Transaction/SingleController.php
#	config/firefly.php
 2019-08-03 05:11:58 +02:00
James Cole
2089ee14e9 Merge branch 'hotfix/4.7.17.6' 4.7.17.6 2019-08-03 05:10:21 +02:00
James Cole
ec8e1d5a7a Version update 2019-08-03 05:10:06 +02:00
James Cole
2d7494f8cd Fix similar XSS issues. 2019-08-03 05:08:35 +02:00
James Cole
8717f469b1 Fix #2370 2019-08-03 05:08:20 +02:00
James Cole
40dd2e0f7f Improve test coverage. 2019-08-03 04:46:47 +02:00
James Cole
00dee03709 Update version again. 2019-08-02 21:21:38 +02:00
James Cole
ca9f8b56f7 Merge tag '4.7.17.5' into develop 
4.7.17.5

# Conflicts:
#	resources/views/v1/transactions/convert.twig
 2019-08-02 20:59:57 +02:00
James Cole
ece0c99dbb Merge branch 'hotfix/4.7.17.5' 4.7.17.5 2019-08-02 20:59:23 +02:00
James Cole
b217acfe26 New version + correct credits. 2019-08-02 20:59:06 +02:00
James Cole
15d4d185bb Fix #2363 2019-08-02 20:57:36 +02:00
James Cole
3435cb937c Merge tag '4.7.17.4' into develop 
4.7.17.4

# Conflicts:
#	config/firefly.php
#	resources/views/v1/transactions/convert.twig
 2019-08-02 17:10:55 +02:00
James Cole
c9f4cf4f34 Merge branch 'hotfix/4.7.17.4' 4.7.17.4 2019-08-02 17:08:34 +02:00
James Cole
1b3d3de969 Update version. 2019-08-02 17:08:24 +02:00
James Cole
e80d616ef4 Fix #2367 2019-08-02 17:05:54 +02:00
James Cole
2ddf48f15c Fix #2366 2019-08-02 16:46:45 +02:00
James Cole
692b256f3f Fix #2365 2019-08-02 16:44:48 +02:00
James Cole
3ad4e04e2a Fix #2364 2019-08-02 16:43:36 +02:00
James Cole
427de0594d Fix #2363 2019-08-02 16:42:16 +02:00
James Cole
6ac08de71d First steps for reconciliation fix. 2019-08-02 16:31:36 +02:00
James Cole
494f783a2b Fix #2333 2019-08-02 08:28:51 +02:00
James Cole
59801b8bc1 Fix #2332 2019-08-02 05:49:20 +02:00
James Cole
3dbde59787 Fix #2331 2019-08-02 05:44:51 +02:00
James Cole
ac903b88ba Fix search 2019-08-02 05:32:30 +02:00
James Cole
fc70afa3ea Improve test coverage. 2019-08-02 05:25:24 +02:00
James Cole
4bd8e1b11e Fix #2328 2019-08-02 05:24:51 +02:00
James Cole
04bf92d946 Fix #2188 2019-08-01 21:07:40 +02:00
James Cole
eb2ee0c683 Extend cases for #2179 2019-08-01 17:19:32 +02:00
James Cole
324e0e7e30 Fix #2361 2019-08-01 17:17:26 +02:00
James Cole
81dce5d7c7 Fix #2179 2019-08-01 06:22:07 +02:00
James Cole
b049ca27f1 Improve test coverage. 2019-08-01 06:21:44 +02:00
James Cole
9b574ce7ad Improve test coverage. 2019-07-31 16:53:09 +02:00
James Cole
5524941c90 Update rule handling and views. 2019-07-27 15:01:13 +02:00
James Cole
67c0ef6ec6 Improve test coverage. 2019-07-27 13:54:06 +02:00
James Cole
d94d34ca63 Expand test coverage. 2019-07-26 17:48:24 +02:00
James Cole
6ff4a0b45c Improve test coverage. 2019-07-25 14:19:49 +02:00
James Cole
ee95606ec0 Improve test coverage. 2019-07-24 19:02:41 +02:00
James Cole
226e2f7185 Improve test coverage. 2019-07-23 17:33:23 +02:00
James Cole
1e7e0facf1 Improve test coverage. 2019-07-22 19:23:14 +02:00
James Cole
b7a4b0fdfd Refactored a lot of tests. 2019-07-21 17:15:06 +02:00