IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-20 11:48:27 -06:00
Code Issues Packages Projects Releases Wiki Activity
15,279 Commits 4 Branches 526 Tags 1.1 GiB
0b1b7c4952
Commit Graph

15279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
VREEdom
374aea4e09
Update menu-sidebar.twig 
Small changes for the Classification in the menu-sidebar.
When route `groups` is active add class `menu-open` by adding this code `{{ activeRoutePartial('groups') }}`
 2021-06-11 12:14:04 +07:00
James Cole
ebe37495c0
Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop 2021-06-11 06:14:02 +02:00
James Cole
eb4b9f0599
Merge pull request #4849 from hamza-fadil/main 
Replace i tag with em to fix minor issues in Sonar
 2021-06-11 06:13:21 +02:00
Hamza FADIL
ea2afa46ed Replace i tag with span to fix minor issues in Sonar 2021-06-10 23:40:07 +01:00
James Cole
0fd8d86eac
Merge pull request #4848 from kasperkls02/main 
Update TransactionCurrencySeeder.php
 2021-06-09 20:26:52 +02:00
Kasper Læssø Sørensen
10d6ed01e1
Update TransactionCurrencySeeder.php 
Added the currency of denmark
 2021-06-09 18:38:58 +02:00
James Cole
9873365369
Show user info about mandatory updates. 2021-06-08 19:19:56 +02:00
James Cole
81669bfcc1
Merge pull request #4843 from firefly-iii/dependabot/composer/develop/phpunit/phpunit-9.5.5 
Bump phpunit/phpunit from 9.5.4 to 9.5.5
 2021-06-07 10:06:54 +02:00
James Cole
719b9e690a
Merge pull request #4842 from firefly-iii/dependabot/composer/develop/barryvdh/laravel-debugbar-3.6.1 
Bump barryvdh/laravel-debugbar from 3.6.0 to 3.6.1
 2021-06-07 09:48:05 +02:00
James Cole
bd0444437a
Merge pull request #4844 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/sass-loader-12.0.0 
Bump sass-loader from 11.1.1 to 12.0.0 in /frontend
 2021-06-07 09:46:41 +02:00
dependabot[bot]
57e28eb90e
Bump sass-loader from 11.1.1 to 12.0.0 in /frontend 
Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 11.1.1 to 12.0.0.
- [Release notes](https://github.com/webpack-contrib/sass-loader/releases)
- [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/sass-loader/compare/v11.1.1...v12.0.0)

---
updated-dependencies:
- dependency-name: sass-loader
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-07 05:27:55 +00:00
dependabot[bot]
ff850d750e
Bump phpunit/phpunit from 9.5.4 to 9.5.5 
Bumps [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) from 9.5.4 to 9.5.5.
- [Release notes](https://github.com/sebastianbergmann/phpunit/releases)
- [Changelog](https://github.com/sebastianbergmann/phpunit/blob/master/ChangeLog-9.5.md)
- [Commits](https://github.com/sebastianbergmann/phpunit/compare/9.5.4...9.5.5)

---
updated-dependencies:
- dependency-name: phpunit/phpunit
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-07 05:05:49 +00:00
dependabot[bot]
7bd44f5f62
Bump barryvdh/laravel-debugbar from 3.6.0 to 3.6.1 
Bumps [barryvdh/laravel-debugbar](https://github.com/barryvdh/laravel-debugbar) from 3.6.0 to 3.6.1.
- [Release notes](https://github.com/barryvdh/laravel-debugbar/releases)
- [Changelog](https://github.com/barryvdh/laravel-debugbar/blob/master/changelog.md)
- [Commits](https://github.com/barryvdh/laravel-debugbar/compare/v3.6.0...v3.6.1)

---
updated-dependencies:
- dependency-name: barryvdh/laravel-debugbar
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-07 05:05:26 +00:00
James Cole
31ba0133c7
Whoops 2021-06-07 06:27:44 +02:00
Alex
a5bb8dfa5a Localize splits 2021-06-06 22:29:04 +02:00
James Cole
20e51d79b6
Fix array thing. Pretty basic. 2021-06-06 17:47:44 +02:00
James Cole
26ad0d3bc3
Basic fix for entire page loading: https://github.com/firefly-iii/firefly-iii/pull/4839 2021-06-06 17:25:38 +02:00
James Cole
a8f4154a77
Add translations. 2021-06-06 17:18:10 +02:00
James Cole
eacaee9e47
Code for #4838 and some translations 2021-06-06 17:17:46 +02:00
James Cole
4d4290c234
Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop 2021-06-06 17:16:27 +02:00
James Cole
a61ea446aa
Merge pull request #4839 from alex6480/develop 
Add table to transaction index
 2021-06-06 17:14:35 +02:00
James Cole
782340908d
Remove some old code. 2021-06-06 17:03:30 +02:00
Alex
d1a0dac092 Add table to transaction index 2021-06-06 14:04:51 +02:00
James Cole
fa50f76f5d
Disable flag, update packages. 2021-06-05 07:38:49 +02:00
James Cole
38dcb96086
Merge tag '5.5.12' into develop 
5.5.12

# Conflicts:
#	config/firefly.php
 2021-06-03 13:02:45 +02:00
James Cole
8b90d2297d Merge branch 'hotfix/5.5.12' into main 2021-06-03 13:01:20 +02:00
James Cole
28479ef2ed
Update version. 2021-06-03 12:54:21 +02:00
James Cole
9b03ae160d
Update changelog. 2021-06-03 12:54:15 +02:00
James Cole
5303321952
Fix export vulnerability, found by GitHub user @oomb and disclosed via the excellent huntr.dev platform. 2021-06-03 12:51:31 +02:00
James Cole
95ba6aa2c3
Add to readme. 2021-06-03 12:50:05 +02:00
James Cole
a54f152a34
Fix issue in exporting. 2021-06-03 12:08:04 +02:00
James Cole
021e0a04ac
Merge pull request #4821 from JeroenED/bugfix-sqlite-int-type 
BUGFIX: sqlite does not return int types
 2021-06-01 18:17:42 +02:00
Jeroen De Meerleer
28faee6e41 Resolved code smell 2021-06-01 12:25:01 +02:00
Jeroen De Meerleer
acc496e3e9 BUGFIX: sqlite does not return int types 2021-06-01 12:07:29 +02:00
James Cole
55ae280aaa
Merge pull request #4819 from firefly-iii/dependabot/composer/develop/laravel/ui-3.3.0 
Bump laravel/ui from 3.2.1 to 3.3.0
 2021-05-31 08:39:11 +02:00
James Cole
299b857946
Merge pull request #4818 from firefly-iii/dependabot/composer/develop/laravel/framework-8.44.0 
Bump laravel/framework from 8.42.1 to 8.44.0
 2021-05-31 08:38:53 +02:00
James Cole
2d395023fe
Merge pull request #4820 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/chart.js-3.3.2 
Bump chart.js from 3.3.0 to 3.3.2 in /frontend
 2021-05-31 08:28:58 +02:00