IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-07-29 15:53:28 -05:00
Code Issues Packages Projects Releases Wiki Activity
15,458 Commits 9 Branches 1,104 Tags
10787aada885bd389eec36db968dbd08c37650ca
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
James Cole 10787aada8 New user groups and memberships 2021-08-28 15:47:33 +02:00
James Cole a14c9438ad Minor code cleanup. 2021-08-28 15:47:09 +02:00
James Cole 92f7a9c574 Small code cleanup 2021-08-28 15:46:34 +02:00
James Cole d9e3d9ca9e Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop 2021-08-28 15:45:38 +02:00
James Cole 54b4b9438e Merge branch 'main' into develop 2021-08-28 15:45:04 +02:00
James Cole ef3d2b8e99 Merge pull request #5015 from firefly-iii/dependabot/npm_and_yarn/develop/laravel-mix-6.0.28 
Bump laravel-mix from 6.0.27 to 6.0.28
 2021-08-25 12:17:02 +02:00
James Cole fa2c90064d Merge pull request #5016 from firefly-iii/dependabot/npm_and_yarn/develop/vue/compiler-sfc-3.2.4 
Bump @vue/compiler-sfc from 3.2.2 to 3.2.4
 2021-08-25 12:16:03 +02:00
James Cole ec1764ba8c Update fr.yml 2021-08-23 06:24:47 +02:00
James Cole 17757eb3ca Merge pull request #5007 from hoshsadiq/patch-1 
Add additional extensions to composer require
 2021-08-21 20:43:10 +02:00
James Cole c9c043712a Sort and clean up some code. 2021-08-20 20:49:42 +02:00
James Cole f80178b1b2 Fix https://huntr.dev/bounties/ea181323-51f8-46a2-a60f-6a401907feb7/ 2021-08-20 10:05:18 +02:00
James Cole 06d319cd71 Fix https://huntr.dev/bounties/d32f3d5a-0738-41ba-89de-34f2a772de76/ 2021-08-20 09:51:00 +02:00
James Cole 14cdce113e Fix vulnerability https://huntr.dev/bounties/dd54c5a1-0d4a-4f02-a111-7ce4ddc67a4d/ 2021-08-20 09:38:52 +02:00
James Cole 83518d7f96 Rebuild frontend. 2021-08-20 09:29:00 +02:00
James Cole e73f04cf77 Fix #4987 2021-08-17 17:29:54 +02:00
James Cole 2a1cec61f3 Merge branch 'main' into develop 2021-08-17 17:18:04 +02:00
James Cole c16eb6f939 Add feature request 2021-08-17 17:16:17 +02:00
James Cole 901d4a2206 Switch templates. 2021-08-17 17:10:52 +02:00
James Cole 3b7bf5a1dd new support document. 2021-08-17 17:08:51 +02:00
James Cole 716a90cf7e Expand show. 2021-08-17 17:07:51 +02:00
James Cole df51dac805 Also test commit. 2021-08-17 12:30:39 +02:00
James Cole c4567a521b Test commit. 2021-08-17 12:29:11 +02:00
James Cole d1fa375d6f Merge branches 'develop' and 'develop' of github.com:firefly-iii/firefly-iii into develop 2021-08-17 12:28:16 +02:00
James Cole fe4db6ea35 Rename file. 2021-08-17 12:28:09 +02:00
James Cole dfe5af9191 Merge pull request #4995 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/webpack-5.50.0 
Bump webpack from 5.49.0 to 5.50.0 in /frontend
 2021-08-16 08:23:52 +02:00
James Cole a4ba6e1842 Rebuild front. 2021-08-12 15:19:32 +02:00
James Cole 077fe2eb69 Move iban character replacements. 2021-08-12 15:13:59 +02:00
James Cole b1ea497262 Just log and return false. 2021-08-11 19:44:22 +02:00
James Cole f741d05f94 Expand error 2021-08-11 14:17:27 +02:00
James Cole d222a7f1b7 Add questionmark. 2021-08-11 14:17:01 +02:00
James Cole 1b62e7289f Fix code. 2021-08-11 14:16:23 +02:00
James Cole 41cb256d49 Filter special chars. 2021-08-11 14:13:19 +02:00
James Cole baa3a91f65 Merge tag '5.6.0-alpha.2' into develop 
5.6.0-alpha.2
 2021-08-10 19:54:36 +02:00
