Commit Graph

11554 Commits

Author SHA1 Message Date
James Cole 2ef5d3d4c6 Update composer file. 2019-03-08 06:11:22 +01:00
James Cole eb3a89555d Small fix in changelog. 2019-03-08 06:11:13 +01:00
James Cole 0a80b7fca7 New translations. 2019-03-08 06:11:05 +01:00
James Cole f682981c1e Fix test for PHPUnit8 2019-03-05 20:11:37 +01:00
James Cole 4aac969ae4 Update version and changelog. 2019-03-05 17:52:44 +01:00
James Cole 00651adf5e Fix issue with bill display 2019-03-05 17:52:34 +01:00
James Cole ed94e71168 Update language strings. 2019-03-05 17:52:26 +01:00
James Cole 6e12f434ad Fix issue #2144 2019-03-05 16:55:03 +01:00
James Cole b8c4ec1449 Add old string under new key. 2019-03-03 08:17:19 +01:00
James Cole 4ca60ca92a Code for upgrade of various libraries. 2019-03-02 21:18:26 +01:00
James Cole 48219c9af3 Update libraries. 2019-03-02 20:14:45 +01:00
James Cole 9887b9809d Merge branch 'master' into develop
* master:
  Bump version for travis build.
2019-03-02 17:36:44 +01:00
James Cole a13ad5b417 Bump version for travis build. 2019-03-02 17:36:08 +01:00
James Cole 3f28fd689f Merge tag '4.7.15' into develop
4.7.15
2019-03-02 17:17:22 +01:00
James Cole 959025545e Merge branch 'release/4.7.15' 4.7.15 2019-03-02 17:17:21 +01:00
James Cole 1978463e59 Update language strings for new release. 2019-03-02 15:55:26 +01:00
James Cole e85ac07c49 Update meta files for new release. 2019-03-02 15:55:01 +01:00
James Cole b7f0a6fff4 Update migrations so you can always roll back. 2019-03-02 15:54:24 +01:00
James Cole 3a57e09447 Fix for #2128 2019-03-02 14:33:46 +01:00
James Cole 87d5cabe52 Search improvements. 2019-03-02 14:12:09 +01:00
James Cole af07522f16 Fix for #2135 2019-03-02 10:42:43 +01:00
James Cole 1b8d4e4c63 Make sure bills show attachment notes 2019-03-02 09:18:41 +01:00
James Cole 9f3c114d57 Add JSON decrypt for #2125 2019-03-02 09:18:26 +01:00
James Cole c51c1b8098 Some basic date tests 2019-03-02 08:05:15 +01:00
James Cole 143fe2a71f Fix #2125 2019-03-01 17:56:52 +01:00
James Cole 3379b723cf Last attempt I hope for #2125 2019-02-28 19:56:41 +01:00
James Cole 39321b320e Improve search speed. 2019-02-27 19:08:09 +01:00
James Cole fe738fd321 Another fix for #2125 2019-02-27 18:55:56 +01:00
James Cole 95720673d2 Merge pull request #2130 from lastlink/patch-1
add missing rollback for 477 migration
2019-02-26 18:33:20 +01:00
lastlink 963be4a4fa add missing rollback for 477 migration 2019-02-26 00:16:05 -05:00
James Cole 61db419485 Fixes #2125 2019-02-25 20:57:29 +01:00
James Cole cb17b09b24 Merge pull request #2120 from lastlink/fix/pwaApple
missing meta tag for ios
2019-02-25 07:23:50 +01:00
Mr. Funk 0f1236a597 missing meta tag for ios 2019-02-24 15:12:58 -05:00
James Cole ac26427a63 Merge branch 'master' into develop
* master:
  Don't change ARM PHP settings.
2019-02-24 10:56:28 +01:00
James Cole 491903778a Don't change ARM PHP settings. 2019-02-24 10:56:08 +01:00
James Cole 405c3e110a Merge tag '4.7.14' into develop
4.7.14
2019-02-24 07:28:00 +01:00
James Cole 5464bfac19 Merge branch 'release/4.7.14' 4.7.14 2019-02-24 07:28:00 +01:00
James Cole ad31cc1c1f Fixes #2119 and bump version. 2019-02-24 07:27:24 +01:00
James Cole 3aa79fb1e4 Merge tag '4.7.13' into develop
4.7.13
2019-02-23 21:27:05 +01:00
James Cole e3de03e50d Merge branch 'release/4.7.13' 4.7.13 2019-02-23 21:27:04 +01:00
James Cole d8b4af34e0 Update files for release 4.7.13 2019-02-23 14:32:24 +01:00
James Cole 222d8e071a Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop
* 'develop' of github.com:firefly-iii/firefly-iii:
  New check for journals with 0.00 amount.
2019-02-23 12:36:17 +01:00
James Cole 36c2f27d59 New check for journals with 0.00 amount. 2019-02-23 07:47:41 +01:00
James Cole 5d43faab96 Refactor script locations to clear up root directory. 2019-02-20 07:04:24 +01:00
James Cole 07048cb5fb Fix #2100 2019-02-19 20:19:30 +01:00
James Cole 38c79c3dc4 Upgrade fix for Softaculous. 2019-02-19 19:59:02 +01:00
James Cole 7610d9e0db Update Dockerfiles to increase PHP execution time. 2019-02-19 07:10:13 +01:00
James Cole e4f3d0a0ea Some new strings. 2019-02-18 19:47:48 +01:00
James Cole fdf147d9c6 Merge branch 'hotfix/4.7.12.1' 4.7.12.1 2019-02-16 23:01:29 +01:00
James Cole f7e418f517 Merge tag '4.7.12.1' into develop
4.7.12.1
2019-02-16 23:01:29 +01:00