4104 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
James Cole	6490f9c128	Fix search.	2016-04-04 19:48:00 +02:00
James Cole	2d7f1af52c	Add clear cache, for issue #237	2016-04-04 19:47:55 +02:00
James Cole	ac27659a59	Merge pull request #238 from nhaarman/fix_active-bill-expected-amount ... Fixed incorrect average of expectedAmount in active bills.	2016-04-04 18:58:42 +02:00
Niek Haarman	11d59c8bd1	Fixed incorrect average of expectedAmount in active bills.	2016-04-04 18:15:38 +02:00
James Cole	a6936cbd02	Merge branch 'release/3.8.2'	2016-04-03 16:47:54 +02:00
James Cole	3be84d76ef	Updated composer.lock and other files. [skip ci]	2016-04-03 16:47:27 +02:00
James Cole	9aed1f344f	Code cleanup.	2016-04-03 15:47:00 +02:00
James Cole	4fff264630	New translations.	2016-04-03 15:45:41 +02:00
James Cole	2e444da2a3	Better titles.	2016-04-03 14:55:56 +02:00
James Cole	7a216f95ca	Add sum.	2016-04-03 14:38:12 +02:00
James Cole	f22a9799a1	Hide some fields.	2016-04-03 14:01:27 +02:00
James Cole	90bdc40393	Fixed balance list.	2016-04-03 13:56:06 +02:00
James Cole	622a97c8d8	Category information. #159	2016-04-03 11:20:55 +02:00
James Cole	03691c81c2	More code for #159 [skip ci]	2016-04-03 11:14:36 +02:00
James Cole	885b56c465	More code for #159	2016-04-03 11:07:51 +02:00
James Cole	23cc7be231	More things [skip ci]	2016-04-03 10:51:37 +02:00
James Cole	bb82b0eb79	Better view for admin [skip ci]	2016-04-03 10:42:46 +02:00
James Cole	2e05f640b8	Title in guest view [skip ci]	2016-04-03 10:35:54 +02:00
James Cole	697a02ffee	Page titles.	2016-04-03 10:34:42 +02:00
James Cole	ad402021ed	Basic user admin.	2016-04-03 07:07:17 +02:00
James Cole	67caf6ef1f	Code cleanup [skip ci]	2016-04-01 16:46:11 +02:00
James Cole	3277858c5a	Code cleanup. [skip ci]	2016-04-01 16:44:46 +02:00
James Cole	3fbedf323f	Fix list for no budget #159	2016-04-01 16:23:12 +02:00
James Cole	144a6130f2	First code for #159 popups	2016-04-01 16:06:55 +02:00
James Cole	fa38c975b6	New converters for #180 (Tag and accounts)	2016-04-01 14:17:12 +02:00
James Cole	c14fa1021c	New converters for #180 (Currency)	2016-04-01 14:10:08 +02:00
James Cole	5e78cc02bd	New converters for #180 (Category and some other stuff)	2016-04-01 13:23:12 +02:00
James Cole	429ef80fb9	New converters for #180 (Budget)	2016-04-01 13:17:07 +02:00
James Cole	e4d93cad27	New converters for #180 (Bill)	2016-04-01 13:07:19 +02:00
James Cole	d9a4840e37	New converters for #180	2016-04-01 13:03:38 +02:00
James Cole	a93070b98d	Fixes #234.	2016-04-01 09:13:50 +02:00
James Cole	c05a942862	This fixes a null pointer exception. [skip ci]	2016-04-01 05:36:29 +02:00
James Cole	f9a7879c1e	Damn git.	2016-03-30 17:51:40 +02:00
James Cole	bdfbc6d6a7	Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop ... * 'develop' of https://github.com/JC5/firefly-iii: New activation message	2016-03-30 17:48:59 +02:00
James Cole	21181d8d8e	Fixes for #233	2016-03-30 17:47:13 +02:00
James Cole	1c7a27b816	New activation message	2016-03-30 12:46:51 +02:00
James Cole	e953f58c74	Merge branch 'release/3.8.1' into develop	2016-03-29 17:42:45 +02:00
James Cole	9250cee9e7	Merge branch 'release/3.8.1'	2016-03-29 17:42:44 +02:00
James Cole	bb075d15ff	Add warning about PHP 7.0	2016-03-29 17:42:32 +02:00
James Cole	a31f16bba7	Change log for 3.8.1 [skip ci]	2016-03-29 17:41:43 +02:00
James Cole	88a41c37f3	Bug fix, thank you scrutiniser.	2016-03-29 17:18:42 +02:00
James Cole	d21885ca98	New translations.	2016-03-29 16:38:42 +02:00
James Cole	d774f8e870	Code cleanup.	2016-03-29 16:17:06 +02:00
James Cole	08b5e66628	Some code cleanup.	2016-03-29 16:16:14 +02:00
James Cole	6fdfec3967	Clean up some code.	2016-03-29 16:13:36 +02:00
James Cole	ab4616a3ad	Make some vars longer.	2016-03-29 16:10:51 +02:00
James Cole	cb34ff4c83	Clean up some code.	2016-03-29 16:02:54 +02:00
James Cole	bdbead256c	Make field a number.	2016-03-29 16:02:09 +02:00
James Cole	f200086d01	Code for #207	2016-03-29 15:55:14 +02:00
James Cole	ef97c3b42d	Some new help text for bills. #207	2016-03-29 15:33:09 +02:00