kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-19 10:53:37 +00:00
Code Issues Projects Releases Wiki Activity
16,735 Commits 4 Branches 726 Tags
b3740e643a5ed9ef8dec4f95ab1ed565da98bd6d
Commit Graph

527 Commits

Author SHA1 Message Date
James Cole
55ac76f663 Update copyright. 2022-10-16 19:22:26 +02:00
James Cole
49560ca6a6 Merge branch 'develop' into 5.8-dev 
# Conflicts:
#	composer.lock
#	config/firefly.php
#	public/v1/js/create_transaction.js
#	public/v1/js/edit_transaction.js
#	public/v1/js/profile.js
 2022-10-16 19:13:15 +02:00
James Cole
02081b09a2 Meta files for new release. 2022-10-16 15:52:22 +02:00
James Cole
05fe503456 Merge branch 'develop' into 5.8-dev 
# Conflicts:
#	frontend/src/i18n/tr_TR/index.js
#	public/v1/js/create_transaction.js
#	public/v1/js/edit_transaction.js
#	public/v1/js/profile.js
#	resources/assets/js/locales/bg.json
#	resources/assets/js/locales/cs.json
#	resources/assets/js/locales/de.json
#	resources/assets/js/locales/el.json
#	resources/assets/js/locales/en-gb.json
#	resources/assets/js/locales/en.json
#	resources/assets/js/locales/es.json
#	resources/assets/js/locales/fi.json
#	resources/assets/js/locales/fr.json
#	resources/assets/js/locales/hu.json
#	resources/assets/js/locales/it.json
#	resources/assets/js/locales/ja.json
#	resources/assets/js/locales/nb.json
#	resources/assets/js/locales/nl.json
#	resources/assets/js/locales/pl.json
#	resources/assets/js/locales/pt-br.json
#	resources/assets/js/locales/pt.json
#	resources/assets/js/locales/ro.json
#	resources/assets/js/locales/ru.json
#	resources/assets/js/locales/sk.json
#	resources/assets/js/locales/sv.json
#	resources/assets/js/locales/tr.json
#	resources/assets/js/locales/vi.json
#	resources/assets/js/locales/zh-cn.json
#	resources/assets/js/locales/zh-tw.json
#	resources/lang/bg_BG/firefly.php
#	resources/lang/fr_FR/firefly.php
#	resources/lang/nl_NL/firefly.php
#	resources/lang/ru_RU/firefly.php
 2022-10-08 07:03:40 +02:00
James Cole
896c15a7a1 Update meta data and translations. 2022-10-08 06:47:56 +02:00
James Cole
ee9b651f0f Add ability to invite users 2022-10-01 12:21:42 +02:00
James Cole
625ad14d7d Add code to create webhook. 2022-09-17 16:54:13 +02:00
James Cole
ad9efde2d0 Expand webhook code. 2022-09-17 07:08:30 +02:00
James Cole
7104433a68 Merge branch 'develop' into 5.8-dev 
# Conflicts:
#	app/Exceptions/Handler.php
#	config/firefly.php
 2022-09-07 18:35:01 +02:00
James Cole
1d21a8788c Update packages and meta data. 2022-09-04 13:58:21 +02:00
James Cole
443b76388e Expand frontend 2022-07-25 05:42:49 +02:00
James Cole
ea808b441b Add first budget view 2022-07-23 20:13:24 +02:00
James Cole
72ef7ac5e4 Merge branch 'develop' into 5.8-dev 
# Conflicts:
#	frontend/yarn.lock
 2022-07-21 16:56:27 +02:00
