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
3,382 Commits 9 Branches 1,163 Tags
2e7c26c5393ba102fa44ff05e109ef2e8df5171e
Commit Graph
55 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
James Cole f9c3c0c8ae Merge pull request #191 from roberthorlings/feature/test-triggers 
New feature for testing triggers
 2016-02-17 17:19:21 +01:00
James Cole 44a15551ba Merge pull request #192 from roberthorlings/bugfix/abnamro-description-specifix 
Bugfix in parsing specific descriptions
 2016-02-17 17:15:53 +01:00
James Cole b3e18f4e56 Merge pull request #189 from roberthorlings/feature/trigger-matches-anything 
Check for triggers that match anything
 2016-02-17 15:28:39 +01:00
James Cole aa25ac774e Merge pull request #190 from roberthorlings/feature/trigger-action-factories 
Introduction of factories to create rule actions and rule triggers
 2016-02-17 15:27:38 +01:00
James Cole 985019e117 Merge pull request #188 from roberthorlings/bugfix/fixed-missing-tags 
Added closing li tags
 2016-02-17 10:31:51 +01:00
James Cole 7cbfa9fcd4 Merge pull request #182 from roberthorlings/develop 
Small fix for importing amounts with comma as decimal separator
 2016-02-15 19:48:27 +01:00
James Cole cd14360d62 Merge pull request #178 from zjean/develop 
Respect the base href in ajax calls.
 2016-02-11 21:24:53 +01:00
James Cole aa057d6a57 Merge pull request #177 from zjean/develop 
Tried to start with #107
 2016-02-11 06:27:01 +01:00
James Cole 1d4d156749 Merge pull request #176 from zjean/2fa 
Some small fixes to respect the base url
 2016-02-10 20:12:28 +01:00
James Cole fba9cc3739 Merge pull request #175 from zjean/2fa 
Started over with 2fa
 2016-02-10 06:13:44 +01:00
James Cole 3b5b51578d Merge pull request #153 from webenhanced/feature/current-fiscal-year-quicklink-report 
Quicklink fiscal year report feature. As per github issue #131.
 2016-01-29 06:45:36 +01:00
James Cole e8776d44c5 Merge pull request #149 from webenhanced/feature/custom-fiscal-years 
Feature - custom fiscal years
 2016-01-27 17:57:13 +01:00
James Cole 559f429f5e Merge pull request #148 from roberthorlings/bugfix/rulegrouprepository 
Added binding for RuleGroupRepositoryInterface
 2016-01-22 19:30:37 +01:00
James Cole ae4b198d3d Merge pull request #147 from roberthorlings/develop 
Fixed a bug in storing date changes for the opening balance
 2016-01-22 19:30:02 +01:00
James Cole 48728e8418 Merge pull request #146 from roberthorlings/feature/abn-amro-import-specifix 
ABN AMRO Specifix
 2016-01-19 08:36:06 +01:00
James Cole 6f231b840b Merge pull request #144 from roberthorlings/feature/import-csv-delimiter 
Option to choose CSV delimiter when importing data
 2016-01-15 16:19:53 +01:00
James Cole bc192a8e54 Merge pull request #138 from leander091/develop 
String is a reserved class name in php 7.
 2016-01-03 20:25:34 +01:00
James Cole d071f3947e Merge pull request #127 from tonicospinelli/demeter-law 
applying Demeter law for Transaction Type. Looking good!
 2015-12-11 08:36:03 +01:00
James Cole 1e603c0833 Merge pull request #113 from RonaldvanMeer/develop 
Removed duplicated controlbar item
 2015-11-01 08:22:33 +01:00
James Cole b7dab817f2 Merge pull request #111 from colinodell/patch-1 
Loosen league/commonmark version
 2015-10-27 12:17:25 +01:00
James Cole 8d99baf38a Update charts.js 2015-08-05 09:02:33 +02:00
James Cole 8b1366b20a Merge pull request #93 from RonaldvanMeer/master 
fix issue #91
 2015-07-15 21:00:29 +02:00
James Cole 5e6aa63d03 Merge pull request #86 from ebbz/master 
use relative path in login screen improved
 2015-07-03 10:29:35 +02:00
