1366 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Balazs Varkonyi	28216cbcb5	Removed merge conflict from CategoryController	2015-04-04 01:56:19 +02:00
Balazs Varkonyi	3e08a8cd6b	Merge branch 'hotfix/account-fix'	2015-04-04 01:37:05 +02:00
Balazs Varkonyi	67fafdeef7	Return the new account from firstOrCreateEncrypted	2015-04-04 01:36:55 +02:00
Balazs Varkonyi	cc82505b66	Merge branch 'hotfix/chart-fix'	2015-04-04 01:33:36 +02:00
Balazs Varkonyi	fd5f075f63	Chart fix for accounts with accented letters	2015-04-04 01:31:57 +02:00
James Cole	a115960411	Merge branch 'release/3.3.6' ... Conflicts: app/Http/Controllers/CategoryController.php	2015-04-03 23:31:29 +02:00
James Cole	e9fa4ca816	New version in read me.	2015-04-03 23:30:54 +02:00
James Cole	75d92bc7f0	Allow FF to send events.	2015-04-03 23:22:23 +02:00
James Cole	74aa6e911e	Make boxes respond to unpaid / paid credit card bills.	2015-04-03 23:10:51 +02:00
James Cole	9d000c1898	Added amount because debug.	2015-04-03 23:05:50 +02:00
James Cole	b2254875b2	Expanded to credit cards.	2015-04-03 22:54:21 +02:00
James Cole	78d04230d5	New CC help text.	2015-04-03 21:25:04 +02:00
James Cole	1c04477393	Support credit cards (in name only).	2015-04-03 21:12:54 +02:00
James Cole	2a9679c94e	Textual fix in bill [skip ci]	2015-04-03 21:05:41 +02:00
James Cole	6009f8ecde	Better chart for bills.	2015-04-03 21:05:01 +02:00
James Cole	35cdbec70a	Clean up for budget limits.	2015-04-03 19:39:36 +02:00
James Cole	0faef542c1	Fixed a bug in the budget controller.	2015-04-03 19:11:55 +02:00
James Cole	8b085af6a1	First attempt at account controller::index.	2015-04-03 12:14:40 +02:00
James Cole	e3b11a9eb2	New test for edit form that is more inclusive.	2015-04-03 09:30:44 +02:00
James Cole	72fc88f3c6	Even more tests.	2015-04-03 08:55:24 +02:00
James Cole	a5b759f268	Updates TestCase.php	2015-04-03 08:37:53 +02:00
James Cole	6a9ffae25d	New tests and factories.	2015-04-03 08:31:50 +02:00
James Cole	64c031c7fe	Small updates [skip ci]	2015-04-03 07:44:44 +02:00
James Cole	720926c50d	Tests now run without a database, as they should.	2015-04-03 07:33:18 +02:00
James Cole	36ec974284	Add heavy but working migrate routine. Will fix the tests but must be optimised. Also, should not be necessary.	2015-04-02 22:51:00 +02:00
James Cole	cff77c39e2	Update travis-ci and composer.lock and composer.json	2015-04-02 22:46:50 +02:00
James Cole	056a0a1736	Smaller boxes.	2015-04-02 22:43:12 +02:00
James Cole	f301da83c6	Fixed the tests.	2015-04-02 22:39:31 +02:00
James Cole	5362231efa	Ignore virtual balance in select places.	2015-04-01 19:46:16 +02:00
James Cole	4bb14cad73	Allow virtual balance to be ignored.	2015-04-01 19:45:13 +02:00
James Cole	7f5188f5a4	Added something fancy called "virtual balance".	2015-04-01 19:42:14 +02:00
James Cole	a80b7aac6c	Fix more redirections.	2015-04-01 18:59:34 +02:00
James Cole	83f32478fa	Fixed more redirections.	2015-04-01 09:43:19 +02:00
James Cole	7578ec6801	Fix redirections in budget.	2015-04-01 09:40:19 +02:00
James Cole	e14a32f76f	Also fix delete/destroy redirection routine.	2015-04-01 09:23:51 +02:00
James Cole	58faa189ac	Can now actually store transactions without an expense / revenue account.	2015-04-01 09:17:07 +02:00
James Cole	9b4f87d44a	Fix checkbox for edit screen.	2015-04-01 09:16:51 +02:00
James Cole	7830a64170	Fix redirect.	2015-04-01 09:16:41 +02:00
James Cole	8f0fa02107	Better redirection for new transactions.	2015-04-01 09:12:49 +02:00
James Cole	e000fb5d80	Optimized decryption.	2015-03-31 22:46:11 +02:00
James Cole	566fadad15	Add decryption routine.	2015-03-31 21:18:22 +02:00
James Cole	cf23858c10	Gokje.	2015-03-31 20:52:48 +02:00
James Cole	216a223617	Fix in year list.	2015-03-31 20:49:02 +02:00
James Cole	638f38d823	New flush method.	2015-03-31 20:46:37 +02:00
James Cole	98ee70f04e	Fix range thing.	2015-03-31 20:45:06 +02:00
James Cole	b365db5a4b	New hidden id field.	2015-03-31 20:39:28 +02:00
James Cole	02e55496df	Remove reminders when piggy bank is reminded.	2015-03-31 20:22:51 +02:00
James Cole	e11e53913a	Some new code + GA	2015-03-31 19:21:49 +02:00
James Cole	f8a5fb4225	Fixed tests.	2015-03-31 17:49:47 +02:00
James Cole	3a49450461	Made sure migrations can be rolled back.	2015-03-31 15:38:44 +02:00