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
|
e3181e90df
|
Fix https://github.com/firefly-iii/firefly-iii/issues/6130
|
2022-10-30 06:45:56 +01:00 |
|
James Cole
|
486f25cd96
|
Update translations.
|
2022-10-29 07:59:49 +02:00 |
|
James Cole
|
612a395eb2
|
Merge branch 'develop' into 5.8-dev
|
2022-10-26 05:50:42 +02:00 |
|
James Cole
|
a3b4d5ff62
|
Add missing locale data.
|
2022-10-26 05:50:06 +02:00 |
|
James Cole
|
b613b56d1e
|
Merge branch 'develop' into 5.8-dev
# Conflicts:
# resources/views/list/groups.twig
|
2022-10-24 19:59:26 +02:00 |
|
James Cole
|
6b7fc03f02
|
Fix style
|
2022-10-24 19:58:49 +02:00 |
|
James Cole
|
5999ee406c
|
Fix style
|
2022-10-24 19:58:12 +02:00 |
|
James Cole
|
e348127770
|
Merge branch 'develop' into 5.8-dev
|
2022-10-24 19:53:42 +02:00 |
|
James Cole
|
b60a3be34b
|
Fix style
|
2022-10-24 19:53:19 +02:00 |
|
James Cole
|
e3bdc62ac4
|
Merge branch 'develop' into 5.8-dev
|
2022-10-24 19:48:13 +02:00 |
|
James Cole
|
83b8fdba05
|
Fix #6564
|
2022-10-24 19:42:06 +02: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
|
4ad666d964
|
Add button to remove unused accounts.
|
2022-10-19 19:57:22 +02:00 |
|
James Cole
|
f3566c609a
|
Meta files for new release.
|
2022-10-18 21:13:14 +02:00 |
|
James Cole
|
9e41cd9c8c
|
Fix spelling
|
2022-10-17 05:42:05 +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
|
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
|
f1457fcda6
|
New stuff
|
2022-10-06 06:23:12 +02:00 |
|
James Cole
|
a39553256e
|
Merge branch 'develop' into 5.8-dev
|
2022-10-06 06:18:25 +02:00 |
|
Nathan PERIER
|
fc83565d02
|
Added translations for the new options
|
2022-10-05 15:23:22 +02:00 |
|
James Cole
|
7e94f246e3
|
New translations.
|
2022-10-04 20:49:29 +02:00 |
|
James Cole
|
ee2b87d5fe
|
Fix sentences.
|
2022-10-03 20:26:26 +02:00 |
|
James Cole
|
db2485f97a
|
Clean up rule form.
|
2022-10-03 05:49:25 +02:00 |
|
James Cole
|
d8a15e41e6
|
Catch various audit log things
|
2022-10-02 20:13:32 +02:00 |
|
James Cole
|
ca8a65af60
|
Display audit logs
|
2022-10-02 14:37:50 +02:00 |
|
James Cole
|
5f11272d49
|
Merge branch 'develop' into 5.8-dev
|
2022-10-01 19:06:55 +02:00 |
|
James Cole
|
ee9b651f0f
|
Add ability to invite users
|
2022-10-01 12:21:42 +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
|
5714bd0749
|
Add reverse button
|
2022-10-01 07:19:33 +02:00 |
|
James Cole
|
36caf5d8ec
|
New translations
|
2022-09-30 19:46:02 +02:00 |
|
James Cole
|
9b7285ea84
|
Expand search and add operators.
|
2022-09-28 07:35:57 +02:00 |
|
James Cole
|
3c33ea959e
|
Expand search with negated search options
|
2022-09-25 15:31:07 +02:00 |
|
James Cole
|
80a732b32b
|
First negative search query
|
2022-09-24 18:06:01 +02:00 |
|
James Cole
|
a9f2741282
|
Add ability to move stuff around, fix spelling.
|
2022-09-24 17:43:49 +02:00 |
|
James Cole
|
600fa388c1
|
Fix extra notification
|
2022-09-24 12:17:55 +02:00 |
|
James Cole
|
45d7042405
|
Add slack support to Firefly III
|
2022-09-24 12:14:27 +02:00 |
|
James Cole
|
be1dff49fa
|
Add notifications.
|
2022-09-24 11:41:07 +02:00 |
|
James Cole
|
665b78ebf5
|
Expand notifications.
|
2022-09-24 08:23:07 +02:00 |
|