James Cole 42d13e02ef New images [skip ci] 2015-06-22 21:04:31 +02:00
Sander Dorigo d7ee03d4f9 New HTML view. 2015-06-08 09:48:53 +02:00
Sander Dorigo c1c06410c2 Add HTML view. 2015-06-08 09:47:02 +02:00
Sander Dorigo b7fbe110d4 Merge pull request #82 from JC5/scrutinizer-patch-5 
Scrutinizer Auto-Fixes
 2015-06-05 11:39:08 +02:00
Sander Dorigo d1d6c48d9b Update GA code 2015-06-03 11:27:47 +02:00
Sander Dorigo 4d5124fb4c Merge pull request #81 from JC5/scrutinizer-patch-4 
Scrutinizer Auto-Fixes
 2015-05-26 20:58:11 +02:00
Sander Dorigo ffc6139e21 Merge pull request #80 from JC5/scrutinizer-patch-3 
Scrutinizer Auto-Fixes
 2015-05-26 20:16:39 +02:00
James Cole cc33af8193 Could not set order. 2015-04-24 10:00:56 +02:00
James Cole 25d1d1be1b Merge pull request #72 from vbali/feature/savings-total 
Add savings total for savings widget on dashboard
 2015-04-09 17:47:24 +02:00
James Cole 0c02a08954 Merge pull request #65 from vbali/master 
Fixes for chart and account creation
 2015-04-04 06:50:30 +02:00
James Cole 38ba645415 Add hidden-xs class. 2015-03-30 09:23:18 +02:00
James Cole f67ac2e25e Update AccountController.php 2015-03-26 14:50:49 +01:00
James Cole 26127c9ccf Update AccountController.php 2015-03-26 14:49:02 +01:00
James Cole a867b60af0 Update CategoryController.php 2015-03-25 16:14:28 +01:00
James Cole 26eafb0bd2 Update CategoryController.php 2015-03-25 16:13:39 +01:00
James Cole 0dbe44764b Update GoogleChartController.php 2015-03-25 16:00:06 +01:00
James Cole 2159df6802 Update GoogleChartController.php 
Fixed chart.
 2015-03-25 15:58:37 +01:00
James Cole 23389b9f17 Update FireflyValidator.php 
Update uniqueForUser.
 2015-03-25 15:56:32 +01:00
James Cole 6d3e3b894a Update AccountFormRequest.php 
Update rules to include belongsToUser.
 2015-03-25 15:55:39 +01:00
James Cole 2f1073712f Merge pull request #63 from niekvanderkooy/fix-migrations 
Fix migrations
 2015-03-13 07:00:55 +01:00
James Cole 0096f50cde Update month.blade.php 
Add decryption routine.
 2015-02-21 12:20:42 +01:00
James Cole 7ed2e03654 Merge pull request #62 from kilya11/master 
Handle foreign keys
 2015-02-11 14:29:19 +01:00
James Cole b8ab7d1a14 Update README.md 2014-12-16 09:15:04 +01:00
James Cole 6211fd8496 Update README.md 
Added new badge.
 2014-12-16 09:13:29 +01:00
James Cole 1335a52db3 Remove packages only found in development. 2014-12-08 20:27:33 +01:00
James Cole 4918f1c4cb Merge pull request #31 from sonikarc/develop 
[Fixes #21] Change the majority of View::share to View::make()->with()
 2014-11-10 10:37:49 +01:00
James Cole f38d80cbf5 Update composer.json 2014-10-23 16:42:11 +02:00
James Cole 8bea1acd8e Update composer.json 2014-10-23 16:42:01 +02:00
Sander Dorigo 3c97a1018a Merge pull request #4 from GrahamCampbell/patch-1 
Update composer.json
 2014-07-27 20:49:46 +02:00
Sander Dorigo 092a79dc75 Update README.md 2014-07-02 13:31:38 +02:00
Sander Dorigo 4834f3243c Update README.md 2014-07-02 13:30:23 +02:00
Sander Dorigo b1b836652c Created Readme 2014-07-02 13:23:03 +02:00