firefly-iii/public
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
..
.well-known Update security.txt and associated key. 2022-02-19 07:28:13 +01:00
images/vendor/leaflet/dist Rebuild frontend 2021-02-17 06:46:26 +01:00
v1 Merge branch 'develop' into 5.8-dev 2022-12-24 17:34:20 +01:00
v3 Merge branch 'develop' into 5.8-dev 2022-12-24 17:34:20 +01:00
v3-local Add local css & js 2022-06-05 11:50:23 +02:00
.htaccess Various updated files. 2017-09-09 22:32:11 +02:00
android-chrome-192x192.png Remove some debug info. 2021-03-24 19:28:07 +01:00
android-chrome-512x512.png Remove some debug info. 2021-03-24 19:28:07 +01:00
apple-touch-icon-precomposed.png Update icons and favicons. 2021-03-21 08:56:51 +01:00
apple-touch-icon.png Remove some debug info. 2021-03-24 19:28:07 +01:00
browserconfig.xml Code cleanup. 2021-03-28 11:43:07 +02:00
favicon-16x16.png Remove some debug info. 2021-03-24 19:28:07 +01:00
favicon-32x32.png Remove some debug info. 2021-03-24 19:28:07 +01:00
favicon.ico Remove some debug info. 2021-03-24 19:28:07 +01:00
index.php remove old inspections 2022-10-30 12:12:35 +01:00
manifest.webmanifest Add maskable icons (and some PWA-related settings) 2021-09-11 01:06:22 +02:00
maskable72.png Add maskable icons (and some PWA-related settings) 2021-09-11 01:06:22 +02:00
maskable76.png Add maskable icons (and some PWA-related settings) 2021-09-11 01:06:22 +02:00
maskable96.png Add maskable icons (and some PWA-related settings) 2021-09-11 01:06:22 +02:00
maskable120.png Add maskable icons (and some PWA-related settings) 2021-09-11 01:06:22 +02:00
maskable128.png Add maskable icons (and some PWA-related settings) 2021-09-11 01:06:22 +02:00
maskable144.png Add maskable icons (and some PWA-related settings) 2021-09-11 01:06:22 +02:00
maskable152.png Add maskable icons (and some PWA-related settings) 2021-09-11 01:06:22 +02:00
maskable180.png Add maskable icons (and some PWA-related settings) 2021-09-11 01:06:22 +02:00
maskable192.png Add maskable icons (and some PWA-related settings) 2021-09-11 01:06:22 +02:00
maskable384.png Add maskable icons (and some PWA-related settings) 2021-09-11 01:06:22 +02:00
maskable512.png Add maskable icons (and some PWA-related settings) 2021-09-11 01:06:22 +02:00
maskable-icon.svg Add copyright statements 2022-03-29 14:55:51 +02:00
mix-manifest.json Add option to delete webhooks. 2022-09-18 05:49:56 +02:00
mstile-150x150.png Remove some debug info. 2021-03-24 19:28:07 +01:00
robots.txt Send search engine spiders away, as suggested in issue #105 2015-08-24 20:11:04 +02:00
safari-pinned-tab.svg Rebuild frontend. 2021-09-16 14:32:06 +02:00
web.config Various files 2017-09-09 22:10:43 +02:00