Commit Graph

8914 Commits

Author SHA1 Message Date
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 7a873c6ee7 Merge pull request #918 from firefly-iii/l10n_develop
New Crowdin translations
2017-10-15 08:30:57 +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 f63bf12733 New translations firefly.php (French) 2017-10-11 18:10:29 +02:00
James Cole 65f0acbd10 New translations csv.php (French) 2017-10-11 18:00:21 +02:00
James Cole 6dd0c2612b New translations firefly.php (German) 2017-10-11 14:31:30 +02:00
James Cole 21701fd5f2 New translations intro.php (German) 2017-10-11 14:20:21 +02:00
James Cole beabed1c1b New translations intro.php (German) 2017-10-11 14:10:11 +02:00
James Cole ece042b468 New translations intro.php (German) 2017-10-11 14:00:18 +02:00
James Cole 668e36ccf6 New translations list.php (German) 2017-10-11 14:00:17 +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 31b92fe594 New translations firefly.php (Slovenian) 2017-10-10 17:32:09 +02:00
James Cole 1753b58ec9 New translations firefly.php (Slovenian) 2017-10-10 17:20:14 +02:00
James Cole ade8bbb221 New translations firefly.php (Slovenian) 2017-10-10 17:10:10 +02:00
James Cole c31160f82d New translations csv.php (Slovenian) 2017-10-10 17:10:08 +02:00
James Cole d161c9850a New translations csv.php (Slovenian) 2017-10-10 17:00:07 +02:00
James Cole a3b8cb25ca New translations list.php (Slovenian) 2017-10-10 16:50:12 +02:00
James Cole 6c5f915751 New translations csv.php (Slovenian) 2017-10-10 16:50:10 +02:00
James Cole 1bb3581fef New translations bank.php (Slovenian) 2017-10-10 14:00:44 +02:00
James Cole d9e8036dda New translations list.php (Slovenian) 2017-10-10 14:00:43 +02:00
James Cole b754c9d8a3 New translations breadcrumbs.php (Slovenian) 2017-10-10 14:00:41 +02:00
James Cole b9679284d0 New translations intro.php (French) 2017-10-10 10:20:32 +02:00
James Cole 3fa5f1cff6 New translations firefly.php (French) 2017-10-10 10:20:31 +02:00
James Cole dea2b055ae New translations firefly.php (French) 2017-10-10 10:11:05 +02:00
James Cole 84b20f3f32 New translations csv.php (French) 2017-10-10 10:11:02 +02:00
James Cole dce39066ad New translations breadcrumbs.php (French) 2017-10-10 10:11:01 +02:00
James Cole 6b82679f78 New translations firefly.php (French) 2017-10-10 10:00:36 +02:00
James Cole 1f26b26a16 New translations intro.php (German) 2017-10-10 08:50:20 +02:00
James Cole c5de4338e1 New translations firefly.php (German) 2017-10-10 08:50:18 +02:00
James Cole 41d12f4f2f New translations intro.php (German) 2017-10-10 08:40:16 +02:00
James Cole 055b80cf7a New translations intro.php (German) 2017-10-10 08:30:07 +02:00
James Cole 1187169dbd New translations bank.php (German) 2017-10-10 08:20:08 +02:00