IntenseFinance/firefly-iii
3
0 Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-10-13 08:52:05 -05:00
Code Issues Packages Projects Releases Wiki Activity
8,939 Commits 12 Branches 1,279 Tags
2e40ec5d4b8fe6b98264a2cce5d41605dc07a10d
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
James Cole 2e40ec5d4b Some new files. Updated composer file. 2017-10-20 21:18:27 +02:00
James Cole 72cf4c26f2 Push some stuff over get, not post. 2017-10-20 20:23:45 +02:00
James Cole b6add99654 Expand capnp file. [skip ci] 2017-10-20 19:28:39 +02:00
James Cole b07f732daa Update Sandstorm things 2017-10-20 18:50:54 +02:00
James Cole a67037d586 Update sandstorm files. 2017-10-20 14:21:47 +02:00
James Cole a352423cf8 Fix account display. 2017-10-20 13:35:54 +02:00
James Cole b0be407c7c Updated read me file. [skip ci] 2017-10-20 10:07:53 +02:00
James Cole 4bacbae68a Updated read me file. [skip ci] 2017-10-20 10:06:13 +02:00
James Cole 87987f2a2e Less popups for #943 2017-10-20 08:00:13 +02:00
James Cole 30bfdda2b0 Fix view of #942 2017-10-20 07:55:04 +02:00
James Cole 4d6c679b0e Fix #942 2017-10-20 07:51:53 +02:00
James Cole de15ca01e3 Fix #895 2017-10-19 20:51:15 +02:00
James Cole c53618d0e2 Fix #942 2017-10-19 20:37:39 +02:00
James Cole 7d921d648d Remove exclamation mark. 2017-10-19 20:32:41 +02:00
James Cole 7e8e766ab4 Fix #902 2017-10-19 18:58:54 +02:00
James Cole 7f5134f758 Clean up routine for #938 2017-10-19 18:35:19 +02:00
James Cole bcc8e84a73 tpl 2017-10-19 18:11:45 +02:00
James Cole eec076c745 Fixed #940 2017-10-19 18:08:50 +02:00
James Cole 783f587a8a Fix #933 2017-10-16 19:01:26 +02:00
James Cole 95c3f52144 Fix #932 2017-10-16 15:53:55 +02:00
James Cole b36fc067c9 Set environment to local. 2017-10-15 16:25:26 +02:00
James Cole dc48335ed9 Remove double budget limits. 2017-10-15 14:38:12 +02:00
James Cole dad1ee6edd Fix bars #916 2017-10-15 14:37:58 +02:00
James Cole 5c0bb34d77 Code for #916 2017-10-15 14:05:31 +02:00
James Cole 7ff19a8419 Updated changelog. 2017-10-15 08:52:36 +02:00
James Cole b28c3a64fa Updated version. 2017-10-15 08:45:12 +02:00
James Cole 6fedf1eec0 Fixed tests 2017-10-15 08:44:16 +02:00
James Cole e47911ef43 Merge branch 'develop' of https://github.com/firefly-iii/firefly-iii into develop 
* 'develop' of https://github.com/firefly-iii/firefly-iii: (30 commits)
  New translations firefly.php (French)
  New translations csv.php (French)
  New translations firefly.php (German)
  New translations intro.php (German)
  New translations intro.php (German)
  New translations intro.php (German)
  New translations list.php (German)
  New translations firefly.php (Slovenian)
  New translations firefly.php (Slovenian)
  New translations firefly.php (Slovenian)
  New translations csv.php (Slovenian)
  New translations csv.php (Slovenian)
  New translations list.php (Slovenian)
  New translations csv.php (Slovenian)
  New translations bank.php (Slovenian)
  New translations list.php (Slovenian)
  New translations breadcrumbs.php (Slovenian)
  New translations intro.php (French)
  New translations firefly.php (French)
  New translations firefly.php (French)
  ...
 2017-10-15 08:31:17 +02:00
James Cole c6c76ac710 New lock file 2017-10-15 08:30:32 +02:00
James Cole 2dae7f40e1 Small updates in change log [skip ci] 2017-10-15 08:26:13 +02:00
James Cole 918ebafd7c Update changelog formatting. 2017-10-15 08:24:21 +02:00
James Cole 466ff4fe3c Solution for #926 2017-10-15 07:52:15 +02:00
James Cole 353b3fcba7 Fix invalid JSON. 2017-10-14 08:08:14 +02:00
James Cole da980bcf9c Remove dev package from wrong section. 2017-10-14 08:06:34 +02:00
James Cole ed237476fa Correct environment in example .env file. #925 2017-10-14 08:06:24 +02:00
James Cole 401ae92a62 Various fixes for #916 2017-10-14 07:58:29 +02:00
James Cole 70ab42bc43 Will correctly join budget tables. #916 2017-10-13 18:26:22 +02:00
James Cole 15e060ea9e Won’t set budget for anything other then withdrawals. #916 2017-10-13 18:26:05 +02:00
James Cole 4c834467ae Get all fields 2017-10-13 17:34:19 +02:00
James Cole 7bf691e2bd Verify deposits with budget. 2017-10-13 17:32:14 +02:00
James Cole 27d533dd5b New docker things. 2017-10-11 10:07:09 +02:00
James Cole 011e28e8c2 Updated docker file. 2017-10-11 09:34:03 +02:00
James Cole dadeb4616e Updated docker file. 2017-10-11 09:14:34 +02:00
James Cole bea0c8dd55 Update docker files. #919 and #915 2017-10-11 08:16:57 +02:00
James Cole b6245d4b0b Updated composer lock file. 2017-10-09 20:43:36 +02:00
James Cole 74494a0df6 Added language. 2017-10-09 20:43:25 +02:00
James Cole 9cdd79ee30 Updated changelog. 2017-10-09 20:43:19 +02:00
James Cole f90a27ce59 Remove twig clean from test script 2017-10-09 20:30:57 +02:00
James Cole 624b654fa6 Fix #917 2017-10-09 20:30:46 +02:00
James Cole 09118013c9 Update for #915 2017-10-08 18:35:24 +02:00
James Cole e934d8943f Fix #915 2017-10-08 18:27:51 +02:00
James Cole 9a8ddf5c05 Some debug for #916 2017-10-08 10:14:26 +02:00
James Cole 70d5737d83 Fix #910 2017-10-08 06:08:20 +02:00
James Cole b1b2bb4cc9 Fix #911 2017-10-08 06:07:15 +02:00
James Cole 511d2c8d1e Update log thing. 2017-10-06 16:16:01 +02:00
James Cole 9aaee0a951 Met coverage enabled this time. 2017-10-06 15:55:28 +02:00
James Cole a606a3eef4 Test code coverage. 2017-10-06 15:52:06 +02:00
James Cole 67ed6e14aa New tests. 2017-10-06 15:41:21 +02:00
James Cole 29e02ce31f A longer search string will no longer partly match on account name! 2017-10-06 07:07:12 +02:00
James Cole e5514bc61a Fix #904 2017-10-06 06:36:00 +02:00
James Cole e68594a93b Various code cleanup. 2017-10-05 11:49:06 +02:00
James Cole b18012a36c Fix tests 2017-10-05 08:26:08 +02:00
James Cole 61eeb84db6 Merge branch 'develop' of https://github.com/firefly-iii/firefly-iii into develop 
* 'develop' of https://github.com/firefly-iii/firefly-iii:
  Add missing translations strings in search
 2017-10-05 07:34:04 +02:00
