IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-07-29 23:57:59 -05:00
Code Issues Packages Projects Releases Wiki Activity
15,344 Commits 9 Branches 1,105 Tags
e2380def5d600475db6147e6e1933d1c411245f6
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
James Cole e2380def5d Delete unused route 2021-07-09 06:42:23 +02:00
James Cole ec73020b3c Fix exception. 2021-07-08 20:31:12 +02:00
James Cole 253e7499e3 Remove unused strings. 2021-07-05 20:03:54 +02:00
James Cole 48fdd50428 Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop 
# Conflicts:
#	frontend/yarn.lock
 2021-07-05 20:02:07 +02:00
James Cole c0d3554acb Clean up views and code 2021-07-05 20:01:36 +02:00
James Cole 24b633b5ad Merge pull request #4896 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/sortablejs-1.14.0 
Bump sortablejs from 1.13.0 to 1.14.0 in /frontend
 2021-07-05 06:18:21 +02:00
James Cole 41cfa7b84e Merge pull request #4897 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/vue-loader-16.3.0 
Bump vue-loader from 15.9.7 to 16.3.0 in /frontend
 2021-07-05 06:18:10 +02:00
James Cole f9abb1fb6e Merge pull request #4895 from firefly-iii/dependabot/composer/develop/phpstan/phpstan-0.12.91 
Bump phpstan/phpstan from 0.12.90 to 0.12.91
 2021-07-05 06:18:00 +02:00
James Cole 8135c034a9 Rename file 2021-07-04 19:41:47 +02:00
James Cole b5583eba23 Catch error 2021-07-04 19:38:17 +02:00
James Cole b0ab79bb48 Build empty bills things. 2021-07-04 19:20:21 +02:00
James Cole 5eca404866 Fix issue in number formatting. 2021-07-04 19:19:31 +02:00
James Cole b94885f8ba Update meta file. 2021-07-04 19:18:41 +02:00
James Cole 6814582f32 Empty bills view. 2021-07-04 19:18:23 +02:00
James Cole a09d831613 Fix #4894 2021-07-04 07:58:11 +02:00
James Cole d35b0ea279 Merge tag '5.6.0-alpha.1' into develop 
5.6.0-alpha.1
 2021-07-03 12:35:08 +02:00
James Cole 10545f3e1b Merge branch 'release/5.6.0-alpha.1' 2021-07-03 12:35:07 +02:00
James Cole 2d294015f2 Update PR template 2021-07-03 12:34:47 +02:00
James Cole 739d01efe4 Update and build. 2021-07-03 12:32:02 +02:00
James Cole 3d81315769 Some search fixes. 2021-06-30 20:02:19 +02:00
James Cole 1350da9666 Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop 2021-06-30 19:45:25 +02:00
James Cole 7e73af789d Merge pull request #4889 from firefly-iii/dependabot/npm_and_yarn/develop/vue-loader-16.3.0 
Bump vue-loader from 15.9.7 to 16.3.0
 2021-06-30 19:44:44 +02:00
James Cole 42267bfc65 Fix feature flag. 2021-06-30 19:44:42 +02:00
James Cole a952ba5411 Merge branch 'main' into develop 2021-06-30 19:38:35 +02:00
James Cole 8bf0eaf969 Rebuild front 2021-06-30 06:48:49 +02:00
James Cole 27c90bd217 Remove logging 2021-06-30 06:45:54 +02:00
James Cole 1d6e05f7cf Update translations. 2021-06-30 06:45:37 +02:00
James Cole 7bd1041820 Fix various bugs (very descriptive I know) 2021-06-30 06:45:19 +02:00
James Cole 7195f198a6 add entry 2021-06-30 06:18:05 +02:00
James Cole 70da5917c9 Refactor findNull to find 2021-06-30 06:17:38 +02:00
James Cole 0fed21e831 Merge pull request #4888 from firefly-iii/dependabot/composer/league/flysystem-1.1.4 
Bump league/flysystem from 1.1.3 to 1.1.4
 2021-06-29 06:42:00 +02:00
