Commit Graph
3791 Commits
Author SHA1 Message Date
James Cole 4627ea1dec Updated views for user activation. 2016-03-29 11:54:26 +02:00
James Cole 7ed24e78d5 New emails for the activation. 2016-03-29 11:48:29 +02:00
James Cole ae02e3fd8d New example configuration that includes user account activation (disabled by default). 2016-03-29 11:46:21 +02:00
James Cole cc88d5962e Move code to event handlers instead of registration routine. 2016-03-28 19:50:24 +02:00
James Cole 70c8a524cd Should fix the tests 2016-03-22 17:22:48 +01:00
James Cole 9a8efc8a58 Info in tags for #159 2016-03-22 16:59:29 +01:00
James Cole f0f67b87c4 Code for #159 2016-03-22 16:57:26 +01:00
James Cole 1a3ec98896 Give all icons some context, no value yet. 2016-03-22 16:55:04 +01:00
James Cole efff44cba9 Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop
* 'develop' of https://github.com/JC5/firefly-iii:
  Fix link to non-existing budget
2016-03-22 16:54:31 +01:00
James Cole 7227418c4c More fine-grained cookie control. 2016-03-22 15:04:51 +01:00
James Cole 29f93a9b73 Fix link to non-existing budget 2016-03-22 09:04:32 +01:00
James Cole 532aa2acd0 Fix amount [skip ci] 2016-03-21 19:29:24 +01:00
James Cole 6aca410f37 Fix amount [skip ci] 2016-03-21 19:28:22 +01:00
James Cole f20656b516 Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop
* 'develop' of https://github.com/JC5/firefly-iii:
  Fix for #227
2016-03-21 19:27:13 +01:00
James Cole bcd7866e10 For debug, add float. [skip ci] 2016-03-21 19:24:15 +01:00
James Cole c1b8d44209 Small various fixes. 2016-03-21 19:22:37 +01:00
James Cole 50e947fbbe Fix for #227 2016-03-21 08:48:36 +01:00
James Cole 189d969ee6 Include "no budget" thing for issue #152 2016-03-20 20:06:05 +01:00
James Cole 201790ff8d Cleanup transaction journal edit. #215 2016-03-20 17:12:34 +01:00
James Cole cc26ce4143 Some scrutiniser related code cleanup. 2016-03-20 16:49:49 +01:00
James Cole 745e0aa525 Move to object held user object. 2016-03-20 16:47:53 +01:00
James Cole 6602b1587a Some scrutiniser related code cleanup. 2016-03-20 16:46:26 +01:00
James Cole 6698b57f52 Fixed a bug that would leave all amounts at zero. #224 2016-03-20 16:41:48 +01:00
James Cole 628268d47c Code to fix #223 2016-03-20 11:47:10 +01:00
James Cole 56a635212a Code for #155 2016-03-20 11:46:27 +01:00
James Cole 7e67eb17e0 All new translations for #218 2016-03-20 11:38:01 +01:00
James Cole 935d72d672 New English text for issue #218 2016-03-20 11:36:50 +01:00
James Cole fccb510186 Merge pull request #222 from eddyh/patch-1
Fixed small typo.
2016-03-20 11:34:58 +01:00
Edwin e7ea0dc842 Fixed small typo. 2016-03-19 18:45:12 +01:00
James Cole a40d6b0649 Merge branch 'master' into develop
* master:
  Code cleanup [skip ci]
  Quick bug fix.
2016-03-19 17:40:24 +01:00
James Cole b7429a358f Code cleanup [skip ci] 3.8.0 2016-03-19 17:34:37 +01:00
James Cole cf8b4e2f76 Quick bug fix. 2016-03-19 17:34:02 +01:00
James Cole 48c865e57a Merge branch 'hotfix/account-repos' into develop 2016-03-19 17:28:16 +01:00
James Cole 059764cd23 Merge branch 'hotfix/account-repos' account-repos 2016-03-19 17:28:15 +01:00
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