IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-09-03 20:52:58 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,287 Commits 9 Branches 1,163 Tags
3c68c99bd5560617f7720ebe4303fa0475ff29ff
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
James Cole 3c68c99bd5 Fixed some translations. 2015-07-24 09:03:40 +02:00
James Cole ec4b37c596 Updated chart. 2015-07-24 08:36:49 +02:00
James Cole ba9601d21c Better display for piggy bank events. 2015-07-24 08:34:30 +02:00
James Cole 50c13fd469 Clear cache. 2015-07-22 22:13:40 +02:00
James Cole 7af072b8fc Show message. 2015-07-22 19:35:39 +02:00
James Cole faa128d41e Made a cron controller. 2015-07-22 19:09:17 +02:00
James Cole 868fe46932 Some more debug stuff. 2015-07-22 18:44:51 +02:00
James Cole e9e4307ce5 Better debug. 2015-07-22 18:09:14 +02:00
James Cole 774d4844a9 Another try to fix csrf 2015-07-22 17:58:06 +02:00
James Cole 586c53e670 Remove CSRF check. 2015-07-22 17:52:55 +02:00
James Cole 68e073fbff A new controller that can be used in combination with SendGrid. 2015-07-22 17:50:02 +02:00
James Cole 8101dc37b1 New route for attachment preview. 2015-07-19 22:19:36 +02:00
James Cole 63f16c458d Small fixes for piggy banks data seed. 2015-07-19 22:19:26 +02:00
James Cole 821e007e95 If zero, other thing. 2015-07-19 18:39:06 +02:00
James Cole 1656a2f11a Experimenting with a preview for attachments. 2015-07-19 18:37:29 +02:00
James Cole 4dbc135dce Added max file size for uploads. 2015-07-19 14:30:20 +02:00
James Cole fc886f6bc1 Seed some tags. 2015-07-19 13:46:41 +02:00
James Cole f93e480466 Better notifications. 2015-07-19 13:46:34 +02:00
James Cole fe807e23f8 Fixed sorting in tags. 2015-07-19 13:46:20 +02:00
James Cole ecf61c31f1 Add new line to file. 2015-07-19 12:23:27 +02:00
James Cole 4feff18af5 Fix test data. 2015-07-19 12:21:51 +02:00
James Cole a07c52e0d8 Fix some route names. 2015-07-19 12:21:38 +02:00
James Cole 7bb07d7f55 Add non-breaking space to fix issue #95. 2015-07-19 12:20:35 +02:00
James Cole f12dfc8a14 Icons for attachments. 2015-07-19 11:47:56 +02:00
James Cole be030f15c4 New composer.lock. 2015-07-19 09:57:26 +02:00
James Cole f5fb6c063b Also delete attachments. 2015-07-19 09:53:58 +02:00
James Cole fb722f06b9 Some added newlines. 2015-07-19 09:38:44 +02:00
James Cole c0ea19e15e Test data no longer runs into the future. 2015-07-19 09:37:52 +02:00
James Cole cdeb1ad87c Some model updates. 2015-07-19 09:37:37 +02:00
James Cole 0dbe4e94fa Allow to edit an attachment. 2015-07-19 09:37:28 +02:00
James Cole b5e2e8aa1d Edit attachment page. 2015-07-18 23:51:51 +02:00
James Cole 9502010248 Some new routes. 2015-07-18 23:06:51 +02:00
James Cole fea0557b47 Going to allow edit of attachment. 2015-07-18 22:49:27 +02:00
James Cole ed4fcc9011 Some optimisation. 2015-07-18 22:17:31 +02:00
James Cole ed12ea7cfb Check for double files and some code clean up. 2015-07-18 21:46:16 +02:00
James Cole 73e526645e Uncomment providers. 2015-07-18 21:33:52 +02:00
James Cole 72aeafb2b5 Some model code block updates 2015-07-18 21:33:10 +02:00
James Cole cc1af60cb4 Basic attachment download function. 2015-07-18 21:32:31 +02:00
James Cole 359fab315f A fix in the model and a simple view for attachments. 2015-07-18 21:12:34 +02:00
James Cole 6a9574bab9 Allow jpeg and PDF. 2015-07-18 19:49:35 +02:00
James Cole 83d6158483 Basic upload working. 2015-07-18 09:49:59 +02:00
James Cole 63ef89b6cc Basic interface for upload. 2015-07-18 09:49:29 +02:00
James Cole b0beab4cd3 Attachment model and database changes. 2015-07-18 09:49:19 +02:00
James Cole a34782575f Fix form and upload thing. 2015-07-18 08:59:33 +02:00
James Cole 142bdc9430 Add attachment thing to upload form. 2015-07-17 21:45:58 +02:00
James Cole 14b79cb0a4 Fixed a bug where deposits and/or transfers would be assigned budgets if you had selected a budget at the withdrawal screen earlier. 2015-07-17 21:03:13 +02:00
James Cole ce5beeaf2c Better compare for amounts because floatval can be inaccurate. 2015-07-17 17:35:04 +02:00
James Cole 31114a2ca5 Fixed a bug where tags would be recreated instead of "found". 2015-07-17 17:34:49 +02:00
James Cole 32528094ad Updated composer file. 2015-07-16 20:39:20 +02:00
James Cole 0a2a01c44c Code reformat. 2015-07-15 21:06:26 +02:00
James Cole 4d76afbe01 Merge branch 'release/3.4.9' into develop 2015-07-15 21:02:36 +02:00
James Cole 76d7a97f93 New release with all changes so far. Change log coming soon. 2015-07-15 21:02:27 +02:00
James Cole a15fbc8094 Now committing to correct branch. 2015-07-14 22:48:34 +02:00
James Cole 546f1d9c50 Revert "Some login and session updates." 
This reverts commit 74231f552a.
 2015-07-14 22:45:14 +02:00
