IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-08-05 18:57:26 -05:00
Code Issues Packages Projects Releases Wiki Activity
4,064 Commits 9 Branches 1,120 Tags
7707c81b2dabda66ed2ffb2c433291aeafac6edd
Commit Graph
887 Commits
Author SHA1 Message Date
James Cole ce191fa6d3 Fix split deposit. 2016-07-26 20:26:46 +02:00
James Cole 1392275b81 Lots of new code for importer and some preferences. 2016-07-24 18:47:55 +02:00
James Cole 87c0f1d86e More CSV related updates. 2016-07-23 21:37:06 +02:00
James Cole 921e2c06f4 Beta warning for import thing. 2016-07-20 15:47:30 +02:00
James Cole cb9433f4b9 This should fix #280 2016-07-17 08:50:22 +02:00
James Cole c9e46a4dd1 Lots of import related code. 2016-07-15 22:26:08 +02:00
James Cole f5b3dc36e3 Fix view. 2016-07-05 09:02:01 +02:00
James Cole f1e8d1cf1e Show bill average. 2016-07-05 08:57:45 +02:00
James Cole ae768a8525 Works up until actual import. 2016-07-02 23:08:47 +02:00
James Cole 162c762973 First set of data mappers. 2016-07-02 20:40:23 +02:00
James Cole a56a5fc228 New code for import routine. 2016-07-02 17:33:57 +02:00
James Cole 18d2741814 More code for the new CSV import 2016-06-27 15:15:46 +02:00
James Cole 3d201db6fc More code for import. 2016-06-24 14:24:34 +02:00
James Cole 9ffc0936ee Merge branch 'feature/new-csv-import' into develop 
# Conflicts:
#	app/Helpers/Csv/Importer.php
 2016-06-23 12:15:19 +02:00
James Cole ae649223d8 Mobile add money to piggy routine 2016-06-16 20:52:59 +02:00
James Cole 6267930938 Work on new chart for year report. 2016-06-16 20:52:30 +02:00
James Cole ec18165698 Fixed #267 2016-06-11 07:38:30 +02:00
James Cole 307e6a2337 Renamed fields #267 2016-06-11 06:36:46 +02:00
James Cole 7a5ef6013a Fix #271 2016-06-11 06:31:56 +02:00
James Cole 13b92c47d9 Translations and fixes. 2016-06-11 06:31:40 +02:00
James Cole 5a79bc0a99 Initial code base for new CSV import. 2016-06-10 21:00:00 +02:00
James Cole 8091dbfdfa Restore views (#262) 2016-06-06 09:28:35 +02:00
James Cole a447c886c4 Basic for for #262 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-05-22 21:11:30 +02:00
James Cole 288e713f94 Remove all code related to the CSV importer in preparation of #262 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-05-22 20:18:16 +02:00
James Cole 7e6d3c9d6b Various last minute bug fixes. 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-05-22 16:38:32 +02:00
James Cole 44960e8e42 Various last minute bug fixes. 2016-05-22 15:48:34 +02:00
James Cole e10d5e89e5 Last minute bug fixes. 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-05-20 15:02:52 +02:00
James Cole 7dd858be39 Fix bugs. 2016-05-20 11:27:41 +02:00
James Cole ed948cc965 Allow user to split unsplit journal 2016-05-20 07:51:26 +02:00
James Cole c66fe2b541 Fix some views [skip ci] 2016-05-20 06:27:48 +02:00
James Cole 536a5cd1c8 New translations. [skip ci] 2016-05-18 18:13:38 +02:00
James Cole b0a5b53abb Better number formatting. 2016-05-17 19:23:23 +02:00
James Cole 109d96ad16 Small but expensive changes to audit report. 2016-05-17 16:10:32 +02:00
James Cole 4cbb0d9716 Fixed split journals views. 2016-05-17 16:00:27 +02:00
James Cole 495b80f5ef More code for the split journal support. 2016-05-17 15:19:07 +02:00
James Cole 260b611293 Various fixes in report pages. 2016-05-15 18:16:31 +02:00
James Cole 6a750a998f Remove category chart from report controller. 2016-05-15 16:13:05 +02:00
James Cole a0aa114ee6 Update balance view. [skip ci] 2016-05-15 12:32:18 +02:00
James Cole 823839fbf6 Better routes and titles. 2016-05-15 12:26:40 +02:00
James Cole 1c93d8bf79 More test data and better views. 2016-05-15 12:08:41 +02:00
James Cole 626404407e More support for #142 2016-05-15 09:00:49 +02:00
James Cole 446ab62d38 View updates. [skip ci] 2016-05-14 23:14:49 +02:00
James Cole 863227c55c Some refactoring. 2016-05-14 13:51:33 +02:00
James Cole 5a6967cefd Better formatting for split transactions. 2016-05-13 19:40:13 +02:00
James Cole 20e1e50032 Refactoring. 2016-05-13 15:53:39 +02:00
James Cole 36bc483edb Reorder some fields. 2016-05-13 10:50:19 +02:00
James Cole aa59227786 Fixed transactions and attachments. 2016-05-13 09:55:06 +02:00
James Cole 2d8449ed68 This should just about finished split transaction editing. 2016-05-13 07:33:04 +02:00
James Cole d7ab482ae1 Various updates for split transactions. 2016-05-12 22:44:31 +02:00
James Cole 988049061d Start with edit split journals routine. 2016-05-12 12:13:10 +02:00