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
11,485 Commits 4 Branches 526 Tags 1.1 GiB
9a461fc7b7
Commit Graph

208 Commits

Author SHA1 Message Date
James Cole
22144b78ea
Strict comparisons. 2017-07-15 16:41:07 +02:00
James Cole
c4039b53e6
Various code cleanup. 2017-06-05 11:12:50 +02:00
James Cole
82e74a2afd
Big update to properly support multi currencies. 2017-06-04 13:39:16 +02:00
James Cole
595596d73f
Apparently this is changed in PHPStorm’s formatting templates so there you go [skip ci]. 2017-04-09 07:44:22 +02:00
James Cole
9d22bbee1c
Add code coverage ignore instructions. 2017-03-04 11:19:44 +01:00
James Cole
d9aa074330
Large commit to get rid of a lot of static methods. 2017-03-04 07:18:35 +01:00
James Cole
5bbaaece38 Encryption is optional (but on by default) and a command to switch from one to the other 2017-01-14 17:13:57 +01:00
James Cole
5b5acba816 Clean up lots of models. 2016-12-24 17:36:51 +01:00
James Cole
1b4d55cca4
Fix various code style issues. 2016-12-15 21:35:33 +01:00
James Cole
848cfabcba Rearrange code [skip ci] 2016-12-14 18:59:12 +01:00
James Cole
b33aa733c7
Fix some minor scrutinizer issues. 2016-11-28 20:38:03 +01:00
James Cole
eb78cf20c2 This fixes #414 2016-11-22 19:10:17 +01:00
James Cole
73f0cc705b
Code cleanup. 2016-11-18 20:06:08 +01:00
James Cole
0c072c7d51
Some code cleanup. 2016-11-18 19:58:06 +01:00
James Cole
1657048181 Fixed bug #370 2016-11-01 18:40:35 +01:00
James Cole
9a3cd27700 Many updates to get split transactions and normal transactions working side by side. 2016-10-21 19:06:22 +02:00
James Cole
71804af624 Updated some model code. 2016-10-10 06:50:24 +02:00
James Cole
b355c18e0c Some code cleanup and copyright cleanup. [skip ci] 2016-10-05 06:52:15 +02:00
James Cole
ad2b254be0 Fix for issue #328. Turns out the import routine converts accounts back and forth instead of creating new entries. 2016-09-24 18:59:31 +02:00
James Cole
d25d0454fc Code clean up 2016-09-16 12:15:58 +02:00
James Cole
f38984398d Code clean up [skip ci] 2016-09-16 12:07:45 +02:00
James Cole
fccdf56c5d Fixed some query things. 2016-09-16 09:09:54 +02:00
James Cole
629baf9de5
Added invoice date 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-09-10 18:36:52 +02:00
James Cole
176752e219
Code for optional fields #301 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-09-09 11:19:40 +02:00
James Cole
5c7df5c04d
Copyright notices. [skip ci] 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-05-20 12:41:23 +02:00
James Cole
7dd858be39 Fix bugs. 2016-05-20 11:27:41 +02:00
James Cole
66d7fd7d4c Declare strict types. 2016-05-20 08:57:45 +02:00
James Cole
dda3082c7e Some code cleanup. 2016-05-20 08:00:35 +02:00
James Cole
962965b5b7 Code cleanup. 2016-05-15 18:36:40 +02:00
James Cole
aa59227786 Fixed transactions and attachments. 2016-05-13 09:55:06 +02:00
James Cole
7c39a04c4b Cleanup. 2016-05-11 17:33:22 +02:00
James Cole
934656c954 Some small changes. 2016-05-11 07:57:16 +02:00
James Cole
d233a2df3c Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop 
* 'develop' of https://github.com/JC5/firefly-iii:
  Should fix frontpage.

# Conflicts:
#	app/Models/TransactionJournal.php
#	app/Repositories/Account/AccountRepository.php
 2016-05-11 06:08:05 +02:00