James Cole 74231f552a Some login and session updates. 2015-07-14 22:45:00 +02:00
James Cole b250a10e3c Merge branch 'release/3.4.8' 
Conflicts:
	resources/twig/auth/login.twig
	resources/twig/auth/password.twig
	resources/twig/auth/register.twig
 2015-07-12 22:45:37 +02:00
James Cole a9f1b31dd6 New version. 2015-07-12 22:43:43 +02:00
James Cole 7fe393acaf Updated composer.lock. 2015-07-12 22:43:01 +02:00
James Cole 04faba4db5 Fix URL things. 2015-07-12 22:37:05 +02:00
James Cole 91bba40c20 Cleanup code. 2015-07-12 17:59:13 +02:00
James Cole 79e39f7de8 Code cleanup. 2015-07-12 17:36:38 +02:00
James Cole 9c09353559 Some improvements in tour 2015-07-12 12:45:41 +02:00
James Cole 50752a5bfe Implemented a short tour. 2015-07-11 10:01:13 +02:00
James Cole d59879db7d Add bootstrap tour references. 2015-07-11 08:37:21 +02:00
James Cole aab125da27 Add bootstrap tour files. 2015-07-11 08:36:46 +02:00
James Cole 74fc731f96 Full Bootstrap. 2015-07-11 08:35:51 +02:00
James Cole bd0050fec2 Fix balance display. 2015-07-10 20:59:20 +02:00
James Cole aa5e313b92 Save transactions by moving them. 2015-07-10 20:48:45 +02:00
James Cole e89d613b7e Removed confidential data from logging routine. [skip ci] 2015-07-10 20:25:17 +02:00
James Cole 8757929ead Make log [skip ci] 2015-07-10 20:19:31 +02:00
James Cole e0a9b19802 Some new translations and what-not. 2015-07-10 20:17:17 +02:00
James Cole 308da6dc6e Clean up some lists [skip ci] 2015-07-10 07:39:59 +02:00
James Cole b6960fb0e5 Small layout and translation fixes [skip ci] 2015-07-10 05:39:35 +02:00
James Cole 137208c3fd Typical. 2015-07-09 21:59:02 +02:00
James Cole d7a9a62a1d Should fix some scrutinyizer problems. 2015-07-09 21:48:05 +02:00
James Cole 075315bdaa Added some model thingies so scrutinizer will stop whining. 2015-07-09 21:29:30 +02:00
James Cole 3948fcd614 Added newlines to files. 2015-07-09 21:26:40 +02:00
James Cole 8e61e129ab More debug, some bug fixes. 2015-07-09 19:36:14 +02:00
James Cole 20cffd0502 Fixed Rabo importer. 2015-07-09 19:23:49 +02:00
James Cole 5df09dab09 Put specifix in json. 2015-07-09 19:05:59 +02:00
James Cole 7446b911e5 Logging in Rabo specifix. 2015-07-09 19:03:39 +02:00
James Cole f15267c1ab Better import feedback. 2015-07-09 18:38:15 +02:00
James Cole 9c9fc2b5dc Some fixes in csv importer. 2015-07-09 18:33:09 +02:00
James Cole 28f601b54b Import fix asset account. 2015-07-09 16:37:42 +02:00
James Cole 18b8a05014 Extra logging. 2015-07-09 16:07:05 +02:00
James Cole 910c995ed8 Log account id. [skip ci] 2015-07-09 16:03:47 +02:00
James Cole 498468aa2c Display error. [skip ci] 2015-07-09 15:39:41 +02:00
James Cole 637aebcb34 Bug fix for importer. [skip ci] 2015-07-09 15:36:56 +02:00
James Cole 9afd5cb277 Fix specific [skip ci] 2015-07-09 15:27:40 +02:00
James Cole bc525e7272 Date format in config downloader. [skip ci] 2015-07-09 15:25:24 +02:00
James Cole a80180780d Use log [skip ci] 2015-07-09 15:21:34 +02:00
James Cole 0d73086c37 More logging [skip ci] 2015-07-09 15:20:55 +02:00
James Cole 02ae39238d Forgot one iban key. 2015-07-09 14:04:01 +02:00
James Cole 43d6b51d42 Some cleaning up [skip ci] 2015-07-09 11:13:38 +02:00
James Cole 84566310de Cleaned up model comments. 2015-07-09 09:42:09 +02:00
James Cole 6a6ec9fbe4 Cleaned up some bill related code. 2015-07-09 09:41:54 +02:00
James Cole 84a7f825d7 Some small code optimisations. 2015-07-09 06:13:39 +02:00
James Cole 0372c1aaf1 Small fix to make account journal list sortable. [skip ci] 2015-07-08 20:18:51 +02:00
James Cole c9fff197f7 Some improved sorting. 2015-07-08 13:11:51 +02:00
James Cole 6900392e43 Fixed some sorting. 2015-07-08 13:05:33 +02:00