IntenseFinance/firefly-iii
3
0 Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-10-12 16:32:04 -05:00
Code Issues Packages Projects Releases Wiki Activity
7,150 Commits 12 Branches 1,278 Tags
5ef20678368a0a44e78f03f85c3643f54f2013fe
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
James Cole 5ef2067836 Some code cleanup. 2017-07-08 06:28:44 +02:00
James Cole de9728895e Fixed #658 2017-07-08 06:09:17 +02:00
James Cole 19774f32c2 First code for #658 2017-07-07 17:51:14 +02:00
James Cole e62b979708 Fix redirect error [skip ci] 2017-07-07 16:53:44 +02:00
James Cole 69eef30ad3 Various code clean up. 2017-07-07 13:50:15 +02:00
James Cole 71a41bc00d Add newlines [skip ci] 2017-07-07 08:09:42 +02:00
James Cole dd508dbc49 This should fix #693. 2017-07-07 08:04:21 +02:00
James Cole 71eed45b77 Merge branch 'develop' of https://github.com/firefly-iii/firefly-iii into develop 
* 'develop' of https://github.com/firefly-iii/firefly-iii:
  New translations firefly.php (Dutch)
  New translations firefly.php (Chinese Traditional)
  New translations firefly.php (Dutch)
  New translations firefly.php (French)
  New translations firefly.php (German)
  New translations firefly.php (Polish)
  New translations firefly.php (Portuguese, Brazilian)
  New translations firefly.php (Slovenian)
  New translations firefly.php (Spanish)
 2017-07-02 09:35:46 +02:00