James Cole fd932ad5b3 Merge branch 'release/5.6.0-alpha.2' into main 2021-08-10 19:54:31 +02:00
James Cole 02aeccbfb4 Update frontend and packages. 2021-08-10 19:52:56 +02:00
James Cole ec7bc53b5a Rebuild frontend. 2021-08-10 19:43:51 +02:00
James Cole 21d28a9a19 New translations. 2021-08-10 19:32:48 +02:00
James Cole 8328c26df3 Update PHP code, code cleanup. 2021-08-10 19:31:55 +02:00
James Cole 8e104a62ae Better endpoint to move transactions. 2021-08-10 18:43:21 +02:00
James Cole 840316d4e4 Fix huntr link. 2021-08-10 18:08:22 +02:00
James Cole 5938fb7f88 Update config. 2021-08-10 18:06:49 +02:00
James Cole c54dc1ad98 Fix readme in dev. 2021-08-10 18:05:40 +02:00
James Cole 54cf46ff32 Rebuild frontend for account creation / editing. 2021-08-09 08:01:27 +02:00
James Cole 6f7900234d Progress and updates for new layout. 2021-08-07 12:14:48 +02:00
James Cole d97f090f86 Fix conversion. 2021-08-03 10:20:50 +02:00
James Cole 4b9f70db1c cast to string 2021-08-03 06:18:35 +02:00
James Cole a7eb92b9bb Edit views for auth 2021-08-02 20:31:00 +02:00
James Cole e04a71738d Fix commonmark error. 2021-08-02 20:30:26 +02:00
James Cole f7f296c674 Merge pull request #4962 from firefly-iii/dependabot/composer/develop/phpunit/phpunit-9.5.8 2021-08-02 04:13:12 +00:00
James Cole 440ddd175d Merge pull request #4964 from firefly-iii/dependabot/composer/develop/phpstan/phpstan-0.12.94 2021-08-02 04:13:04 +00:00
James Cole c814082918 Merge pull request #4966 from firefly-iii/dependabot/npm_and_yarn/develop/laravel-mix-6.0.27 2021-08-02 04:12:57 +00:00
James Cole 879c0224d5 Merge pull request #4963 from firefly-iii/dependabot/composer/develop/league/commonmark-2.0.1 2021-08-02 04:12:48 +00:00
James Cole 18bd06760a Merge pull request #4967 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/sass-1.37.0 2021-08-02 04:12:40 +00:00
James Cole 5232aec11e Merge pull request #4968 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/vue-loader-15.9.7 2021-08-02 04:12:32 +00:00
James Cole 8f926fb176 Merge pull request #4965 from firefly-iii/dependabot/npm_and_yarn/develop/uiv-1.3.1 2021-08-02 04:12:25 +00:00
James Cole 8ebdd481aa Update frontpage and packages. 2021-07-30 07:02:11 +02:00
James Cole 1a79525024 New frontend. 2021-07-29 06:24:50 +02:00
James Cole 03bdca39f1 New translations. 2021-07-29 06:22:59 +02:00
James Cole 89f98bb7ab Catch error. 2021-07-26 18:51:29 +02:00
James Cole 0d4e952a69 Merge pull request #4941 from firefly-iii/dependabot/composer/develop/nunomaduro/larastan-0.7.11 
Bump nunomaduro/larastan from 0.7.10 to 0.7.11
 2021-07-26 18:45:29 +02:00
James Cole 011d6273fa Merge pull request #4943 from firefly-iii/dependabot/composer/develop/laravel/framework-8.51.0 
Bump laravel/framework from 8.50.0 to 8.51.0
 2021-07-26 06:33:01 +02:00
