Commit Graph

2332 Commits

Author SHA1 Message Date
James Cole
0a91a40c1b Merge branch 'develop' of github.com:JC5/firefly-iii into develop 2016-02-16 13:25:48 +01:00
James Cole
12f4305691 Possible fix for attachment helper 2016-02-16 13:25:03 +01:00
Robert Horlings
28d880a7c4 Ignoring eclipse specific files 2016-02-15 14:50:10 +01:00
James Cole
693ff3cc66 Various fixes. 2016-02-13 13:13:22 +01:00
James Cole
706b095f95 Forgot to actually return the created array. 2016-02-12 17:50:12 +01:00
James Cole
28bce44f69 More code cleanup. 2016-02-12 17:41:12 +01:00
James Cole
53d88dfd50 Clean up code. 2016-02-12 17:37:11 +01:00
James Cole
42daf7ed32 Clean up some code. 2016-02-12 17:34:42 +01:00
James Cole
e5402ea7c1 Fixed a sum. 2016-02-12 15:01:32 +01:00
James Cole
505f340917 Some clean up in the error handler. 2016-02-12 14:15:49 +01:00
James Cole
46856c9394 Remove entrust package. 2016-02-12 05:49:53 +01:00
James Cole
c63a2ad39d Updated test data. 2016-02-12 05:32:16 +01:00
James Cole
68a7078614 Clean up TestData 2016-02-12 05:29:41 +01:00
James Cole
2e15f1e2a3 Removed todo comments. 2016-02-12 04:59:14 +01:00
James Cole
56cbc7683e Try changes to the handler 2016-02-11 14:20:18 +01:00
James Cole
bf778d2fca Try changes to the handler 2016-02-11 14:17:58 +01:00
James Cole
6e5bca8306 Try changes to the handler 2016-02-11 14:17:11 +01:00
James Cole
43ff3e11ed Some changes to the error handler 2016-02-11 14:13:23 +01:00
James Cole
f1750e3c35 Will inform about the logged in user 2016-02-11 12:54:16 +01:00
James Cole
8b1fe26c84 A route that displays an error. Seems quite useless, I know 2016-02-11 12:49:04 +01:00
James Cole
df45298c1f Fixed bug in sumOfEverything() function 2016-02-11 11:21:50 +01:00
James Cole
3dab683a45 New asset account number handler. For issue #107 2016-02-11 08:12:10 +01:00
James Cole
d08fa37ccf Expanded error handling. 2016-02-11 08:11:26 +01:00
James Cole
4cd7976f63 Changes to the CSV importer because I ran into small bugs. 2016-02-11 08:11:12 +01:00
James Cole
569e8b6180 Better sort for CSV import column roles. 2016-02-11 07:03:12 +01:00
James Cole
4658ef9918 Fix PHP7 related strict type check. 2016-02-11 07:02:27 +01:00
James Cole
2b6a1c9cb1 Fixes a bug in the CSV importer. 2016-02-11 06:49:39 +01:00
James Cole
d47b946d00 New validator for account number #107 2016-02-11 06:40:16 +01:00
James Cole
a886e8087d New rule for account number. #107 2016-02-11 06:40:06 +01:00
James Cole
d473455680 Valid misspelled #107 2016-02-11 06:30:37 +01:00
James Cole
40245ef43b Some cosmetic changes for #107. 2016-02-11 06:30:09 +01:00
zjean
5c03e64f46 Tried to start with #107
- Always show the IBAN in the create account view, because it is always editable the edit view.
- Added 'accountNumber' account_meta field, and showing it in create/edit account view.
2016-02-10 22:09:24 +01:00
James Cole
49292bbb2d New model for future implementation of #164 2016-02-10 16:26:42 +01:00
James Cole
3e502db772 Various code fixes. 2016-02-10 16:23:37 +01:00
James Cole
426351bb54 Added new lines. 2016-02-10 16:01:18 +01:00
James Cole
4d6e244100 Better error handling for issue #168 2016-02-10 15:18:13 +01:00
James Cole
94b6c7975a Fixes #174. 2016-02-10 14:36:21 +01:00
James Cole
bc67113d77 This fixes the broken tests. 2016-02-10 12:01:45 +01:00
James Cole
5974bdcc2a This fixes what turns out to be an incredibly inaccurate chart. 2016-02-10 07:34:04 +01:00
James Cole
f9696287a4 Removed opening balance as possible expense for the balance thing. [skip ci] 2016-02-10 06:58:41 +01:00
James Cole
807dede90a Because nextExpectedMatch() must return a date (and cannot return null) the list of bills will show "unknown" when the bill is next expected in 1900. 2016-02-10 06:55:08 +01:00
James Cole
7288ba0fd7 Bit of code cleanup + the true/false in SHOW_INCOMPLETE_TRANSLATIONS is not a text but a boolean. Changed as such. 2016-02-10 06:25:21 +01:00
zjean
e04388a230 Added two factor auth setting to Preferences page. 2016-02-08 22:28:24 +01:00
James Cole
2f278c8618 Just a test commit [skip ci]
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-02-08 21:10:33 +01:00
James Cole
905ae3437b float > string. 2016-02-08 21:09:00 +01:00
James Cole
7679721007 float > string. 2016-02-08 21:07:11 +01:00
James Cole
9f29a2e04f Fixed something in the reports. 2016-02-08 20:59:09 +01:00
James Cole
ff5bf0c6e5 Opening balance does not count as an income or as an expense. It's just there. 2016-02-08 20:42:31 +01:00
James Cole
0eb8c2b7ba Make sure account has a start and end balance. 2016-02-08 20:40:47 +01:00
James Cole
deb140e3bc Fixes to export [skip ci] 2016-02-07 09:19:51 +01:00
James Cole
9a1710eb27 Some enhancements to export. 2016-02-07 09:11:46 +01:00
James Cole
c9c9410908 Use translations instead of hard config. [skip ci] 2016-02-07 08:40:59 +01:00
James Cole
42372cabd5 Wasn't used. [skip ci] 2016-02-07 08:35:37 +01:00
James Cole
ab9c991530 Better flashes (also translated) [skip ci] 2016-02-07 08:31:21 +01:00
James Cole
9429d84cf8 Some code cleanup [skip ci] 2016-02-07 07:56:58 +01:00
James Cole
b22774a599 Logout blocked accounts. 2016-02-07 07:36:31 +01:00
James Cole
ca3b0a2ab1 It's called a route [skip ci] 2016-02-06 22:16:59 +01:00
James Cole
62f76d08ad It's called a route [skip ci] 2016-02-06 22:16:30 +01:00
James Cole
92bff24d43 It's called a route [skip ci] 2016-02-06 22:15:16 +01:00
James Cole
eddd3e508f Force blocked users to logout. 2016-02-06 22:14:51 +01:00
James Cole
649eb65bb1 Fixed scrutiniser issue. [skip ci] [skip Scrutinizer] 2016-02-06 20:19:28 +01:00
James Cole
8fb3348a7c Added some (yet without function) information icons. [skip ci] [skip Scrutinizer] 2016-02-06 20:17:55 +01:00
James Cole
060b031272 Added PHP7 return type statements. 2016-02-06 18:59:48 +01:00
James Cole
95c4c4a238 Fixed a small bug after changing the return type statements. 2016-02-06 16:23:54 +01:00
James Cole
4424e48926 Added PHP7 return type statements. 2016-02-06 16:22:12 +01:00
James Cole
b8c7876454 Simplified export controller. 2016-02-06 15:01:26 +01:00
James Cole
8256f60340 Fixed form elements. 2016-02-06 15:00:57 +01:00
James Cole
d1a184e3f2 Added PHP7 return type statements. 2016-02-06 10:17:41 +01:00
James Cole
aa38b31015 Added PHP7 return type statements. 2016-02-06 10:15:07 +01:00
James Cole
466067bd95 Added PHP7 return type statements. 2016-02-06 10:11:06 +01:00
James Cole
0e0c475c83 Forgot a thing. 2016-02-06 05:04:41 +01:00
James Cole
241190c4da More consistent error handling. 2016-02-06 05:01:34 +01:00
James Cole
388d141d82 Fix for #172 2016-02-06 04:32:30 +01:00
James Cole
1542d5e386 Include IBAN 2016-02-05 21:12:19 +01:00
James Cole
f1b6b3386a Expanded entry for export. 2016-02-05 21:10:55 +01:00
James Cole
9465a6d2b5 This PHP7 thing is strict! 2016-02-05 19:57:17 +01:00
James Cole
c3f78b698d This PHP7 thing is strict! 2016-02-05 19:56:25 +01:00
James Cole
a4e699f781 Fix another php7 bug. 2016-02-05 19:54:25 +01:00
James Cole
c9b215684c Also fixed tests. 2016-02-05 19:25:17 +01:00
James Cole
b90c7c09b6 Smaller travis file. Try to fix the search. 2016-02-05 19:12:54 +01:00
James Cole
f72a8c5c06 Fixed some errors. Debug tests. 2016-02-05 17:38:58 +01:00
James Cole
ba5db2c15f Fixed test data. 2016-02-05 17:29:51 +01:00
James Cole
f5b89ca783 Some code cleanup. 2016-02-05 15:41:40 +01:00
James Cole
4ef840e210 More test data tweaks. 2016-02-05 15:20:44 +01:00
James Cole
e2d0ee125f Cleaning up test data. 2016-02-05 15:01:33 +01:00
James Cole
cb52af28e7 Also fixes #171 2016-02-05 13:20:10 +01:00
James Cole
c5e283a13e This is a fix for #171 2016-02-05 13:13:47 +01:00
James Cole
df918e8529 Fixed all problems related to strict types. 2016-02-05 13:09:18 +01:00
James Cole
aa1193a9eb Fixed all problems related to strict types. 2016-02-05 12:28:05 +01:00
James Cole
8f7f263a48 Declare strict type. 2016-02-05 12:08:25 +01:00
James Cole
0bad227548 No more PHP 5.6 tests. 2016-02-05 09:30:06 +01:00
James Cole
78bcd3e1bb Changed a lot of parameters. 2016-02-05 09:25:15 +01:00
James Cole
554640c345 These are the first commits that make FF require php 7. 2016-02-05 08:03:26 +01:00
James Cole
5a23b95352 Final fix for #170. Now to make a new release! 2016-02-05 07:21:51 +01:00
James Cole
6f9675b6d6 Catch the latest exceptions for #170. 2016-02-05 07:16:55 +01:00
James Cole
bb8ce30552 Added missing ranges to Navigation, see issue #170 2016-02-05 06:56:10 +01:00
James Cole
ee8c83bbd8 Some small fixes. 2016-02-04 17:57:36 +01:00
James Cole
dbd32abdd1 Also delete old files. 2016-02-04 17:50:35 +01:00
James Cole
f300287814 Better cleanup routine. 2016-02-04 17:22:09 +01:00
James Cole
dd361bb9ad Delete files used. 2016-02-04 17:22:01 +01:00