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,901 Commits 9 Branches 1,163 Tags
863227c55cdd0dae7276f2de00432d6949ce41d3
Commit Graph
3901 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
James Cole 863227c55c Some refactoring. 2016-05-14 13:51:33 +02:00
James Cole 5a6967cefd Better formatting for split transactions. 2016-05-13 19:40:13 +02:00
James Cole 5166171e5d More refactoring 2016-05-13 17:22:24 +02:00
James Cole 3e36a29c23 More refactoring. 2016-05-13 15:58:30 +02:00
James Cole 20e1e50032 Refactoring. 2016-05-13 15:53:39 +02:00
James Cole 36bc483edb Reorder some fields. 2016-05-13 10:50:19 +02:00
James Cole aa59227786 Fixed transactions and attachments. 2016-05-13 09:55:06 +02:00
James Cole 2d8449ed68 This should just about finished split transaction editing. 2016-05-13 07:33:04 +02:00
James Cole d7ab482ae1 Various updates for split transactions. 2016-05-12 22:44:31 +02:00
James Cole cfcc4ce88a Let's leave this on false. 2016-05-12 16:34:44 +02:00
James Cole eda44bbed0 Merge branch 'develop' of github.com:JC5/firefly-iii into develop 2016-05-12 12:13:42 +02:00
James Cole 988049061d Start with edit split journals routine. 2016-05-12 12:13:10 +02:00
James Cole ebb1c5ae25 Merge pull request #260 from zjean/ssl 
Force https schema if APP_FORCE_SSL=true in .env
 2016-05-12 11:00:41 +02:00
James Cole ce7eebac5c Build edit split transactions. 2016-05-12 10:38:44 +02:00
James Cole b7c446f7db Start with edit and view screens. 2016-05-11 23:03:13 +02:00
James Cole 7c39a04c4b Cleanup. 2016-05-11 17:33:22 +02:00
James Cole 037d84b810 Fixes for transactions. 2016-05-11 17:17:43 +02:00
James Cole 529bf50c85 Removed some dead code. 2016-05-11 10:37:56 +02:00
James Cole d2b4bd78a9 Removed some dead code. 2016-05-11 10:02:27 +02:00
James Cole e1c146a5c1 Reinstate chart. 2016-05-11 09:17:47 +02:00
James Cole ed9acbdfde Reinstate report. 2016-05-11 09:08:18 +02:00
James Cole dc825d5a9c Fix queries. 2016-05-11 08:40:22 +02:00
James Cole 9f8faf15f1 Reinstate sorting. 2016-05-11 08:10:05 +02:00
James Cole 934656c954 Some small changes. 2016-05-11 07:57:16 +02:00
James Cole d233a2df3c Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop 
* 'develop' of https://github.com/JC5/firefly-iii:
  Should fix frontpage.

# Conflicts:
#	app/Models/TransactionJournal.php
#	app/Repositories/Account/AccountRepository.php
 2016-05-11 06:08:05 +02:00
James Cole 7c7740d3ba Should fix frontpage. 2016-05-10 09:33:23 +02:00
James Cole cda6cfb4cd Fix more charts. 2016-05-09 20:15:26 +02:00
James Cole a90d095609 More stuff for categories. 2016-05-09 18:06:53 +02:00
James Cole 98e683329e New stuff for categories and transactions. 2016-05-08 13:45:23 +02:00
James Cole 3588bd881c More chart cleanup. 2016-05-06 22:54:36 +02:00
James Cole 0460811e6c Fixed some more charts. 2016-05-06 22:53:08 +02:00
James Cole 27f5fe18df Moving stuff around, optimising charts. 2016-05-06 10:32:26 +02:00
James Cole 6d944ec98f More cleanup for budgets. 2016-05-06 06:15:46 +02:00
James Cole adf6691470 This breaks everything budget-related. 2016-05-05 22:03:35 +02:00
James Cole dd8b500efd These budget charts are the worst, I'm telling you. 2016-05-05 21:25:20 +02:00
James Cole 4e1ff8c4a3 Removed phpunit.xml 2016-05-05 19:07:46 +02:00
James Cole e73d590ead Update composer.lock 2016-05-05 19:05:29 +02:00
James Cole 5cc22f49cf Fix tests. 2016-05-05 19:04:21 +02:00
James Cole eb3d2b1749 Building split transactions and fixing tests. 2016-05-05 18:59:46 +02:00
James Cole 21a197ba46 More translations. 2016-05-05 07:46:19 +02:00
James Cole 0b74707638 Display and handle errors. 2016-05-05 07:46:11 +02:00
James Cole 16dc8b7d68 Translation for error. 2016-05-05 07:45:52 +02:00
James Cole 5a8abe004e Field rename 2016-05-05 07:45:40 +02:00
James Cole b211d72c8b Static data must remain static data. 2016-05-05 07:45:29 +02:00
James Cole 36f3eb8b2f Small fix in journal handler. 2016-05-05 07:09:12 +02:00
zjean cb1cb9f328 Force https schema if APP_FORCE_SSL=true in .env 2016-05-04 22:09:42 +02:00
James Cole 3344bb7263 Code cleanup. 2016-05-02 20:49:19 +02:00
James Cole 5e1167b8ae Code cleanup. 2016-05-01 15:05:29 +02:00
James Cole b80db054e2 Remove journal collector. 2016-05-01 09:52:58 +02:00
James Cole c66df3cb2c Code cleanup. 2016-05-01 09:42:08 +02:00