James Cole b7ae5eda35 Merge pull request #4880 from firefly-iii/dependabot/composer/develop/phpunit/phpunit-9.5.6 2021-06-28 07:30:08 +02:00
James Cole 720a90a6ab Merge pull request #4879 from firefly-iii/dependabot/composer/develop/doctrine/dbal-3.1.1 2021-06-28 07:26:17 +02:00
James Cole 0008da3e79 Merge pull request #4881 from firefly-iii/dependabot/composer/develop/league/commonmark-1.6.5 2021-06-28 07:26:07 +02:00
James Cole 3625204df9 Merge pull request #4882 from firefly-iii/dependabot/composer/develop/laravel/framework-8.48.2 2021-06-28 07:25:52 +02:00
James Cole d4483aed74 Merge pull request #4883 from firefly-iii/dependabot/npm_and_yarn/develop/laravel-mix-6.0.25 2021-06-28 07:25:45 +02:00
James Cole 9d1135cb69 Merge pull request #4884 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/laravel-mix-6.0.25 2021-06-28 07:15:57 +02:00
James Cole ac8f2e9e0d Merge pull request #4885 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/vue2-leaflet-2.7.1 2021-06-28 07:15:50 +02:00
James Cole 070a26a85e Merge pull request #4887 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/chart.js-3.4.0 2021-06-28 07:15:44 +02:00
James Cole 0eb3676268 Merge pull request #4886 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/webpack-5.40.0 2021-06-28 07:15:33 +02:00
James Cole 363d8075f2 Merge branch 'main' into develop 2021-06-21 06:45:13 +02:00
James Cole 3325353639 Rebuild frontend. 2021-06-21 06:44:38 +02:00
James Cole dbc5997198 Merge pull request #4867 from firefly-iii/dependabot/composer/develop/barryvdh/laravel-debugbar-3.6.2 
Bump barryvdh/laravel-debugbar from 3.6.1 to 3.6.2
 2021-06-21 06:34:40 +02:00
James Cole 1c8080a9fe Merge pull request #4869 from firefly-iii/dependabot/composer/develop/laravel/framework-8.47.0 
Bump laravel/framework from 8.46.0 to 8.47.0
 2021-06-21 06:34:32 +02:00
James Cole 3c8e6cfd31 Update dependabot.yml 2021-06-21 04:34:18 +00:00
James Cole f56a6e8ecd Merge pull request #4868 from firefly-iii/dependabot/composer/develop/phpstan/phpstan-0.12.90 
Bump phpstan/phpstan from 0.12.89 to 0.12.90
 2021-06-21 06:32:27 +02:00
James Cole 6a107bf745 Merge pull request #4875 from firefly-iii/dependabot/npm_and_yarn/develop/laravel-mix-6.0.24 
Bump laravel-mix from 6.0.19 to 6.0.24
 2021-06-21 06:30:28 +02:00
James Cole 0b1b7c4952 Merge pull request #4871 from firefly-iii/dependabot/composer/develop/bacon/bacon-qr-code-2.0.4 
Bump bacon/bacon-qr-code from 2.0.3 to 2.0.4
 2021-06-21 06:29:19 +02:00
James Cole 1e3668a9d1 Merge pull request #4870 from firefly-iii/dependabot/composer/develop/league/commonmark-1.6.4 
Bump league/commonmark from 1.6.2 to 1.6.4
 2021-06-21 06:28:40 +02:00
James Cole 29dc3ce430 Merge pull request #4874 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/laravel-mix-6.0.24 
Bump laravel-mix from 6.0.23 to 6.0.24 in /frontend
 2021-06-21 06:28:31 +02:00
James Cole e523abacc7 Merge pull request #4872 from firefly-iii/dependabot/npm_and_yarn/develop/vue-i18n-8.24.5 
Bump vue-i18n from 8.24.4 to 8.24.5
 2021-06-21 06:27:52 +02:00
James Cole 0b7edec983 Merge pull request #4873 from firefly-iii/dependabot/npm_and_yarn/develop/postcss-8.3.5 
Bump postcss from 8.3.3 to 8.3.5
 2021-06-21 06:27:42 +02:00
James Cole 2fa927266f Fix #4864 and relatred issues. 2021-06-20 18:39:15 +02:00
James Cole c9eeaf7e95 Fix some logging. 2021-06-20 18:33:17 +02:00
James Cole 1bd87bfb88 Experimental rebuild. 2021-06-19 19:29:51 +02:00
James Cole 1f2c0f634b Make index 2021-06-19 14:03:59 +02:00
James Cole 1f176c93d5 Rebuild + some placeholders. 2021-06-19 13:39:40 +02:00
James Cole 3e31752a8f Add some boxes. 2021-06-19 09:09:08 +02:00
James Cole 4ba55e8546 Update sonar properties. 2021-06-19 08:19:07 +02:00
James Cole 0d80582874 Update translations and account index code. 2021-06-19 08:18:54 +02:00
James Cole 3e88bf4692 Merge pull request #4841 from alex6480/develop 
Localize expand and collapse button for splits
 2021-06-19 08:10:01 +02:00