James Cole
7c7740d3ba Should fix frontpage. 2016-05-10 09:33:23 +02:00
James Cole
6d944ec98f More cleanup for budgets. 2016-05-06 06:15:46 +02:00
James Cole
eb3d2b1749 Building split transactions and fixing tests. 2016-05-05 18:59:46 +02:00
James Cole
1fd7852309 Fix query thing. 2016-04-30 20:24:47 +02:00
James Cole
9baadd3793 Use other method of collecting query fields. #142 2016-04-29 21:52:15 +02:00
James Cole
42c3d1fa68 Expanding support for split transactions #142 2016-04-29 21:36:59 +02:00
James Cole
5ed53d5f04 Some new code for CSV. 2016-04-08 20:36:11 +02:00
James Cole
c8440af9a5 PHP7 compatible function definitions. 2016-04-06 09:27:45 +02:00
James Cole
3fbedf323f Fix list for no budget #159 2016-04-01 16:23:12 +02: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
631bafc6ab Small bug fixes. 2016-03-14 20:47:13 +01:00
James Cole
8f1bf846fe Journal allows date edits and sets fields as dates #122 2016-03-12 07:37:13 +01:00
James Cole
f9de65c035 Expand phpdoc. 2016-03-12 07:36:23 +01:00
James Cole
6f95e9a3cb Fix some decrypt bugs. 2016-03-12 07:17:00 +01:00
James Cole
d054e085d6 This will make triggers check existing fields first. 2016-03-12 07:02:39 +01:00
James Cole
5b949d6e00 Move some stuff around. 2016-03-02 19:41:22 +01:00
James Cole
500243b0b3 This fixes most of the tests. 2016-03-02 13:37:28 +01:00
James Cole
ca32ae4561 Fix is / is not already joined. 2016-03-02 12:52:36 +01:00
James Cole
6b277c5e67 Fix bill overview. 2016-03-02 12:47:15 +01:00
James Cole
1ac64fd0b3 Last updates, fixes the main list. 2016-03-02 12:33:07 +01:00
James Cole
f2c1dd41d0 Expanded Amount and expanded TransactionJournal to include source and destination information. 2016-03-02 12:25:00 +01:00
James Cole
b317d1a171 First attempt at scopeExpanded(), included some new fields in QUERYFIELDS. 2016-03-02 12:09:34 +01:00
James Cole
b00c7b0ce3 New constant that defines which fields a journal query is expected to load. 2016-03-02 12:03:53 +01:00
James Cole
a61eafeac2 Will now look for new field "transaction_type_type" 2016-03-02 12:03:04 +01:00
James Cole
9f16799453 Re-added phpdoc. 2016-03-02 11:59:39 +01:00
James Cole
74fe0ee4e4 Add some todo things, removed "withrelevantdata". This breaks FF 2016-03-02 11:58:31 +01:00
James Cole
e8880232b3 Removed "transaction_type" 2016-03-02 11:57:02 +01:00
James Cole
556e9f1df7 Removed "source_account" attribute. 2016-03-02 11:56:47 +01:00
James Cole
beb301e781 Removed "destination_account" 2016-03-02 11:54:03 +01:00
James Cole
056c809754 Removed amount_positive. This breaks the other half. 2016-03-02 11:53:23 +01:00
James Cole
fa47eac9ff Removed "amount" attribute. This breaks half of Firefly III. 2016-03-02 11:52:52 +01:00
James Cole
bf4a7846dd Removed boolean for left join that was never called more than twice anyway. 2016-03-02 11:52:17 +01:00
James Cole
b0cc6dd714 - Removed php doc. 
- Added book_date and rent_date as fillable fields.
 2016-03-02 11:50:37 +01:00
James Cole
49292bbb2d New model for future implementation of #164 2016-02-10 16:26:42 +01:00
James Cole
4ef840e210 More test data tweaks. 2016-02-05 15:20:44 +01:00
James Cole
7343304284 Code cleanup. 2016-02-04 07:28:39 +01:00
James Cole
4916c06797 Added new dates to transaction journal, see #122 2016-01-30 09:52:05 +01:00
James Cole
d9bafe34eb Renamed some stuff, courtesy of sensiolabs. 2016-01-28 22:06:16 +01:00
James Cole
287c1c4ffa Some code cleanup. 2016-01-28 16:03:49 +01:00
James Cole
28fdad9426 A set of small fixes, courtesy of scrutinizer-ci 2016-01-27 19:35:00 +01:00
James Cole
9155c13e08 A set of small fixes, courtesy of scrutinizer-ci 2016-01-27 18:31:44 +01:00
James Cole
be5ff35b13 Reversed the removal of the validating trait since @roberthorlings discovered it's actually still being used. 2016-01-18 13:15:11 +01:00
James Cole
3857e8d49f Remove old code. 2016-01-15 22:44:25 +01:00
James Cole
0620830b10 Move from getDates to array dates. 2016-01-15 22:23:01 +01:00
James Cole
7ee25693aa Removed stuff no longer used. 2016-01-15 22:20:38 +01:00
James Cole
ffdd37ddd5 More code cleanup. 2016-01-15 20:57:26 +01:00
James Cole
3649b595df Will no longer recognise transactions of type "opening balance". 2016-01-15 19:48:09 +01:00
James Cole
a7a00ecf40 More rule possibilities 2016-01-13 14:02:22 +01:00
James Cole
88bbafd3e8 If you get the destination account attribute before the model is saved, the cache breaks. 2016-01-13 14:01:40 +01:00
James Cole
ae3258b449 If you get the source account attribute before the model is saved, the cache breaks. 2016-01-13 14:01:09 +01:00
James Cole
caa1ff120a Built more binders. 2016-01-09 15:53:11 +01:00
James Cole
e892c9a824 Followed up on some inspections. 2016-01-01 21:49:27 +01:00
James Cole
5862803434 This saves some queries. 2015-12-25 09:34:23 +01:00
Antonio Spinelli
b3d99cd210 apply demeter law for transaction type calls 
- adds contants for transaction type names
- demeter law = never speaks with strangers
 2015-12-10 16:53:48 -02:00
James Cole
7e10641461 Organized some category charts. Still needs some translating 2015-09-26 07:18:12 +02:00
James Cole
cdc0e3cfd8 Some cleaning up. 2015-09-25 20:40:24 +02:00
James Cole
eef28d96f4 Code cleanup [skip ci] 2015-07-26 19:13:06 +02:00
James Cole
3e05fd91d9 Lots of cleaning up. 2015-07-26 19:07:02 +02:00
James Cole
17a8c4918c Code cleanup. 2015-07-26 15:51:07 +02:00
James Cole
cdeb1ad87c Some model updates. 2015-07-19 09:37:37 +02:00
James Cole
72aeafb2b5 Some model code block updates 2015-07-18 21:33:10 +02:00
James Cole
359fab315f A fix in the model and a simple view for attachments. 2015-07-18 21:12:34 +02:00
James Cole
b0beab4cd3 Attachment model and database changes. 2015-07-18 09:49:19 +02:00
James Cole
0a2a01c44c Code reformat. 2015-07-15 21:06:26 +02:00
James Cole
137208c3fd Typical. 2015-07-09 21:59:02 +02:00
James Cole
d7a9a62a1d Should fix some scrutinyizer problems. 2015-07-09 21:48:05 +02:00
James Cole
075315bdaa Added some model thingies so scrutinizer will stop whining. 2015-07-09 21:29:30 +02:00