James Cole ae30b02405 New version and changelog. 2017-07-02 09:32:19 +02:00
James Cole 89b7a9d3ac Updated composer file [skip ci] 2017-07-02 09:30:46 +02:00
James Cole 2795042c2c Included some dev data by accident [skip ci] 2017-07-02 09:30:28 +02:00
James Cole c164553ba1 Small cosmetic change. 2017-07-02 09:27:08 +02:00
James Cole e6c72b2995 Fixed mobile display 2017-07-02 09:24:46 +02:00
James Cole cbcefabbff Forgot a translation. 2017-07-02 09:24:30 +02:00
James Cole 97cfa3f3ae Remove old providers. 2017-07-02 09:24:20 +02:00
James Cole 803a008821 Improve bread crumbs 2017-07-02 09:24:11 +02:00
James Cole 658730928b Remove old JS 2017-07-02 09:24:00 +02:00
James Cole 310db374c8 Fix #678 2017-07-02 09:22:56 +02:00
James Cole dc5bd648cf Fix for #685 2017-07-02 08:43:34 +02:00
James Cole b6be9e6ade Fix for #682 2017-07-01 10:39:59 +02:00
James Cole 04f71496e3 Code for #678 2017-07-01 10:36:08 +02:00
James Cole 1eed142423 Small display bug related to #648 2017-07-01 10:29:07 +02:00
James Cole f1e0ad0df0 CoC. [skip ci] 2017-06-30 07:22:12 +02:00
James Cole f8fa5f1ba5 Improved mobile response, issue #678 2017-06-30 07:17:25 +02:00
James Cole c187563267 Update report layout [skip ci] 2017-06-28 20:41:02 +02:00
James Cole fcdbbd5dbc Update report layout [skip ci] 2017-06-28 20:39:12 +02:00
James Cole 6604d04c60 Slightly different report layout [skip ci] 2017-06-28 20:23:24 +02:00
James Cole 2414f998ba Update git ignore file. 2017-06-28 18:09:32 +02:00
James Cole a4ef81ebd8 Improve test coverage. 2017-06-28 18:05:38 +02:00
James Cole 67fc810fc2 Ignore test database. 2017-06-28 18:05:04 +02:00
James Cole e13a61645d New change log 2017-06-28 18:04:42 +02:00
James Cole aae4a78fd4 Possible fix for #649 [skip ci] 2017-06-28 15:52:13 +02:00
James Cole 3947da5e27 Possible fix for #682 2017-06-28 15:45:28 +02:00
James Cole 4e4ce2f77c Remove test database from Firefly III thing. [skip ci] 2017-06-28 15:31:11 +02:00
James Cole d9a2e081bd Update travis script. 2017-06-28 15:27:31 +02:00
James Cole 699b138999 Small link fixes [skip ci] 2017-06-28 15:18:11 +02:00
James Cole 8f191b497f Updated read me and contributing guidelines. 2017-06-28 15:17:19 +02:00
James Cole 4a435e5701 Updated composer file. 2017-06-28 15:01:06 +02:00
James Cole 506509b1b2 Fix #677 2017-06-26 18:29:45 +02:00
James Cole 02a36316be Forgot to remove a variable. 2017-06-26 18:24:44 +02:00
James Cole 8549c7c81b This should fix #677 2017-06-26 18:24:29 +02:00
James Cole 5a0be7d2ad Push new version number. 2017-06-24 13:05:12 +02:00
James Cole c6f44c6398 Composer update. 2017-06-24 13:04:50 +02:00
James Cole 04a8a0e6a1 Code clean up 2017-06-24 13:04:41 +02:00
James Cole 8a175d147b Remove JS console log. 2017-06-24 13:03:09 +02:00
James Cole 5fbc319b20 This fixes the tests (must still upload test database). 2017-06-24 12:38:24 +02:00
James Cole 8e3ba7caf2 Fix various import bugs. 2017-06-24 08:37:09 +02:00
James Cole da3a56c144 Further improve import storage. 2017-06-24 07:30:05 +02:00
James Cole 58aa54d8cf Improving import storage. 2017-06-24 07:21:10 +02:00
James Cole e525e673a8 Import routine cleanup. 2017-06-24 06:57:24 +02:00
James Cole 445dbf8779 More and improved code for the import routine. 2017-06-24 05:49:33 +02:00
James Cole edb355941c More code for import routine. 2017-06-22 21:50:10 +02:00
James Cole cddaccb7f7 Further improve import routine 2017-06-21 20:04:35 +02:00
James Cole a905cce2c9 Expand import routine. 2017-06-20 21:04:25 +02:00
James Cole b9f110ac2b Refactor and rename some import things. 2017-06-17 22:49:44 +02:00
James Cole 7cc24417b3 Expanded import routine. 2017-06-14 20:13:19 +02:00
James Cole b304284d70 Fix report bug. 2017-06-14 19:15:30 +02:00
James Cole c382fb1577 Add debug info for #671 2017-06-12 19:58:32 +02:00
James Cole 77244f4e2c Lots of new code for new importer routine. 2017-06-12 19:12:07 +02:00
James Cole 8beab5f5bc Fix #672 2017-06-12 17:21:31 +02:00
James Cole 902ae3f0cf Fix for #671 2017-06-12 17:07:29 +02:00
James Cole c79a577060 Remove unused files in import. 2017-06-10 15:10:46 +02:00
James Cole 091596e80e Lots of new code for new importer routine. 2017-06-10 15:09:41 +02:00
James Cole 0b4efe4ae1 Small typo in chart. [skip ci] 2017-06-09 12:53:31 +02:00
James Cole 1f9b7faa60 Code for #660 2017-06-09 11:52:20 +02:00
James Cole 762d7bcc34 Fix database for postgresql 2017-06-09 11:51:59 +02:00
James Cole a2145f6b49 Possible fix for #667 2017-06-08 10:54:15 +02:00
James Cole b48de98865 Fix a bug where the balance routine forgot to account for accounts without a currency preference. 2017-06-08 10:35:02 +02:00
James Cole 5c18794122 Update lock file, and update database. 2017-06-07 12:22:59 +02:00
James Cole d8a8574dda Prep for new release. 2017-06-07 12:08:32 +02:00
James Cole 935fb015d3 Live update budget amounts. 2017-06-07 11:58:04 +02:00
James Cole 8bbd3063ec Move code around for simplicity and fix tests. 2017-06-07 11:13:04 +02:00
James Cole 92c5cabd70 Try to untangle complex repositories 2017-06-07 08:18:42 +02:00
James Cole e5db5a7b5c Various code clean up. 2017-06-07 07:38:58 +02:00
James Cole 51ddcd9ee1 Plus not minus [skip ci] 2017-06-06 20:37:24 +02:00
James Cole 9d5d1c0a41 Updated budget view. 2017-06-06 20:35:39 +02:00
James Cole a8ec4fe2fd New interface for budget overview. 2017-06-06 19:30:31 +02:00
James Cole 65ccb2d443 Fix error display #662 2017-06-06 19:29:10 +02:00
James Cole 0e929602a8 Verify currency data routine. 2017-06-06 07:23:54 +02:00
James Cole 5329e026dc Fixed various currency displays. 2017-06-06 07:18:09 +02:00
James Cole a7412e43b3 Beter message for #662 2017-06-06 06:56:32 +02:00
James Cole 17b6cc43d5 Fix display of foreign currencies in charts. 2017-06-05 22:11:54 +02:00
James Cole b69a2ef0cd Can handle multi-currency balances better. 2017-06-05 15:09:17 +02:00
James Cole 6d1296094e Fixes a lot of issues in scrutinizer. 2017-06-05 11:20:38 +02:00
James Cole c4039b53e6 Various code cleanup. 2017-06-05 11:12:50 +02:00
James Cole 64831b4c86 Code cleanup and refactoring. 2017-06-05 08:31:22 +02:00
James Cole 1dec270907 These changes fix the tests. 2017-06-05 07:37:53 +02:00
James Cole f72f8b03df Catch empty currency preference 2017-06-05 07:03:32 +02:00
James Cole 0b47e5d05d Removed unnecessary variable. 2017-06-05 07:03:20 +02:00
James Cole a487c7b4b2 Make sure amounts are formatted, and fixed some issues. 2017-06-04 23:39:26 +02:00
James Cole 82e74a2afd Big update to properly support multi currencies. 2017-06-04 13:39:16 +02:00
James Cole 771ebde295 Update journal collector so currency information is taken from the transaction. 2017-06-04 08:49:37 +02:00
James Cole 4ce4c3138c Update export routine so currency information is taken from the transaction. 2017-06-04 08:49:22 +02:00
James Cole d37b46effc Database upgrade routine. 2017-06-04 08:48:54 +02:00
James Cole 0868aac750 Small update for 4.5.0 SQL update. 2017-06-04 08:48:40 +02:00
James Cole 4ff5f33966 Prep for solid multi-currency configuration. 2017-06-02 13:01:43 +02:00
James Cole e1aebbe12b Remove non-existing charts. 2017-06-02 13:01:24 +02:00
James Cole 8273f467b6 Refactor some JS functions. 2017-06-02 13:00:43 +02:00
James Cole 74664afa68 Was not able to remove opening balance. 2017-06-02 13:00:24 +02:00
James Cole c05f344371 Code clean up [skip ci] 2017-06-02 13:00:09 +02:00