Commit Graph

8934 Commits

Author SHA1 Message Date
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
34bf5f7bfd Create PULL_REQUEST_TEMPLATE.md 2017-10-19 11:13:04 +02:00
James Cole
e0e2b79c1a Create ISSUE_TEMPLATE.md 2017-10-19 11:12:20 +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
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