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
11,682 Commits 12 Branches 1,278 Tags
42bd5d05b52387900c519a88705c7d5c94653fd5
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
James Cole 42bd5d05b5 Renaming methods must also be included in api.php 2019-06-09 09:40:21 +02:00
James Cole 9d0a5c97c2 Implement rule group and rule tests 2019-06-09 09:40:08 +02:00
James Cole a1929b0521 Suppress PHPMD messages and make sure to use route() [skip ci] 2019-06-09 09:39:56 +02:00
James Cole 57cfd7e3bc Add separate request classes for rule groups and triggers. 2019-06-09 09:39:23 +02:00
James Cole 55345fa931 Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop 2019-06-09 08:26:29 +02:00
James Cole 3c2dfc52bc API updates. 2019-06-09 08:26:23 +02:00
James Cole 73e32efd79 Merge pull request #2303 from JurajMlich/master 
Correct ratesapi URL
 2019-06-09 08:25:50 +02:00
James Cole 85f9c256a1 Refactor some code for recurrences. 2019-06-08 06:19:21 +02:00
James Cole 7c2c24d330 Rename env variables. 2019-06-08 06:18:55 +02:00
James Cole 3681bf258b Composer update 2019-06-08 06:18:43 +02:00
James Cole 8b5551fc26 Replace \get_class with get_class 2019-06-07 18:20:15 +02:00
James Cole 779650f63d Deprecate the export function. 2019-06-07 18:19:24 +02:00
James Cole 9c5df6ab6e Clean up some code. 2019-06-07 18:13:54 +02:00
James Cole fba3cb6d90 Remove unnecessary backslash 2019-06-07 17:58:11 +02:00
James Cole e4a9abc315 Clean up repositories and cron code. 2019-06-07 17:57:46 +02:00
James Cole a845cb9af9 Removed some todo's. 2019-06-05 19:38:28 +02:00
James Cole 9b7835c9ed Various API updates. 2019-06-04 20:42:11 +02:00
James Cole 6a6d67f2b4 Split group update now works. 2019-06-02 16:33:25 +02:00
James Cole f46834e203 Remove some serious duplicates. 2019-06-02 06:39:54 +02:00
James Cole 2a2f29533d Some improvements, also edit screen. 2019-06-01 20:38:18 +02:00
James Cole 0a6e20eae4 Remove last references 2019-05-31 13:36:13 +02:00
James Cole e15c35de64 Migrated all code to group collector. 2019-05-31 13:35:33 +02:00
James Cole eb6329e556 Various code cleanup as suggested by PHPStorm. 2019-05-30 12:39:06 +02:00
James Cole 8b7e87ae57 Big refactor to remove the deprecated transaction collector. 2019-05-30 12:31:19 +02:00
James Cole 10a6ff9bf8 make sure reports work as expected. 2019-05-30 06:23:25 +02:00
James Cole bdf48227bb Merge branch 'v480' into develop 
# Conflicts:
#	public/v1/js/app.js
 2019-05-29 22:03:43 +02:00