James Cole 095ef308c7 Merge pull request #4944 from firefly-iii/dependabot/npm_and_yarn/develop/postcss-8.3.6 
Bump postcss from 8.3.5 to 8.3.6
 2021-07-26 06:17:36 +02:00
James Cole e329784448 Merge pull request #4942 from firefly-iii/dependabot/composer/develop/league/commonmark-2.0.0 
Bump league/commonmark from 1.6.6 to 2.0.0
 2021-07-26 06:16:02 +02:00
James Cole b44f893869 Merge pull request #4940 from firefly-iii/dependabot/composer/develop/phpunit/phpunit-9.5.7 
Bump phpunit/phpunit from 9.5.6 to 9.5.7
 2021-07-26 06:15:52 +02:00
James Cole 2df20b4480 Merge pull request #4945 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/v-calendar-2.3.2 
Bump v-calendar from 2.3.1 to 2.3.2 in /frontend
 2021-07-26 06:14:24 +02:00
James Cole 9885b7e716 Rebuild frontend. 2021-07-25 19:41:28 +02:00
James Cole abb4b0befe Update and improve bills. 2021-07-25 19:40:14 +02:00
James Cole 217a382616 Update frontend to facilitate bills. 2021-07-25 19:39:35 +02:00
James Cole a18742d250 Merge pull request #4936 from Flightkick/feature/fix-broken-images-readme 
Feature/fix broken images readme
 2021-07-23 13:16:23 +02:00
James Cole afc9f4b7eb Add missing rate limiter. 2021-07-23 06:26:42 +02:00
James Cole cb759e5c21 Fix issue in liability credits. 2021-07-21 06:23:42 +02:00
James Cole 33d6584924 Merge pull request #4926 from firefly-iii/dependabot/npm_and_yarn/develop/vue-loader-16.3.1 
Bump vue-loader from 15.9.7 to 16.3.1
 2021-07-19 06:49:29 +02:00
James Cole fbb5a4dc25 Merge pull request #4927 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/vue-loader-16.3.1 2021-07-19 06:35:52 +02:00
James Cole abb9ced8e6 Merge pull request #4924 from firefly-iii/dependabot/npm_and_yarn/develop/vue/compiler-sfc-3.1.5 2021-07-19 06:35:40 +02:00
James Cole 35bd023a79 Merge pull request #4925 from firefly-iii/dependabot/npm_and_yarn/develop/vue-i18n-8.25.0 2021-07-19 06:35:32 +02:00
James Cole e959dbc6e0 Rebuild frontend. 2021-07-18 19:23:50 +02:00
James Cole 704cf26725 Translations. 2021-07-18 19:21:30 +02:00
James Cole e8c08a0e93 Update packages. 2021-07-18 19:20:24 +02:00
James Cole 6d971e86b1 Various fixes and extensions. 2021-07-18 14:51:30 +02:00
James Cole fb17da3f56 Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop 2021-07-18 14:50:51 +02:00
James Cole fae8c05e71 Fix events for LDAP 2021-07-17 17:26:12 +02:00
James Cole a865f4b72e Merge pull request #4913 from firefly-iii/dependabot/composer/develop/phpstan/phpstan-0.12.92 
Bump phpstan/phpstan from 0.12.91 to 0.12.92
 2021-07-12 06:19:27 +02:00
James Cole 2c943e0d53 Fix #4901 2021-07-11 09:31:29 +02:00
James Cole 7e1af72186 Update JS 2021-07-11 09:31:10 +02:00
James Cole 1bf4fb1b70 Rebuild frontend. 2021-07-10 16:24:00 +02:00
James Cole b7919e4ef2 Add strict thing. 2021-07-10 15:54:49 +02:00
James Cole d828660b9e Catch LDAP events 2021-07-10 07:35:54 +02:00
James Cole ddb222cc72 Various code cleanup. 2021-07-10 07:29:39 +02:00
James Cole b0ccd26928 Update packages 2021-07-10 07:27:22 +02:00
James Cole c741878f9f Update translations. 2021-07-10 05:21:14 +02:00
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