James Cole
|
0022009dd5
|
Merge branch 'develop' into 5.8-dev
# Conflicts:
# config/firefly.php
# resources/lang/de_DE/firefly.php
# resources/lang/de_DE/validation.php
# resources/lang/pl_PL/firefly.php
|
2022-12-29 19:16:24 +01:00 |
|
James Cole
|
ba35c5da0b
|
Update meta data
|
2022-12-29 19:13:15 +01:00 |
|
James Cole
|
80762616f3
|
Merge branch 'develop' into 5.8-dev
# Conflicts:
# app/Api/V1/Controllers/Models/AvailableBudget/DestroyController.php
# config/firefly.php
# frontend/package.json
# frontend/src/i18n/fr_FR/index.js
# frontend/src/i18n/pt_BR/index.js
# frontend/src/i18n/ru_RU/index.js
# frontend/src/i18n/sl_SI/index.js
# frontend/src/i18n/zh_CN/index.js
# frontend/yarn.lock
# public/v3/index.html
# public/v3/js/1473.9b55dc17.js
# public/v3/js/150.35592a2c.js
# public/v3/js/1501.3980515e.js
# public/v3/js/1543.010ec22e.js
# public/v3/js/1730.207e6e59.js
# public/v3/js/1864.d9ea853e.js
# public/v3/js/1951.a5d70097.js
# public/v3/js/2106.33b7eabd.js
# public/v3/js/2124.bfc4091d.js
# public/v3/js/2194.4baebc21.js
# public/v3/js/2372.f07615ae.js
# public/v3/js/2407.747d87e4.js
# public/v3/js/2476.8af9976c.js
# public/v3/js/2686.5e278d64.js
# public/v3/js/2700.1251f369.js
# public/v3/js/3232.0964e736.js
# public/v3/js/3903.4e461032.js
# public/v3/js/4640.601878ff.js
# public/v3/js/4782.e1382ab6.js
# public/v3/js/4851.3c27e6c7.js
# public/v3/js/5221.fded0f96.js
# public/v3/js/5266.e820dd38.js
# public/v3/js/5348.109b8049.js
# public/v3/js/5439.d75e5cb4.js
# public/v3/js/5724.8b5fcafb.js
# public/v3/js/576.e26ddde9.js
# public/v3/js/6072.21c05085.js
# public/v3/js/6323.69d55ffd.js
# public/v3/js/6676.60b155c0.js
# public/v3/js/6691.80040366.js
# public/v3/js/6719.f9d4744f.js
# public/v3/js/6826.74ed4602.js
# public/v3/js/6882.c5970da7.js
# public/v3/js/6919.cc55656e.js
# public/v3/js/7044.96c481ac.js
# public/v3/js/7083.c223af4f.js
# public/v3/js/7222.86a095eb.js
# public/v3/js/7480.b9bd8fed.js
# public/v3/js/7499.c362f695.js
# public/v3/js/7544.47af6552.js
# public/v3/js/7552.ebdf1aef.js
# public/v3/js/7586.29cf8776.js
# public/v3/js/7697.4338f28d.js
# public/v3/js/773.ff7cb3ef.js
# public/v3/js/7919.910d5ebb.js
# public/v3/js/7956.3e1c81cf.js
# public/v3/js/8044.169b21f8.js
# public/v3/js/8218.966b669d.js
# public/v3/js/8344.119567b0.js
# public/v3/js/8376.477a5508.js
# public/v3/js/8387.a4c1d7d6.js
# public/v3/js/8405.62235b41.js
# public/v3/js/8493.48ada210.js
# public/v3/js/8611.3ab24e6d.js
# public/v3/js/8907.233f4719.js
# public/v3/js/8928.8127fcdf.js
# public/v3/js/9009.d0e97de6.js
# public/v3/js/9038.06ad98ab.js
# public/v3/js/9069.e81f039c.js
# public/v3/js/9287.bc57ab91.js
# public/v3/js/9597.0c124ce8.js
# public/v3/js/9606.ce293dd2.js
# public/v3/js/app.13f6ce91.js
# public/v3/js/chunk-common.98b27fd7.js
# public/v3/js/vendor.92714ea3.js
# resources/assets/js/locales/fr.json
# resources/assets/js/locales/ru.json
# resources/assets/js/locales/sl.json
# resources/assets/js/locales/zh-cn.json
# resources/lang/de_DE/firefly.php
# resources/lang/nl_NL/firefly.php
# resources/lang/pt_BR/firefly.php
# resources/lang/sl_SI/firefly.php
# resources/lang/zh_CN/firefly.php
|
2022-12-24 17:34:20 +01:00 |
|
James Cole
|
7e63700ca2
|
Update JSON and JS
|
2022-12-24 10:18:50 +01:00 |
|
James Cole
|
acd9685578
|
Merge branch 'develop' into 5.8-dev
|
2022-11-04 05:50:12 +01:00 |
|
James Cole
|
b942f351f8
|
Fix https://github.com/firefly-iii/firefly-iii/issues/6597
|
2022-11-04 05:49:32 +01:00 |
|
James Cole
|
817a9f57c4
|
Merge branch 'develop' into 5.8-dev
# Conflicts:
# config/firefly.php
# frontend/src/i18n/bg_BG/index.js
# frontend/src/i18n/cs_CZ/index.js
# frontend/src/i18n/da_DK/index.js
# frontend/src/i18n/de_DE/index.js
# frontend/src/i18n/el_GR/index.js
# frontend/src/i18n/en_GB/index.js
# frontend/src/i18n/en_US/index.js
# frontend/src/i18n/es_ES/index.js
# frontend/src/i18n/fi_FI/index.js
# frontend/src/i18n/fr_FR/index.js
# frontend/src/i18n/hu_HU/index.js
# frontend/src/i18n/id_ID/index.js
# frontend/src/i18n/it_IT/index.js
# frontend/src/i18n/ja_JP/index.js
# frontend/src/i18n/nb_NO/index.js
# frontend/src/i18n/nl_NL/index.js
# frontend/src/i18n/pl_PL/index.js
# frontend/src/i18n/pt_BR/index.js
# frontend/src/i18n/pt_PT/index.js
# frontend/src/i18n/ro_RO/index.js
# frontend/src/i18n/ru_RU/index.js
# frontend/src/i18n/sk_SK/index.js
# frontend/src/i18n/sl_SI/index.js
# frontend/src/i18n/sv_SE/index.js
# frontend/src/i18n/tr_TR/index.js
# frontend/src/i18n/uk_UA/index.js
# frontend/src/i18n/vi_VN/index.js
# frontend/src/i18n/zh_CN/index.js
# frontend/src/i18n/zh_TW/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/da.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/id.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.json
# resources/assets/js/locales/ro.json
# resources/assets/js/locales/ru.json
# resources/assets/js/locales/sk.json
# resources/assets/js/locales/sl.json
# resources/assets/js/locales/sv.json
# resources/assets/js/locales/tr.json
# resources/assets/js/locales/uk.json
# resources/assets/js/locales/vi.json
# resources/assets/js/locales/zh-cn.json
# resources/assets/js/locales/zh-tw.json
# yarn.lock
|
2022-11-02 05:00:59 +01:00 |
|
James Cole
|
7bb2f96ae2
|
Update meta files for new release.
|
2022-11-02 04:57:15 +01:00 |
|
James Cole
|
e7e3370baa
|
Fix https://github.com/firefly-iii/firefly-iii/issues/6581
|
2022-10-31 20:12:19 +01:00 |
|
James Cole
|
d28326cc89
|
Restore todo's
|
2022-10-30 11:43:17 +01:00 |
|
James Cole
|
b21461c824
|
Merge branch 'develop' into 5.8-dev
# Conflicts:
# resources/views/auth/login.twig
# resources/views/auth/mfa.twig
# resources/views/auth/passwords/email.twig
# resources/views/auth/passwords/reset.twig
# resources/views/auth/register.twig
|
2022-10-24 19:35:47 +02:00 |
|
James Cole
|
d4738b21ab
|
Make sure form elements are not spell checked.
|
2022-10-23 17:36:26 +02:00 |
|
James Cole
|
f4af19e121
|
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
# resources/assets/js/locales/pt-br.json
# resources/lang/pt_BR/firefly.php
# yarn.lock
|
2022-10-23 14:49:54 +02:00 |
|
James Cole
|
e229bd8121
|
Updated translations.
|
2022-10-22 07:34:05 +02:00 |
|
James Cole
|
d31fa743d0
|
Add ability to set some transaction flags. Fixes #6526
|
2022-10-22 07:30:12 +02:00 |
|
James Cole
|
f3566c609a
|
Meta files for new release.
|
2022-10-18 21:13:14 +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
|
77759d5580
|
Update text, remove entry.
|
2022-10-09 07:09:55 +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
|
07541fa08f
|
Update translations and notifications.
|
2022-09-18 15:48:28 +02:00 |
|
James Cole
|
67126e46b9
|
Add webhook code and rebuild.
|
2022-09-18 10:45:38 +02:00 |
|
James Cole
|
d9245f06f7
|
Add option to delete webhooks.
|
2022-09-18 05:49:56 +02:00 |
|
James Cole
|
625ad14d7d
|
Add code to create webhook.
|
2022-09-17 16:54:13 +02:00 |
|
James Cole
|
23e5cf1b34
|
Update languages
|
2022-09-17 07:14:50 +02:00 |
|
James Cole
|
ad9efde2d0
|
Expand webhook code.
|
2022-09-17 07:08:30 +02:00 |
|
James Cole
|
d9e8f8106a
|
Fix https://github.com/firefly-iii/firefly-iii/issues/6379
|
2022-09-11 07:02:39 +02:00 |
|
James Cole
|
1d21a8788c
|
Update packages and meta data.
|
2022-09-04 13:58:21 +02:00 |
|
James Cole
|
2e8ea7493a
|
Update packages.
|
2022-07-16 17:26:10 +02:00 |
|
James Cole
|
bc3c019d03
|
Meta files for new release.
|
2022-05-18 06:40:17 +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
|
ac5c11a8d7
|
Update meta files for new release.
|
2022-04-12 17:45:54 +02:00 |
|
James Cole
|
122cab1757
|
Update meta files for new release.
|
2022-04-03 12:12:41 +02:00 |
|
James Cole
|
b696b09f92
|
New meta files for release.
|
2022-02-28 09:00:33 +01:00 |
|
James Cole
|
efb7d4275d
|
Update meta files for new release.
|
2022-02-28 06:40:34 +01:00 |
|
James Cole
|
f5197ec2e0
|
Update meta files for new release.
|
2022-02-05 08:59:41 +01:00 |
|
James Cole
|
6e4adc86b8
|
Add meta files for new release.
|
2022-01-30 07:12:02 +01:00 |
|
James Cole
|
b104914076
|
Update packages and meta files for new release.
|
2022-01-29 09:26:49 +01:00 |
|
James Cole
|
ab9f26f850
|
Update packages and meta files for new release.
|
2022-01-28 21:19:05 +01:00 |
|
James Cole
|
59f0631685
|
Add external url
|
2022-01-24 07:57:28 +01:00 |
|
James Cole
|
7718deb4a5
|
Fix missing external url field.
|
2022-01-24 07:50:33 +01:00 |
|
James Cole
|
14c6926360
|
rebuild for new release
|
2021-12-19 07:04:57 +01:00 |
|
James Cole
|
344db19232
|
Update translations.
|
2021-12-10 16:44:36 +01:00 |
|
James Cole
|
1e0e5d0fe9
|
Rename variable.
|
2021-10-03 06:05:11 +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
|
7e1af72186
|
Update JS
|
2021-07-11 09:31:10 +02:00 |
|