IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-12-27 17:31:09 -06:00
Code Issues Packages Projects Releases Wiki Activity
3,159 Commits 4 Branches 480 Tags 884 MiB
8f7f263a48
Commit Graph

2193 Commits

Author SHA1 Message Date
James Cole
5958990ed5 Stop processing. 2016-01-15 06:35:31 +01:00
James Cole
cd4cbdc197 Accidentally used a php 7 thing. 2016-01-15 06:25:09 +01:00
James Cole
1f538be16e More code for rules. 2016-01-14 21:34:17 +01:00
James Cole
9703439a4c Some more rule things before I merge a change to the CSV importer. 2016-01-14 19:20:02 +01:00
James Cole
42203ba872 Attempt at validating. 2016-01-14 18:57:52 +01:00
James Cole
cd60b852a1 This isn't really working. 2016-01-14 18:09:20 +01:00
James Cole
5b1d9e1a0d Start work on adding a rule. 2016-01-14 16:41:15 +01:00
James Cole
c352eb0c74 First attempt at create rule form. 2016-01-14 12:37:49 +01:00
James Cole
81b9d5da09 User can now re-order triggers and actions. 2016-01-14 11:27:15 +01:00
James Cole
b9b0413510 More resources for rules. 2016-01-14 10:33:24 +01:00
James Cole
97770da619 Re-order rule groups. 2016-01-14 09:53:59 +01:00
James Cole
521623797e Move rule groups. 2016-01-14 09:49:12 +01:00
James Cole
15d3414443 Can order rules. 2016-01-14 09:38:48 +01:00
James Cole
4697fbdeef Routine to delete rules. Should include routine to move rules to other group. 2016-01-13 21:44:26 +01:00
James Cole
06174d6afb Edit rule group. 2016-01-13 18:50:15 +01:00
James Cole
27aae279e6 More code for rules. 2016-01-13 18:34:56 +01:00
James Cole
20941dedd3 Also fix rule group. 2016-01-13 16:08:05 +01:00
James Cole
5ac88623ed Prep stuff for routes and actions. 2016-01-13 16:05:39 +01:00
James Cole
768508dd4b First attempt at interface. 2016-01-13 15:59:45 +01:00
James Cole
668633e764 All actions and triggers. 2016-01-13 15:10:49 +01:00
James Cole
3dbb1f034d Fix the last triggers. 2016-01-13 14:51:49 +01:00
James Cole
1270e5d15c More valid triggers. 2016-01-13 14:37:19 +01:00
James Cole
afec8480fb More working triggers. 2016-01-13 14:12:46 +01:00
James Cole
8720511046 From account contains trigger. 2016-01-13 14:05:26 +01:00
James Cole
a7a00ecf40 More rule possibilities 2016-01-13 14:02:22 +01:00
James Cole
88bbafd3e8 If you get the destination account attribute before the model is saved, the cache breaks. 2016-01-13 14:01:40 +01:00
James Cole
ae3258b449 If you get the source account attribute before the model is saved, the cache breaks. 2016-01-13 14:01:09 +01:00
James Cole
cf4d7cfeef Grab rules properly. 2016-01-13 09:08:13 +01:00
James Cole
46ee2a0568 Can now automatically handle some rules. No user interface, yet. 2016-01-13 08:14:14 +01:00
James Cole
ce250c85fc Rename class. 2016-01-13 07:48:43 +01:00
James Cole
1087b9f5df Can now trigger. 2016-01-13 07:47:26 +01:00
James Cole
0dc74d9d14 Rules will now fire for a store-action. And fail. 2016-01-13 07:30:11 +01:00
James Cole
98b272383f Clean up triggers, add some new ones. 2016-01-13 07:16:29 +01:00
James Cole
670ab059d1 Simply log presence. 2016-01-13 05:37:25 +01:00
James Cole
09f826ceba First attempt at executing groups and rules. 2016-01-12 21:41:45 +01:00
James Cole
df5e3c9be9 Include handlers. 2016-01-12 21:41:19 +01:00
James Cole
b3a419b2f3 New events. 2016-01-12 21:38:12 +01:00
James Cole
11f63fa6ce Rename models for clarity 2016-01-12 21:38:05 +01:00
James Cole
4b35059140 Add connection to user. 2016-01-12 21:37:48 +01:00
James Cole
321890992e Cleanup php doc. 2016-01-12 21:09:19 +01:00
James Cole
d644403d8a Add php doc to rule controller. 2016-01-12 20:56:53 +01:00
James Cole
48551e8bf5 Merge branch 'feature/rules' into develop 2016-01-12 20:39:49 +01:00
James Cole
35f493beff Move domain stuff to configuration. 2016-01-12 20:37:47 +01:00
James Cole
06d11c9133 New stuff for the rule thing. 2016-01-12 20:36:47 +01:00
James Cole
da7eb615db Added php doc. 2016-01-11 21:42:51 +01:00
James Cole
5da5024ad3 New models. 2016-01-11 21:28:29 +01:00
James Cole
70ed4188b6 New controller for rules. 2016-01-11 20:41:57 +01:00
James Cole
d889094863 New route for rules index. 2016-01-11 20:41:50 +01:00
James Cole
c96eb8753e New bread crumb for rules controller. 2016-01-11 20:41:43 +01:00
James Cole
5a7607f6c6 More consistent monetary formatting. 2016-01-10 18:02:24 +01:00
James Cole
19444551e4 Get withdrawals only. 2016-01-10 12:16:25 +01:00
James Cole
a55e291908 Removed money_format. 2016-01-09 18:02:36 +01:00
James Cole
2003d37a9a Fix for php 5.6 thing. 2016-01-09 16:10:12 +01:00
James Cole
29145bf6cf More bindings. 2016-01-09 16:09:26 +01:00
James Cole
caa1ff120a Built more binders. 2016-01-09 15:53:11 +01:00
James Cole
ef4e964c94 Fixed budget list binder. 2016-01-09 15:47:03 +01:00
James Cole
1f263f60a7 New binder for category lists. 2016-01-09 15:45:21 +01:00
James Cole
5fc7cafcbe All new binders. 2016-01-09 15:44:07 +01:00
James Cole
a14544398b New middleware 2016-01-09 15:39:34 +01:00
James Cole
d439dceac1 New middleware. 2016-01-09 15:39:02 +01:00
James Cole
af29b31ea8 Remove "created by" message. 2016-01-09 15:38:48 +01:00
James Cole
e094871bc9 Merge branch 'release/3.6.1' into develop 
Conflicts:
	composer.lock
 2016-01-09 14:31:52 +01:00