James Cole baae9955c8 Fix bad HTML tag 2021-06-18 06:06:54 +02:00
James Cole 4a77b9c8d5 Rename file 2021-06-17 18:24:09 +02:00
James Cole f17b6dbdf3 Fix icons. 2021-06-17 18:19:43 +02:00
James Cole 8d454ed92a Merge pull request #4855 from vonsogt/patch-1 
Update api.php
 2021-06-16 08:40:22 +02:00
James Cole f4d6d8efa1 Merge pull request #4854 from firefly-iii/dependabot/npm_and_yarn/develop/postcss-8.3.3 
Bump postcss from 8.3.2 to 8.3.3
 2021-06-14 10:59:42 +02:00
James Cole c681d2742b Merge pull request #4853 from firefly-iii/dependabot/npm_and_yarn/develop/postcss-8.3.2 
Bump postcss from 8.3.0 to 8.3.2
 2021-06-14 09:12:45 +02:00
James Cole eb9d3f04b9 Merge branch 'main' into develop 2021-06-14 06:11:29 +02:00
James Cole b19f69dc2a Update lock.yml 2021-06-13 06:33:20 +00:00
James Cole 5262c0240e Various code cleanup. 2021-06-13 08:10:30 +02:00
James Cole c98706fac0 Various code cleanup. 2021-06-13 07:04:18 +02:00
James Cole 85204de9aa Various code cleanup. 2021-06-12 19:32:34 +02:00
James Cole 4614625f82 Remove TODO's. 2021-06-12 14:14:49 +02:00
James Cole 91b08d1772 Rename variable. 2021-06-12 13:15:01 +02:00
James Cole cd9d1cf4ab Fix #4846 2021-06-12 08:46:06 +02:00
James Cole 10597e3bef Clean up code. 2021-06-12 08:40:35 +02:00
James Cole 5854dff37e More robust error display 2021-06-12 07:39:38 +02:00
James Cole fbc3a2fb6a Bad message. 2021-06-12 07:39:30 +02:00
James Cole c290aaa774 Remove some debug logging 2021-06-12 07:39:23 +02:00
James Cole def456bd9b Make sure LDAP is persisted in validation 2021-06-12 07:39:16 +02:00
James Cole 1f83ebc6c7 Update example env file. 2021-06-12 07:38:58 +02:00
James Cole 6a928a3321 Update configuration. Not sure about the environment variable. 2021-06-12 06:35:19 +02:00
James Cole 39ad131b55 update packages. 2021-06-12 06:34:19 +02:00
James Cole 00a122833a update default config 2021-06-12 06:34:10 +02:00
James Cole c593515ec6 Remove old filter. 2021-06-12 06:29:04 +02:00
James Cole 6dde89d1eb Add migrations. 2021-06-12 06:28:44 +02:00
James Cole 351bb81e78 Add LDAP stuff to user model. 2021-06-12 06:28:17 +02:00
James Cole 5ea7c66c83 update changelog 2021-06-12 06:27:14 +02:00
James Cole 8c171fa4d1 Merge branch 'feature/ldap' into develop 
# Conflicts:
#	app/Http/Controllers/Auth/LoginController.php
#	composer.json
#	composer.lock
#	config/firefly.php
 2021-06-12 06:26:45 +02:00
James Cole 310448e9bb Update API version 2021-06-12 06:20:43 +02:00
James Cole aba56b331d Message also in v2. 2021-06-11 20:55:15 +02:00
James Cole 8832387b84 Remove TODO's. 2021-06-11 20:39:01 +02:00
James Cole 0d7d3f45f0 Security alert thing. 2021-06-11 20:19:59 +02:00
James Cole fdf379b88b Set version to alpha version. 2021-06-11 20:04:41 +02:00
James Cole 8a9a36b512 Merge branch 'feature/webhooks' into develop 
# Conflicts:
#	app/Events/UpdatedTransactionGroup.php
 2021-06-11 20:00:40 +02:00
James Cole e9f2d6b5ea Replace icons. 2021-06-11 19:50:05 +02:00
James Cole 460161d9a5 Rebuild frontend. 2021-06-11 19:44:01 +02:00
James Cole 204d5ee1e3 Fix issue with searching for external_id 2021-06-11 17:31:13 +02:00
James Cole c4a00fbc9a Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop 2021-06-11 17:30:23 +02:00
James Cole 41c22c18fe Merge pull request #4850 from vonsogt/patch-1 
Update menu-sidebar.twig
 2021-06-11 08:00:55 +02:00