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
|
2780cf4b20
|
Rebuild frontend
|
2022-12-24 10:20:32 +01:00 |
|
James Cole
|
7e63700ca2
|
Update JSON and JS
|
2022-12-24 10:18:50 +01:00 |
|
James Cole
|
034647a5ca
|
Merge branch 'develop' into 5.8-dev
# Conflicts:
# composer.lock
# public/v1/js/create_transaction.js
# public/v1/js/edit_transaction.js
# public/v1/js/profile.js
|
2022-12-11 10:29:01 +01:00 |
|
James Cole
|
989fd1adba
|
Rebuild frontend
|
2022-12-11 10:22:51 +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
|
914dc8596b
|
remove old inspections
|
2022-10-30 12:12:35 +01: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
|
f3566c609a
|
Meta files for new release.
|
2022-10-18 21:13:14 +02:00 |
|
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
|
5038ed7708
|
Update build files
|
2022-10-16 16:07:48 +02:00 |
|
James Cole
|
841edcfffb
|
Rebuild frontend
|
2022-10-08 07:04:41 +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
|
030b6cb281
|
Rebuild frontend
|
2022-10-08 06:50:17 +02:00 |
|
James Cole
|
896c15a7a1
|
Update meta data and translations.
|
2022-10-08 06:47:56 +02:00 |
|
James Cole
|
db2485f97a
|
Clean up rule form.
|
2022-10-03 05:49:25 +02:00 |
|
James Cole
|
5f11272d49
|
Merge branch 'develop' into 5.8-dev
|
2022-10-01 19:06:55 +02:00 |
|
James Cole
|
c4e46bf89b
|
Fix issue in budget limits
|
2022-10-01 16:35:29 +02:00 |
|
James Cole
|
9bfa52f3ce
|
Merge branch 'develop' into 5.8-dev
And fix rule creation and edit etc
|
2022-10-01 07:34:30 +02:00 |
|
James Cole
|
a9f2741282
|
Add ability to move stuff around, fix spelling.
|
2022-09-24 17:43:49 +02:00 |
|
James Cole
|
c25b63d87b
|
Fix #4198
|
2022-09-18 16:28:04 +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
|
ad9efde2d0
|
Expand webhook code.
|
2022-09-17 07:08:30 +02:00 |
|
James Cole
|
f0416f5322
|
Merge branch 'develop' into 5.8-dev
# Conflicts:
# config/firefly.php
|
2022-09-11 08:59:34 +02:00 |
|
James Cole
|
93ea86f921
|
Fix meta files for new release.
|
2022-09-11 07:27:16 +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
|
e420ead9e8
|
Update translations.
|
2022-09-04 13:53:24 +02:00 |
|
James Cole
|
7cf6066afd
|
Merge branch 'develop' into 5.8-dev
|
2022-08-21 10:42:01 +02:00 |
|
James Cole
|
b6e8144fe9
|
Try to catch bad operations.
|
2022-08-19 20:24:20 +02:00 |
|
James Cole
|
4d1b21f70d
|
Merge branch 'develop' into 5.8-dev
# Conflicts:
# composer.lock
|
2022-08-03 05:40:31 +02:00 |
|
James Cole
|
aa3fba91d4
|
Remove the service worker.
|
2022-08-03 05:39:47 +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
|
1406abe7ae
|
Merge branch 'develop' into 5.8-dev
# Conflicts:
# yarn.lock
|
2022-07-16 09:46:43 +02:00 |
|
James Cole
|
ef23948b41
|
Update packages and rebuild
|
2022-07-16 09:40:52 +02:00 |
|
James Cole
|
0e8d2c5f0a
|
Rebuild frontend
|
2022-07-16 09:26:19 +02:00 |
|
James Cole
|
5e8671d24b
|
Expand code and upgrade.
|
2022-07-10 06:23:59 +02:00 |
|
James Cole
|
9118a153d5
|
Merge branch 'develop' into 5.8-dev
# Conflicts:
# composer.lock
# yarn.lock
|
2022-07-09 17:25:39 +02:00 |
|
James Cole
|
b97988a597
|
Update packages to shutup dependabot.
|
2022-07-05 19:16:53 +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
|
86d15435a5
|
Update frontend build.
|
2022-06-09 20:31:44 +02:00 |
|
James Cole
|
9c08b9f1d3
|
Small update to frontend and associated code.
|
2022-06-05 20:02:43 +02:00 |
|