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
14,873 Commits 9 Branches 1,163 Tags
f8c725e5b2a1f8fcf7cfb1c3c3f11dca16325ac3
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
James Cole f8c725e5b2 Merge branch 'feature/api-bulk-transaction-move' into develop 2021-04-04 07:28:54 +02:00
James Cole e6344e4f51 Update changelog. 2021-04-04 07:28:35 +02:00
James Cole 8eac10bf89 Simplify routine. 2021-04-04 07:25:52 +02:00
James Cole c1da0eeced Update chart to include time. 2021-04-04 07:25:42 +02:00
James Cole 0a6d5b1766 Fix error views. 2021-04-03 20:51:19 +02:00
James Cole 4035ac09ce Clean up error display. 2021-04-03 20:46:37 +02:00
James Cole f81a7cfac0 Merge tag '5.5.3' into develop 
5.5.3
 2021-04-03 18:50:37 +02:00
James Cole 2b086879cc Merge branch 'release/5.5.3' into main 2021-04-03 18:50:36 +02:00
James Cole a3091f7509 Final code for 5.3.3 2021-04-03 18:48:21 +02:00
James Cole 70a6ac0038 Make it easier to login for demo users. 2021-04-03 14:03:54 +02:00
James Cole 468a53d587 Add API route to move transactions from one account to another. 2021-04-03 13:56:45 +02:00
James Cole 51f3b17ad2 Clean up handler. 2021-04-03 13:19:11 +02:00
James Cole a864d3bd56 Rebuild frontend 2021-04-03 12:52:50 +02:00
James Cole a4d5aa0d10 Do not report on authentication exceptions. 2021-04-03 12:46:50 +02:00
James Cole aff5ac2c0a Update changelog and version. 2021-04-03 12:39:01 +02:00
James Cole effe92a05c Make sure the email error mails everything. 2021-04-03 12:32:29 +02:00
James Cole a4ca6dfd38 Update email message paths for #4586 2021-04-03 12:30:34 +02:00
James Cole e6012e1ca2 Fix email templates and handler for #4586 2021-04-03 12:25:35 +02:00
James Cole 472497cafd Fix #4586 2021-04-03 12:16:29 +02:00
James Cole 34f4b16a63 Rebuild frontend. 2021-04-03 10:40:31 +02:00
James Cole 7f55a870d9 Merge tag '5.5.2' into develop 
5.5.2
 2021-04-03 07:40:01 +02:00
James Cole 6a37ad7c15 Merge branch 'release/5.5.2' into main 2021-04-03 07:40:00 +02:00
James Cole 788981d170 Expand changelog and readme. 2021-04-03 07:39:23 +02:00
James Cole f377c92d8a Fix percentage call. 2021-04-03 07:32:48 +02:00
James Cole 0dc3068f7f Rebuild frontend and update packages. 2021-04-03 07:22:21 +02:00
James Cole 1ad8ec6dd1 Update transactions. 2021-04-03 07:17:42 +02:00
James Cole 18a80f3519 Update code for API 2021-04-03 07:16:43 +02:00
James Cole 82f8b091c1 Do not run auto budgets for inactive budgets #4582 2021-04-03 06:04:17 +02:00
James Cole 71785bae57 Upgrade frontend. 2021-04-02 22:33:31 +02:00
James Cole 6d979a68f2 Fix missing first_date 2021-04-02 16:31:24 +02:00
James Cole ef852ef963 Update changelog 2021-04-02 07:06:39 +02:00
James Cole 00b0ce6c6e Add dates for #4575, fiddle with comments for #4578 2021-04-02 06:59:55 +02:00
James Cole 5750087d37 Fix nullpointer in bill transformer. 2021-04-02 06:57:31 +02:00
James Cole a2ae977550 Tag and recurrence as date-time string 2021-04-02 06:18:04 +02:00
James Cole b893651223 Turn dates into date-times. 2021-04-01 21:06:40 +02:00
James Cole e221d37d2b Convert dates into date-times for #4571 2021-04-01 20:56:11 +02:00
James Cole f0acab21a3 Add timezone to template for #4571 2021-04-01 06:48:06 +02:00
James Cole 93dc5fae09 Fix #4571 2021-04-01 06:47:56 +02:00
James Cole 40746db53e Add timezone to debug for #4571 2021-04-01 06:47:33 +02:00
James Cole 4404db650c Fix #4574 2021-04-01 06:19:01 +02:00
James Cole ab968a56e6 Fix #4572 2021-04-01 06:15:50 +02:00
James Cole 246a3d000a Make sure admin page is not empty. 2021-04-01 06:15:32 +02:00
James Cole cbcf251bb3 Fix #4570 2021-03-31 19:36:08 +02:00
James Cole 0756054690 Sort expenses and revenue by percentage. 2021-03-31 08:10:46 +02:00
James Cole b6109ca93e Update some translations. 2021-03-31 07:03:15 +02:00
James Cole 823ee2cea0 Clean up operations repository for #4566 2021-03-31 06:54:32 +02:00
James Cole 18f6052681 Part of #4566 2021-03-31 06:29:08 +02:00
James Cole 4f2ab72567 Ref #4567 2021-03-31 06:08:02 +02:00
James Cole bc6a2c2cca Fix #4562 2021-03-30 08:12:48 +02:00
James Cole 7a6a911f7f Fix #4560 2021-03-30 06:32:42 +02:00
James Cole abeff39829 Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop 2021-03-30 06:11:04 +02:00
James Cole 4d18c1bf83 Add if statement for DB migration issue. 2021-03-29 18:53:31 +02:00
James Cole 8a818059f2 Merge pull request #4554 from firefly-iii/dependabot/composer/develop/vimeo/psalm-4.7.0 
Bump vimeo/psalm from 4.6.4 to 4.7.0
 2021-03-29 08:37:56 +00:00