James Cole ad32c30f82 Changes for the merge with 4.8.0. 2019-05-29 22:03:07 +02:00
James Cole 9e235ac5c8 Final fix before we merge back into develop and wreck havoc on everybody. 2019-05-29 22:02:15 +02:00
James Cole bff156aad4 Add copyright things. 2019-05-29 21:56:39 +02:00
James Cole 7e2159d12c Removed a lot of references to the old collector. 2019-05-29 21:52:08 +02:00
James Cole 280b2efee6 New translations 2019-05-29 18:30:52 +02:00
James Cole d13317095f Replace transaction collector. 2019-05-29 18:28:28 +02:00
James Cole 627ef09f11 Can store and submit transactions. 2019-05-25 10:04:56 +02:00
James Cole 3ec7336d5c Add some stuff for edge cases. 2019-05-25 09:17:46 +02:00
James Cole 47e0f6ed89 Bug catching in form. 2019-05-24 05:47:26 +02:00
James Cole 8f1928c933 Error reporting in new form. 2019-05-24 05:29:04 +02:00
James Cole 695244c928 Bug fix in budget search 2019-05-24 05:28:41 +02:00
James Cole 6e9128d894 Catch errors, prep to render them. 2019-05-17 06:52:16 +02:00
James Cole 9a53f17fff Fix for #2270 2019-05-16 19:37:32 +02:00
James Cole 91183a91b6 Will make submit form possible. 2019-05-12 19:21:14 +02:00
James Cole 7aef52870f Make sure all custom fields are included in form. 2019-05-12 13:46:20 +02:00
James Cole 5d09d7e923 Add custom component for date. 2019-05-12 07:40:24 +02:00
James Cole fd28589395 Fix model and add debug info. 2019-05-11 05:32:09 +02:00
James Cole c0029af929 Update composer lock file. 2019-05-09 20:05:52 +02:00
James Cole 43a17d8676 Lots of new code and first submission thing. 2019-05-08 19:57:07 +02:00
James Cole 4c8f26f25e Remove encryption parameter 2019-05-05 16:16:03 +02:00
James Cole 9015a5e0c1 Updated lock files. 2019-05-05 08:09:43 +02:00
James Cole 8676764513 Remove various sort routines. 2019-05-04 20:58:43 +02:00
James Cole d5c5fa4fad Lots of new code for new transaction screen. 2019-05-04 20:58:11 +02:00
James Cole 912fe99981 New code for overview. Temp submit. 2019-04-19 07:00:19 +02:00
James Cole 4d3af1dcde Basic list, no functionalities. 2019-04-18 20:05:40 +02:00
James Cole 66c55b7bbe Improve tests, models and views. 2019-04-16 16:20:46 +02:00
James Cole 5ac39dbdef Clean up tests, test only the important things. 2019-04-12 04:53:18 +02:00
James Cole 6f063a134f Reset some code. 2019-04-11 06:06:25 +02:00
James Cole 966186cccd Disable all tests that may need some work in 4.8.0 2019-04-10 19:03:33 +02:00
James Cole 784d990e20 Remove slash from method call. 2019-04-09 20:05:20 +02:00
James Cole 80896b7181 Some code optimisations. 2019-04-09 15:42:25 +02:00
James Cole 97726c3822 Disable all kinds of tests until upgrades are complete. 2019-04-09 15:32:48 +02:00
James Cole 63070bffc3 Merge branch 'develop' into v480 
* develop:
  Fix #2204
  CSV file fix for Belfius
 2019-04-09 07:51:11 +02:00
James Cole b3e48ede70 Fix #2204 2019-04-08 20:40:12 +02:00
James Cole 13afd4582f First attempt at displaying a group. 2019-04-08 20:31:31 +02:00
James Cole 4eb8b1a7da Merge pull request #2209 from SanderKleykens/feature/belfius 
CSV file fix for Belfius
 2019-04-08 11:39:39 +02:00
James Cole c7bf167f81 New stale config. 2019-04-06 11:50:16 +02:00
James Cole c07ca12574 Merge branch 'develop' into v480 
* develop:
  docs: Fix minor typo
  docs: Fix minor typo
  Experimental Ranger config.
 2019-04-06 11:09:58 +02:00
James Cole bc735e3a59 Update scripts. 2019-04-06 11:09:14 +02:00
James Cole 47fdf4b1a2 Validate account info 2019-04-06 11:08:46 +02:00
James Cole c519b4d0df Is now capable of updating transactions over the API. 2019-04-06 08:10:50 +02:00
James Cole 846fb57520 Merge pull request #2206 from eddybrando/patch-1 
docs: Fix minor typo
 2019-03-31 15:16:17 +02:00
James Cole b692cccdfb User can submit new journal through API. 2019-03-31 13:36:49 +02:00
James Cole 50a071119b Merge pull request #2205 from eddybrando/patch-1 
docs: Fix minor typo
 2019-03-30 21:54:24 +01:00
