IntenseFinance/firefly-iii
3
0 Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-10-13 17:02:06 -05:00
Code Issues Packages Projects Releases Wiki Activity
7,666 Commits 12 Branches 1,280 Tags
4694e31e35410ab4beea914e6894ead117b34bc1
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
James Cole 4694e31e35 Expand bunq related code. 2017-08-19 09:22:44 +02:00
James Cole ca0f09c8f7 Various cleanup. 2017-08-18 23:02:29 +02:00
James Cole 684c9773c9 Can now register with Bunq and get device server ID. 2017-08-18 21:09:22 +02:00
James Cole df443aa34c Add copyright things. 2017-08-18 21:08:51 +02:00
James Cole 93068659e5 Bunq code. 2017-08-18 17:08:30 +02:00
James Cole 4b46a3d298 Update composer.lock file. 2017-08-18 15:38:33 +02:00
James Cole 3e64028e29 Reinstate export javascript 2017-08-18 15:38:23 +02:00
James Cole 9b17715175 Fix the unit tests. 2017-08-18 15:32:11 +02:00
James Cole 7d8876f03c new export routine 2017-08-18 15:14:44 +02:00
James Cole b955486f14 Updated export routine. 2017-08-18 14:45:42 +02:00
James Cole 6666d1a2f4 Add debug information to getAmount routine. 2017-08-15 21:12:49 +02:00
James Cole 431bcf20ea Add list button [skip ci] #763 2017-08-15 17:37:48 +02:00
James Cole 7b3ef0e3ab Fix #764 2017-08-15 17:34:34 +02:00
James Cole 34894fb76b Add some comments [skip ci] 2017-08-15 17:26:43 +02:00
James Cole 1633994fbd Slight change in amount handler. #760 2017-08-13 15:30:39 +02:00
James Cole f9c85d4d81 Catch the error in #760 2017-08-13 12:37:09 +02:00
James Cole ec636c95a1 Improve update and verify routines. 2017-08-13 12:30:28 +02:00
James Cole f9b5468481 Last minute fixes for import routine. 2017-08-13 08:49:45 +02:00
James Cole 287f37eba5 Remove unused parameters. 2017-08-13 08:24:58 +02:00
James Cole 26740668da Import transfer error 2017-08-12 21:23:19 +02:00
James Cole bdd72f0d30 Fix path for tag controller. 2017-08-12 21:22:59 +02:00
James Cole 7e79f25949 Merge languages. 2017-08-12 19:47:46 +02:00
James Cole ad4a811d0a Small bug fixes [skip ci] 2017-08-12 19:11:24 +02:00
James Cole ab1aa97af4 Read me says 7.1 too. [skip ci] 2017-08-12 19:11:11 +02:00
James Cole 018941c5b3 Actually use journal [skip ci] 2017-08-12 19:05:29 +02:00
James Cole cc1439fb7b Revamped import routine. 2017-08-12 19:03:42 +02:00
James Cole f684a2900b Include default currency. 2017-08-12 16:42:29 +02:00
James Cole 83b721a322 Small bug fix in map / roles. 2017-08-12 16:41:05 +02:00
James Cole a879528ed8 Back to basics. 2017-08-12 16:40:51 +02:00
James Cole accbff3ccb Small cleanup in CSV processor 2017-08-12 16:12:30 +02:00
James Cole 0375f77b73 Prevent asset account from being found by opposing account. #719 2017-08-12 13:49:40 +02:00
James Cole 9803932324 Various code clean up. 2017-08-12 10:27:45 +02:00
James Cole a3a416b5e2 New composer file 2017-08-12 09:15:09 +02:00
James Cole 1453a318fe Merge branch 'develop' of https://github.com/firefly-iii/firefly-iii into develop 
* 'develop' of https://github.com/firefly-iii/firefly-iii: (23 commits)
  New translations firefly.php (Dutch)
  New translations firefly.php (Chinese Traditional)
  New translations firefly.php (Dutch)
  New translations firefly.php (Polish)
  New translations firefly.php (Portuguese, Brazilian)
  New translations firefly.php (Slovenian)
  New translations firefly.php (Spanish)
  New translations firefly.php (German)
  New translations firefly.php (French)
  New translations firefly.php (Russian)
  New translations firefly.php (Dutch)
  New translations validation.php (Dutch)
  New translations form.php (Dutch)
  New translations csv.php (Dutch)
  New translations firefly.php (Slovenian)
  New translations firefly.php (Spanish)
  New translations firefly.php (Portuguese, Brazilian)
  New translations firefly.php (Polish)
  New translations firefly.php (Chinese Traditional)
  New translations firefly.php (Dutch)
  ...
 2017-08-12 09:14:54 +02:00