James Cole
0b378b51f8 Merge branch 'main' into develop 2022-07-21 16:41:52 +02:00
James Cole
20ab457222 Various new stuff 2022-07-21 16:41:28 +02:00
dependabot[bot]
ba1f0d9a24 Bump terser from 5.12.1 to 5.14.2 in /frontend 
Bumps [terser](https://github.com/terser/terser) from 5.12.1 to 5.14.2.
- [Release notes](https://github.com/terser/terser/releases)
- [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/terser/terser/commits)

---
updated-dependencies:
- dependency-name: terser
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-07-21 01:59:45 +00:00
James Cole
eb8f595541 Fix transaction lists. 2022-07-17 08:51:53 +02:00
James Cole
6b6107fb00 Merge branch 'develop' into 5.8-dev 
# Conflicts:
#	config/firefly.php
#	frontend/src/i18n/nb_NO/index.js
#	frontend/src/i18n/nl_NL/index.js
#	frontend/src/i18n/ru_RU/index.js
 2022-07-17 08:18:18 +02:00
James Cole
2e8ea7493a Update packages. 2022-07-16 17:26:10 +02:00
James Cole
5c3b4d1663 Uninstall vuex 2022-07-10 06:29:01 +02:00
James Cole
5e8671d24b Expand code and upgrade. 2022-07-10 06:23:59 +02:00
James Cole
56ff25285c Expand frontend and API 2022-07-05 19:12:22 +02:00
James Cole
f52144d8d9 Expand code. 2022-06-25 14:23:52 +02:00
James Cole
e0c9d3627e Fix bills. 2022-06-10 17:45:25 +02:00
James Cole
5a02006a42 Remove code. 2022-06-10 17:35:34 +02:00
James Cole
313676e3be Add transaction lists 2022-06-09 05:45:45 +02:00
James Cole
86d4549874 Updated code. 2022-06-07 19:46:09 +02:00
James Cole
c3bd46d7c0 Preference can be turned on and off (is always off now) 2022-06-07 19:24:08 +02:00
James Cole
f13dd18b6f Update boxes. 2022-06-06 17:39:50 +02:00
James Cole
c916fbbee9 Add code for budgets 2022-06-06 16:41:54 +02:00
James Cole
d007db166a Various code for currency exchange rate support 2022-06-06 14:40:19 +02:00
James Cole
9c08b9f1d3 Small update to frontend and associated code. 2022-06-05 20:02:43 +02:00
James Cole
6b2619c5cc Clean up index and add some new strings. 2022-06-05 16:18:28 +02:00
James Cole
69b1985ac0 Update packages 2022-06-04 21:07:57 +02:00
James Cole
61eb8f325e Merge branch 'develop' into 5.8-dev 
# Conflicts:
#	frontend/package.json
#	frontend/yarn.lock
 2022-06-04 21:05:56 +02:00
James Cole
66310b494b Update packages 2022-06-04 09:06:19 +02:00
James Cole
2f75437ac1 Code for new release. 2022-05-31 06:05:21 +02:00
James Cole
bc3c019d03 Meta files for new release. 2022-05-18 06:40:17 +02:00
James Cole
35a8016744 Fix store references 2022-05-08 09:32:07 +02:00
James Cole
9020ed158c Various fixes 2022-05-07 19:26:37 +02:00
James Cole
2e3071d40f Merge branch 'develop' into 5.8-dev 2022-05-07 17:12:31 +02:00
James Cole
2579750ba3 Update meta files for new release. 2022-05-05 06:01:48 +02:00
James Cole
a258b35236 Update meta files for 5.7.5 2022-05-04 20:15:47 +02:00
James Cole
295724c4e9 Meta files for new release. 2022-05-02 19:08:28 +02:00
James Cole
0babe84a33 Frontend updates 2022-05-02 18:54:43 +02:00
dependabot[bot]
5d3abb315c Bump async from 2.6.3 to 2.6.4 in /frontend 
Bumps [async](https://github.com/caolan/async) from 2.6.3 to 2.6.4.
- [Release notes](https://github.com/caolan/async/releases)
- [Changelog](https://github.com/caolan/async/blob/v2.6.4/CHANGELOG.md)
- [Commits](https://github.com/caolan/async/compare/v2.6.3...v2.6.4)

---
updated-dependencies:
- dependency-name: async
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-04-23 03:38:54 +00:00
James Cole
ac5c11a8d7 Update meta files for new release. 2022-04-12 17:45:54 +02:00
James Cole
b4638e1ae5 Rebuild meta files for new release. 2022-04-04 05:48:15 +02:00
James Cole
122cab1757 Update meta files for new release. 2022-04-03 12:12:41 +02:00
James Cole
59922e6c2e Expanding the account overview but still a bit stuck on the delete option. 2022-03-30 06:34:37 +02:00