James Cole c07ef3658b Refactor installer. 2019-03-30 11:03:39 +01:00
James Cole 636eeffaed Experimental Ranger config. 2019-03-30 07:39:16 +01:00
James Cole 5b1fb5354e Update API and transaction components. 2019-03-30 07:09:52 +01:00
James Cole 484ed6a585 Introduce group collector to API 2019-03-25 15:14:09 +01:00
James Cole 11e537810a Merge branch 'develop' into v480 
* develop:
  Update Docker files slightly (yes I am a nitpicker).
  - Fixed copying Dockerfile.amd64 to Dockerfile.arm in the 2nd last commit
  entrypoint.sh: Wait for DB to start up
  Misc Optimizations: Changes on Dockerfile*

# Conflicts:
#	.deploy/docker/entrypoint.sh
 2019-03-24 14:56:08 +01:00
James Cole cc67445f35 Update Docker files slightly (yes I am a nitpicker). 2019-03-24 14:54:46 +01:00
James Cole c4ceb9d2cd Merge pull request #2192 from hulloanson/docker-wait-db 
Docker's entrypoint.sh: wait for DB before running DB-dependent artisan commands
 2019-03-24 14:53:10 +01:00
James Cole bc43ea2c25 Update version etc. 2019-03-24 14:52:45 +01:00
James Cole c946a4040f First working version of the group collector. 2019-03-24 14:48:12 +01:00
James Cole d94b23b15d Build a new collector and first view online. 2019-03-24 09:23:36 +01:00
James Cole fb304de75e Final commands. 2019-03-24 09:23:10 +01:00
James Cole 5f76b563dc Update composer stuff. 2019-03-24 09:23:00 +01:00
James Cole ce30375341 Refactor upgrade and verify commands. 2019-03-23 18:58:06 +01:00
James Cole 1b0be2a47e Refactor upgrade and verify commands. 2019-03-23 08:10:59 +01:00
James Cole a89be86ca4 Merge branch 'develop' into v480 
* develop:
  Update config for Romanian.
  German string
  Romanian strings.
  Fix #2166
 2019-03-22 18:29:52 +01:00
James Cole f84655e339 Update config for Romanian. 2019-03-22 18:29:34 +01:00
James Cole a0cead6548 German string 2019-03-22 18:27:05 +01:00
James Cole 4dbc5f1413 Romanian strings. 2019-03-22 18:26:46 +01:00
James Cole 943620c035 Fix #2166 2019-03-22 06:56:01 +01:00
James Cole a1268ffd39 Command updates. 2019-03-20 18:47:51 +01:00
James Cole fcd98b4d33 Revamp upgrade commands. 2019-03-20 18:31:00 +01:00
James Cole e411d7a825 Improve upgrade command structure. 2019-03-18 16:53:05 +01:00
James Cole 3545d894fd Improve factories and tests. 2019-03-18 16:52:49 +01:00
James Cole 200a4b18a8 First full implementation of new storage routine. 2019-03-17 17:05:16 +01:00
James Cole 6bd2b4f288 Merge branch 'develop' into v480 
* develop: (21 commits)
  Update lock file
  Update change logs and config files.
  Enable norsk, update version of DB
  Various language string updates.
  Norwegian strings.
  Improve installer middleware for Sandstorm.
  Fix some issues with importer #2166
  Other delete thing.
  More debug things.
  Extra debug info for #2159 and some kernel changes.
  Extra debug info for #2159
  Fix #2173
  Rename class and add copyright statement @wrouesnel #2167
  Fix LDAP auth configuration paths.
  Fix some cache issues and a version bump.
  Updated file list.
  Updated list.
  New file list.
  Update composer file.
  Small fix in changelog.
  ...
 2019-03-17 12:34:36 +01:00
James Cole c4d57af936 Merge tag '4.7.17' into develop 
4.7.17
 2019-03-17 09:40:14 +01:00
James Cole 76aa8acf0f Merge branch 'release/4.7.17' 2019-03-17 09:40:13 +01:00
James Cole 220add3eda Update lock file 2019-03-17 09:17:55 +01:00
James Cole 541280ee91 Update change logs and config files. 2019-03-17 09:17:07 +01:00
James Cole 01219c951c Enable norsk, update version of DB 2019-03-17 09:14:52 +01:00