Commit Graph
100 Commits
Author SHA1 Message Date
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
James Cole 2c00a8353d Fix small issue reenabling intro [skip ci] 2017-07-23 07:35:30 +02:00
James Cole 19e7a76f85 Forgot small statement [skip ci] 2017-07-23 07:32:06 +02:00
James Cole f16a186faf Option to re-enable intro boxes. 2017-07-23 07:30:05 +02:00
James Cole 456dd39ec4 New intro texts. 2017-07-22 22:56:21 +02:00
James Cole 5b69a697e4 Improve pages to show intro texts. 2017-07-22 10:50:30 +02:00
James Cole f2d388f742 Improve code for intro texts. 2017-07-21 06:00:10 +02:00
James Cole d79008495a Remove some html comments. 2017-07-21 04:36:23 +02:00
James Cole 43f1867fb8 Language strings for #708 2017-07-21 04:36:09 +02:00
James Cole 043c28628c Fixes #708 2017-07-21 04:35:57 +02:00
James Cole 9540854c8a Language is not complete yet. [skip ci] 2017-07-21 04:26:13 +02:00
James Cole 77d077ec08 Fix help button. 2017-07-16 18:28:46 +02:00
James Cole 021d0e6359 More stuff for intro texts. 2017-07-16 18:14:29 +02:00
James Cole 7f4fd2c52f Fix tests. 2017-07-16 17:05:52 +02:00
James Cole 09f838089b Allow rule to be applied to transactions (not just group). 2017-07-16 13:04:45 +02:00
James Cole b676b1fef9 Simplify import storage routine. 2017-07-16 07:45:20 +02:00
James Cole 58bfb35fa6 Built a new routine for intro tours. 2017-07-16 07:35:08 +02:00
James Cole 09131e8c36 Add Russian language. 2017-07-15 22:42:14 +02:00
James Cole 1d6ca91c01 This fixes the tests. 2017-07-15 22:41:57 +02:00
James Cole fa00ba2edd Expand tests and fix various small issues in strict comparison. 2017-07-15 22:17:24 +02:00
James Cole 0068675f3b Remove alert [skip ci] 2017-07-15 21:48:02 +02:00
James Cole 8a38ce1964 Remove references to old tour but include code for new tour. 2017-07-15 21:40:42 +02:00
James Cole accbdea942 Improve search and display of results. 2017-07-15 17:19:12 +02:00
James Cole 22144b78ea Strict comparisons. 2017-07-15 16:41:07 +02:00
James Cole c03ab269f0 Memory optimised, connect journal to tag. 2017-07-15 10:43:22 +02:00
James Cole 0c6c4d5959 Fix small issue in chart. 2017-07-15 10:26:27 +02:00
James Cole e4e1873770 Improve import routine. 2017-07-15 10:26:16 +02:00
James Cole 3b3579025d Improve results when presented with invalid data. #701 2017-07-14 17:57:20 +02:00
James Cole 5cf8f2f4f4 Add sort flag for #698 2017-07-14 17:25:03 +02:00
James Cole c4ff05b1ba Sort fix #698 [skip ci] 2017-07-14 17:21:30 +02:00
James Cole 2bf54d0b8e Remove extra X [skip ci] 2017-07-14 17:10:56 +02:00
James Cole 2a63888546 Table is sortable, #697 2017-07-14 17:10:06 +02:00