James Cole 3768262224 Merge pull request #4553 from firefly-iii/dependabot/composer/develop/league/commonmark-1.5.8 
Bump league/commonmark from 1.5.7 to 1.5.8
 2021-03-29 08:25:22 +00:00
James Cole 22b376da71 Regenerate frontend. 2021-03-29 06:54:53 +02:00
James Cole fde53abb1a Enable edit function 2021-03-29 06:53:51 +02:00
James Cole c32e09a2b3 Fix #4551 2021-03-29 06:53:30 +02:00
James Cole a243f3d7c2 Call to bad function breaks several reports, fix #4547 2021-03-28 20:42:03 +02:00
James Cole 3586c76b95 Parse improvements for budget overview. 2021-03-28 14:34:02 +02:00
James Cole c9d9840235 Merge branch 'release/5.5.1' into main 2021-03-28 12:06:08 +02:00
James Cole 10390953fe Merge tag '5.5.1' into develop 
5.5.1
 2021-03-28 12:06:08 +02:00
James Cole d6c6bc05ad Set correct version :( 2021-03-28 12:05:56 +02:00
James Cole a17601e2a8 Update meta files and build. 2021-03-28 11:59:25 +02:00
James Cole 93d481b515 Merge branch 'release/5.5.0' into main 
# Conflicts:
#	config/firefly.php
#	frontend/src/scss/_variables.scss
#	frontend/yarn.lock
#	public/v2/css/app.css
#	public/v2/css/app.css.map
#	public/v2/js/transactions/edit.js
#	public/v2/js/transactions/edit.js.map
#	public/v2/js/vendor.js
#	public/v2/js/vendor.js.map
 2021-03-28 11:56:01 +02:00
James Cole 13b8ba3746 Rebuild frontend, final files for 5.5.0 2021-03-28 11:53:27 +02:00
James Cole e6fbd9259d Remove some newlines 2021-03-28 11:47:34 +02:00
James Cole b5eeacc128 Code cleanup. 2021-03-28 11:46:23 +02:00
James Cole 2c575f3ca5 Code cleanup. 2021-03-28 11:43:07 +02:00
James Cole 5abbb8a807 Code cleanup. 2021-03-28 11:39:26 +02:00
James Cole 6401b5c9eb Clean up readme and old code. 2021-03-28 10:37:01 +02:00
James Cole 7edc1a2571 Files for new release. 2021-03-27 20:10:05 +01:00
James Cole f489add855 Update releases.md 2021-03-27 20:03:24 +01:00
James Cole adfdcdb9c6 Files for new reelase. 2021-03-27 20:01:28 +01:00
James Cole 922050a79b Should be enough to fix order issues. 2021-03-27 15:28:11 +01:00
James Cole 436bef01da Always reset order. 2021-03-27 15:13:48 +01:00
James Cole b7ba6f81da Option for showing active/inactive accounts. 2021-03-27 15:06:40 +01:00
James Cole 381b09d68b Sortable account list. 2021-03-27 10:19:22 +01:00
James Cole fbed65d464 Fix broken preference 2021-03-26 06:31:25 +01:00
James Cole bcd612d42f First frontend with working account lists. No sorting. 2021-03-26 06:14:35 +01:00
James Cole eac2293778 Remove some debug info. 2021-03-24 19:28:07 +01:00
James Cole 72deff81f9 Fix some alignments and a translation. 2021-03-24 06:28:32 +01:00
James Cole a8e9ba3041 Fix #4520 2021-03-24 06:06:18 +01:00
James Cole 3e73641378 Rebuild CSS 2021-03-23 18:45:27 +01:00
James Cole 7cf44a604a Rebuild frontpage. 2021-03-23 18:39:01 +01:00
James Cole 9003db6eba Fix #4529 2021-03-23 18:38:24 +01:00
James Cole d1c87e1c21 Fix issues where rule action would use old data. 2021-03-23 06:42:26 +01:00
James Cole ccaadd1f52 Update php7/8 detection code. 2021-03-23 06:23:30 +01:00
James Cole e64653eaff Update firefly.php 2021-03-22 05:46:20 +00:00
James Cole abb0f3d2be Whoops. 2021-03-22 06:45:13 +01:00
James Cole 7f48a1b6ee Fix validation, update version. 2021-03-22 06:40:36 +01:00
James Cole 4affed8f68 Rebuild frontend, first working edit form (with feedback) 2021-03-21 20:38:44 +01:00
James Cole 1088a43866 Rebuild frontend, first working edit form (no feedback) 2021-03-21 18:48:47 +01:00
James Cole e0d0f49bfd Merge branch 'release/5.5.0-beta.3' into main 
# Conflicts:
#	frontend/yarn.lock
 2021-03-21 11:11:25 +01:00
James Cole ee5b4d6a03 Update packages. 2021-03-21 11:10:11 +01:00
James Cole 7062294419 Rebuild front 2021-03-21 11:09:12 +01:00
James Cole 97a687e40a Final things. 2021-03-21 11:06:08 +01:00
James Cole 206845575c Code cleanup 2021-03-21 09:15:40 +01:00
James Cole da1751940e Add flame 2021-03-21 09:03:49 +01:00
James Cole 9502544abf Update icons and favicons. 2021-03-21 08:56:51 +01:00
James Cole b975ed87a0 Remove old Firefly III favicon 2021-03-21 08:54:56 +01:00