James Cole 1ba304462f make search query a string 2017-10-05 07:19:23 +02:00
James Cole fb4df3484c New tests 2017-10-04 16:43:01 +02:00
James Cole c17a278e57 New unit tests. 2017-10-04 15:27:20 +02:00
James Cole 6770b8396a Fix sprintf error #893 2017-10-04 14:58:03 +02:00
James Cole 81da87287e Make French a completed language. 2017-10-04 14:53:16 +02:00
James Cole 35a5310485 Fix #893 2017-10-04 07:19:19 +02:00
James Cole a22a2fb4ef Fix #891 and 892 [skip ci] 2017-10-03 13:30:43 +02:00
James Cole c000fe4557 Update tests 2017-10-03 10:41:48 +02:00
James Cole dd9528f531 Migrate notes in upgrade database routine. 2017-10-03 10:41:29 +02:00
James Cole d1a6b37eb3 Use note object instead of field #888 2017-10-03 10:30:56 +02:00
James Cole 4af0c18020 Add missing translation [skip ci] 2017-10-03 05:31:48 +02:00
James Cole 95b5793f63 New triggers and actions for notes. #872 2017-10-03 05:28:00 +02:00
James Cole 7a57c60891 Add config value to .env value. #882 2017-10-02 18:20:03 +02:00
James Cole ebcd8dbd7c Set trusted proxies value from config if present. #882 2017-10-02 18:19:17 +02:00
James Cole 1bfa8f0139 Expand test coverage. 2017-10-02 16:27:21 +02:00
James Cole 2dfe2ddaf3 Attempt to cover all cases in amount converter, this fixes #840 2017-10-02 16:25:48 +02:00
James Cole 03f33c5e7e Remove routes (for help) 2017-10-02 16:24:31 +02:00
James Cole 2b73747ecf Button instead of a link #884 2017-10-02 14:41:06 +02:00
James Cole 174d01292f Fix #881 2017-10-02 08:47:57 +02:00
James Cole cc61281523 Add openstreetmap with a mapbox.com layer. #420 2017-09-30 17:50:22 +02:00
James Cole c0d62dfc86 Merge branch 'develop' of https://github.com/firefly-iii/firefly-iii into develop 
* 'develop' of https://github.com/firefly-iii/firefly-iii:
  Fix dates in CHANGELOG. [skip ci]
 2017-09-30 13:17:45 +02:00
James Cole 134f21bada Fix for #825 2017-09-30 13:16:12 +02:00
James Cole aea6575358 Merge branch 'release/4.6.6' 2017-09-30 09:11:16 +02:00
James Cole d0054e657e Updated composer file. 2017-09-30 09:03:13 +02:00
James Cole d2e312e1c3 Update changelog. [skip ci] 2017-09-30 08:40:36 +02:00
James Cole 8678f9af65 Add redirect for tag thing. See #875 2017-09-29 16:54:23 +02:00
James Cole cca29bcdfe Take redirect uri from controller class. 2017-09-29 16:53:09 +02:00
James Cole 40f2659b91 Smooth error catching. 2017-09-29 15:32:47 +02:00
James Cole d306183c95 Catch exceptions in FixerIO 2017-09-29 15:32:35 +02:00
James Cole aa4682af6a Expand budget box and clear some languages. 2017-09-29 14:22:40 +02:00
James Cole 76ed261441 A basic box for #786 2017-09-29 08:52:15 +02:00
James Cole aaac47ebfc Icons will not break [skip ci] 2017-09-28 08:59:59 +02:00
James Cole fd1feadc67 Fix #826 2017-09-28 08:59:40 +02:00
James Cole c19c7c680b Small improvements to bunq import. 2017-09-28 08:17:32 +02:00
James Cole b80b026246 Fix tests. 2017-09-27 15:46:08 +02:00
James Cole a1a93d9bbb Send test message from admin. 2017-09-27 15:45:55 +02:00
James Cole c9cb310a2f Remove crappy translation of link types. Still needs a solution. 2017-09-27 14:50:04 +02:00