IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-12-29 02:11:12 -06:00
Code Issues Packages Projects Releases Wiki Activity
3,807 Commits 4 Branches 482 Tags 889 MiB
5199377113
Commit Graph

3807 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Cole
c205eee6fd Something went wrong. 2016-03-19 17:28:04 +01:00
James Cole
7b22099608 Merge branch 'release/3.8.0' 
Conflicts:
	app/Repositories/Account/AccountRepository.php
 2016-03-19 17:17:06 +01:00
James Cole
b56b42d6fb Final change log. 2016-03-19 17:15:19 +01:00
James Cole
ef6ef57e67 Various code cleanup things. 2016-03-19 16:51:52 +01:00
James Cole
47d3cf1d45 Updated composer. 2016-03-19 16:50:01 +01:00
James Cole
9cfac9a884 New translations. #219 2016-03-19 16:47:29 +01:00
James Cole
dc172476e1 Make sure the two factor auth pages are not accessible when already authenticated using two factor. 2016-03-19 16:29:01 +01:00
James Cole
6fc7763380 New routes for #219 2016-03-19 16:25:24 +01:00
James Cole
ce45f21dba Translated stuff. #219 2016-03-19 16:25:16 +01:00
James Cole
2de713c946 New language stuff. #219 2016-03-19 16:25:05 +01:00
James Cole
3d1dfe20b3 Listen to the logout event. #219 2016-03-19 16:24:47 +01:00
James Cole
0404735ccb This is the cleaned up version of the controller #219 2016-03-19 16:24:35 +01:00
James Cole
83f200f5a2 This is the two factor middleware. #219 2016-03-19 16:23:09 +01:00
James Cole
a29eb9b993 This is the controller for two factor authentication. #219 2016-03-19 16:22:57 +01:00
James Cole
c939be97fb These are some new middleware groups required to call the two factor auth routines at the right moments. 2016-03-19 16:22:20 +01:00
James Cole
f31e62a532 This is a routine that will remove all two-factor related information from the session, when the user logs out. See issue #219 2016-03-19 16:21:50 +01:00
James Cole
34c195159e Clean mail message for blocked users. 2016-03-19 11:32:23 +01:00
James Cole
322fef2db1 Removed most logging. 2016-03-19 11:25:11 +01:00
James Cole
7aa2565e89 Fixed a bug where profiled account names would not get strtolower() and thus match nothing. Thanks to Tweakers.net user "doeners" 2016-03-19 11:23:23 +01:00
James Cole
8f3572f2d3 Correctly save 2fa secret. 2016-03-19 07:59:55 +01:00
James Cole
fb165ef28b Do not give the user the secret. 2016-03-19 07:56:57 +01:00
James Cole
a26acf4a25 Clean up mail thing. 2016-03-18 20:30:07 +01:00
James Cole
645400e17f Clean up mail thing. 2016-03-18 20:29:51 +01:00
James Cole
ccad52b80f Fix opening balance bug #214 2016-03-18 16:29:08 +01:00
James Cole
f6303deaa4 Error when blocked user logs in 2016-03-18 11:22:58 +01:00
James Cole
d3a3083b85 Error when blocked user logs in 2016-03-18 11:20:54 +01:00
James Cole
99452056ec Error when blocked user logs in 2016-03-18 11:19:22 +01:00
James Cole
fca21bab4d Error when blocked user logs in 2016-03-18 11:16:05 +01:00
James Cole
9c58b77f01 Error when blocked user logs in 2016-03-18 11:10:51 +01:00
James Cole
b5c5f67fcc Catch possible NULL 2016-03-18 10:53:59 +01:00
James Cole
0f17423465 Fix chart money format 2016-03-18 09:57:18 +01:00
James Cole
f093e29bd1 Removed the last floatvals. 2016-03-16 17:48:07 +01:00
James Cole
fe9b8e834d Change the precision. Should not influence anything. 2016-03-16 17:47:07 +01:00
James Cole
64f273120e Make sure that charts work when Firefly III is in a subdirectory. Thx to @xnyhps. 2016-03-16 17:28:04 +01:00
James Cole
31c1dd466b Merge pull request #217 from JC5/revert-216-fix-absolute-urls-report 
Revert "Fix use of absolute URLs for linecharts for the report pages."
 2016-03-16 17:26:06 +01:00
James Cole
99b369bf45 Revert "Fix use of absolute URLs for linecharts for the report pages." 2016-03-16 17:25:57 +01:00
James Cole
e2a1535c44 Merge pull request #216 from xnyhps/fix-absolute-urls-report 
Fix use of absolute URLs for linecharts for the report pages.
 2016-03-16 17:25:53 +01:00
Thijs Alkemade
3dfa88020e Fix use of absolute URLs for linecharts for the report pages. 2016-03-16 11:46:12 +01:00
James Cole
a220094941 Remove param doc. [skip ci] 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-03-14 21:03:35 +01:00
James Cole
ababdacf89 Some code cleanup 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-03-14 20:53:56 +01:00
James Cole
114dd5fc2a Rename method. 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-03-14 20:52:08 +01:00
James Cole
c058629172 Small bug fixes. 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-03-14 20:51:34 +01:00
James Cole
79d7f577e4 Small bug fixes. 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-03-14 20:50:19 +01:00
James Cole
631bafc6ab Small bug fixes. 2016-03-14 20:47:13 +01:00
James Cole
be58da539e Fix various small issues. 2016-03-14 20:38:23 +01:00
James Cole
a508ac9dda Update composer.lock 2016-03-14 20:20:12 +01:00
James Cole
538fd2cef0 Add upgrade warning. 2016-03-14 20:15:29 +01:00
James Cole
42557446a1 New change log file 2016-03-14 20:13:27 +01:00
James Cole
b9586481fc Translate some help text. 2016-03-14 19:46:42 +01:00
James Cole
a0434e3271 Disable audit reports for now. [skip ci] 2016-03-14 19:42:05 +01:00