IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-09-03 20:52:58 -05:00
Code Issues Packages Projects Releases Wiki Activity
11,552 Commits 9 Branches 1,163 Tags
0a80b7fca773f9a8460bba7af7284075a3bec3d2
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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' 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
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
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' 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' 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' 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
James Cole 738f6ed232 Fix #2093 2019-02-16 23:01:14 +01:00
James Cole 12217d9850 Merge tag '4.7.12' into develop 
4.7.12
 2019-02-16 19:35:01 +01:00
James Cole 87c8b3d7c6 Merge branch 'release/4.7.12' 2019-02-16 19:35:00 +01:00
James Cole fd571abbb0 Slight change in build script. 2019-02-16 19:33:33 +01:00
James Cole 64ae56757e Updated meta files. 2019-02-16 19:22:16 +01:00
James Cole 7d75f00696 New translations. 2019-02-16 19:22:05 +01:00
James Cole 451c86e431 Final touches for #2085 2019-02-16 19:04:36 +01:00
James Cole c8c71da903 Extra debug log. #2061 2019-02-16 14:27:54 +01:00
James Cole 423f3a9296 Fix build script. 2019-02-16 14:02:04 +01:00
James Cole 7658b7d9a6 Apply fix for #2070 2019-02-16 11:45:08 +01:00
James Cole 0d0906c5e2 Fix for #2070 2019-02-16 11:43:05 +01:00
James Cole e0aa7f3ff5 Various code cleanup. 2019-02-16 08:05:48 +01:00
James Cole 59fdf5b77a Updates to the login procedure [skip ci] 2019-02-16 07:20:25 +01:00
James Cole e28cfade8d Push and build stuff. 2019-02-15 17:15:42 +01:00
James Cole 19710c3eab Update LDAP config for #2085 2019-02-15 07:39:12 +01:00
James Cole 0782354160 Updated LDAP code #2085 2019-02-15 07:22:51 +01:00
James Cole 22bc6d507e Fix issue with upgrade. 2019-02-13 17:54:46 +01:00
James Cole bf3c74e65f Add required PHP extensions to composer.json. 2019-02-13 17:54:36 +01:00
James Cole 71fb9d8fa5 Code cleaning stuff. 2019-02-13 17:38:41 +01:00
James Cole 9a461fc7b7 Fix for #2082 2019-02-13 17:34:03 +01:00
James Cole e0d87aa11e First part of a large code cleanup commit. 2019-02-12 21:49:28 +01:00
James Cole b273af341c Update version. 2019-02-12 21:01:19 +01:00
James Cole 2117fc2a5a Add thing to apply rules to fints #2081 2019-02-12 21:01:12 +01:00
James Cole 58e55dc789 Document things better. 2019-02-12 21:00:53 +01:00
James Cole ac9b8b8c30 Build and push. 2019-02-12 17:33:34 +01:00
James Cole 4dcc66238e Make directory as well. 2019-02-12 17:31:30 +01:00
James Cole 90c0aa6360 Add touch command. 2019-02-12 17:29:45 +01:00
James Cole 1594335487 Experiment with manifest code. 2019-02-12 17:27:56 +01:00
James Cole 2517674849 Expand experimental things. 2019-02-12 17:21:52 +01:00
James Cole c00bc2a1f3 Update build script. 2019-02-11 19:01:14 +01:00
James Cole f999be81c2 Fix upgrade problem in Softaculous. 2019-02-11 17:22:46 +01:00
James Cole e2530c5486 Refresh journal after a rule is applied, #2070 2019-02-11 17:09:52 +01:00
James Cole 7526f13ca9 Update build script. 2019-02-11 17:07:34 +01:00
James Cole ed08d299de Fix for #2017 2019-02-11 17:07:07 +01:00
James Cole b6ea2f1c64 Updated file list for sandstorm 2019-02-10 15:22:18 +01:00
James Cole 9ee14374bb Updated sandstorm file list. 2019-02-10 15:14:52 +01:00
James Cole 925401682b Merge tag '4.7.11' into develop 
4.7.11
 2019-02-10 14:53:58 +01:00
James Cole 53c71bb7a2 Merge branch 'release/4.7.11' 2019-02-10 14:53:57 +01:00
James Cole 3c036ae021 Fix issue with time stamps. 2019-02-10 14:53:24 +01:00
James Cole bf89d9956d Update language strings. 2019-02-10 14:33:15 +01:00
James Cole 71104f375c Fix tests 2019-02-10 14:33:03 +01:00
James Cole 4c94820cf4 Update meta files. 2019-02-10 14:32:34 +01:00
James Cole 8998c9a672 Extra code for #1975 2019-02-10 10:54:30 +01:00
James Cole ccf60f4cdc Back to classic build. 2019-02-10 08:07:25 +01:00
James Cole c5af1d363c Add audit trail messages to several controllers. 2019-02-10 08:03:09 +01:00
James Cole c6e3b54705 Make update code slightly more robust. 2019-02-10 07:59:11 +01:00
James Cole 4f274a290e Generic debug info. 2019-02-09 20:44:31 +01:00
James Cole 1774bcbabe Add copyright statements and newlines. 2019-02-09 10:36:59 +01:00
James Cole 492c11784b Update with manifest commands. 2019-02-09 06:40:55 +01:00
James Cole 21ddbd220a Include lib for arm 2019-02-08 17:40:29 +01:00
James Cole e4a95e55ed Remove copy argument. 2019-02-08 17:34:46 +01:00
James Cole 3a0eb5a428 Do actual build 2019-02-08 17:31:32 +01:00
James Cole e55fd968cf Rename file 2019-02-08 17:31:25 +01:00
James Cole d41be08b48 Rename file 2019-02-08 17:30:42 +01:00