James Cole 29b779c873 Remove intro popup. 2017-08-12 09:06:13 +02:00
James Cole 598307f676 Update change log 2017-08-12 09:06:02 +02:00
James Cole 218a2d2004 Expand password modal. 2017-08-12 08:01:40 +02:00
James Cole e59090d3b6 Text and modal for password security. 2017-08-12 07:56:02 +02:00
James Cole 337895cbaa Add newlines to files. 2017-08-12 07:48:39 +02:00
James Cole 743547096e Various code cleanup 2017-08-12 07:47:42 +02:00
James Cole 81fb3df45e Fix #747 2017-08-12 07:39:58 +02:00
James Cole 12624cab5b Improve foreign currency routine for #746 2017-08-12 07:38:22 +02:00
James Cole 7d0d1c764f Make sure we’re still at 4.6.4 and bunq import is unavailable. [skip ci] 2017-08-12 07:01:21 +02:00
James Cole b5acf1d529 Merge early release branch 
Code for #749
  Add link to split withdrawal
  Clarifies #751
  Text for #748
  Improve error reporting #752
  Small code cleanup.
  Add copyright markers.
 2017-08-12 06:59:59 +02:00
James Cole 72b08384ad Code for #749 2017-08-12 06:55:46 +02:00
James Cole f51e48f282 Add link to split withdrawal 2017-08-12 06:55:35 +02:00
James Cole 2e6d1f3642 Clarifies #751 2017-08-12 06:44:00 +02:00
James Cole 716af4ed93 Text for #748 2017-08-12 06:41:14 +02:00
James Cole 31de86c9eb Improve error reporting #752 2017-08-12 06:40:17 +02:00
James Cole 04a2cd1f1f Small code cleanup. 2017-08-11 05:42:15 +02:00
James Cole bc0ef11a8c Add copyright markers. 2017-08-11 05:36:05 +02:00
James Cole 90c8420a4c Initial code for preparing bunq import #714 2017-08-11 05:21:00 +02:00
James Cole 657d5e0d74 Upgrade version in develop 2017-08-11 05:02:49 +02:00
James Cole 03fa4d957c Added upgrade instruction [skip ci] 2017-08-10 20:52:10 +02:00
James Cole 8d4530f1f2 Fixes #743 2017-08-10 20:48:29 +02:00
James Cole 6d15c503c3 Fix #515 2017-08-10 20:41:33 +02:00
James Cole 75ddb34398 Remove references to date range thing. 2017-08-10 19:57:18 +02:00
James Cole 6fbfe6fb72 Remove references to date range thing. 2017-08-10 19:55:52 +02:00
James Cole db500e911c update date range picker 2017-08-10 19:55:23 +02:00
James Cole c0c5ced6ad Fix multi currency edit display 2017-08-10 19:55:13 +02:00
James Cole 1d67939e76 No password service in env file. [skip ci] 2017-08-08 16:30:43 +02:00
James Cole 5d1e90d29c Expand verify password routine. 2017-08-08 16:30:21 +02:00
James Cole e7b5cf66d2 Fix #739 2017-08-08 16:06:58 +02:00
James Cole b29fabf76c Include virtual balance in transaction overview #735 2017-08-07 20:36:23 +02:00
James Cole 5d837c3ee4 Bump version. [skip ci] 2017-08-07 20:27:58 +02:00
James Cole 4c0396ad1c Fixes #733 2017-08-07 17:59:26 +02:00
James Cole 1bca1b921b Fix import tests. 2017-08-04 16:24:44 +02:00
James Cole 3e513e92b1 Import routine is prepped for multi-source import (such as banks). 2017-08-04 15:56:14 +02:00
James Cole 194fe178c0 Refactor for #732 2017-08-04 15:48:26 +02:00
James Cole 5d10a19bfa First version of routine #732 2017-08-04 15:46:52 +02:00
James Cole 1878b5287b Cheap solution for #730 [skip ci] 2017-08-03 20:50:16 +02:00
James Cole 05aace84e1 Fix tests for show() routines. 2017-07-30 13:57:46 +02:00
James Cole 1cfa1faccc Remove all time jumps because they’re unclear and complex. 2017-07-30 13:53:04 +02:00
James Cole 1caa393974 Simple cache routine. 2017-07-30 13:44:36 +02:00
James Cole ef357ab6e5 Fix tests 2017-07-30 13:42:38 +02:00
James Cole c39c5492ea Simplify controllers 2017-07-30 13:42:30 +02:00
James Cole 8fcdb91ba3 Will no longer support extended tag modes. 2017-07-30 10:22:14 +02:00
James Cole f67d5f1197 Fix bug in filter. 2017-07-30 10:21:45 +02:00
James Cole 6e0e6203cc Some help text for attachment decrypter 2017-07-30 10:21:35 +02:00
James Cole 2694ce4148 Decryption routine for #671 2017-07-30 08:22:39 +02:00
James Cole eac9613df7 Fix for #648 2017-07-29 14:25:54 +02:00
James Cole db3b822aef Include warning for #722 2017-07-29 08:27:39 +02:00
James Cole f4994ef151 Also store links when importing data. 2017-07-28 14:52:01 +02:00
James Cole 8e27291417 Tags no longer mappable. 2017-07-28 14:40:53 +02:00
James Cole aae9ad78e5 This should fix the tests for now. 2017-07-26 18:40:48 +02:00
James Cole fb3efbfc66 Fix parameter count. 2017-07-26 16:40:25 +02:00
James Cole 0f8a66609a Fix controller for #718 2017-07-26 16:40:14 +02:00
James Cole b3bb8c386f Fix routes for #718 2017-07-26 16:40:00 +02:00
James Cole b3b5e0e155 This will disable the PHP 7.0 tests. 2017-07-25 21:01:37 +02:00
James Cole 99a0bf1286 This fixes #717 2017-07-25 21:01:25 +02:00
James Cole 650f0ee752 Merge branch 'hotfix/4.6.3.1' into develop 2017-07-23 20:02:46 +02:00
James Cole d45c74915c This fixes #715 2017-07-23 20:02:32 +02:00
James Cole cd373791ac Updated composer file. 2017-07-23 20:00:26 +02:00
James Cole 7b03b0c5fc Some PHP 7.1 compatible code. 2017-07-23 19:06:24 +02:00
James Cole 57d6677131 Merge branch 'release/4.6.3' 2017-07-23 10:01:48 +02:00
James Cole 05e73344eb Various files for upgrade. 2017-07-23 09:54:07 +02:00
James Cole 8b033ed4a8 Update contributing and support guidelines [skip ci] 2017-07-23 09:37:51 +02:00
James Cole 8e53a63243 Broken translation. [skip ci] 2017-07-23 09:36:50 +02:00
James Cole f85ab74e2b Code cleanup and tests. 2017-07-23 08:32:51 +02:00
James Cole 8bb7d5de3f Various code clean up. 2017-07-23 08:16:11 +02:00