James Cole
cf5cc626d7 Important bug fix. 2016-01-09 14:27:35 +01:00
James Cole
05f8773fa0 Fix user model. 2016-01-09 08:51:49 +01:00
James Cole
2980860377 Did some code cleanup. Comments and headers mostly. 2016-01-09 08:20:55 +01:00
James Cole
4bc1c032bd Removed middle ware. 2016-01-09 07:48:45 +01:00
James Cole
9fcb00f10b Fixed some date range problems. 2016-01-09 07:46:11 +01:00
James Cole
723e461559 Fix logout. 2016-01-09 07:38:18 +01:00
James Cole
e622774775 Move to better spot 2016-01-08 20:48:34 +01:00
James Cole
84ce9bc94b Move locale code. 2016-01-08 20:47:35 +01:00
James Cole
a3a1bc30b1 Convert to number. 2016-01-08 20:43:46 +01:00
James Cole
b4c9a7698e Also call parent constructor. 2016-01-08 20:40:48 +01:00
James Cole
8b2d7fc32f Need to call parent constructor. 2016-01-08 19:13:51 +01:00
James Cole
90e66cbd94 Remove session guard. 2016-01-08 18:51:10 +01:00
James Cole
fd9a7080ea Move authentication around. 2016-01-08 18:29:47 +01:00
James Cole
c0fad106f0 Temp fix for redirect loop. 2016-01-08 16:38:20 +01:00
James Cole
78c8243184 Not the problem. 2016-01-08 16:36:41 +01:00
James Cole
780abecd53 Worked the last time.. 2016-01-08 16:35:44 +01:00
James Cole
ea6896816d Fix domain check. 2016-01-08 16:34:52 +01:00
James Cole
8c37ef3a95 Updated various files after upgrade to laravel 5.2 2016-01-08 16:02:15 +01:00
James Cole
35deed1d10 Update http related classes after upgrade to Laravel 5.2 2016-01-08 16:01:21 +01:00
James Cole
ba32a665f1 Update middleware after upgrade to Laravel 5.2 2016-01-08 16:00:57 +01:00
James Cole
bbd19be554 Update requests after upgrade to Laravel 5.2 2016-01-08 16:00:28 +01:00
James Cole
c360cc6db6 Update jobs after upgrade to Laravel 5.2 2016-01-08 16:00:16 +01:00
James Cole
7e4b9af315 Updated providers after upgrade to Laravel 5.2 2016-01-08 16:00:07 +01:00
James Cole
66703b30b3 Updated git files after laravel 5.2 upgrade 2016-01-08 14:27:05 +01:00
James Cole
6f2b1a6a76 The Sendgrid cron does not belong in Firefly. 2016-01-06 15:20:21 +01:00
James Cole
8526907f50 Expand multi-year report. 2016-01-05 21:23:58 +01:00
James Cole
6573bd6b4b Code cleanup according to PHPStorm. 2016-01-02 19:33:44 +01:00
James Cole
3888b8cceb Code cleanup according to PHPStorm. 2016-01-02 16:57:31 +01:00
James Cole
294df4a2b3 Simplified some code. 2016-01-02 16:32:08 +01:00
James Cole
265dd37212 Cleanup and add various warnings. 2016-01-02 16:31:14 +01:00
James Cole
eb7c79ad27 Can be written to. 2016-01-02 09:47:01 +01:00
James Cole
de111c7100 Fix broken route. 2016-01-01 21:59:19 +01:00
James Cole
e892c9a824 Followed up on some inspections. 2016-01-01 21:49:27 +01:00
James Cole
5eb0e18cae Cleaning up 2016-01-01 21:15:03 +01:00
James Cole
27cabb398e More queries filtered. 2016-01-01 21:07:15 +01:00
James Cole
64dbb14241 Method no longer used. 2016-01-01 20:05:14 +01:00
James Cole
bb4e2be9eb Method no longer used. 2016-01-01 20:04:44 +01:00
James Cole
7d1de0da17 Method no longer used. 2016-01-01 20:02:01 +01:00
James Cole
bf16c9a42b Method no longer used. 2016-01-01 20:01:07 +01:00
James Cole
1a7b1ce499 Method no longer used. 2016-01-01 20:00:20 +01:00
James Cole
efc9bc71a7 Method no longer used. 2016-01-01 19:58:31 +01:00
James Cole
fc5b315af0 Method no longer used. 2016-01-01 19:58:05 +01:00
James Cole
7a4a78628d Method no longer used. 2016-01-01 19:57:23 +01:00
James Cole
d16fb30a62 Method no longer used. 2016-01-01 19:56:23 +01:00
James Cole
2d177e660e Method no longer used. 2016-01-01 19:55:47 +01:00
James Cole
2f131dc170 Method no longer used. 2016-01-01 19:55:00 +01:00
James Cole
94810e371a Enable bill report. 2016-01-01 19:52:55 +01:00
James Cole
59731878f6 Month report optimised. 2016-01-01 19:46:12 +01:00
James Cole
54ede8aa18 Code cleanup. 2016-01-01 13:54:23 +01:00
James Cole
b415b6b043 Some code cleanup. 2016-01-01 12:41:00 +01:00
James Cole
70c922cdc5 Code cleanup. 2016-01-01 11:32:08 +01:00
James Cole
068fc32cb2 Some query cleaning up. 2015-12-31 20:12:49 +01:00
James Cole
3dcdacc3b8 Cleared lots of queries. In some cases, from 1400 back to 300. And those 300 have a different cause which is next. 2015-12-31 17:46:34 +01:00
James Cole
a6594358d8 Use a lot less queries 2015-12-31 17:20:54 +01:00
James Cole
f98921da46 Optimised summary chart. 2015-12-31 08:36:01 +01:00
James Cole
25747fbcf2 And optimised another chart. Amounts are slightly different. Will investigate 2015-12-31 08:31:28 +01:00
James Cole
aac5c2b13c Optimised another chart. 2015-12-31 08:26:04 +01:00
James Cole
cc810a5b6f Renamed a chart to be more consistent with the others. 2015-12-31 07:54:11 +01:00
James Cole
1b3592d959 Optimise chart. 2015-12-31 07:49:19 +01:00
James Cole
d75614e9a7 Optimised two charts, cleaned up some code. 2015-12-30 16:42:09 +01:00
James Cole
08703e282f Fix array. 2015-12-30 09:30:06 +01:00
James Cole
2904baf44e From 1100+ queries to a steady 6. 2015-12-30 09:17:29 +01:00
James Cole
f99e46bf75 Removed for-loop in favour of "pluck()" aka: RTFM. 2015-12-30 09:17:14 +01:00
James Cole
9f87890ead Removed for-loop in favour of "pluck()" aka: RTFM. 2015-12-30 09:17:05 +01:00
James Cole
638184cf66 Removed for-loop in favour of "pluck()" aka: RTFM. 2015-12-30 09:16:58 +01:00
James Cole
03babfe75c Removed for-loop in favour of "pluck()" aka: RTFM. 2015-12-30 09:16:53 +01:00
James Cole
238ed3c788 Rename a method. 2015-12-30 08:25:38 +01:00
James Cole
6a9d931ba3 More code cleanup. 2015-12-30 08:21:11 +01:00
James Cole
a3d2a9e00b Some cleaning up, and I hope simplification. 2015-12-30 08:15:04 +01:00
James Cole
39b88e8207 Added an alias to make methods more readable. 2015-12-30 08:00:52 +01:00
James Cole
449c6dfde5 Bind new class. 2015-12-29 22:51:31 +01:00
James Cole
7cc47ca0b1 Some cleaning up. 2015-12-29 22:48:55 +01:00
James Cole
95f4a83f41 Split category repository into two repositories. One for database calls for single categories, the other pertaining all categories. 2015-12-29 22:44:13 +01:00
James Cole
35154dc7a3 Another chart optimised 2015-12-29 18:55:30 +01:00
James Cole
0fd0d7d080 Less queries for category frontpage chart. 2015-12-29 10:08:40 +01:00
James Cole
658265c938 Optimised whole budget chart to use less queries. 2015-12-29 08:45:43 +01:00
James Cole
38fe9e7e1c Optimised chart. 2015-12-29 08:27:13 +01:00
James Cole
77056dcf8d Cleanup. 2015-12-29 08:27:05 +01:00
James Cole
026683a8e1 Made reportType camelCase. 2015-12-28 20:04:54 +01:00
James Cole
6ab6dd6ac3 First attempt at optimised query for multi-year budget chart. 2015-12-28 19:56:28 +01:00
James Cole
83de3482ce Optimised budget year chart. 2015-12-28 17:57:03 +01:00
James Cole
f79c9f7cf1 Cleanup. 2015-12-28 16:52:28 +01:00
James Cole
8e75c345d9 Found a bug that requires a new release of FF3 to fix. 2015-12-28 16:52:21 +01:00
James Cole
1857469d2f Removed unused parameters 2015-12-28 08:00:42 +01:00
James Cole
ea71b4843d Formatting fix in chart. 2015-12-28 07:58:40 +01:00
James Cole
97727e2e3d Some code cleanup courtesy of phpstorm. 2015-12-28 07:55:09 +01:00
James Cole
f81e7da8bb Code cleanup. 2015-12-28 07:49:27 +01:00
James Cole
8e827bf83b Removed parameter. 2015-12-28 07:43:57 +01:00
James Cole
9e1fa284ca Update php doc. 2015-12-28 07:43:05 +01:00
James Cole
3bf800be6e null check. 2015-12-28 07:41:44 +01:00
James Cole
635b9f9dba instance check. 2015-12-28 07:39:48 +01:00
James Cole
52a0d7cf7b Clean up code. 2015-12-28 07:38:02 +01:00
James Cole
a34516932b Rename include advised by scrutinizer. 2015-12-28 07:35:09 +01:00
James Cole
929a2a30a2 Fix TODO. 2015-12-28 07:31:48 +01:00
James Cole
ffa88eeb08 Made deleted piggy banks for piggy bank events visible. 2015-12-28 07:27:16 +01:00
James Cole
51b45b4ed4 Code cleanup. 2015-12-28 07:12:47 +01:00
James Cole
f263844793 Fix a bug where you cannot edit transactions. Will warrant a new release of FF. 2015-12-28 07:12:12 +01:00
James Cole
18c46df9aa Fix negative amounts and chart names. 2015-12-27 21:26:44 +01:00
James Cole
15846e157b From 200+ queries back to ~17. 2015-12-27 21:17:04 +01:00
James Cole
bc59f2db0d Optimised queries. 2015-12-27 20:07:49 +01:00
James Cole
cd2be8c1a4 Activate caching. 2015-12-27 19:51:20 +01:00
James Cole
e7d677bfb6 Add rounding, so the number will be a float. 2015-12-27 17:34:31 +01:00
James Cole
3e80ffc52b Huge change to bills and paid/unpaid/cc boxes. 2015-12-27 17:29:41 +01:00
James Cole
d0c7a5c076 Optimised query. 2015-12-27 09:44:12 +01:00
James Cole
f3f4e6b354 Stops date from skipping ahead slowly. 2015-12-27 09:40:28 +01:00
James Cole
da3dc599f9 Fix chart call. 2015-12-27 09:35:24 +01:00
James Cole
6b750c909a Fix forgotten call in bill repository. 2015-12-27 08:39:41 +01:00
James Cole
5f8b6640a9 A lot less queries thanks to efficient query. 2015-12-27 08:39:29 +01:00
James Cole
dd42d8437c Removed code for unused chart. 2015-12-27 08:12:46 +01:00
James Cole
67a178591d Some query optimisations. 2015-12-27 07:59:00 +01:00
James Cole
f5e5659c1f Code cleanup. 2015-12-26 09:40:24 +01:00
James Cole
8b0f0fb615 Optimise queries. 2015-12-26 09:39:35 +01:00
James Cole
209116e766 Query optimisations. 2015-12-26 09:21:45 +01:00
James Cole
79392ab656 Add caching to various queries and lists. 2015-12-26 08:44:34 +01:00
James Cole
3ca1207231 #135 2015-12-26 08:24:41 +01:00
James Cole
cec1b147f2 #135 2015-12-26 08:23:52 +01:00
James Cole
b833e8dfa2 #135 2015-12-26 08:16:30 +01:00
James Cole
77b843efd8 #135 2015-12-26 08:15:22 +01:00
James Cole
eadc630fcb #135 2015-12-26 08:12:44 +01:00
James Cole
170c1793cc #135 2015-12-26 08:06:34 +01:00
James Cole
9f7c6c2d0c Extra cache. 2015-12-25 17:11:55 +01:00
James Cole
72d054c55c Add support for virtual balance currency, even though it cannot be stored yet. 2015-12-25 17:10:04 +01:00
James Cole
4f38b77ef6 Better caching. 2015-12-25 09:34:37 +01:00
James Cole
5862803434 This saves some queries. 2015-12-25 09:34:23 +01:00
James Cole
5b3beded39 I can't believe I left this here all this time. 2015-12-25 07:58:19 +01:00
James Cole
c61fb7a598 Marked some unused stuff as deprecated. 2015-12-25 07:52:56 +01:00
James Cole
33d9148029 Make sure charts are cached. 2015-12-25 07:43:34 +01:00
James Cole
63969f5a33 Same routine but for money spent on accounts. 2015-12-25 07:42:00 +01:00
James Cole
edde18aeef Remove old chart. 2015-12-25 07:32:56 +01:00
James Cole
e16269daa8 Collect data for new chart. 2015-12-25 07:31:54 +01:00
James Cole
c07591ff5c New method, earnedForAccounts 2015-12-25 07:31:43 +01:00
James Cole
75a478ad54 New chart, earned in period. 2015-12-25 07:31:29 +01:00
James Cole
15fd8cf486 Completed the renaming of some methods. 2015-12-24 10:27:45 +01:00
James Cole
55333156ac Better cache control for some charts. 2015-12-24 10:14:01 +01:00
James Cole
8cdcba3231 Original fix in place. #133 2015-12-24 09:50:28 +01:00
James Cole
8bab9e84e2 Should not have edited that code. #133 2015-12-24 09:50:16 +01:00
James Cole
2faae83912 Include empty budgets. #133 2015-12-24 09:47:44 +01:00
James Cole
5a61a11a61 Attempt to fix bug #133 2015-12-24 09:45:21 +01:00