Compare commits

...

9720 Commits
3.2.2 ... 4.7.5

Author SHA1 Message Date
James Cole
c2216843d8 Merge branch 'release/4.7.5' 2018-07-03 20:33:34 +02:00
James Cole
339fb5099f Fix test. 2018-07-03 20:33:12 +02:00
James Cole
cf56707b02 Add more fake entropy. 2018-07-03 20:10:14 +02:00
James Cole
19f38aa6ed Updated everything for version 4.7.5 2018-07-03 19:57:38 +02:00
James Cole
9f69e112d0 Last minute fixes. 2018-07-03 19:34:13 +02:00
James Cole
8eb4259be0 Last minute test fixes. 2018-07-03 19:04:46 +02:00
James Cole
d3a1f43cbb Some last-minute fixes. 2018-07-03 18:24:43 +02:00
James Cole
18b06ff283 Some last-minute fixes. 2018-07-03 17:48:26 +02:00
James Cole
53addcf99a Add cron job to docker file. 2018-07-03 06:03:38 +02:00
James Cole
0fa4d75a47 Enable profile for Sandstorm users. 2018-07-03 05:56:46 +02:00
James Cole
2ef86c3339 Add description. 2018-07-03 05:52:35 +02:00
James Cole
d48c3a6d2f Fix tests 2018-07-03 05:52:27 +02:00
James Cole
2260ede559 Add transaction list to recurring transaction 2018-07-03 05:32:35 +02:00
James Cole
5690a44c38 Remove a filter. 2018-07-02 20:41:28 +02:00
James Cole
e36a9fda1b Get a list of transactions belonging to the recurrence. 2018-07-02 20:39:45 +02:00
James Cole
10f195d334 Update versions. 2018-07-02 20:18:00 +02:00
James Cole
54afc6ca8c Some last minute updates. 2018-07-02 20:17:50 +02:00
James Cole
2e67bd3b78 New test code. 2018-07-02 20:02:20 +02:00
James Cole
f27eb084c7 Test the currency exchange controller. 2018-07-02 16:06:49 +02:00
James Cole
7629dfd54a Fix issues with #1521 2018-07-02 15:37:56 +02:00
James Cole
f62fd18b72 Update some translations [skip ci] 2018-07-01 21:40:45 +02:00
James Cole
c6b60ff6b4 Different order for recurrences [skip ci] 2018-07-01 21:32:48 +02:00
James Cole
e9655e6d86 Different order for recurrences [skip ci] 2018-07-01 21:31:27 +02:00
James Cole
3bca9b06f8 Implement category and configuration tests. 2018-07-01 21:27:25 +02:00
James Cole
d97fdc3393 Implement budget limit API tests 2018-07-01 21:02:39 +02:00
James Cole
7dc72f98bf Include tests for budget API 2018-07-01 20:19:34 +02:00
James Cole
da00179066 Test available budget API. 2018-07-01 18:58:41 +02:00
James Cole
89910031cd Test the attachment controller. 2018-07-01 18:31:02 +02:00
James Cole
5676aeac80 Improve test filter. 2018-07-01 16:13:22 +02:00
James Cole
b0b9055e2e Remove extra semi-colon. 2018-07-01 15:48:02 +02:00
James Cole
c0aefed764 Fix extra semicolon in test description 2018-07-01 14:55:06 +02:00
James Cole
e2ec9ca5fb Improve amount conversion code. 2018-07-01 13:34:57 +02:00
James Cole
8e38f5c2c0 Disable amount debit and credit tests. 2018-07-01 12:34:58 +02:00
James Cole
99b2858863 Go for php 7.1.8 to mimic dev machine. 2018-07-01 10:47:54 +02:00
James Cole
b43669e731 Update amount test codes. 2018-07-01 10:32:27 +02:00
James Cole
3bc9905715 Remove php7.2 tests. 2018-07-01 10:19:00 +02:00
James Cole
c55aebd005 Fix credit test. 2018-07-01 10:11:41 +02:00
James Cole
55c331f536 Update read me file. 2018-07-01 09:53:03 +02:00
James Cole
ce236284f4 Update test code. 2018-07-01 09:52:56 +02:00
James Cole
c24cac68f6 Fix for #1518 2018-07-01 09:43:44 +02:00
James Cole
db149ca6e1 Fix tests. 2018-07-01 09:27:22 +02:00
James Cole
0502f2a4a5 Implement rule group API. 2018-06-30 18:10:54 +02:00
James Cole
f13df7e605 Implement rules in API. 2018-06-30 17:49:14 +02:00
James Cole
36a6981329 Halfway rule API. 2018-06-30 16:46:51 +02:00
James Cole
7abcdea816 New translations [skip ci] 2018-06-30 06:16:09 +02:00
James Cole
0509e54a95 Complete API for recurring transactions. 2018-06-30 06:14:39 +02:00
James Cole
b8893bcad7 Fix bulk editor. 2018-06-30 05:54:23 +02:00
James Cole
c9356c1237 Restructure code to rename a variable. 2018-06-30 05:21:21 +02:00
James Cole
2d7b7c2f3f Expand recurring transactions API 2018-06-29 19:27:07 +02:00
James Cole
d0db1117f7 Recurrence first start and API routes. 2018-06-29 14:07:33 +02:00
James Cole
e287e76db5 Complete preferences. 2018-06-29 12:28:29 +02:00
James Cole
8c28c4b5ac New translations and routes. 2018-06-29 12:11:44 +02:00
James Cole
f048e943f8 Implement piggy bank API. 2018-06-29 08:06:17 +02:00
James Cole
12a84572e2 First code for the piggy bank API. 2018-06-29 06:43:44 +02:00
James Cole
c8de1d3372 New (empty) API controllers. 2018-06-28 22:15:22 +02:00
James Cole
234e3f4ca5 Implement link type controller. 2018-06-28 22:14:50 +02:00
James Cole
7749fb1a0b Expand API for journal links. 2018-06-28 17:02:13 +02:00
James Cole
f55d4e32c0 Implement currency exchange rate API. 2018-06-28 07:32:58 +02:00
James Cole
cfd98a33fe Fix #1463 2018-06-28 06:43:59 +02:00
James Cole
7bdf20fee5 Fix #1446 2018-06-28 06:40:04 +02:00
James Cole
e906fa3653 Bot cannot close bug tickets [skip ci] 2018-06-28 06:34:36 +02:00
James Cole
57cf7f6f0d Update some things for recurring transactions. 2018-06-28 06:31:31 +02:00
James Cole
d378e7e897 New translations [skip ci] 2018-06-27 21:37:16 +02:00
James Cole
a8e666db34 Expand view to include weekend responses. 2018-06-27 18:30:53 +02:00
James Cole
7b46339a5d Add some logging to weekly recurring. 2018-06-27 05:40:14 +02:00
James Cole
20aa6e429b Expand support for weekend and add some logging. 2018-06-27 05:37:56 +02:00
James Cole
7ba11a57a8 make sure recurrence can skip weekends. 2018-06-26 21:17:50 +02:00
James Cole
49de4f2200 Expand report email. 2018-06-26 19:26:10 +02:00
James Cole
5d01955133 Various extensions to recurring transactions. 2018-06-26 18:49:33 +02:00
James Cole
7591f3fa29 Send mail message when cron has hit. 2018-06-25 16:01:45 +02:00
James Cole
89f8f9b45b Fix view of bills. 2018-06-24 16:17:42 +02:00
James Cole
59f5b38dca Fix for #1509 2018-06-24 15:43:05 +02:00
James Cole
5b0e61033c Add configuration to Api. 2018-06-24 15:33:36 +02:00
James Cole
096af00a72 Add Category to API 2018-06-24 15:05:59 +02:00
James Cole
dca2dc4600 Add budgets to API. 2018-06-24 14:54:06 +02:00
James Cole
96b482dac5 Fix #1510 2018-06-24 13:59:20 +02:00
James Cole
e05664f34f Fix #1509 2018-06-24 13:46:34 +02:00
James Cole
72cca5ccbf Expand schedule. 2018-06-24 13:23:08 +02:00
James Cole
0b9be029ac Expand API with budget limits 2018-06-24 13:20:29 +02:00
James Cole
91701473af Expand API with available budgets. 2018-06-24 08:33:06 +02:00
James Cole
ad6a9a7df7 Expand API for attachments. 2018-06-24 06:51:22 +02:00
James Cole
32b6ded008 Fix #1505 2018-06-23 19:56:04 +02:00
James Cole
4f2d0a0322 Sentence patch [skip ci] 2018-06-23 17:59:57 +02:00
James Cole
793cfcb2c5 Code for #1503 2018-06-23 17:59:37 +02:00
James Cole
3a71bd01fb Remove dead code. 2018-06-23 17:40:41 +02:00
James Cole
a1d99c1954 Bunq and Spectre will ask to apply rules. 2018-06-23 10:55:26 +02:00
James Cole
19a874b274 Ability to delete recurring transactions. 2018-06-23 08:19:29 +02:00
James Cole
b95dd5c238 Updated language strings [skip ci] 2018-06-23 06:29:14 +02:00
James Cole
7c84af2370 Schedule recurring transactions daily. 2018-06-23 05:41:14 +02:00
James Cole
db1c27d833 First attempt at job to create transactions for recurring transactions. 2018-06-22 18:42:23 +02:00
James Cole
636cd84f4f Merge branch 'develop' of https://github.com/firefly-iii/firefly-iii into develop
* 'develop' of https://github.com/firefly-iii/firefly-iii:
  Change in YunoHost links
2018-06-22 18:40:37 +02:00
James Cole
f2d4fae813 Make sure directories exist #1500 2018-06-22 18:40:06 +02:00
James Cole
986c9ab20a Merge pull request #1499 from anmol26s/patch-2
Change in YunoHost links
2018-06-22 07:44:07 +02:00
anmol26s
cd7e222b72 Change in YunoHost links
As the link was changed, the current link was broken. So fixed it.
2018-06-22 03:05:02 +05:30
James Cole
50b599b1a9 Some refactoring. 2018-06-21 18:58:27 +02:00
James Cole
1d162edb59 Improve code for recurring transactions. 2018-06-21 18:57:51 +02:00
James Cole
7bdd4ddeab Small refactoring. 2018-06-21 18:56:44 +02:00
James Cole
ae6e5a5599 Clean up API references. 2018-06-20 21:17:16 +02:00
James Cole
1222184b68 Include softdelete 2018-06-20 21:16:42 +02:00
James Cole
18f779c6de Various fixes. 2018-06-20 16:27:57 +02:00
James Cole
138f67581c Fix #1483 2018-06-20 16:09:15 +02:00
James Cole
597d6ac513 Fix #1492 2018-06-20 16:06:47 +02:00
James Cole
3ab25c2e8c Merge pull request #1493 from invidian/typo
Fix typo in en_US translations
2018-06-20 15:14:45 +02:00
James Cole
b11d97ba4e Merge pull request #1491 from anmol26s/patch-1
Added support for YunoHost
2018-06-20 15:14:23 +02:00
Mateusz Gozdek
080c810131 Fix typo in en_US translations 2018-06-19 22:20:27 +02:00
James Cole
56bc79d64e Various code to fix checkboxes. 2018-06-18 21:07:09 +02:00
anmol26s
72d2c9d600 Added support for YunoHost
Hi 
I have packaged a Firefly  III app for YunoHost. It has install,remove,update,backup,restore script along with multi-instance(can be installed multiple times on different domains on a single server). The app is tested and works well. 
The CL passing will take a day to show up on the app page.
Thanks for coding this app.
2018-06-18 01:05:02 +05:30
James Cole
0374c32236 Improve code for edit routine #1469 2018-06-17 17:45:47 +02:00
James Cole
d73cd4b515 Can now create recurring transactions. #1469 2018-06-17 15:14:34 +02:00
James Cole
54e3e3f051 Play around with boxes layout. 2018-06-17 07:45:21 +02:00
James Cole
abf218fc21 Prevent empty box. 2018-06-17 07:45:10 +02:00
James Cole
dcf90b6159 Cannot create transfer 2018-06-17 07:44:59 +02:00
James Cole
1cf91c78f8 Lots of new code for recurring transactions. #1469 2018-06-16 21:47:51 +02:00
James Cole
968abd26e8 Extend mail config and help. #1487 2018-06-16 07:23:54 +02:00
James Cole
aa05f7a2d2 Merge branch 'develop' of https://github.com/firefly-iii/firefly-iii into develop
* 'develop' of https://github.com/firefly-iii/firefly-iii:
  Various updated code for recurring transactions.
  Don't report authentication exceptions.
  Fix various bugs in the import routine, discovered by Doug.
  Prevent index error
  Spelcheck plz [skip ci]
  Set demo user back to English at login.
  Add calendar view.
  Demo text for recurring.
  Capital sensitive [skip ci]
  Various code related to the recurring transactions.
  Fix missing variable
  Some code optimalisations.
  First batch of code for recurring transactions #1469
  Fix #1434
  Invalidate cache right after storing data #1478
  Fix #1475
  Remove the option to check for updates from Sandstorm installations.
  Fix #1474
2018-06-15 22:18:53 +02:00
James Cole
181c23b07c Various updated code for recurring transactions. 2018-06-15 22:06:33 +02:00
James Cole
955cde3ed9 Don't report authentication exceptions. 2018-06-14 19:52:20 +02:00
James Cole
477a3c7eb2 Fix various bugs in the import routine, discovered by Doug. 2018-06-13 19:03:18 +02:00
James Cole
f4b66b980b Prevent index error 2018-06-13 08:22:10 +02:00
James Cole
281de63e0d Spelcheck plz [skip ci] 2018-06-12 21:44:03 +02:00
James Cole
c19a700662 Set demo user back to English at login. 2018-06-12 21:41:58 +02:00
James Cole
fc011ba1d9 Add calendar view. 2018-06-12 21:38:05 +02:00
James Cole
b941f590e0 Demo text for recurring. 2018-06-12 19:44:17 +02:00
James Cole
8f4db78ff2 Capital sensitive [skip ci] 2018-06-12 19:03:01 +02:00
James Cole
4b4dc2e298 Various code related to the recurring transactions. 2018-06-12 18:48:15 +02:00
James Cole
2de19547ca Fix missing variable 2018-06-11 11:41:38 +02:00
James Cole
5a058491b0 Some code optimalisations. 2018-06-10 16:59:41 +02:00
James Cole
6743d99d9b First batch of code for recurring transactions #1469 2018-06-10 16:59:03 +02:00
James Cole
35a5ec78c3 Fix #1434 2018-06-10 10:41:45 +02:00
James Cole
3440c3e77a Invalidate cache right after storing data #1478 2018-06-10 07:10:44 +02:00
James Cole
dd17f06362 Fix #1475 2018-06-09 07:09:43 +02:00
James Cole
8a15cb3a34 Remove the option to check for updates from Sandstorm installations. 2018-06-09 06:07:40 +02:00
James Cole
4a548ac282 Fix #1474 2018-06-09 05:50:31 +02:00
James Cole
d22353b13d Update screenshots and Sandstorm files. 2018-06-08 19:35:51 +02:00
James Cole
c18046c25d Update composer libs. 2018-06-06 21:23:17 +02:00
James Cole
4a12d4d156 Code cleanup [skip ci] 2018-06-06 21:23:00 +02:00
James Cole
20044427b4 Use Guzzle, not Requests library. 2018-06-06 21:20:21 +02:00
James Cole
073dedd483 Add debug info 2018-06-06 05:54:24 +02:00
James Cole
06c25c913c Merge branch 'develop' of https://github.com/firefly-iii/firefly-iii into develop
* 'develop' of https://github.com/firefly-iii/firefly-iii:
  Still not sure what's causing the empty strings to appear.
2018-06-05 14:56:10 +02:00
James Cole
08d06cf465 Small updates to meta files [skip ci] 2018-06-05 07:57:18 +02:00
James Cole
1e9eb843c0 Still not sure what's causing the empty strings to appear. 2018-06-03 19:14:03 +02:00
James Cole
78a5dae2a0 Merge branch 'release/4.7.4' 2018-06-03 09:16:56 +02:00
James Cole
19443a5b34 Update readme [skip ci] 2018-06-03 09:11:18 +02:00
James Cole
74acc90702 Update readme [skip ci] 2018-06-03 09:08:24 +02:00
James Cole
349f580371 Update readme [skip ci] 2018-06-03 09:07:41 +02:00
James Cole
f019d33a03 New screenshots [skip ci] 2018-06-03 09:04:57 +02:00
James Cole
c7af25ac38 Fix last minute issues. 2018-06-03 08:23:49 +02:00
James Cole
b52bd59cea Upgrade various files for 4.7.4 [skip ci] 2018-06-02 20:05:39 +02:00
James Cole
332d32c319 Fix tests 2018-06-02 20:02:42 +02:00
James Cole
2f824ba1a8 Some more last-minute fixes. 2018-06-02 19:23:46 +02:00
James Cole
a6b09acd5e Some last minute fixes. 2018-06-02 18:19:35 +02:00
James Cole
d4779c8c8f Some last minute translations [skip ci] 2018-06-02 07:15:21 +02:00
James Cole
ba01c4bbe8 Ignore basic methods, improving code coverage. 2018-06-02 06:18:07 +02:00
James Cole
ddc1d81665 Fix tests, improve coverage. 2018-06-02 06:11:13 +02:00
James Cole
790aeb3c46 Fix #1458 2018-06-02 05:46:37 +02:00
James Cole
6ed5be10b1 Expand test coverage. 2018-06-01 22:20:08 +02:00
James Cole
a7b8470d9e Expand test coverage. 2018-06-01 22:04:52 +02:00
James Cole
2a05cc382f Update Turkish language files [skip ci] 2018-06-01 14:22:53 +02:00
James Cole
1e10a6ce1b Update Russian language files [skip ci] 2018-06-01 14:22:37 +02:00
James Cole
7645ef55c2 Update PT_BR language files [skip ci] 2018-06-01 14:22:19 +02:00
James Cole
6ce200b60d Update Polish language files [skip ci] 2018-06-01 14:22:08 +02:00
James Cole
d782e28906 Update Dutch language files [skip ci] 2018-06-01 14:21:54 +02:00
James Cole
da3bd31fb8 Update Italian language files [skip ci] 2018-06-01 14:21:27 +02:00
James Cole
aa3ed40430 Update Indonesian language files [skip ci] 2018-06-01 14:21:14 +02:00
James Cole
ad7e564f14 Update French language files [skip ci] 2018-06-01 14:20:52 +02:00
James Cole
f23ee2dac5 Update Spanish language files [skip ci] 2018-06-01 14:20:39 +02:00
James Cole
1962f74439 Update German language files [skip ci] 2018-06-01 14:20:17 +02:00
James Cole
0064d060ea Show bunq payment ID. #1443 2018-06-01 13:14:51 +02:00
James Cole
e47e6b1958 Fix null pointer. #1443 2018-06-01 13:11:23 +02:00
James Cole
4c04415e80 Fix #1452. 2018-06-01 13:11:10 +02:00
James Cole
3654e75b8c Improve test coverage. 2018-06-01 06:40:24 +02:00
James Cole
66fa73aea4 Fix tests. 2018-06-01 05:49:41 +02:00
James Cole
df87d03f32 FF3 will apply rules when importing from bunq #1443 2018-06-01 05:49:33 +02:00
James Cole
3fbe851a0b Include external ID with import. 2018-06-01 05:23:57 +02:00
James Cole
d1b2e63950 Small fixes for import routine. 2018-05-31 22:33:42 +02:00
James Cole
34fd8cf751 Fix #1442 2018-05-31 21:48:09 +02:00
James Cole
f1fe90fce0 Fix #1455 2018-05-31 21:30:25 +02:00
James Cole
2ba6fa0dda Add description to debug logging. #1443 2018-05-31 21:13:07 +02:00
James Cole
f2928e3d7d Possible fix for #1453 2018-05-31 20:34:49 +02:00
James Cole
895ab9c5d8 Updated lock file. 2018-05-31 20:34:32 +02:00
James Cole
fb07c68132 Updated tests 2018-05-31 20:04:19 +02:00
James Cole
68e7d45f63 Fix #1451 2018-05-30 18:38:39 +02:00
James Cole
49e302e1bc Reinstate ability to download config. 2018-05-30 18:36:21 +02:00
James Cole
b33ca786ae use cases for rules tested. 2018-05-30 18:05:06 +02:00
James Cole
dc77d8edda Extra upgrade instructions. 2018-05-30 18:04:53 +02:00
James Cole
c339a183b9 Fix code coverage and a test #1443 2018-05-30 18:04:43 +02:00
James Cole
f263795a99 Add config entries for tests 2018-05-30 18:04:23 +02:00
James Cole
e9e771e57b List 100 entries for bunq. #1443 2018-05-30 18:04:00 +02:00
James Cole
fbb9d7c6b4 It's about expecting JSON, not accepting it. 2018-05-29 18:33:43 +02:00
James Cole
10abd7b0ae Delete account meta data when field is made empty. 2018-05-29 18:31:48 +02:00
James Cole
3de36901b8 Fix #1425 2018-05-29 07:25:04 +02:00
James Cole
5b4967acb9 Changes in error handler 2018-05-29 07:09:11 +02:00
James Cole
0a007b1e6e Fix menu view. 2018-05-29 06:30:25 +02:00
James Cole
4ad68b7dfa Fix #1449 2018-05-28 19:07:06 +02:00
James Cole
73aef1b9a4 Code for #1415 2018-05-26 13:55:11 +02:00
James Cole
dcfea20973 Expand error logs. 2018-05-26 13:14:51 +02:00
James Cole
9b6766d3b2 Fix #1416 2018-05-26 08:04:50 +02:00
James Cole
b8bc8e2c47 Fix #1413 2018-05-26 07:58:36 +02:00
James Cole
039e3aa34c Fix for #1406 2018-05-26 07:55:31 +02:00
James Cole
551ff109c9 Fixed #1403 2018-05-26 07:53:32 +02:00
James Cole
664451d0c6 Fixed #1405 2018-05-26 07:48:49 +02:00
James Cole
4031057bc0 Fix #1386 2018-05-26 07:25:22 +02:00
James Cole
fcf9b782c1 Improve code coverage. #1443 2018-05-25 23:13:08 +02:00
James Cole
d693d382b9 Handle different account types #1443 2018-05-25 17:31:41 +02:00
James Cole
0a1b6c7793 Catch nullpointer #1443 2018-05-25 13:15:36 +02:00
James Cole
5acba2bddf Merge branch 'develop' of https://github.com/firefly-iii/firefly-iii into develop
* 'develop' of https://github.com/firefly-iii/firefly-iii:
  Revert "Updated git ignore. (firefly-iii/firefly-iii#1443)"
  Update curl to latest version. (firefly-iii/firefly-iii#1443)
  Install composer before updating curl. (firefly-iii/firefly-iii#1443)
  Added missing new line at EOF. (firefly-iii/firefly-iii#1443)
  Updated libpng and added wget. (firefly-iii/firefly-iii#1443)
  Updated git ignore. (firefly-iii/firefly-iii#1443)
2018-05-25 12:08:43 +02:00
James Cole
883b16fad1 Fix IBAN selection. 2018-05-25 12:08:15 +02:00
James Cole
ef48b3e751 Merge pull request #1445 from OGKevin/update-curl-in-docker-firefly-iii/firefly-iii#1443
Update curl in docker firefly-iii/firefly-iii#1443
2018-05-25 11:48:00 +02:00
Kevin Hellemun
3c956e7e98 Revert "Updated git ignore. (firefly-iii/firefly-iii#1443)"
This reverts commit 656bb5043d.
2018-05-25 11:22:06 +02:00
Kevin Hellemun
519ea271a9 Update curl to latest version. (firefly-iii/firefly-iii#1443) 2018-05-25 10:10:08 +02:00
Kevin Hellemun
09d5160404 Install composer before updating curl. (firefly-iii/firefly-iii#1443) 2018-05-25 10:09:54 +02:00
Kevin Hellemun
97dcf03334 Added missing new line at EOF. (firefly-iii/firefly-iii#1443) 2018-05-25 10:07:09 +02:00
Kevin Hellemun
896a804a72 Updated libpng and added wget. (firefly-iii/firefly-iii#1443) 2018-05-25 10:06:45 +02:00
Kevin Hellemun
656bb5043d Updated git ignore. (firefly-iii/firefly-iii#1443) 2018-05-25 10:05:57 +02:00
James Cole
e953becbae Expand test coverage for bunq. 2018-05-25 08:38:15 +02:00
James Cole
6c9901b919 Redirect correctly. 2018-05-25 08:33:59 +02:00
James Cole
ff45c94106 Test coverage for routine and prerequisites. 2018-05-25 06:29:51 +02:00
James Cole
a8a3fbeef4 Write bunq lowercase. 2018-05-25 06:27:40 +02:00
James Cole
dae8092ecd Add return call so the error is not called. 2018-05-25 06:27:32 +02:00
James Cole
70110208fc Use non-static class for ApiContext to improve testability. 2018-05-25 06:26:37 +02:00
James Cole
217ca98933 Update composer lock + json 2018-05-25 06:26:10 +02:00
James Cole
c2945c532e Testing environment always uses the sandbox. 2018-05-25 06:25:59 +02:00
James Cole
ea750576b3 Move to bitly shortlinks. 2018-05-23 14:31:12 +02:00
James Cole
82538ba4fc Catch OpenSSL error. 2018-05-23 14:08:37 +02:00
James Cole
2b2f37a8c9 All code for bunq. 2018-05-23 12:36:12 +02:00
James Cole
4db2ec60e0 Update composer files. 2018-05-23 08:41:15 +02:00
James Cole
7d88d35556 Fix test for coverage. 2018-05-23 08:38:05 +02:00
James Cole
3c3e91ff48 Deprecate and ignore bunq code. 2018-05-23 07:38:27 +02:00
James Cole
039e8d6e17 Add debug info and update routine for multiple accounts. 2018-05-23 07:38:03 +02:00
James Cole
50bf79ab18 Ignore bunq objects. 2018-05-22 18:55:30 +02:00
James Cole
467c6762fa Catch all edge cases. 2018-05-22 18:42:34 +02:00
James Cole
740f4e403f Improve coverage for Spectre 2018-05-22 18:05:35 +02:00
James Cole
5664d51695 Fix #1439 2018-05-21 20:04:30 +02:00
James Cole
b195a61498 Improve coverage for Spectre. 2018-05-21 19:17:33 +02:00
James Cole
94e6816bf6 Improve test coverage. 2018-05-21 17:28:09 +02:00
James Cole
ebf97f710f Refactor code and fix tests. 2018-05-21 09:40:19 +02:00
James Cole
714b54ed06 Refactor and rename test code. 2018-05-21 07:22:38 +02:00
James Cole
620c5f515e Improve test coverage, remove dead code. 2018-05-20 16:26:27 +02:00
James Cole
c06fd12b07 Fix test coverage. 2018-05-19 22:23:08 +02:00
James Cole
2c206bba64 First working version of a working Spectre import. 2018-05-19 21:13:00 +02:00
James Cole
04953b5645 Lots of new code for the Spectre routine. 2018-05-19 10:44:33 +02:00
James Cole
1732ce63f3 Merge branch 'hotfix/4.7.3.2' into develop 2018-05-16 21:55:42 +02:00
James Cole
1e212c6da2 Merge branch 'hotfix/4.7.3.2' 2018-05-16 21:55:41 +02:00
James Cole
7d8fc54351 Fix version number. 2018-05-16 21:55:24 +02:00
James Cole
dd44a1e517 Code for Spectre. 2018-05-16 21:31:45 +02:00
James Cole
9f26757e8a First code for Spectre login and import routine. 2018-05-14 20:21:00 +02:00
James Cole
a9c8c8384d Merge branch 'hotfix/4.7.3.1' into develop 2018-05-14 19:24:54 +02:00
James Cole
a826b0e0fb Merge branch 'hotfix/4.7.3.1' 2018-05-14 19:24:53 +02:00
James Cole
4aaec0e379 Fix an issue where new users would be given a rule that always triggers. 2018-05-14 19:24:35 +02:00
James Cole
69019d5215 First code for Spectre import. 2018-05-14 17:59:43 +02:00
James Cole
96411b17e9 Fix tests, improve demo text. 2018-05-13 16:04:53 +02:00
James Cole
5a093b58d8 Prep for bunq and spectre import. 2018-05-13 15:00:30 +02:00
James Cole
470b3e0973 Remove middleware [skip ci] 2018-05-13 09:58:21 +02:00
James Cole
dc251c216c Add debug log [skip ci] 2018-05-13 09:51:05 +02:00
James Cole
ae9ef61f80 Add debug log [skip ci] 2018-05-13 09:47:51 +02:00
James Cole
d9ca7b7277 Better error messages [skip ci] 2018-05-13 09:39:06 +02:00
James Cole
0c99248deb Fix rules surrounding creation of jobs [skip ci] 2018-05-13 09:34:27 +02:00
James Cole
1aae84a4d0 Optimise tests and coverage. 2018-05-13 09:01:10 +02:00
James Cole
528da3f08e Allow the mapping of asset accounts for opposing value 2018-05-12 20:56:34 +02:00
James Cole
9c507f7f62 Refactor some code to handle command line imports. 2018-05-12 19:09:34 +02:00
James Cole
07da2fdda3 Remove unused imports. 2018-05-12 17:27:19 +02:00
James Cole
ca3366544e Add file used to test UTF8 check. 2018-05-12 16:54:07 +02:00
James Cole
ccee7b483c Fix tests 2018-05-12 16:04:46 +02:00
James Cole
5903133e3b Remove return type. 2018-05-12 15:54:20 +02:00
James Cole
5bf520b6ed Code consistency and new tests. 2018-05-12 15:50:01 +02:00
James Cole
a47da92d81 Test coverage for opposing account mapper. 2018-05-12 13:27:02 +02:00
James Cole
63f84ae7b1 Lots of refactoring and new tests. 2018-05-12 10:46:18 +02:00
James Cole
4d6bc55723 Update test code. 2018-05-11 19:58:10 +02:00
James Cole
9bb4df4cc3 Split and cleanup file import routine. 2018-05-11 19:56:52 +02:00
James Cole
c47a5379ae Improve code test coverage. 2018-05-11 10:37:13 +02:00
James Cole
cde9c4a2bc Update copyright statements. 2018-05-11 10:08:34 +02:00
James Cole
5a560b42ef Improve test coverage. 2018-05-11 09:51:47 +02:00
James Cole
50874c9cf7 Rename some variables. 2018-05-10 23:11:11 +02:00
James Cole
6f984aa591 Improve test coverage. 2018-05-10 23:01:21 +02:00
James Cole
274162afcd Fix test that could come up with journals with 0 transactions, and improve test coverage for file routine. 2018-05-10 20:05:02 +02:00
James Cole
6bd23d897f Try to get details about OAuth exceptions. 2018-05-10 09:48:13 +02:00
James Cole
73f29ebf69 make sure class is compatible with interface. 2018-05-10 09:18:40 +02:00
James Cole
cabcb9c6d0 Basic storage routine works, basic file handling. 2018-05-10 09:10:16 +02:00
James Cole
116f7ed613 First attempt to run file import. 2018-05-10 06:26:57 +02:00
James Cole
6ef0eb73d0 Improve importer. 2018-05-09 20:53:39 +02:00
James Cole
7f4feb0cfc More code for import routine. 2018-05-07 20:35:14 +02:00
James Cole
626f7357bb Improve CSV import routine. 2018-05-07 19:21:12 +02:00
James Cole
690c9203c8 Start processing files. 2018-05-06 21:06:23 +02:00
James Cole
1209f3b39a First start for CSV file import. 2018-05-06 20:42:30 +02:00
James Cole
a4524b3c2c Throw exception with empty amount. 2018-05-06 20:42:07 +02:00
James Cole
a3cbdadb39 Towards managing mapping for file imports. 2018-05-06 16:19:29 +02:00
James Cole
9e3c5fd984 Remove references to non-existing files. 2018-05-06 07:40:50 +02:00
James Cole
7d80ac37a6 Can configure file upload in file imports. 2018-05-06 07:09:08 +02:00
James Cole
f74b9ba7ab Add strict types and newlines. 2018-05-05 16:51:32 +02:00
James Cole
3ac240dc1c Add some randomness to test data. 2018-05-05 15:18:41 +02:00
James Cole
d233b3f24f Improve test (coverage). 2018-05-05 14:40:12 +02:00
James Cole
19fff681d2 Improve test coverage, mark as deprecated. 2018-05-05 13:53:12 +02:00
James Cole
bc7c3bb9b3 Improve test coverage and remove deprecated code. 2018-05-05 11:03:10 +02:00
James Cole
57be7f2905 Fix test coverage, ignore all other routines. 2018-05-05 06:47:35 +02:00
James Cole
1c0da454db Improved code for new import + some tests. 2018-05-04 20:21:27 +02:00
James Cole
b541f7b944 Improve fake import. 2018-05-04 06:59:14 +02:00
James Cole
6e84326583 Fix #1418 2018-05-04 06:00:16 +02:00
James Cole
ca14496e4e First code for file import. 2018-05-03 22:20:06 +02:00
James Cole
480d65fc1f Fake import works, won't fire rules yet. also needs a state. 2018-05-03 18:17:59 +02:00
James Cole
6bddb63b45 New code for updated import routine. 2018-05-03 17:23:16 +02:00
James Cole
c5142aeba5 Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop 2018-05-03 17:22:34 +02:00
James Cole
38d9f10672 New issue templates. 2018-05-03 16:53:52 +02:00
James Cole
937394af7a Merge pull request #1409 from shashankmc/develop
Adding Indian rupee
2018-05-03 07:27:51 +02:00
Shashank M Chakravarthy
fe10955eb9 Adding Indian rupee
Adding Indian rupee under asian currencies.
2018-05-03 10:56:09 +05:30
James Cole
ccda71ff8e New code for updated import routine. 2018-05-01 20:47:38 +02:00
James Cole
cd75224cdd Create a fake routine, check for its progress. 2018-04-30 06:37:29 +02:00
James Cole
1c2089b8a3 Fixes #1400 2018-04-30 06:17:27 +02:00
James Cole
3ead4d4587 List rules as inactive if relevant #1392 2018-04-30 06:12:55 +02:00
James Cole
f2b71bc280 Fake jobs can be started and will crash. 2018-04-29 21:20:06 +02:00
James Cole
f027d71136 Fake jobs can be configured and can reach the landing stage. 2018-04-29 20:01:03 +02:00
James Cole
fa41d6df04 Clean up translations and strings in import routine. 2018-04-29 19:28:07 +02:00
James Cole
d2bb65bf04 Can now create jobs, and set prerequisites for the fake provider, which will be skipped when they're not necessary. 2018-04-29 19:07:54 +02:00
James Cole
b5be1b11d1 Update index and routes. 2018-04-29 18:07:58 +02:00
James Cole
9fb049991f Migration for 4.7.4 2018-04-29 18:07:47 +02:00
James Cole
fba847dd28 New bindable for import provider 2018-04-29 18:07:38 +02:00
James Cole
b33883b334 Small code improvements. 2018-04-29 18:07:23 +02:00
James Cole
f74a6dffca Update providers and repositories for new import job fields 2018-04-29 18:07:14 +02:00
James Cole
7390e20218 Add method to indicate completeness. 2018-04-29 18:06:47 +02:00
James Cole
9646dc439e Big fat reset in import controller to accomodate new routine. 2018-04-29 18:06:31 +02:00
James Cole
554c63b9c7 Expand config to handle new providers 2018-04-29 18:03:55 +02:00
James Cole
24d8640e9b Add logos for new providers. 2018-04-29 18:03:35 +02:00
James Cole
ea151d069c Merge pull request #1401 from paul999/select_bunq_option
Select the matching bunq account from the import. Fixes #1398
2018-04-29 17:32:07 +02:00
Paul Sohier
f140d2f37a Select the matching bunq account from the import. Fixes #1398 2018-04-29 16:26:19 +02:00
James Cole
4e163c4bda Merge pull request #1395 from nicoschreiner/patch-1
Fix alignment of sidebar-icons
2018-04-29 14:08:24 +02:00
Nico Schreiner
ddcf8b892b Fix alignment of sidebar-icons
I noticed a minor thing which was bothering me. The Icons in the sidebar weren't align correctly (the fa-repeat icon). This change should fix this.
2018-04-29 13:28:49 +02:00
James Cole
49138eb03a Can now import and handle external ID field. 2018-04-29 10:13:33 +02:00
James Cole
71b63bd33b Remove references to ExpandedForm. 2018-04-29 09:48:53 +02:00
James Cole
88348f59c2 Could repair #1389 2018-04-29 09:00:49 +02:00
James Cole
7eb5643204 Use new select options. 2018-04-29 07:46:30 +02:00
James Cole
565cb6d79e New select options 2018-04-29 07:46:14 +02:00
James Cole
c0d715c78a Add method to collect note text. 2018-04-29 07:46:03 +02:00
James Cole
a3d0355ddd Use new expanded for method. 2018-04-29 07:45:54 +02:00
James Cole
bc4e06568d Move references to repository 2018-04-29 07:45:38 +02:00
James Cole
8acb9f4056 Fix error when un-decryptable files would break the export. 2018-04-29 07:42:17 +02:00
James Cole
9cbbd581ee Rename template file. 2018-04-29 07:42:01 +02:00
James Cole
fdc9467218 Fix #1369 2018-04-28 21:54:48 +02:00
James Cole
84ac3df580 Merge branch 'release/4.7.3' 2018-04-28 16:27:55 +02:00
James Cole
7f459df9e9 Last minute sanity check. 2018-04-28 16:24:24 +02:00
James Cole
3625f3293a Code for 4.7.3 release. 2018-04-28 15:35:43 +02:00
James Cole
0a2308592f New language strings. 2018-04-28 15:26:45 +02:00
James Cole
8ef3f18da7 Update language strings for English. 2018-04-28 10:29:31 +02:00
James Cole
e126427809 Improve code quality and fix test coverage. 2018-04-28 10:27:33 +02:00
James Cole
7b39828980 Improve attachment list. 2018-04-28 06:53:37 +02:00
James Cole
d03de52735 New buttons and links [skip ci] 2018-04-28 06:44:37 +02:00
James Cole
cabe90b2dd Attachment controller basic index. 2018-04-28 06:34:01 +02:00
James Cole
13b78bdc20 Code cleanup 2018-04-28 06:23:13 +02:00
James Cole
6f0e1c79ac Fix #1353 2018-04-28 05:42:47 +02:00
James Cole
b66daad3d3 Fix coverage. 2018-04-28 05:40:23 +02:00
James Cole
9c5523252d Clean up old JS. 2018-04-28 05:40:08 +02:00
James Cole
bc8bcf7a1a Upgrade spectre to v4 2018-04-28 05:25:29 +02:00
James Cole
85d655d3e2 Upgrade Spectre to v4 2018-04-27 13:07:46 +02:00
James Cole
ac419e01d3 Catch open basedir errors. 2018-04-27 12:58:43 +02:00
James Cole
5d4467a6c0 Improve test speed. 2018-04-27 12:39:25 +02:00
James Cole
81da7f3667 Move to correct directory [skip ci] 2018-04-27 11:53:22 +02:00
James Cole
9734196eb9 Updated translations. 2018-04-27 11:48:52 +02:00
James Cole
7e0f9b9b8e Update packages. 2018-04-27 11:29:19 +02:00
James Cole
bb25132865 Fix tests 2018-04-27 11:29:09 +02:00
James Cole
28bcff99f6 Add config for stale bot. 2018-04-27 08:50:49 +02:00
James Cole
246cb36836 Expand support for trusted proxies configuration. 2018-04-27 07:01:03 +02:00
James Cole
9a0c0f6d21 Fix #1383 2018-04-27 06:50:41 +02:00
James Cole
a9dd8eb9e7 Fix #1382 2018-04-27 06:26:37 +02:00
James Cole
9026c9d6f1 Update docker file. 2018-04-26 21:16:45 +02:00
James Cole
d5f7430723 Move and update security txt [skip ci] 2018-04-26 21:00:29 +02:00
James Cole
5a53249fbb Merge pull request #1380 from paul999/fix_1378
iban returned from bunq might be empty.
2018-04-25 19:16:12 +02:00
Paul Sohier
d2848cf569 getIban might return null from the bunq API. Fixes #1378 as it gets imported now :) 2018-04-25 19:11:32 +02:00
James Cole
71f39f55f2 Push some more fixes for #1378 2018-04-25 17:02:43 +02:00
James Cole
490c817fc1 Some fixes for #1378 2018-04-25 16:01:51 +02:00
James Cole
2e1a777811 Fix small deprecated function call. [skip ci] 2018-04-24 19:49:54 +02:00
James Cole
48357d1cc9 Fix #1273 and #1272 2018-04-24 19:48:42 +02:00
James Cole
846df21764 Fix #1372 2018-04-24 19:26:31 +02:00
James Cole
f78b8f9267 Some code for #1272 2018-04-24 19:26:16 +02:00
James Cole
798d9ee876 Mail to logbooks. 2018-04-24 19:23:32 +02:00
James Cole
1eea81e9dd Update readme [skip ci] 2018-04-22 19:18:57 +02:00
James Cole
4fcdfd41fa Update readme [skip ci] 2018-04-22 19:17:43 +02:00
James Cole
36a5f17af2 Code cleanup as described in #1272 2018-04-22 17:12:22 +02:00
James Cole
8032684ad0 Some code cleanup for #1272 2018-04-22 17:10:11 +02:00
James Cole
f7d3d4a010 Updated language strings [skip ci] 2018-04-22 13:14:36 +02:00
James Cole
9975e0b3f3 And now without var_dump. 2018-04-22 12:01:34 +02:00
James Cole
ea484a7787 Small bill related fixes. 2018-04-22 12:01:18 +02:00
James Cole
c2e8a67330 Code for #1367 2018-04-22 11:29:20 +02:00
James Cole
8f3e4a2dee Code for #1356 2018-04-22 11:17:30 +02:00
James Cole
07768a43c8 Code for #1321 2018-04-22 09:40:03 +02:00
James Cole
01c10e320c Fix for #1364 2018-04-22 09:16:51 +02:00
James Cole
f16b2257c6 Custom input for amount. 2018-04-22 08:08:09 +02:00
James Cole
e005fe7ce1 Also show foreign amount. 2018-04-22 08:07:57 +02:00
James Cole
c682e69ee7 Keep order 2018-04-22 08:07:46 +02:00
James Cole
49421f50ac Will not store fields with empty strings or weird value 2018-04-22 08:07:33 +02:00
James Cole
529dd490b7 Fix #1336 2018-04-22 07:16:09 +02:00
James Cole
36329e596e Fix #1334 2018-04-21 23:48:54 +02:00
James Cole
fb75e2ef02 Move to MariaDB. [skip ci] #1366 2018-04-21 21:09:56 +02:00
James Cole
352171e339 New language strings [skip ci] 2018-04-21 20:48:18 +02:00
James Cole
592901b143 Code for @1346 2018-04-21 20:36:42 +02:00
James Cole
769b4819b2 Add timezone to Docker file. 2018-04-21 20:30:36 +02:00
James Cole
77fa2bcc39 Call test at wrong position [skip ci] 2018-04-21 20:30:07 +02:00
James Cole
1129001bc6 Possible solution for #1353 2018-04-21 20:29:44 +02:00
James Cole
8dd765ee89 Remove deprecated method. 2018-04-21 20:28:41 +02:00
James Cole
479648e7c1 Fix #1352 2018-04-21 20:28:30 +02:00
James Cole
45cd19d1e3 Fix #1363 2018-04-21 20:27:35 +02:00
James Cole
f8718e0b7b Fix some issues with verify database code. 2018-04-21 20:26:41 +02:00
James Cole
dcc45631da New language strings [skip ci] 2018-04-19 20:04:04 +02:00
James Cole
c6d3a5bedc Code for #1351 2018-04-19 20:03:02 +02:00
James Cole
7cc8539298 Fix for #1349, thanks to @NyKoF 2018-04-19 18:27:39 +02:00
James Cole
900e8202e6 Remove some deprecated functions. 2018-04-16 20:21:28 +02:00
James Cole
eb6ac7d1d1 Remove unused methods. 2018-04-16 20:12:30 +02:00
James Cole
178f917a49 Fix #1348 2018-04-16 19:29:26 +02:00
James Cole
1a8293d9ef Fix view for transaction controller. 2018-04-16 19:25:33 +02:00
James Cole
ecdc00dcb7 Debug code for transaction view. [skip ci] 2018-04-16 19:24:46 +02:00
James Cole
147e04ecd2 Debug code for transaction view. [skip ci] 2018-04-16 18:06:53 +02:00
James Cole
49e48725a5 Debug code for transaction view. [skip ci] 2018-04-16 18:03:56 +02:00
James Cole
b3af744041 Debug code for transaction view. [skip ci] 2018-04-16 18:02:35 +02:00
James Cole
58a6a95d90 Debug code for transaction view. [skip ci] 2018-04-16 17:59:35 +02:00
James Cole
1aa9461370 Fix reference to unknown method. 2018-04-16 17:51:37 +02:00
James Cole
1f78b9d4bc Add today as well. #1328 2018-04-15 19:24:20 +02:00
James Cole
6f974fe285 Improve API and test coverage. 2018-04-15 19:20:24 +02:00
James Cole
f4f3c8798e Fix for #1328 2018-04-15 19:20:04 +02:00
James Cole
ce1614f4e7 Fix chart range. 2018-04-15 19:11:10 +02:00
James Cole
91494584c2 Fix #1327 2018-04-15 17:58:39 +02:00
James Cole
a85ebb49b2 Improve test coverage. 2018-04-15 14:03:23 +02:00
James Cole
ae273f8320 Also test PHP 7.2 2018-04-15 10:44:47 +02:00
James Cole
ef62e31b61 Fix #1246 2018-04-15 10:12:04 +02:00
James Cole
0c2c5d5344 Code for #1326 2018-04-15 08:52:58 +02:00
James Cole
11e93eac3d Merge pull request #1341 from bconte/develop
Remove the 'php artisan optimize' line from .deploy/docker/entroypoin…
2018-04-15 08:52:04 +02:00
Brenden Conte
dbe17debb4 Remove the 'php artisan optimize' line from .deploy/docker/entroypoint.sh because the command was removed in artisan 5.6 2018-04-15 02:35:47 -04:00
James Cole
6c12337317 Improve transaction linking [skip ci] 2018-04-14 23:25:28 +02:00
James Cole
b2aa73b31e Improve transaction linking [skip ci] 2018-04-14 23:23:47 +02:00
James Cole
38b1fc7aa6 Improve logging [skip ci] 2018-04-14 23:12:54 +02:00
James Cole
f4afcb4d50 Add debug logging [skip ci] 2018-04-14 23:09:24 +02:00
James Cole
4b019fe38b Limit scope in transaction matcher. 2018-04-14 23:06:27 +02:00
James Cole
191401f32b Fix division by zero. 2018-04-14 22:37:20 +02:00
James Cole
62b68c6a21 Fix tests. 2018-04-14 21:21:20 +02:00
James Cole
15a22f0bfc Expand rules and bills. 2018-04-14 20:31:31 +02:00
James Cole
926c03986c Remove references to bill scanning. 2018-04-14 13:00:24 +02:00
James Cole
d8a00f4314 Various code for bills and rules. 2018-04-14 09:59:04 +02:00
James Cole
5862b832d9 Fix issue with API 2018-04-14 09:38:58 +02:00
James Cole
67fa4a0fc7 Add currency controls to API 2018-04-13 17:28:11 +02:00
James Cole
90cf7a3bf5 Fix several issues with bunq import #1330 2018-04-10 21:18:38 +02:00
James Cole
0847040017 Correct access rights #1320 2018-04-09 18:59:06 +02:00
James Cole
69b577048e New string [skip ci] 2018-04-08 18:35:13 +02:00
James Cole
3fbd2f93c8 Code for #1324 2018-04-08 17:36:37 +02:00
James Cole
8f0e36a8e4 Code for #1324 2018-04-08 16:27:52 +02:00
James Cole
7583698ee5 Remove hard exit from upgrade routine. 2018-04-08 16:26:26 +02:00
James Cole
b561e79a6c Catch null in currency pref. [skip ci] 2018-04-08 16:21:17 +02:00
James Cole
5850ad06b1 More debug [skip ci] 2018-04-08 16:18:35 +02:00
James Cole
e597f04b0d Add debug logging. 2018-04-08 16:17:29 +02:00
James Cole
7b715925cf Code for #1324 2018-04-07 22:23:16 +02:00
James Cole
d3701837e3 Possible fix for #1325 2018-04-07 18:00:09 +02:00
James Cole
7af10aca9e Add new action to link a transaction to a bill. 2018-04-07 06:20:45 +02:00
James Cole
b54e99642b Refactor some auto complete routes. 2018-04-07 06:19:40 +02:00
James Cole
b1ad0668cc Clean overview for bills. 2018-04-07 05:58:59 +02:00
James Cole
6583d0f69b Fix JS in installer. 2018-04-07 05:30:29 +02:00
James Cole
cee6bbf134 Update files for Sandstorm. 2018-04-06 22:24:57 +02:00
James Cole
43e49bf14a Fire middleware on index. 2018-04-06 21:38:43 +02:00
James Cole
371b58a807 Make upgrade routine not trigger everywhere. 2018-04-06 21:38:17 +02:00
James Cole
7812a1bb51 Fix for #1320 2018-04-06 18:14:48 +02:00
James Cole
538e045e4c Give error for proc_close. 2018-04-06 13:36:36 +02:00
James Cole
91fe1493a7 Improve edit routine for split transactions. 2018-04-06 12:44:43 +02:00
James Cole
4650a2ea52 Merge branch 'release/4.7.2.2' 2018-04-04 19:26:51 +02:00
James Cole
7cd51a7747 Update version. 2018-04-04 19:18:59 +02:00
James Cole
b55545b959 Fix #1317 2018-04-04 19:18:01 +02:00
James Cole
2685256c93 Fix split edit. 2018-04-04 19:15:05 +02:00
James Cole
3819de4e74 Fix security issue with markdown, thanks to @simhnna 2018-04-04 19:14:47 +02:00
James Cole
73fee4eb6b Fix #1313 2018-04-03 19:15:06 +02:00
James Cole
609c193b88 Fix #1312 2018-04-03 19:12:59 +02:00
James Cole
03a42976b1 Configure logging for Slack. [skip ci] 2018-04-02 20:05:18 +02:00
James Cole
6db0efdfbc Fix extremely specific piggy bank percentage. 2018-04-02 17:30:30 +02:00
James Cole
ebbbe1a620 Merge branch 'release/4.7.2.1' 2018-04-02 16:52:23 +02:00
James Cole
5d1c77cb16 New version: 4.7.2.1 2018-04-02 15:40:43 +02:00
James Cole
d48fb3ba55 Create keys by hand if not existing. 2018-04-02 15:26:33 +02:00
James Cole
8c024a1ae9 Create default token if none exist. 2018-04-02 15:17:03 +02:00
James Cole
a3c34e6b3c Code cleanup 2018-04-02 15:10:40 +02:00
James Cole
fa7ab45a40 Code cleanup 2018-04-02 14:50:17 +02:00
James Cole
379b104778 Refer to classes directly. 2018-04-02 14:43:06 +02:00
James Cole
d956c795a4 Vue components will now work in subdirs too. 2018-04-02 14:42:30 +02:00
James Cole
7d02d0f762 Code cleanup. 2018-04-02 14:42:07 +02:00
James Cole
f96f38b172 Code cleanup. 2018-04-02 14:17:11 +02:00
James Cole
4cea5d65a6 Expand language list #1310 2018-04-02 06:56:19 +02:00
James Cole
40d94e7a62 Avoid using serialised preferences for security purposes. This might break existing preferences. 2018-04-01 19:22:30 +02:00
James Cole
66019fdbbf Code for #1309 2018-04-01 16:00:15 +02:00
James Cole
37b02e3d5b Merge branch 'release/4.7.2' 2018-04-01 11:46:41 +02:00
James Cole
093bdd6090 Fix some last minute issues. 2018-04-01 08:50:23 +02:00
James Cole
52656b25da Let's cancel these tests for now. 2018-04-01 08:04:19 +02:00
James Cole
1386c9d915 Disable some tests. 2018-04-01 07:40:30 +02:00
James Cole
02c9441727 Last minute language updates. 2018-04-01 07:24:18 +02:00
James Cole
b1e926f2cb Use php unit 7, not 6. 2018-04-01 07:13:29 +02:00
James Cole
df9dcb395b Change composer build instructions 2018-04-01 07:02:46 +02:00
James Cole
ad59dad921 Remove deprecated features. 2018-03-31 21:42:08 +02:00
James Cole
46e75968f5 Update composer 2018-03-31 21:05:53 +02:00
James Cole
0df5c5121d Update language strings 2018-03-31 21:05:43 +02:00
James Cole
16f04b45ac Update composer file. 2018-03-31 21:05:17 +02:00
James Cole
5ce35a50c2 Make sure tests work. 2018-03-31 21:05:06 +02:00
James Cole
7110c1178a Fix bad parse error. 2018-03-30 22:49:46 +02:00
James Cole
220f5e2913 Add support for Italian. 2018-03-30 22:48:00 +02:00
James Cole
9f8c75efc6 Fix null pointer in account format. 2018-03-30 22:44:37 +02:00
James Cole
8f3e84df4d Fix possible null pointer. 2018-03-30 22:40:20 +02:00
James Cole
08ff3d8ad0 Implement test of import command. 2018-03-30 19:41:16 +02:00
James Cole
5c4d7734ac Expand test code for create export routine. 2018-03-30 16:44:33 +02:00
James Cole
15f8cd49d3 Log file security. 2018-03-30 14:50:44 +02:00
James Cole
62b3986fcd Update env files for #1280 2018-03-30 07:00:20 +02:00
James Cole
55b6d711f3 Currency exchange rate will not be saved when rate is 0. 2018-03-30 06:33:04 +02:00
James Cole
7e51d57d21 Update composer file. 2018-03-29 19:01:59 +02:00
James Cole
170d23d768 Code cleanup before release. 2018-03-29 19:01:47 +02:00
James Cole
40266c6821 Add support for Italian and update language files. 2018-03-29 19:00:21 +02:00
James Cole
0a71077513 Push updated tests. 2018-03-28 19:38:20 +02:00
James Cole
be5c44af61 Update some code, add security txt file. 2018-03-28 19:37:59 +02:00
James Cole
720dcb0fe5 Fix #1300 2018-03-27 19:29:58 +02:00
James Cole
c86b207b1c Fix #1297 2018-03-26 20:48:47 +02:00
James Cole
413c1bc2fe Fix #1294 2018-03-26 19:19:11 +02:00
James Cole
5ca31ea3dd Fix #1296 2018-03-26 19:09:58 +02:00
James Cole
dd5d2d1616 Consistent overview for #1292 2018-03-25 21:16:46 +02:00
James Cole
5f08790f12 Restore chart #1292 2018-03-25 20:52:21 +02:00
James Cole
d5ef5ee5a7 Fix #1293 2018-03-25 20:42:56 +02:00
James Cole
f641c70172 Fix #1292 2018-03-25 18:26:35 +02:00
James Cole
992657b942 Code for #1257 2018-03-25 13:30:55 +02:00
James Cole
41e468b507 Fix #1247 2018-03-25 10:17:07 +02:00
James Cole
6660306ac4 Various code cleanup. 2018-03-25 09:01:43 +02:00
James Cole
dd9694890a Code for #1291 2018-03-25 09:00:45 +02:00
James Cole
0b8654d865 Fix #1252 2018-03-25 07:59:06 +02:00
James Cole
f07dc7bd81 Finalize bunq import #1248 2018-03-25 07:55:31 +02:00
James Cole
6a6482dc7f Finish up bunq import routine. 2018-03-24 18:55:02 +01:00
James Cole
3c9b7c07af Move import to factory #1222 2018-03-24 14:05:29 +01:00
James Cole
796ab4bf2c Fixed some small issues in import routine. 2018-03-24 11:49:26 +01:00
James Cole
55602d632d Clean up code for import routine. 2018-03-24 10:35:42 +01:00
James Cole
310ed9f504 Add budget warnings #1202 2018-03-24 06:46:37 +01:00
James Cole
dafddfa39a Fix all tests. 2018-03-24 06:08:50 +01:00
James Cole
3e22c9860e Fix some tests. 2018-03-23 05:31:45 +01:00
James Cole
fb0a0c3fb5 Fix a few tests. 2018-03-23 05:31:30 +01:00
James Cole
3b735c7533 Expand views and files to use new methods. 2018-03-19 19:39:26 +01:00
James Cole
1645490f5c Avoid using model methods and use repository instead 2018-03-19 19:39:02 +01:00
James Cole
aecffe10d9 Import routine can handle new SEPA fields and many new date fields. See #1248 2018-03-19 19:38:17 +01:00
James Cole
4e69bc0e32 Add reference to FAQ [skip ci] 2018-03-19 15:44:08 +01:00
James Cole
909f72e6be Move notes for attachments to different object. This sacrifices the original notes. 2018-03-19 15:28:35 +01:00
James Cole
6a1d39d5f8 Add newlines and strict type declarations. 2018-03-19 13:23:26 +01:00
James Cole
c5d4ec17c3 Move strict type declaration. 2018-03-19 13:22:08 +01:00
James Cole
ed33a72945 Make sure that strict_types declaration is always at the very top of the file. 2018-03-19 12:09:12 +01:00
James Cole
d8c0091680 Make sure that strict_types declaration is always at the very top of the file. 2018-03-19 12:08:50 +01:00
James Cole
6419d68626 Add newlines to end of file. 2018-03-19 12:08:22 +01:00
James Cole
e2ecaf5bcf Include BIC in import routine 2018-03-19 10:03:08 +01:00
James Cole
31146954d1 Fix #1258 2018-03-19 09:33:48 +01:00
James Cole
601ca9ec80 Update German translations [skip ci] 2018-03-19 09:09:47 +01:00
James Cole
082b5ba895 Fix #1262 2018-03-19 09:09:02 +01:00
James Cole
e06361d5d7 Push strict declaration to top. 2018-03-19 08:17:42 +01:00
James Cole
552a8e130c Add support methods. 2018-03-19 08:17:31 +01:00
James Cole
40787bc29a Improve bunq import. 2018-03-19 08:17:15 +01:00
James Cole
6ab03bb228 Improve IBAN uniqueness. 2018-03-19 08:16:54 +01:00
James Cole
3fdb782321 Fix various tests. 2018-03-11 21:19:35 +01:00
James Cole
c8f52a1c40 Code cleanup [skip ci] 2018-03-11 20:41:03 +01:00
James Cole
eb63090387 Fix custom range thing for accounts #1240 [skip ci] 2018-03-11 19:01:19 +01:00
James Cole
5bc8f31c31 Add verify routine to installer. 2018-03-11 18:47:26 +01:00
James Cole
5776de7745 Update various tests. 2018-03-11 18:46:41 +01:00
James Cole
f45d0bb317 Expand install routine. 2018-03-11 18:46:18 +01:00
James Cole
93aa5b7753 Fix null pointer in chart JS [skip ci] 2018-03-11 18:40:08 +01:00
James Cole
dd6a6a565f Fix null pointer in budget report [skip ci] 2018-03-11 18:38:35 +01:00
James Cole
aba8025645 Move docker files, include kubernetes files. 2018-03-11 18:27:30 +01:00
James Cole
b12872e5de Various code cleanup. 2018-03-11 16:24:07 +01:00
James Cole
5a7b1ba292 Remove unused methods. 2018-03-11 15:55:36 +01:00
James Cole
24715c72a2 Remove unused functions. 2018-03-11 15:54:33 +01:00
James Cole
ed3a4e4663 View extension for amounts [skip ci] 2018-03-11 14:19:28 +01:00
James Cole
e97283b34b Make sure transfers can't get a budget. 2018-03-11 14:13:23 +01:00
James Cole
c2dfbcba10 Improve view for transactions. 2018-03-11 14:09:44 +01:00
James Cole
a9870b35be Remove some stuff, mark as deprecated. 2018-03-11 13:34:16 +01:00
James Cole
ed5cd2b9ca Add currency symbol. 2018-03-11 13:31:22 +01:00
James Cole
a9356ca1e2 Mark methods as deprecated. 2018-03-11 13:30:58 +01:00
James Cole
cfba11e9ca Code for #1244 2018-03-11 13:26:11 +01:00
James Cole
4304a3c916 Code for #1214 2018-03-11 13:22:34 +01:00
James Cole
9e6194bfdc Catch null pointer [skip ci] 2018-03-11 08:23:47 +01:00
James Cole
7d6c8aa9dc Fix null pointer. 2018-03-11 08:22:20 +01:00
James Cole
aad0864018 Various code cleanup [skip ci] 2018-03-10 22:38:20 +01:00
James Cole
a55d18709c More code to catch exceptions in #1238 2018-03-10 22:34:02 +01:00
James Cole
dd2f3c861b Optimize imports. 2018-03-10 20:30:09 +01:00
James Cole
da1dc67e1c Validation message. 2018-03-10 20:25:55 +01:00
James Cole
0c2b35e542 Improve bunq import. 2018-03-10 20:25:42 +01:00
James Cole
85dc1263ea Fix #1238 2018-03-10 20:25:11 +01:00
James Cole
c8ecb3e0ee Fix #1199 for web interface 2018-03-10 09:44:04 +01:00
James Cole
ce10036a27 Fix #1199 in API 2018-03-10 09:39:49 +01:00
James Cole
30e49846e0 First list existing devices, then try to get a new one. 2018-03-10 07:33:49 +01:00
James Cole
be97dd1c57 Expand various views. 2018-03-10 07:17:23 +01:00
James Cole
648a6dca42 Expand install routine. 2018-03-10 07:17:05 +01:00
James Cole
0566d0d198 Expand bunq import. 2018-03-10 07:16:38 +01:00
James Cole
dfc25722c9 Expand debug page with locale information. 2018-03-10 07:15:21 +01:00
James Cole
a436c55c50 Code for #1236 2018-03-10 06:49:03 +01:00
James Cole
0d58530f55 Fix #1237 2018-03-09 20:58:46 +01:00
James Cole
04b2eaf535 Fix tests that broke during Laravel 5.6 upgrade 2018-03-09 06:46:45 +01:00
James Cole
ace2ed8bd0 Fix #1213 2018-03-09 05:52:52 +01:00
James Cole
dff2d716a1 Move 2FA to profile #1153 2018-03-09 05:45:22 +01:00
James Cole
ad18b9b81b Remove optional chart (always enabled) 2018-03-09 05:44:35 +01:00
James Cole
eabfe0769b Update explanation for new PW hash check. 2018-03-09 04:48:17 +01:00
James Cole
19f7027718 Fix #1198 2018-03-09 04:47:43 +01:00
James Cole
f537945351 Fix #1236 2018-03-09 04:04:42 +01:00
James Cole
d02372ab90 Fix debug controller for Laravel 5.6 2018-03-08 21:08:26 +01:00
James Cole
1b020c522f Fix currency test. 2018-03-08 21:02:46 +01:00
James Cole
79d0450c77 Implement new password verifier #1187 2018-03-08 20:44:56 +01:00
James Cole
bc32bc8831 Stop Travis from optimising. 2018-03-08 06:13:06 +01:00
James Cole
f68a307eeb Fix file names, ignore installer in test env 2018-03-07 21:04:10 +01:00
James Cole
82e7479cfe Force fresh config var [skip ci] 2018-03-07 21:01:46 +01:00
James Cole
462fe5d89f Force migration [skip ci]Middleware log. [skip ci] 2018-03-07 20:59:32 +01:00
James Cole
b0d8ac83ae Middleware log. [skip ci] 2018-03-07 20:58:54 +01:00
James Cole
d8ac817c91 Middleware log. [skip ci] 2018-03-07 20:56:52 +01:00
James Cole
5105bc6f64 Add more debug logging to output. 2018-03-07 20:55:11 +01:00
James Cole
47c9f1e9b8 Update logging for Laravel 5.6 #1221 2018-03-07 20:47:39 +01:00
James Cole
49d0ed0c1b Fix null pointer. 2018-03-07 20:41:17 +01:00
James Cole
99f5151aab Remove coverage for methods that do not exist. 2018-03-07 20:39:33 +01:00
James Cole
0a056ad02d Upgrade to Laravel 5.6 #1221 2018-03-07 20:37:00 +01:00
James Cole
c76b634d0b Fix #1189 2018-03-07 20:27:10 +01:00
James Cole
a81698d50f Code for #1219 2018-03-07 20:25:58 +01:00
James Cole
bae79063e1 Code to fix #1234 2018-03-07 20:21:51 +01:00
James Cole
fb5323c283 Code to facilitate #1123 2018-03-07 20:21:36 +01:00
James Cole
e2d1de94b7 Fix tests to catch use of repositories 2018-03-07 10:18:50 +01:00
James Cole
7109fd8196 Correct reference to journal description 2018-03-07 10:18:36 +01:00
James Cole
a5fd821e0c Code to implement #1168 and #1197. 2018-03-07 10:18:22 +01:00
James Cole
6c63583e49 Fix test to always select correct journal. 2018-03-07 05:52:45 +01:00
James Cole
dd16e1b784 Expand list of bills for #1102 2018-03-07 05:52:34 +01:00
James Cole
d52d8d7970 Expand exception code and fix demo user redirect. 2018-03-07 05:51:51 +01:00
James Cole
f349aa47ce Merge pull request #1232 from benyanke/patch-1
Allow user to specify port
2018-03-06 05:22:46 +01:00
James Cole
ef4018934c Merge branch 'release/4.7.1.4' 2018-03-06 05:15:04 +01:00
Ben Yanke
951aa9535e Allow user to specify port 2018-03-05 20:49:21 -06:00
James Cole
de1fe36226 Fix #1226 2018-03-05 19:56:50 +01:00
James Cole
64fd36d437 Fix #1227 2018-03-05 19:39:41 +01:00
James Cole
6f9ecc0ffa Update version. [skip ci] 2018-03-05 19:37:06 +01:00
James Cole
a97bfc92e1 Add newlines and strict types 2018-03-05 19:35:58 +01:00
James Cole
0d72fcdf02 Fix #1225 2018-03-05 19:35:39 +01:00
James Cole
0e84ca1df5 Merge branch 'release/4.7.1.3' 2018-03-04 20:57:12 +01:00
James Cole
b28bdda510 Move base href to top of page. 2018-03-04 20:40:49 +01:00
James Cole
72314e2d9f Expand tests for updated triggers / actions. 2018-03-04 17:10:36 +01:00
James Cole
d22fb9f438 Improve tests for transaction rules. 2018-03-04 16:42:29 +01:00
James Cole
04b8552d27 Implement tests. 2018-03-04 16:30:20 +01:00
James Cole
5d6f44cd91 Fix test that could select a deposit or transfer. 2018-03-04 16:07:03 +01:00
James Cole
afc8ad7ff5 Clean test. 2018-03-04 15:57:19 +01:00
James Cole
ae039bf1c7 Update composer file for failed passport thing and update version. 2018-03-04 15:36:06 +01:00
James Cole
8fa25e9d37 Update read me file. 2018-03-04 15:25:43 +01:00
James Cole
0daab491ec Remove unused file [skip ci] 2018-03-04 15:16:37 +01:00
James Cole
4f825bac1a Add newlines to files [skip ci] 2018-03-04 15:16:18 +01:00
James Cole
39c8b79ebb Add newlines to files [skip ci] 2018-03-04 15:14:29 +01:00
James Cole
7d66c90beb Make sure that the API returns all entries of a split transaction. 2018-03-04 14:20:23 +01:00
James Cole
1b8b65582a Merge branch 'release/4.7.1.2' 2018-03-04 13:27:21 +01:00
James Cole
d25971cb44 Actually upgrade version. 2018-03-04 13:26:35 +01:00
James Cole
89a56e661d Merge branch 'hotfix/4.7.1.1' into develop 2018-03-04 13:24:07 +01:00
James Cole
3482746d7c Merge branch 'hotfix/4.7.1.1' 2018-03-04 13:24:06 +01:00
James Cole
d5aeca6222 Fix import problem in 4.7.1 2018-03-04 13:23:44 +01:00
James Cole
03f46638e1 Merge branch 'release/4.7.1' 2018-03-04 10:52:17 +01:00
James Cole
c2b000d910 Update change log. 2018-03-04 10:39:40 +01:00
James Cole
88eb702d7b Update Sandstorm files. 2018-03-04 10:39:31 +01:00
James Cole
b1d98f026f Update docker file. 2018-03-04 10:39:00 +01:00
James Cole
28dfe7b02c Update test config. 2018-03-04 10:38:50 +01:00
James Cole
84f0ee183c Fix tests. 2018-03-04 09:49:15 +01:00
James Cole
7eedd6c2fc Update changelog and increment version. 2018-03-04 09:13:15 +01:00
James Cole
e7b80c6d10 Fix parameter error in test script. 2018-03-04 09:12:58 +01:00
James Cole
d165609476 Expand debug view with API version. 2018-03-04 09:12:47 +01:00
James Cole
2f17521c06 Fix small errors in bulk and mass controller 2018-03-04 09:12:33 +01:00
James Cole
8b52006959 Updated all language strings. 2018-03-04 08:54:01 +01:00
James Cole
8eb3d43123 Fix tag auto select. 2018-03-04 08:52:06 +01:00
James Cole
a511368229 Fix missing index. 2018-03-04 08:51:46 +01:00
James Cole
f0006a0743 Update composer lock file. 2018-03-04 08:51:20 +01:00
James Cole
7171e69715 All API routes seem to work. 2018-03-04 08:22:32 +01:00
James Cole
2ab44fb33a Improve test coverage. 2018-03-04 07:56:30 +01:00
James Cole
7542175258 Improve test coverage. 2018-03-03 17:16:47 +01:00
James Cole
9dc4c50527 Expand test coverage. 2018-03-03 14:24:06 +01:00
James Cole
99d116f4ce Improve test coverage. 2018-03-03 10:15:39 +01:00
James Cole
9475fef8f6 Implement user API and first tests. 2018-03-03 08:12:18 +01:00
James Cole
60339a0f6a make sure randomly selected journals match prerequisites. 2018-03-02 17:29:47 +01:00
James Cole
36113f84be make sure randomly selected journals match prerequisites. 2018-03-02 17:07:32 +01:00
James Cole
139c2284b8 Various code cleanup. 2018-03-02 16:31:02 +01:00
James Cole
91909a70d7 Fix #1209 2018-03-02 03:14:36 +01:00
James Cole
a23d97563f Fix tests that selected split journals. 2018-03-01 21:39:31 +01:00
James Cole
bf538e2514 Merge pull request #1211 from m0nhawk/patch-1
3 new european currencies in database seed
2018-03-01 21:28:36 +01:00
Andrew Prokhorenkov
149b62f486 3 new european currencies in database seed 2018-03-01 22:20:04 +02:00
James Cole
06dc8a499b Expand factory tests. 2018-03-01 20:54:50 +01:00
James Cole
5b8479f3a4 Remove PHP 7.2 support. 2018-03-01 17:40:06 +01:00
James Cole
e803a5e26e Fix test coverage. 2018-03-01 17:20:06 +01:00
James Cole
959f798a7f Update English strings. 2018-02-28 21:33:14 +01:00
James Cole
5b8adbfd0c Repository and test clean up. 2018-02-28 21:32:59 +01:00
James Cole
54ba18975a Use different method for finding objects. 2018-02-28 20:23:45 +01:00
James Cole
fdd2dedfc6 Fix test cases. 2018-02-28 20:18:47 +01:00
James Cole
46f4fa1a7d Expand tests. 2018-02-28 15:50:00 +01:00
James Cole
28debb46be Needs to return bill to work. 2018-02-28 14:57:58 +01:00
James Cole
5f132be94d Add catalan (still in comments, because its incomplete [skip ci] 2018-02-28 07:22:57 +01:00
James Cole
9f9feea159 Code to fix #1185 2018-02-28 07:22:11 +01:00
James Cole
3bd9e0bcd4 Remove not existing method 2018-02-27 07:39:28 +01:00
James Cole
c80a76f8c0 Remove not existing method. 2018-02-27 07:37:40 +01:00
James Cole
c71f498587 Merge branches 'develop' and 'develop' of https://github.com/firefly-iii/firefly-iii into develop
* 'develop' of https://github.com/firefly-iii/firefly-iii:
  Update validation.php
  Update config.php

* 'develop' of https://github.com/firefly-iii/firefly-iii:
  Update validation.php
  Update config.php
2018-02-26 21:09:51 +01:00
James Cole
e658d447ca Update validation. 2018-02-26 21:09:33 +01:00
James Cole
33def5b45d Update validation.php 2018-02-26 13:18:34 +01:00
James Cole
9fc26a8ee0 Update config.php 2018-02-26 13:15:54 +01:00
James Cole
1b304bf85e use journal repository instead of direct calls. 2018-02-25 19:09:05 +01:00
James Cole
99983a5c8f Match default values #1191 2018-02-25 17:39:19 +01:00
James Cole
d01b370cd7 Change docker vars #1191 2018-02-25 17:39:09 +01:00
James Cole
1a643e2042 Expand tests 2018-02-25 17:38:24 +01:00
James Cole
1aaf5fd288 Improve split controller code. 2018-02-25 16:04:25 +01:00
James Cole
8a758b8df0 Fix #1192 2018-02-25 15:09:57 +01:00
James Cole
211caa07dc Update edit and submit routines for transactions. 2018-02-24 14:31:20 +01:00
James Cole
ac66e89edb Expand some tests. 2018-02-24 09:18:01 +01:00
James Cole
6fe5b50410 Expand view + JS for view to cope with new factory 2018-02-24 09:17:48 +01:00
James Cole
166cdad58b Some intermittent changes to storing journals. 2018-02-24 09:17:15 +01:00
James Cole
1a721ac6b5 Fix transactions. 2018-02-23 16:59:21 +01:00
James Cole
6591fa9fb4 Small adjustments to fix tests. 2018-02-23 16:21:28 +01:00
James Cole
d804093f8b Expand destroy routine. 2018-02-23 15:13:30 +01:00
James Cole
5261b784b0 New validation 2018-02-23 15:13:23 +01:00
James Cole
5a188ceca3 Remove triggers 2018-02-23 15:13:16 +01:00
James Cole
ce56cc538d Remove bad method. 2018-02-23 15:13:09 +01:00
James Cole
269433bf00 Refactor reconciliation routine 2018-02-23 15:13:01 +01:00
James Cole
dae3371c69 Move common methods to traits 2018-02-23 15:12:47 +01:00
James Cole
38c1d332e2 Removed a lot of old spaghetti code. Now have to rewrite it 2018-02-22 20:13:00 +01:00
James Cole
b627d42160 Code removal. The code removed from these classes must move to respective services. 2018-02-22 20:07:14 +01:00
James Cole
4e923057ae Clean up repository. 2018-02-21 21:11:44 +01:00
James Cole
35d0bd1985 Factory seems to work for update and create 2018-02-21 21:06:59 +01:00
James Cole
085eb650e7 Code cleanup. 2018-02-21 20:34:48 +01:00
James Cole
b4157e8ce0 Build account update service. 2018-02-21 20:34:24 +01:00
James Cole
81221038f0 Expand services. 2018-02-21 18:42:15 +01:00
James Cole
9f37bf5875 Fix budget controller tests. 2018-02-21 09:23:20 +01:00
James Cole
140a5b20db Update transactions, delete splits. 2018-02-21 08:58:06 +01:00
James Cole
e9b6b45fc4 Expand code to be able to handle updates. 2018-02-21 08:51:30 +01:00
James Cole
f16760d607 Expand API validation. 2018-02-20 18:03:02 +01:00
James Cole
9d457787f7 Specify times for SQLite database. #1192 2018-02-20 17:17:14 +01:00
James Cole
4e6afd5afc Remove todo items [skip ci] 2018-02-19 20:32:44 +01:00
James Cole
36354c3846 Fix for #1111 2018-02-19 20:32:33 +01:00
James Cole
9f63dfb9cb Fix #1178 [skip ci] 2018-02-19 20:17:37 +01:00
James Cole
cae4faad0a Expand tests. 2018-02-19 20:02:27 +01:00
James Cole
e389d0f7fa Expand tests 2018-02-19 19:45:13 +01:00
James Cole
6b32213735 make findByName nullable. 2018-02-19 19:44:58 +01:00
James Cole
b3fe24b713 Expand and refactor factories. 2018-02-19 19:44:46 +01:00
James Cole
5bb7530642 Expand tests. 2018-02-18 20:40:32 +01:00
James Cole
0b61c16eb0 Expand test cases for transaction creation through the API. 2018-02-18 19:55:35 +01:00
James Cole
77aced6734 Test every happy path for journal creation. 2018-02-18 16:35:26 +01:00
James Cole
94a7b6b9bd First create basic objects. Then, enhance. 2018-02-18 10:52:56 +01:00
James Cole
f8bf6c163f Add some factory stuff before another refactoring. 2018-02-18 10:49:42 +01:00
James Cole
eb0da038fb Expand tests and API code. 2018-02-18 10:31:15 +01:00
James Cole
6cda9f2900 Expand tests for account API. 2018-02-17 19:56:45 +01:00
James Cole
ecd4a862ff Tests for API controllers 2018-02-17 14:46:12 +01:00
James Cole
632d50a0d0 Fix all tests. 2018-02-17 14:14:26 +01:00
James Cole
0f1cc46b71 Fix JSON tests 2018-02-17 12:33:42 +01:00
James Cole
60b225d61c Fix use of transformer. 2018-02-17 12:24:29 +01:00
James Cole
23e540a57a Fix missing methods in account controller test 2018-02-17 10:50:47 +01:00
James Cole
1998412a3c Remove API tests for the time being. 2018-02-17 10:48:31 +01:00
James Cole
7bbfb692de Move code to repository. 2018-02-17 10:47:32 +01:00
James Cole
c6da990748 Expand decryption routine. 2018-02-17 10:47:18 +01:00
James Cole
049e57d578 New tests for object transformers. 2018-02-17 10:47:06 +01:00
James Cole
78ba0f749c tests for bill and attachment transformers. 2018-02-16 22:47:08 +01:00
James Cole
9cc1bfb4b5 Improve code for test coverage 2018-02-16 22:14:53 +01:00
James Cole
278b7ac52b First tests for transformers. 2018-02-16 22:14:34 +01:00
James Cole
645a29e22b Add API test suite 2018-02-16 22:14:08 +01:00
James Cole
b22d30bc65 Add method to mark journals as completed. 2018-02-16 16:58:08 +01:00
James Cole
2ee0490141 Remove debug info. 2018-02-16 16:57:54 +01:00
James Cole
1fd783de69 Remove debug info. 2018-02-16 16:57:46 +01:00
James Cole
8073896965 Add request data for tags. 2018-02-16 16:57:35 +01:00
James Cole
8a26e43c40 Fix display for new transaction store. 2018-02-16 16:57:27 +01:00
James Cole
a302aba3ab Expand journal repos 2018-02-16 16:45:03 +01:00
James Cole
0458058cb1 Update piggy bank transformer 2018-02-16 16:44:52 +01:00
James Cole
999bb5ed49 Add new transaction type repository 2018-02-16 16:44:21 +01:00
James Cole
c9f4a1eb7b Add route binder to transaction 2018-02-16 16:43:57 +01:00
James Cole
45aa76afce Expand collector to return single journals. 2018-02-16 16:43:48 +01:00
James Cole
e89a77efb1 New factories for the creation of journals and associated meta data. 2018-02-16 16:43:25 +01:00
James Cole
8f930d6dd5 Transaction request with full validation 2018-02-16 16:43:00 +01:00
James Cole
9d62b4c70d Add return types 2018-02-16 16:42:23 +01:00
James Cole
834032f58e Updated transaction controller 2018-02-16 16:42:13 +01:00
James Cole
33db99ffd3 Update find methods to return null 2018-02-16 15:19:19 +01:00
James Cole
28b00f6507 New routes for transaction 2018-02-16 15:18:07 +01:00
James Cole
6559076c48 New strings for validation 2018-02-16 15:17:55 +01:00
James Cole
60f6311e00 Rule to validate if object belongs to submitting user. 2018-02-16 15:17:36 +01:00
James Cole
574a5630e0 Add binder for transactions 2018-02-16 14:52:16 +01:00
James Cole
d3294be1bc Add method that makes sure that URL's are expanded for page navigation/ 2018-02-16 14:51:59 +01:00
James Cole
22fdc81de2 Refactor transactions. 2018-02-13 21:04:15 +01:00
James Cole
370e9b25d1 Expand API. 2018-02-13 18:24:06 +01:00
James Cole
30f821af3e About controller for basic site info 2018-02-13 18:23:26 +01:00
James Cole
7a5aa1c39b Update and restructure YAML file for Docker. [skip ci] 2018-02-11 20:53:30 +01:00
James Cole
f674df4422 Fix empty title. 2018-02-11 20:45:48 +01:00
James Cole
c2da5931ec Expanded API code, wrote a bunch new transformers as well. 2018-02-11 20:45:33 +01:00
James Cole
94f6bd34c7 Fix some issues with semi-colon delimiters, see #1172 2018-02-11 15:52:24 +01:00
James Cole
e066a6421c Fix #1172 2018-02-11 15:36:16 +01:00
James Cole
ef338e2515 Fix #1174 2018-02-11 15:27:28 +01:00
James Cole
dcf549261c Fix for #1175 2018-02-11 15:24:19 +01:00
James Cole
8b868b426a First API routes for accounts. 2018-02-11 08:08:08 +01:00
James Cole
2ef1022c92 Make sure bills API is consistent. 2018-02-11 07:46:34 +01:00
James Cole
9b3abd3b19 Expand transformers to include other objects. 2018-02-10 10:58:06 +01:00
James Cole
db02fefcf4 Update composer. 2018-02-10 09:58:06 +01:00
James Cole
523ae83811 Show proper 404 page for JSON. 2018-02-10 09:57:56 +01:00
James Cole
4eb010f807 Use correct CSS in 404 page. 2018-02-10 09:57:47 +01:00
James Cole
4958f28052 Allow API to work with bills. 2018-02-10 09:57:31 +01:00
James Cole
7e727b63ed Use built-in PHPUnit in tests. 2018-02-10 09:57:05 +01:00
James Cole
138c38fbb5 Clean up code in validator. 2018-02-10 09:22:13 +01:00
James Cole
2e61bb7375 Fix tests. 2018-02-10 09:22:04 +01:00
James Cole
fce4c9174d Fix for #1154 2018-02-10 08:21:35 +01:00
James Cole
2220963899 Remove guard from user model. 2018-02-10 08:21:20 +01:00
James Cole
e69e6c1ce8 Would be nice to remove the references as well... 2018-02-09 19:28:16 +01:00
James Cole
0f09a9db4d Remove reference to guard from other bind support classes. 2018-02-09 19:24:30 +01:00
James Cole
53a6c10ada Remove reference to guard from models. 2018-02-09 19:24:15 +01:00
James Cole
14772469ed Remove reference to guard from binder 2018-02-09 19:23:31 +01:00
James Cole
55f13ef121 Code cleanup in 2FA middleware. 2018-02-09 19:12:46 +01:00
James Cole
95648c37b3 Various code cleanup. 2018-02-09 19:11:55 +01:00
James Cole
ac98822a55 Fix for issue #1167 2018-02-09 16:47:01 +01:00
James Cole
c460419166 Final fixes for API binder. 2018-02-09 15:01:22 +01:00
James Cole
d2a8819dd4 Merge branch 'apifix' into develop
* apifix:
  Fix issues with API authentication.

# Conflicts:
#	app/Api/V1/Controllers/BillController.php
#	app/Http/Middleware/HttpBinder.php
#	app/Transformers/AttachmentTransformer.php
#	app/Transformers/BillTransformer.php
#	app/Transformers/NoteTransformer.php
#	routes/api.php
2018-02-09 14:57:39 +01:00
James Cole
d393c693de Fix issues with API authentication. 2018-02-09 14:47:37 +01:00
James Cole
d4a84ed198 Update tests. 2018-02-07 16:49:11 +01:00
James Cole
e8c7986a58 Rename binder test 2018-02-07 16:20:40 +01:00
James Cole
809e40c5ce Remove double middleware from routes. 2018-02-07 11:20:37 +01:00
James Cole
f445a95c26 Consistent use of links in transformers. 2018-02-07 11:20:24 +01:00
James Cole
909dc212fb make sure all route binders use guard. 2018-02-07 11:15:36 +01:00
James Cole
eacc1da157 Implement multi purpose binder 2018-02-07 11:13:04 +01:00
James Cole
587ad1298d Make sure transformer accepts null dates. 2018-02-07 10:49:24 +01:00
James Cole
fae7dabbc2 Split binder in api and http binder 2018-02-07 10:49:06 +01:00
James Cole
3a813c30b4 Clean up js file. 2018-02-06 19:52:46 +01:00
James Cole
3de46f55fa Use transformer in view. 2018-02-06 19:49:53 +01:00
James Cole
3aa922341c Remove unused package from config 2018-02-06 19:49:38 +01:00
James Cole
e94043edc2 Expand transformers. 2018-02-06 19:49:29 +01:00
James Cole
da91645ec0 Clean up code. 2018-02-06 19:49:16 +01:00
James Cole
178072d3af Remove unused markdown method 2018-02-06 19:49:09 +01:00
James Cole
811d8e330f Refer to correct location for bill transformer. 2018-02-06 19:48:56 +01:00
James Cole
d3c8d06114 Update lock files 2018-02-06 19:48:43 +01:00
James Cole
82dc0045ba Move bill transformer to previous location 2018-02-06 19:48:32 +01:00
James Cole
3d06f0ac14 Remove unused dependencies 2018-02-06 18:15:26 +01:00
James Cole
b5c0ef01d9 Clean up app.js 2018-02-06 18:13:54 +01:00
James Cole
3a5d3016c7 Refer to correct bill route 2018-02-06 18:12:43 +01:00
James Cole
20690b4d5b Clean up API routes 2018-02-06 18:12:31 +01:00
James Cole
2816a4a325 Make bill views use transformer object. 2018-02-06 18:12:09 +01:00
James Cole
2f4f37778c Fix error page CSS 2018-02-06 18:11:46 +01:00
James Cole
c4507a7f75 Make sure the "classic" page uses the transformer as well. 2018-02-06 18:11:33 +01:00
James Cole
9a0672e359 Update previous view to use new strings. 2018-02-06 10:57:23 +01:00
James Cole
f128db35c6 Update view to use localized strings. 2018-02-06 10:57:07 +01:00
James Cole
a2cfaa0867 Update language strings. 2018-02-06 10:56:50 +01:00
James Cole
5850c5e20a Add code to enable localisation. 2018-02-06 10:56:37 +01:00
James Cole
e77a1e403f Expand config for localisation 2018-02-06 10:56:17 +01:00
James Cole
b72e8db7b1 Add localisation package. 2018-02-06 10:56:01 +01:00
James Cole
07506784f4 Add localisation package. 2018-02-06 10:55:40 +01:00
James Cole
0435e42b3d Update package files. 2018-02-06 07:52:04 +01:00
James Cole
31884bbba6 Add generated js / css to all views. 2018-02-06 07:51:49 +01:00
James Cole
6b38faf84e Expand views for bills. 2018-02-06 07:51:28 +01:00
James Cole
2f95f99890 Update exceptions thrown for better IDE support. 2018-02-06 07:50:19 +01:00
James Cole
9b78069f41 Expand API for bills. 2018-02-06 07:49:56 +01:00
James Cole
559c2042ac Remove library now included in npm build. 2018-02-06 07:49:19 +01:00
James Cole
ae3b369e9a Match layout to Firefly III 2018-02-04 15:58:03 +01:00
James Cole
31a6565e17 Add package fractal. 2018-02-04 15:57:48 +01:00
James Cole
f488bbde02 First basic routes and code for bills. 2018-02-04 15:57:35 +01:00
James Cole
e668b88fb5 Make sure authorise view is translatable and matches Firefly III 2018-02-04 14:04:52 +01:00
James Cole
2d0aa4af96 Give all web routes full namespace. 2018-02-04 14:04:29 +01:00
James Cole
6e67416c83 Blank namespace for route namespace prefix. 2018-02-04 13:55:36 +01:00
James Cole
1ef28cbc02 Changes to repair API auth 2018-02-04 13:41:59 +01:00
James Cole
58bdf14f6b First empty controllers for API. 2018-02-04 13:41:42 +01:00
James Cole
9f4ecb0963 Make authorise view a twig file. 2018-02-04 11:21:57 +01:00
James Cole
b1259a014f Add support for Spanish [skip ci] 2018-02-04 09:52:42 +01:00
James Cole
142d0b5af2 First set of JS/CSS built by npm. 2018-02-04 09:23:46 +01:00
James Cole
450e2bad1c New composer.lock after installing Laravel Passport. 2018-02-04 09:23:20 +01:00
James Cole
089300d57e Update date related code to fix several issues with SQLite 2018-02-04 09:22:52 +01:00
James Cole
36f67793cb Include Vue components. 2018-02-04 08:17:22 +01:00
James Cole
c335a9bbc8 Rename access token variables 2018-02-04 08:17:05 +01:00
James Cole
029688a594 Passport auth view. 2018-02-04 08:16:37 +01:00
James Cole
6f2eb33fd0 Future strings for JS translations 2018-02-04 08:16:06 +01:00
James Cole
8351020913 Add passport components to app.js 2018-02-04 08:15:20 +01:00
James Cole
220efca8d7 Add passport migrations 2018-02-04 08:14:36 +01:00
James Cole
28579f7b80 Add debug information to import routine. 2018-02-04 08:14:22 +01:00
James Cole
f1d77bdb50 Expand code to support laravel passport 2018-02-04 08:14:03 +01:00
James Cole
ca8b4cb11a Add laravel passport 2018-02-04 08:13:31 +01:00
James Cole
31dbb7b111 Update view to use new assets 2018-02-03 09:14:58 +01:00
James Cole
352cdf75c8 Include font awesome in assets. 2018-02-03 09:14:39 +01:00
James Cole
d81c99bcda Other name for CSRF token in html and JS. 2018-02-01 19:39:55 +01:00
James Cole
1e2c979341 Fix #1155 2018-02-01 19:39:41 +01:00
James Cole
d8664096f9 Fix view issues when user has multiple pages of budgets #1111 2018-02-01 17:55:18 +01:00
James Cole
0d9a221b00 Extend debug page with session fields. 2018-02-01 16:58:47 +01:00
James Cole
de85f17cac Improve login form autocomplete values [skip ci] 2018-02-01 16:54:42 +01:00
James Cole
e3d6f4f00f Add some Vue related components. Prep for inclusion of passport and other tools. 2018-01-31 17:55:49 +01:00
James Cole
d0e0054b00 Correct errors in English sentences. [skip ci] 2018-01-31 14:02:04 +01:00
James Cole
735222a8ed Merge branch 'release/4.7.0' 2018-01-31 07:14:15 +01:00
James Cole
66f299cd06 Update composer file. 2018-01-31 06:42:44 +01:00
James Cole
e3c5268143 Update changelog for Sandstorm. 2018-01-31 06:35:41 +01:00
James Cole
df32493d77 Final update for some translations. 2018-01-30 21:07:14 +01:00
James Cole
86faf44153 Small fixes in change log [skip ci] 2018-01-29 20:17:43 +01:00
James Cole
e2f3e4b555 Update sandstorm file list. 2018-01-29 19:56:57 +01:00
James Cole
e57ed6015c Updated composer lock file. 2018-01-29 19:31:36 +01:00
James Cole
9c34ca7fc4 Changelog for Sandstorm. 2018-01-29 19:14:58 +01:00
James Cole
7b94f4a441 Update change log. 2018-01-29 19:13:51 +01:00
James Cole
693f8d0738 Update language files. 2018-01-29 19:13:43 +01:00
James Cole
d6ecbc06bf Add Portuguese (Brazil) 2018-01-29 19:12:58 +01:00
James Cole
c31674fffc New version in Sandstorm file. 2018-01-29 19:10:29 +01:00
James Cole
b08de8cc00 Clean up config. 2018-01-29 19:09:52 +01:00
James Cole
4c503e4c7c Merge branch 'develop' of https://github.com/firefly-iii/firefly-iii into develop
* 'develop' of https://github.com/firefly-iii/firefly-iii:
  Workaround IE tab order issue w/ js initial select
2018-01-29 19:09:13 +01:00
James Cole
dd4158c6b4 Expand tests 2018-01-29 19:09:00 +01:00
James Cole
5fd7ea2b96 Add code coverage. 2018-01-29 19:08:49 +01:00
James Cole
b9ff80eb5a Update changelog. 2018-01-29 19:08:26 +01:00
James Cole
afc725bbc8 Merge pull request #1148 from devlearner/login-tab-order
Workaround IE tab order issue on js initial select
2018-01-28 21:13:56 +01:00
James Cole
0342c371cc Fix debug issue caught by @devlearner. 2018-01-28 20:59:26 +01:00
devlearner
2da4e6b048 Workaround IE tab order issue w/ js initial select 2018-01-28 14:23:06 +00:00
James Cole
f50550d79c Fix unit tests 2018-01-25 20:38:50 +01:00
James Cole
3fa39a6805 Clean up view and route. 2018-01-25 19:21:58 +01:00
James Cole
3dbe6d4870 Clean up config. 2018-01-25 19:21:46 +01:00
James Cole
59c48268ab Support more icons. 2018-01-25 19:21:40 +01:00
James Cole
1f83c5195d Add view method. Clean up repository links 2018-01-25 19:21:31 +01:00
James Cole
49a95a08fe More friendly demo user message. 2018-01-25 19:02:14 +01:00
James Cole
c86c5ccfe9 Add forgotten migration [skip ci] 2018-01-25 18:55:31 +01:00
James Cole
8a2497fc67 Expand mime type and upgrade version [skip ci] 2018-01-25 18:41:51 +01:00
James Cole
7c70732247 Some light refactoring. No changes. 2018-01-25 18:41:27 +01:00
James Cole
53fc4f2740 Better link to Spectre docs. [skip ci] 2018-01-24 15:23:27 +01:00
James Cole
f3ade5621e Merge pull request #1145 from devlearner/woff2
Include Woff fonts as well
2018-01-24 14:30:57 +01:00
devlearner
ec2e08e33a Update fonts for Source Sans Pro
(Bold Italic)
2018-01-24 21:04:03 +08:00
devlearner
b9a26faa4d Update css for Source Sans Pro
(Bold Italic)
2018-01-24 12:52:48 +00:00
James Cole
1a434d0c83 Expand readme with links to contribution pages. [skip ci] 2018-01-24 12:00:41 +01:00
James Cole
9a2c6c2967 Expand test coverage. 2018-01-24 11:09:21 +01:00
James Cole
602b35d589 Breadcrumb shows the correct title. 2018-01-24 11:09:05 +01:00
James Cole
f42cd0c7c3 Give correct info about import jobs. 2018-01-24 11:08:50 +01:00
James Cole
cb81855a17 Fix #1143 2018-01-24 11:05:00 +01:00
James Cole
89cf351ad0 add some fixes for #1111 2018-01-24 05:17:26 +01:00
devlearner
3f70a3f06c Added woff fonts 2018-01-24 01:10:04 +08:00
devlearner
9df360f010 Updated woff2 fonts
Roboto: Last modified 2017-10-16 (v18)
Lato: Last modified 2017-10-11 (v14)
2018-01-24 00:59:27 +08:00
James Cole
9a26d6d49f Fix #1140 2018-01-22 18:37:59 +01:00
James Cole
bc4d801c12 Fix #1141 2018-01-22 18:16:50 +01:00
James Cole
f2d8e13576 Fix #1142 2018-01-22 18:14:30 +01:00
James Cole
ec0b5db973 Update change log. 2018-01-21 20:04:53 +01:00
James Cole
46a0d1ce35 Update change log. 2018-01-21 20:03:29 +01:00
James Cole
cb81446ca6 Clean up debug code 2018-01-21 20:03:13 +01:00
James Cole
9350b4939c Make some file names lowercase. 2018-01-21 19:47:19 +01:00
James Cole
33e8c8c415 Make some file names lowercase. 2018-01-21 19:46:56 +01:00
James Cole
48fa86cc54 Improve some test coverage. 2018-01-21 18:06:57 +01:00
James Cole
d5e6d1c578 Remove reference to website from read me. 2018-01-21 11:10:08 +01:00
James Cole
0bc688795a Small update in update routine. 2018-01-21 11:09:55 +01:00
James Cole
eb76ed5591 New text in contributing [skip ci] 2018-01-21 09:10:36 +01:00
James Cole
839cbaf37a Updated read me file [skip ci] 2018-01-21 00:08:14 +01:00
James Cole
788fc9204d Update readme [skip ci] 2018-01-21 00:06:40 +01:00
James Cole
3e3e304ef3 Updated read me file [skip ci] 2018-01-20 23:59:10 +01:00
James Cole
447d453fdc Update composer lock file [skip ci] 2018-01-20 07:15:39 +01:00
James Cole
36fd7884f3 Update demo pages. 2018-01-20 07:15:26 +01:00
James Cole
54da08b2f2 Change settings so demo user can use Spectre. 2018-01-20 06:40:23 +01:00
James Cole
3f02072ae9 Update read me[skip ci] 2018-01-20 06:40:05 +01:00
James Cole
a9c117703b Update composer.json 2018-01-19 08:35:25 +01:00
James Cole
c137255155 Update .scrutinizer.yml 2018-01-19 08:23:31 +01:00
James Cole
e7829ecc38 Committed bad help JS. [skip ci] 2018-01-17 14:26:31 +01:00
James Cole
529bdafa31 Code climate file. 2018-01-17 13:04:43 +01:00
James Cole
e2af0caa41 Fix tests 2018-01-17 12:29:00 +01:00
James Cole
80f96abf08 Fix notes in link types. 2018-01-17 10:40:44 +01:00
James Cole
70da38193f Fix issue with budget chart. 2018-01-17 10:17:49 +01:00
James Cole
13df973873 Fix query cache. 2018-01-17 10:03:47 +01:00
James Cole
3ccb791674 Various code cleanup. [skip ci] 2018-01-17 09:32:18 +01:00
James Cole
ccf1a6c182 Fix #1134 2018-01-17 09:22:45 +01:00
James Cole
493543c1f5 Update language files [skip ci] 2018-01-17 06:43:04 +01:00
James Cole
5f5725e0e3 Explicit language tag in layout 2018-01-17 06:25:32 +01:00
James Cole
107dd42957 Update English language files [skip ci] 2018-01-17 06:24:50 +01:00
James Cole
a9f3fe4d3a Remove memcached experiment. 2018-01-16 22:01:55 +01:00
James Cole
3e62e17b9e Add some echo to Sandstorm scripts. 2018-01-16 21:34:36 +01:00
James Cole
57855b1930 Remove references to unused cache thing. 2018-01-16 21:09:27 +01:00
James Cole
aa9e8227bb Smal changes in Sandstorm configuration. [skip ci] #1130 2018-01-15 17:48:20 +01:00
James Cole
a80f083b6e Catch errors in DB seeds. 2018-01-15 17:13:23 +01:00
James Cole
474e066d4a Expand debug message [skip ci] 2018-01-14 19:59:05 +01:00
James Cole
4428ccefbf Expand debug message [skip ci] 2018-01-14 19:58:39 +01:00
James Cole
d568a6c8a9 First version of actual update check. 2018-01-14 19:56:18 +01:00
James Cole
97e9ad6cb2 Small updates in read me. 2018-01-14 19:49:29 +01:00
James Cole
00607d2a6d Code for #1040 2018-01-14 19:36:24 +01:00
James Cole
c2a425121d Code for #1040 2018-01-14 16:32:26 +01:00
James Cole
435694e9ea Code for #989 2018-01-14 10:57:27 +01:00
James Cole
f59135a9ca Code for #989 2018-01-14 10:48:17 +01:00
James Cole
102b106402 Different “drop up” menu. 2018-01-13 18:52:06 +01:00
James Cole
5c27c8e633 Multi currency net worth box. 2018-01-13 18:40:28 +01:00
James Cole
edd5215b21 Different icon for view. [skip ci] 2018-01-13 18:07:25 +01:00
James Cole
94b173ae6b New language strings. 2018-01-13 18:02:41 +01:00
James Cole
7d96b281b6 Add buttons to views 2018-01-13 18:01:53 +01:00
James Cole
a5515ac89f Update tests. 2018-01-13 10:36:49 +01:00
James Cole
fb863b0bf2 Improve step count for spectre imports. 2018-01-13 07:52:35 +01:00
James Cole
50882f309b Make sure number of steps is always correct. 2018-01-13 07:36:44 +01:00
James Cole
ce854fbb43 Catch error when trying to read (non-existent) logs. 2018-01-12 21:43:04 +01:00
James Cole
6799268ec4 Add intval just in case. 2018-01-12 21:31:39 +01:00
James Cole
6fe5ce0485 Expand budget report #1106 2018-01-12 21:08:59 +01:00
James Cole
cbeaf8e16a Expand tag report #1106 2018-01-12 21:02:27 +01:00
James Cole
04de4c9b36 Expand category report #1106 2018-01-12 20:53:18 +01:00
James Cole
517731cb59 Extra buttons 2018-01-12 20:37:56 +01:00
James Cole
e34e43173c Fix #1132 2018-01-12 20:37:39 +01:00
James Cole
79d6055a78 Fix #1131 2018-01-12 20:32:09 +01:00
James Cole
7ac4d2a2f4 Various new strings [skip ci] 2018-01-12 18:44:59 +01:00
James Cole
4984eda320 Clean up view HTML 2018-01-12 18:42:48 +01:00
James Cole
89e0791e2f Add button to create transaction. 2018-01-12 18:42:25 +01:00
James Cole
922d487821 Update icon [skip ci] 2018-01-11 21:27:24 +01:00
James Cole
4b789979ac Fix 2FA check #1125 2018-01-11 20:56:42 +01:00
James Cole
554b38ccff Code for #1126 2018-01-11 20:49:55 +01:00
James Cole
9614310208 Extra button for #1124 2018-01-11 19:08:01 +01:00
James Cole
d9ec3ac354 Code for #1124 2018-01-11 19:06:46 +01:00
James Cole
f326f08f7b Fix #1088 2018-01-11 18:58:33 +01:00
James Cole
0ae8418f32 Fix tests. 2018-01-10 20:07:47 +01:00
James Cole
309f9cd076 Add new roles 2018-01-10 19:59:40 +01:00
James Cole
61f5ed3874 Fix check for column roles. 2018-01-10 19:06:27 +01:00
James Cole
91178d2604 Various cleanup in import. 2018-01-10 18:18:49 +01:00
James Cole
87dae6ea18 Expand some code for Spectre import. 2018-01-10 16:49:32 +01:00
James Cole
2e495c38d1 Make env files more readable. 2018-01-10 14:37:40 +01:00
James Cole
c2987aaf4c Update docker config #1081 2018-01-10 13:15:12 +01:00
James Cole
f4f4eecb7b Add routes to ignore. [skip ci] 2018-01-10 12:42:32 +01:00
James Cole
84d9287251 Remove unused route [skip ci] 2018-01-10 12:42:17 +01:00
James Cole
b71f334744 Small rewrite in readme [skip ci] 2018-01-10 12:42:01 +01:00
James Cole
ad306e4d01 Strings for #1116 (help text) 2018-01-10 08:03:37 +01:00
James Cole
e40d4ef829 Add strings for #1116 to intro page. 2018-01-10 07:57:36 +01:00
James Cole
48c16c3dcc Clean up binders. 2018-01-10 07:51:47 +01:00
James Cole
c045193246 Remove unnecessary routes. 2018-01-10 07:29:55 +01:00
James Cole
a816e59a97 Small update in readme [skip ci] 2018-01-10 07:19:28 +01:00
James Cole
892074eaf2 Final touches on readme [skipci] 2018-01-09 20:24:45 +01:00
James Cole
3e501e429d Fix link to softalucous [skip ci] 2018-01-09 20:23:31 +01:00
James Cole
0f40accb4c Expand links. [skipci] 2018-01-09 20:22:46 +01:00
James Cole
3dae6c99a4 Fix badges. [skipci] 2018-01-09 20:17:58 +01:00
James Cole
b185c83597 Update read me file. [skip ci] 2018-01-09 20:16:17 +01:00
James Cole
ef6b4120f1 Lower case some file names. 2018-01-09 19:27:12 +01:00
James Cole
a43eef01fc Lower case some file names. 2018-01-09 19:26:49 +01:00
James Cole
2cb9aa537f Experimental support for CodeCov. 2018-01-09 17:52:18 +01:00
James Cole
2edd49a8b4 First version that supports Spectre. 2018-01-08 20:20:45 +01:00
James Cole
a57554d380 Merge branch 'develop' of https://github.com/firefly-iii/firefly-iii into develop
* 'develop' of https://github.com/firefly-iii/firefly-iii:
  Fix charts in IE
2018-01-08 20:20:14 +01:00
James Cole
c89486b6d9 Expand Spectre import code. 2018-01-08 19:21:00 +01:00
James Cole
f737cb7235 Update language files for #1109 2018-01-08 19:20:41 +01:00
James Cole
f1fe169553 Disable Spectre again. 2018-01-08 19:19:17 +01:00
James Cole
2fc760780e Add support for Russian. 2018-01-08 19:19:03 +01:00
James Cole
8c3290bf6f Merge pull request #1107 from devlearner/patch-1
Fix charts in Internet Explorer
2018-01-08 10:21:09 +01:00
devlearner
495158b9c9 Fix charts in IE
since IE apparently doesn't support arrow function expression (and throws a syntax error)
2018-01-08 07:49:32 +00:00
James Cole
f9fc9b1889 Spectre should not be enabled. [skip ci] 2018-01-07 16:49:49 +01:00
James Cole
11ff2ab9d1 Debug controller cannot be accessed by demo user. 2018-01-07 12:53:20 +01:00
James Cole
52b138e6b2 Fix error in read me [skip ci] 2018-01-07 12:43:02 +01:00
James Cole
3562ec1f79 Merge branch 'release/4.6.13' 2018-01-07 12:40:54 +01:00
James Cole
943b4de6dc Update Sandstorm file list. 2018-01-07 12:29:18 +01:00
James Cole
4097f51f69 Updated composer file. 2018-01-07 12:28:43 +01:00
James Cole
cad5b2cae9 Final translations before release. 2018-01-07 12:20:05 +01:00
James Cole
8bb4b0b9b2 Make sure log stays small. 2018-01-06 20:26:21 +01:00
James Cole
9bcd1ed807 Make sure file content is trimmed. 2018-01-06 19:17:47 +01:00
James Cole
d7b1892bda Catch when no amount info is present. 2018-01-06 19:17:35 +01:00
James Cole
ea0980ba83 Update Sandstorm file list. 2018-01-06 16:27:20 +01:00
James Cole
b479a3ef99 Update change log, composer files. 2018-01-06 16:10:02 +01:00
James Cole
600e15d42f Jump back a version. 2018-01-06 15:48:44 +01:00
James Cole
824959e71a Fix form thing [skip ci] 2018-01-06 14:19:30 +01:00
James Cole
cfd8d231fb Update logging for #1089 [skip ci] 2018-01-06 12:21:24 +01:00
James Cole
87c3dc2ecc Improve comparisons for #1089 2018-01-06 12:20:02 +01:00
James Cole
590f0a83ea Code for #1098 2018-01-06 11:56:20 +01:00
James Cole
65e518856b Add warning message to index. 2018-01-06 10:25:21 +01:00
James Cole
469313eca7 Commit merge. 2018-01-06 10:12:43 +01:00
James Cole
f13f378d7f Merge pull request #1093 from jinformatique/patch-1
create .htaccess file
2018-01-06 10:10:41 +01:00
James Cole
76d8017be5 Small extension on import account, for testing mostly. 2018-01-06 09:33:28 +01:00
James Cole
af1bdc0c2c Expand debug view. 2018-01-06 09:33:06 +01:00
James Cole
6ac1e05e60 Clear cache sooner for #1096 2018-01-06 07:42:03 +01:00
James Cole
7fa937e80b Fixed tests to account for issue fixed by #1097 2018-01-06 07:33:30 +01:00
James Cole
ed0e14aee5 Merge pull request #1097 from kelvinhammond/patch-1
Fix issue with accounts in select map not matching
2018-01-06 07:23:21 +01:00
Kelvin
e300c1aab4 Fix issue with accounts in select map not matching
When mapping Opposing Accounts the select input's values are incorrect and do not match account ids.
2018-01-06 00:40:17 -05:00
James Cole
9e1586878b Test some preprocessors. 2018-01-05 17:51:05 +01:00
James Cole
5d54939bd4 Expand read me. 2018-01-05 17:29:57 +01:00
James Cole
3e9f98b43e Expand test coverage. 2018-01-05 17:29:42 +01:00
James Cole
c329ffa545 Updated tests and views 2018-01-05 07:54:10 +01:00
James Cole
d3cad66b69 Improve tests for import. 2018-01-05 07:41:26 +01:00
James Cole
246af608d3 Update repository to fix #972 2018-01-04 22:44:47 +01:00
James Cole
e7debc5466 Rewrote importer to be more clean about the stage it is in. 2018-01-04 19:33:16 +01:00
James Cole
5866300ac1 Rename and move some files. 2018-01-04 18:34:51 +01:00
J'informatique
c1221aef4b create .htaccess file
- To force HTTPS
- To hide directory listing
- To prevent access to .env and other files
2018-01-04 12:29:33 +01:00
James Cole
bc879a3872 Updated language files [skip ci] 2018-01-04 10:31:49 +01:00
James Cole
2b4a3d463b Update composer files. 2018-01-04 10:25:24 +01:00
James Cole
6b59b6de6e Fix some things in import routine. 2018-01-04 08:59:39 +01:00
James Cole
3ce5ccb98a Another fix for #1092 2018-01-04 08:09:26 +01:00
James Cole
a1b83def4f New strings for translation. [skip ci] 2018-01-03 20:37:11 +01:00
James Cole
5177619301 Lots of new code for Spectre import. 2018-01-03 19:17:30 +01:00
James Cole
4e0319bacc Fix for #1092 2018-01-03 07:35:29 +01:00
James Cole
30f64af55f Experimental cross OS command for #1083 [skip ci] 2018-01-02 20:08:56 +01:00
James Cole
cdeabaaf9a Extra fix to cover for #1091 2018-01-02 19:53:22 +01:00
James Cole
fa676f60fb Internationalise several forms for #1090 2018-01-02 17:25:59 +01:00
James Cole
4ec123a19a Add some logging for #1089 2018-01-02 16:25:47 +01:00
James Cole
de35bde048 Some updated language strings. 2018-01-02 15:18:22 +01:00
James Cole
3f786856f3 Expand code for Spectre login. 2018-01-02 15:17:31 +01:00
James Cole
d49aecdf49 Update tests. 2018-01-02 07:14:00 +01:00
James Cole
6713597621 Fix #1087 2018-01-02 06:39:34 +01:00
James Cole
09bd55675d Fix Turkish string [skip ci] 2018-01-01 16:46:56 +01:00
James Cole
d87dda40ee Clean up some JS and views. 2018-01-01 16:46:41 +01:00
James Cole
06cfc391a1 Add cast to string to fix chart. [skip ci] 2018-01-01 16:46:15 +01:00
James Cole
bea06a06a1 Various updated sentences and strings in Polish. 2018-01-01 15:38:09 +01:00
James Cole
06fa2ab7a1 Update string in Spectre import, as suggested by @pkoziol 2018-01-01 15:37:15 +01:00
James Cole
4926011f3f Fix #1085 2018-01-01 15:33:38 +01:00
James Cole
0455f8658d Move debug to new controller, add some fields. 2018-01-01 15:33:24 +01:00
James Cole
4773021ff0 Expand debug controller. 2017-12-31 11:38:21 +01:00
James Cole
e2bd1f6544 Update breadcrumbs for PHP 7.2 #1079 2017-12-31 11:10:36 +01:00
James Cole
b73884160a Fix account controller + coverage. 2017-12-31 10:40:27 +01:00
James Cole
8bcfa729b6 Updated language files. 2017-12-31 09:36:36 +01:00
James Cole
f8dda5b4a6 Added Turkish. 2017-12-31 09:10:38 +01:00
James Cole
c0961d438d Rename a view. 2017-12-31 09:01:27 +01:00
James Cole
d9dd00eb39 Fix #1074 2017-12-30 21:04:04 +01:00
James Cole
6d9baaa499 Updated language files. [skip ci] 2017-12-30 20:43:18 +01:00
James Cole
b37ed5ab23 Code for #1077 2017-12-30 20:07:49 +01:00
James Cole
3fba741f1b Update views and routes for #1078 2017-12-30 14:25:11 +01:00
James Cole
73051d7d42 Add budget list, expand view. #1078 2017-12-30 13:05:19 +01:00
James Cole
717e101b80 Start updating view. 2017-12-30 12:54:19 +01:00
James Cole
08f28d48af Refer to new views. 2017-12-30 12:44:10 +01:00
James Cole
ec2f693575 Update breadcrumb #1078 2017-12-30 12:43:57 +01:00
James Cole
3cc1bf52cb Move view. #1078 2017-12-30 12:43:13 +01:00
James Cole
5da9f0cfb6 Fix #1080 2017-12-30 12:33:44 +01:00
James Cole
64624bea1d Rename language string #1078 2017-12-30 12:24:28 +01:00
James Cole
dc95395f42 Clean up buttons #1078 2017-12-30 12:23:26 +01:00
James Cole
273f188101 Fix error in route (my error) #1078 2017-12-30 12:23:16 +01:00
James Cole
a6b22b5156 Remove unused language string. #1078 2017-12-30 12:23:03 +01:00
James Cole
9d8a4cd934 Clean up JS code #1078 (also old code removed) 2017-12-30 12:22:49 +01:00
James Cole
c73dd5f664 Update routes to reflect change. #1078 2017-12-30 12:14:10 +01:00
James Cole
7ff8c5e966 Move bulk methods to their own controller. #1078 2017-12-30 12:13:13 +01:00
James Cole
1c11aa13b8 Merge commit for PR #1078 2017-12-30 11:56:02 +01:00
James Cole
0c2ec58366 Merge pull request #1078 from vicmosin/issues/509
Introduced bulk edit endpoint for bulk edit of categories and tags
2017-12-30 11:54:06 +01:00
Victor Mosin
2955d7148f Merge branch 'develop' into issues/509
# Conflicts:
#	public/js/ff/transactions/list.js
2017-12-30 11:49:42 +01:00
James Cole
f9d87cb9f6 Remove unused translations. 2017-12-30 09:47:37 +01:00
Victor Mosin
50fcc42e99 Fixed wrong counter value 2017-12-30 09:39:47 +01:00
Victor Mosin
805456d032 Introduced bulk edit endpoint for bulk edit of categories and tags 2017-12-30 09:21:28 +01:00
James Cole
a9df7906eb Update JS and CSS libraries. 2017-12-30 06:51:16 +01:00
James Cole
59d732cba7 Merge branch 'release/4.6.12' 2017-12-29 20:06:56 +01:00
James Cole
61099bef27 Last changes for Sandstorm. 2017-12-29 20:02:33 +01:00
James Cole
dca44f1588 Code for new release. 2017-12-29 19:55:15 +01:00
James Cole
87174ddbb3 Fix language strings. 2017-12-29 19:35:51 +01:00
James Cole
c5cc101f4b Fix language strings. 2017-12-29 19:29:58 +01:00
James Cole
071c4286a7 Add a test for the Rabobank converter. 2017-12-29 12:27:29 +01:00
James Cole
7603fc0436 Some language updates. 2017-12-29 09:35:40 +01:00
James Cole
c7850f9f1a Update some French strings. 2017-12-29 09:32:58 +01:00
James Cole
c0eebb2b08 Updated languages. 2017-12-29 09:13:46 +01:00
James Cole
87147c37ae Clean up language. 2017-12-29 09:06:07 +01:00
James Cole
3815f9836f Various code cleanup. 2017-12-29 09:05:35 +01:00
James Cole
cf66ae61e1 Add extra info line. 2017-12-29 07:25:30 +01:00
James Cole
962324c3f7 Expand test coverage. 2017-12-28 20:06:16 +01:00
James Cole
bd3e262273 Expand coverage. 2017-12-28 19:55:10 +01:00
James Cole
fa65035664 make sure mocked class accepts all arguments. 2017-12-28 19:47:58 +01:00
James Cole
ca1b6046f3 Test update checker. 2017-12-28 19:16:27 +01:00
James Cole
128085963f Small update to update checker. 2017-12-28 19:03:15 +01:00
James Cole
67cc03e4dd More code for spectre. 2017-12-28 18:39:30 +01:00
James Cole
ca4db81dbd First code to check for new version. 2017-12-28 18:39:17 +01:00
James Cole
a10672a683 Progress for Spectre import. 2017-12-28 18:38:59 +01:00
James Cole
0977d8d631 Fix #1070 2017-12-28 18:28:22 +01:00
James Cole
42676746a2 Remove Spectre table. 2017-12-28 18:26:08 +01:00
James Cole
ae7933c8c9 use config, not preferences, first tests. 2017-12-28 11:57:38 +01:00
James Cole
b65e1e022e First code for #1050 2017-12-28 11:38:40 +01:00
James Cole
9ab3848755 New binary file that doesn’t look like a zip file in PHP7.2 2017-12-28 09:53:37 +01:00
James Cole
986d7de906 Code for #1040 2017-12-28 09:53:21 +01:00
James Cole
eda1673518 Also test PHP7.2 2017-12-27 22:29:25 +01:00
James Cole
97cde38d8f Create logins. 2017-12-27 18:34:03 +01:00
James Cole
5ba03bd222 Fix #1066 2017-12-27 18:11:22 +01:00
James Cole
a14ae02c27 Expand Spectre code. 2017-12-27 17:22:44 +01:00
James Cole
deebdef04d Updated language files [skip ci] 2017-12-27 15:58:03 +01:00
James Cole
e881bb55a7 Improve code coverage. 2017-12-26 17:34:59 +01:00
James Cole
9e3f31f2f0 Improve testing of middleware. 2017-12-26 17:33:53 +01:00
James Cole
f7652e7f01 Fix data export. 2017-12-26 08:32:00 +01:00
James Cole
5289f3e4c2 Limit export controller for demo users. 2017-12-25 15:31:57 +01:00
James Cole
01818af963 Expand binder test. 2017-12-25 15:30:50 +01:00
James Cole
58eaf3bccc Update code to match route binder. 2017-12-25 10:34:32 +01:00
James Cole
a3ec741d67 Updated code coverage, improved binder code. 2017-12-25 09:44:46 +01:00
James Cole
5cb948d0f3 Currency code test. 2017-12-25 09:00:09 +01:00
James Cole
56ae279c96 Code coverage ignore instruction is case sensitive. 2017-12-25 08:48:49 +01:00
James Cole
bf390b65d9 Replace Laravel binder with own binder. This will save in queries and increase security. 2017-12-25 08:45:23 +01:00
James Cole
96ccce5db3 Expand tests. 2017-12-24 11:29:16 +01:00
James Cole
d4aee258c4 Update language to fix #1064 2017-12-23 22:07:39 +01:00
James Cole
7f8e736928 Expand read me. 2017-12-23 22:03:06 +01:00
James Cole
f85bdcebaf Expand test coverage 2017-12-23 22:02:54 +01:00
James Cole
f6096339cb Fix #1063 2017-12-23 22:02:42 +01:00
James Cole
f6bd17c70b Update languages and language config. 2017-12-23 22:02:29 +01:00
James Cole
6a05ec98f4 Update job thing. 2017-12-23 21:30:30 +01:00
James Cole
c60ee14b86 Better context for language strings. 2017-12-23 21:29:05 +01:00
James Cole
26f196a067 Finally remove incomplete test flag 2017-12-23 21:05:12 +01:00
James Cole
93c463c349 Fix all tests after large composer update. 2017-12-23 20:46:52 +01:00
James Cole
59ea4a0364 Update packages. 2017-12-23 17:51:45 +01:00
James Cole
df406dd794 Update most, if not all dependencies. 2017-12-23 17:43:13 +01:00
James Cole
08b743ddcb Expand test coverage. 2017-12-23 17:42:07 +01:00
James Cole
8bd76d1ff0 Various code cleanup. 2017-12-22 18:32:43 +01:00
James Cole
f13a93348f Updated readme [skip ci] 2017-12-22 07:47:50 +01:00
James Cole
b0ecdfe01d Fix pagination of account lists for issue #1040 2017-12-21 21:18:30 +01:00
James Cole
4b869f0d9e Middleware does not fire when user is not logged in. 2017-12-21 19:55:28 +01:00
James Cole
707af8bb4e Code for #1045 2017-12-21 19:18:53 +01:00
James Cole
840705f793 No need to unset non-existing variable #1059 2017-12-21 07:59:22 +01:00
James Cole
36c8275f5e Fix #1061 2017-12-20 20:07:57 +01:00
James Cole
62a4af8607 Expand fix for #1059 [skip ci] 2017-12-19 21:56:29 +01:00
James Cole
46f894c09b Fix #1059 2017-12-19 21:54:15 +01:00
James Cole
e8f9796fc5 Make sure language files are up to date [skip ci] 2017-12-19 19:35:54 +01:00
James Cole
a69aad878e Fix #1056 2017-12-19 19:25:50 +01:00
James Cole
e21e339cb0 Fix some spelling errors. 2017-12-19 18:53:50 +01:00
James Cole
9ede6755c5 Update language files [skip ci] 2017-12-19 05:24:14 +01:00
James Cole
34fc9bc50a Fix Spectre, first code to create customer. 2017-12-19 05:20:37 +01:00
James Cole
79f700c622 Catch query exception 2017-12-19 05:20:05 +01:00
James Cole
ac04f77d94 Expand issue template 2017-12-19 05:19:54 +01:00
James Cole
9e8d7b18fa Disable not working imports [skip ci] 2017-12-17 19:24:43 +01:00
James Cole
3f62cf512f Limit some upload functions for demo users. 2017-12-17 19:22:34 +01:00
James Cole
51728efba1 Various cleanup [skip ci] 2017-12-17 19:06:11 +01:00
James Cole
c7d4ff6f27 Expand test code. 2017-12-17 18:23:10 +01:00
James Cole
c1e1da12c2 Fix division by zero. 2017-12-17 14:58:33 +01:00
James Cole
859b6fcea8 Update copyright [skip ci] 2017-12-17 14:44:46 +01:00
James Cole
1f6e42afd9 Update copyright [skip ci] 2017-12-17 14:44:05 +01:00
James Cole
ef3bc07249 Update copyright [skip ci] 2017-12-17 14:43:34 +01:00
James Cole
6c3204a8ce Update copyright [skip ci] 2017-12-17 14:43:13 +01:00
James Cole
250da33fd7 Update copyright [skip ci] 2017-12-17 14:42:49 +01:00
James Cole
dfda29cec3 Update copyright [skip ci] 2017-12-17 14:42:33 +01:00
James Cole
085876dd83 Update copyright [skip ci] 2017-12-17 14:42:21 +01:00
James Cole
ff9ad859b3 Update copyright [skip ci] 2017-12-17 14:41:58 +01:00
James Cole
78335e5814 Expand tests, do code cleanup. 2017-12-17 14:30:53 +01:00
James Cole
b08af77c98 Fixed a lot of tests and associated code. 2017-12-17 14:06:14 +01:00
James Cole
7d348f25ac Expand import routine to work over command line. 2017-12-16 20:47:08 +01:00
James Cole
22535c0e43 Last steps for import, in user interface. 2017-12-16 20:21:05 +01:00
James Cole
1d58d519a0 Unrelated code cleanup. 2017-12-16 19:48:31 +01:00
James Cole
8176356509 New code for import routine, part 3 2017-12-16 19:47:14 +01:00
James Cole
9086259a65 Small code change for controllers. 2017-12-16 19:46:36 +01:00
James Cole
66ee382da0 Lots of new code for the import routine part 2 2017-12-16 17:19:10 +01:00
James Cole
84b6708260 Massive rewrite for import routine, part 1. 2017-12-16 08:03:35 +01:00
James Cole
985cc100e2 Code to fix #964 2017-12-15 12:59:21 +01:00
James Cole
3d0ecaa8d2 Heroku composer [skip ci] 2017-12-15 11:19:51 +01:00
James Cole
009c5a438c Heroku composer [skip ci] 2017-12-15 11:18:14 +01:00
James Cole
c3af8fefde Better check for Heroku [skip ci] 2017-12-15 11:15:22 +01:00
James Cole
1b116e3a1d Update composer for heroku [skip ci] 2017-12-15 11:14:07 +01:00
James Cole
76632f5bae Update composer file [skip ci] 2017-12-15 11:06:33 +01:00
James Cole
ee6030bc62 Update composer file [skip ci] 2017-12-15 11:02:49 +01:00
James Cole
2a000d432f Update composer file [skip ci] 2017-12-15 10:59:06 +01:00
James Cole
7557d4d3cb Clean up docker compose file. 2017-12-15 10:05:37 +01:00
James Cole
54ecfac550 New docker related files. 2017-12-15 09:16:41 +01:00
James Cole
11b5a0294e Small changes in templates [skip ci] 2017-12-13 18:46:30 +01:00
James Cole
9264f1e9b9 Fix #1051 2017-12-13 17:09:55 +01:00
James Cole
044af254f3 Update links to new site. 2017-12-13 14:15:44 +01:00
James Cole
e60bbc78e6 Forgot to include include command. 2017-12-13 11:07:05 +01:00
James Cole
06ddfe3d41 Limit routes for demo user. 2017-12-13 10:59:48 +01:00
James Cole
df458b3913 Update composer file and version info. 2017-12-12 21:13:50 +01:00
James Cole
fc4165b800 Make sure new CSV reader is compatible with specifics #1015 2017-12-12 21:05:16 +01:00
James Cole
44496707fb Remove some comments [skip ci] 2017-12-12 20:53:40 +01:00
James Cole
bad889d450 Update ING description for #1015 2017-12-12 20:53:16 +01:00
James Cole
1b4edae4d9 Final code for #384 2017-12-12 18:22:29 +01:00
James Cole
cacd889193 New translations [skip ci] 2017-12-11 19:42:57 +01:00
James Cole
5a7cf04a7c Update import index [skip ci] 2017-12-11 15:17:02 +01:00
James Cole
fd7a293f4b Merge branch 'spectre' into develop
* spectre:
  Fix encryption.
  Can handle some mandatory fields (not all).
  More code for Spectre import.
  Initial code to get providers from Spectre.
  Exceptions when class does not exist.
2017-12-11 14:53:01 +01:00
James Cole
f35aa6a035 Remove GA event codes. 2017-12-11 14:52:30 +01:00
James Cole
d1c8e54798 Null pointer in verify routine. 2017-12-11 10:59:28 +01:00
James Cole
5d9e547d05 Allow profile index [skip ci] 2017-12-11 10:28:10 +01:00
James Cole
c91bb5a565 Update admin rights for demo user. 2017-12-11 10:26:44 +01:00
James Cole
1b5b79897a Fix demo user rights in admin. 2017-12-11 10:23:29 +01:00
James Cole
d7f2b7cd63 Remove unused overview #384 2017-12-11 05:57:07 +01:00
James Cole
12c15ea590 Fix #1049 2017-12-10 21:12:04 +01:00
James Cole
d3a6ccacf0 Fix earned by category view [skip ci] 2017-12-10 20:10:04 +01:00
James Cole
6fed773cb8 Fix view [skip ci] 2017-12-10 20:07:23 +01:00
James Cole
4a1e4bb821 Decrypt object names. [skip ci] 2017-12-10 20:05:56 +01:00
James Cole
0c529cb7e7 Updated code for #384 2017-12-10 20:03:10 +01:00
James Cole
b1b6fe553a Fix tests, expand flush routine. 2017-12-10 18:09:36 +01:00
James Cole
54c449f11b Some code to get #384 working. 2017-12-10 17:55:06 +01:00
James Cole
b93a96db23 Expand code for #384 2017-12-10 12:00:08 +01:00
James Cole
06683c57dd Update verify routine for issue #1048 2017-12-10 11:52:14 +01:00
James Cole
6ad90c7a87 Update copyright stuff [skip ci] 2017-12-10 09:02:26 +01:00
James Cole
2a87add745 New stuff for report. 2017-12-10 08:56:20 +01:00
James Cole
089214709f Remove wrong copyright blocks [skip ci] 2017-12-10 08:56:11 +01:00
James Cole
9bf891f3fb Add newline to file. [skip ci] 2017-12-09 21:50:23 +01:00
James Cole
583f376f11 Updated composer file. 2017-12-09 21:49:33 +01:00
James Cole
4998eaeaf1 Code for #384 2017-12-09 21:49:19 +01:00
James Cole
3cf6386bb6 Fix encryption. 2017-12-09 20:08:08 +01:00
James Cole
2365fb69b4 Can handle some mandatory fields (not all). 2017-12-09 20:02:26 +01:00
James Cole
1fec7d6271 Fix #1047 2017-12-09 19:19:15 +01:00
James Cole
17684a3ab3 Fix #1046 2017-12-09 19:14:31 +01:00
James Cole
e488d7d84c More code for Spectre import. 2017-12-09 19:13:00 +01:00
James Cole
aa9500f5ad Initial code to get providers from Spectre. 2017-12-09 12:23:28 +01:00
James Cole
0774258516 Exceptions when class does not exist. 2017-12-09 12:08:24 +01:00
James Cole
f231edaa6d Update composer.json for #1045 2017-12-09 09:23:25 +01:00
James Cole
e47b218fc1 Merge branch 'release/4.6.11.1' 2017-12-08 19:53:15 +01:00
James Cole
93bdecb07c Remove unused lib. 2017-12-08 19:46:44 +01:00
James Cole
5f6f59a851 Update list of languages to match available languages. 2017-12-08 19:40:30 +01:00
James Cole
6469c7f537 Fix logging in Sandstorm. 2017-12-08 19:35:22 +01:00
James Cole
80f72d9dd7 Sort currencies. 2017-12-08 19:35:09 +01:00
James Cole
84d0ec062e New files for coming release. 2017-12-08 17:47:04 +01:00
James Cole
9220c0de16 New translations [skip ci] 2017-12-07 19:00:26 +01:00
James Cole
db77a83ac5 Fix docker file. 2017-12-07 18:46:52 +01:00
James Cole
5da8c2200a Fixes #1038 2017-12-07 16:16:48 +01:00
James Cole
cbde9cdae9 This should fix tests. 2017-12-06 19:41:51 +01:00
James Cole
343eb3a768 Fix null pointer [skip ci] 2017-12-06 19:21:17 +01:00
James Cole
9a9257176a Restore log routine. 2017-12-05 20:50:19 +01:00
James Cole
e4a0a718d1 Code that add extra check for #1039 2017-12-05 20:50:04 +01:00
James Cole
1b56765da3 Touch journals so issue #1036 is fixed. 2017-12-04 20:57:33 +01:00
James Cole
462439a5ab Better chart display for #1034 2017-12-03 09:27:54 +01:00
James Cole
7158dfe29a Hide reconcile button #1032 2017-12-03 09:01:39 +01:00
James Cole
f300c66143 Fix #1033 2017-12-03 08:57:23 +01:00
James Cole
553586a159 Remove reference to incomplete translations [skip ci] 2017-12-02 07:53:23 +01:00
James Cole
afd8896896 Update language related stuff. 2017-12-02 07:42:12 +01:00
James Cole
c9f188e5a6 Remove incomplete languages from code base [skip ci] 2017-12-02 07:28:24 +01:00
James Cole
3ad833b3ae Will no longer show incomplete languages. [skip ci] 2017-12-02 07:28:03 +01:00
James Cole
8cfd19855a Various new translations [skip ci] 2017-12-02 07:24:51 +01:00
James Cole
14deade6a4 Whoops [skip ci] 2017-12-02 07:20:43 +01:00
James Cole
efaa69cba1 Updates to bill code for #1029 2017-12-02 07:10:36 +01:00
James Cole
8eded63055 Fix for #1028 2017-12-02 06:42:00 +01:00
James Cole
ab689111f9 In the spirit of #1030, fix other JS strings as well. 2017-12-02 06:37:23 +01:00
James Cole
b87ef6252c Fix #1030 2017-12-02 06:29:06 +01:00
James Cole
8a59380c6d First set of code for #956 2017-12-01 20:11:29 +01:00
James Cole
382c5e5760 Updated config files [skip ci] 2017-12-01 18:43:37 +01:00
James Cole
02b4de46db Fix #1026 2017-11-30 22:05:18 +01:00
James Cole
aca5d8b6e9 Remove upgrade method. 2017-11-30 20:26:56 +01:00
James Cole
c2a129ddb0 Remove unused reference to model. 2017-11-30 20:26:16 +01:00
James Cole
f7eb78364d Merge branch 'release/4.6.11' 2017-11-30 20:16:28 +01:00
James Cole
a43dd4b2e8 Updated file list. 2017-11-30 20:01:18 +01:00
James Cole
7ef2941b85 Updated French translation. 2017-11-30 19:51:15 +01:00
James Cole
8a2b581658 Update change log and composer lock file. 2017-11-30 19:50:50 +01:00
James Cole
51f07ce918 Fix #1024 and #1025 2017-11-30 19:43:02 +01:00
James Cole
f30442320c Remove meta field when content is empty. 2017-11-30 19:39:49 +01:00
James Cole
4a1c155874 Update file list for sandstorm. 2017-11-30 07:24:42 +01:00
James Cole
c8ae19b811 New translations. 2017-11-30 07:13:52 +01:00
James Cole
64db5b91e2 heroku is broken 2017-11-30 07:12:22 +01:00
James Cole
941392f5ae Update composer and change log for sandstorm. 2017-11-30 07:11:39 +01:00
James Cole
0d9ac8b9c7 Restore composer file 2017-11-30 06:59:45 +01:00
James Cole
3581925b18 Update changelog. 2017-11-30 06:59:36 +01:00
James Cole
79517fc6e0 Various Heroku related fixes. 2017-11-29 19:15:44 +01:00
James Cole
9ae878724a Test: remove copy env.example 2017-11-29 18:20:38 +01:00
James Cole
aacc94cb01 Remove pre-install thing. 2017-11-29 18:20:20 +01:00
James Cole
203556aa8e Do not overrule logging when it’s not set to daily. [skip ci] 2017-11-29 18:12:00 +01:00
James Cole
16b0264a79 Do not overrule logging when it’s not set to daily. 2017-11-29 18:10:43 +01:00
James Cole
86d8ba6fc5 Update config for Heroku [skip ci] 2017-11-29 16:57:14 +01:00
James Cole
4dee6a9f59 Now without PHP errors. 2017-11-29 16:26:00 +01:00
James Cole
dedf774bf2 Update config for Heroku [skip ci] 2017-11-29 16:23:17 +01:00
James Cole
18a5bb682d Heroku related changes. 2017-11-27 19:07:57 +01:00
James Cole
b0b904c32e Fix parse error in composer.json 2017-11-27 19:01:44 +01:00
James Cole
fbaf84c427 Remove package discovery. 2017-11-27 18:47:00 +01:00
James Cole
0b2934235d Experimenting with heroku settings. 2017-11-27 18:39:11 +01:00
James Cole
2db0550eee Update composer file for Heroku. 2017-11-27 16:31:52 +01:00
James Cole
99d3ff5e47 Update composer file. 2017-11-26 18:00:05 +01:00
James Cole
be3d8ed192 Update composer file. 2017-11-26 17:59:31 +01:00
James Cole
2df8368a54 Update Heroku script [skip ci] 2017-11-26 17:52:20 +01:00
James Cole
c366f741c1 Update code for heroku [skip ci] 2017-11-26 17:48:53 +01:00
James Cole
3ab7dd3fb7 Some code cleanup to generate a push for #1006 2017-11-26 17:30:26 +01:00
James Cole
7852f4df1f Expand test coverage. 2017-11-26 09:54:09 +01:00
James Cole
0cf359b75f Code for #959 2017-11-25 20:54:42 +01:00
James Cole
60abe2a3af Various code cleanup. 2017-11-25 20:27:53 +01:00
James Cole
23826557c3 Fix #1004 2017-11-25 20:27:36 +01:00
James Cole
35647a062c Add php doc blocks. 2017-11-25 15:20:53 +01:00
James Cole
f7b1168e7c Code cleanup for scrutinizer. 2017-11-25 08:54:52 +01:00
James Cole
f2cf0ed446 Some bread crumbs and stuff [skip ci] 2017-11-24 23:14:27 +01:00
James Cole
378b4abaf1 Fix tests. 2017-11-24 23:05:44 +01:00
James Cole
af8df75e49 Add link to debug thing. 2017-11-24 21:51:31 +01:00
James Cole
be0758ce8a Update reconciliation code for #1011 and #736 2017-11-24 21:51:07 +01:00
James Cole
644fa3027a Some code for #736 2017-11-24 18:05:58 +01:00
James Cole
7de512aff8 Fix #1014 2017-11-24 17:33:05 +01:00
James Cole
93c2f13807 New strings [skip ci] 2017-11-24 17:06:42 +01:00
James Cole
7a1f698d5e Fix for #1016 and #968 2017-11-24 17:05:22 +01:00
James Cole
1aa325053e Update some Dutch translations [skip ci] 2017-11-22 22:09:29 +01:00
James Cole
8198d86934 Fix #1012 2017-11-22 21:54:58 +01:00
James Cole
8f80ee25c2 Code for #1010 2017-11-22 21:41:48 +01:00
James Cole
24b63abf2f Fix Javascript [skip ci] 2017-11-22 21:18:55 +01:00
James Cole
781ca052d8 Code cleanup. 2017-11-22 21:12:27 +01:00
James Cole
4e6b782204 Fix tests. 2017-11-22 20:30:23 +01:00
James Cole
3cb3c7f60f Code for 2fa 2017-11-22 20:20:57 +01:00
James Cole
0faa599b4c Code for reconcile. 2017-11-22 20:20:44 +01:00
James Cole
1fee62566b Fix some markdown related items for #1009 2017-11-22 18:12:09 +01:00
James Cole
d9fa098ae5 Fix view things. [skip ci] 2017-11-22 18:03:32 +01:00
James Cole
aa42d0f131 Missing translation. [skip ci] 2017-11-22 18:00:16 +01:00
James Cole
ba6a147032 Create reconciliation transaction. 2017-11-22 17:49:06 +01:00
James Cole
69bb76b6fe Update code for reconciliation. 2017-11-22 16:54:49 +01:00
James Cole
4b87e5be55 Keep mysql on latest. 2017-11-22 16:54:00 +01:00
James Cole
8f6ea6a73f Fix #1003 2017-11-19 09:20:29 +01:00
James Cole
6a88064548 Fix currency code. 2017-11-19 08:53:08 +01:00
James Cole
c357d25335 Update CSS 2017-11-18 21:03:41 +01:00
James Cole
7f27e3ce67 Update currencies #994 2017-11-18 21:03:28 +01:00
James Cole
7e66794cf5 Fix #958 2017-11-18 20:26:57 +01:00
James Cole
cd42399c29 Fix #931 2017-11-18 20:26:42 +01:00
James Cole
6bda5c2d53 New version [skip ci] 2017-11-18 16:55:12 +01:00
James Cole
9db83bc6ad Session lifetime is a week. 2017-11-18 16:51:57 +01:00
James Cole
ee45cc2f73 Fix upgrade database thing. 2017-11-18 16:36:22 +01:00
James Cole
e8e0a44cca Fix for #1002 2017-11-18 16:30:45 +01:00
James Cole
5f127b7bec Expand types. 2017-11-18 15:53:27 +01:00
James Cole
03edf6c0a0 Create new account and transaction types. 2017-11-18 15:51:11 +01:00
James Cole
5cfe3cf8a9 Fix entry fields 2017-11-18 15:50:21 +01:00
James Cole
1cec7652bf Fix #1001 2017-11-18 15:34:11 +01:00
James Cole
1045ed13fa Fix #996 2017-11-18 11:32:35 +01:00
James Cole
64fc6b6523 Some charts will render correctly #1000 2017-11-18 06:02:15 +01:00
James Cole
0812901745 Various code cleanup. 2017-11-18 05:46:19 +01:00
James Cole
573e72f7fb Fix views for #1000 2017-11-18 05:45:58 +01:00
James Cole
51a1512a3f Language update [skip ci] 2017-11-18 05:23:19 +01:00
James Cole
de41f23fb1 Merge branch 'develop' of https://github.com/firefly-iii/firefly-iii into develop
* 'develop' of https://github.com/firefly-iii/firefly-iii:
  Blind attempt to fix #997
2017-11-17 19:32:17 +01:00
James Cole
141225c980 Code for #914 2017-11-17 19:31:48 +01:00
James Cole
7bdafb48d2 Fix tag repos #997 2017-11-17 08:23:49 +01:00
James Cole
32695ba960 Blind attempt to fix #997 2017-11-17 08:22:26 +01:00
James Cole
02c2636b7d Fix #997 2017-11-17 05:52:44 +01:00
James Cole
bf87ffb933 Simplify tag cloud. 2017-11-15 15:38:39 +01:00
James Cole
63d93968d0 Fix tests. 2017-11-15 15:30:15 +01:00
James Cole
0c1ff98c66 Remove reference to self. 2017-11-15 12:53:55 +01:00
James Cole
ffca858b8d Code clean up. 2017-11-15 12:25:49 +01:00
James Cole
57dcdfa0c4 Code clean up. 2017-11-15 11:33:07 +01:00
James Cole
ef837f20dd Code clean up. 2017-11-15 10:53:17 +01:00
James Cole
649dca77f5 Code clean up. 2017-11-15 10:52:29 +01:00
James Cole
aee17221eb Code clean up. 2017-11-15 10:50:23 +01:00
James Cole
845d7d701f Update language files. 2017-11-15 10:36:50 +01:00
James Cole
c1259843cb Update language config. 2017-11-15 07:18:02 +01:00
James Cole
f576074f67 Merge pull request #977 from firefly-iii/l10n_develop
New Crowdin translations
2017-11-15 06:38:31 +01:00
James Cole
9fbad8df07 New translations firefly.php (Polish) 2017-11-15 06:30:56 +01:00
James Cole
f6d0aea015 New translations firefly.php (Portuguese, Brazilian) 2017-11-15 06:30:53 +01:00
James Cole
683dde54b7 New translations firefly.php (Slovenian) 2017-11-15 06:30:51 +01:00
James Cole
af6f21c4fd New translations firefly.php (Spanish) 2017-11-15 06:30:48 +01:00
James Cole
56501930b9 New translations firefly.php (German) 2017-11-15 06:30:43 +01:00
James Cole
62b38f43cd New translations firefly.php (French) 2017-11-15 06:30:38 +01:00
James Cole
0cc33cc3f6 New translations firefly.php (Dutch) 2017-11-15 06:30:33 +01:00
James Cole
6b1b41d320 New translations firefly.php (Indonesian) 2017-11-15 06:30:24 +01:00
James Cole
50e32cd570 New translations firefly.php (Russian) 2017-11-15 06:30:15 +01:00
James Cole
5530347bb2 New code for #736 2017-11-15 06:29:49 +01:00
James Cole
88ebcd1086 New translations list.php (Spanish) 2017-11-14 17:20:26 +01:00
James Cole
1971fb7e29 New translations validation.php (Russian) 2017-11-14 10:30:10 +01:00
James Cole
3243288e44 New translations validation.php (Russian) 2017-11-14 10:20:11 +01:00
James Cole
080a4002c6 New translations validation.php (Russian) 2017-11-14 10:10:14 +01:00
James Cole
cf460a0584 New translations validation.php (Russian) 2017-11-14 10:00:16 +01:00
James Cole
16ebee549b New translations bank.php (Russian) 2017-11-14 09:50:11 +01:00
James Cole
e73a7a3d14 New translations demo.php (Russian) 2017-11-14 09:50:10 +01:00
James Cole
e2ecfc7073 New translations validation.php (Russian) 2017-11-14 09:50:09 +01:00
James Cole
d413615943 Update tag routine for #993 2017-11-13 16:26:44 +01:00
James Cole
6c8f631582 Fix #992 2017-11-12 08:42:25 +01:00
James Cole
c013ce5bdb New translations firefly.php (German) 2017-11-11 17:40:58 +01:00
James Cole
f3a2a467d4 New translations firefly.php (Polish) 2017-11-10 18:31:45 +01:00
James Cole
8f6a5672fa New translations firefly.php (Portuguese, Brazilian) 2017-11-10 18:31:42 +01:00
James Cole
f6ebabe41d New translations firefly.php (Slovenian) 2017-11-10 18:31:39 +01:00
James Cole
b950b82e10 New translations firefly.php (Spanish) 2017-11-10 18:31:37 +01:00
James Cole
65b9d2cb00 New translations firefly.php (German) 2017-11-10 18:31:31 +01:00
James Cole
b79cbacce9 New translations firefly.php (French) 2017-11-10 18:31:25 +01:00
James Cole
fb20293e40 New translations firefly.php (Dutch) 2017-11-10 18:31:20 +01:00
James Cole
34c74ee3a3 New translations firefly.php (Indonesian) 2017-11-10 18:31:11 +01:00
James Cole
18f2b28b11 New translations firefly.php (Russian) 2017-11-10 18:31:00 +01:00
James Cole
f0e195f33b Basic reconcile view for #736 2017-11-10 18:25:11 +01:00
James Cole
19611982fa New translations form.php (German) 2017-11-10 18:10:15 +01:00
James Cole
112168b57c New translations firefly.php (Polish) 2017-11-10 15:02:05 +01:00
James Cole
e549009964 New translations firefly.php (Portuguese, Brazilian) 2017-11-10 15:02:01 +01:00
James Cole
60c261cb31 New translations firefly.php (Slovenian) 2017-11-10 15:01:57 +01:00
James Cole
628457695c New translations firefly.php (Spanish) 2017-11-10 15:01:54 +01:00
James Cole
a3befd9b1f New translations firefly.php (German) 2017-11-10 15:01:47 +01:00
James Cole
8bcfc624da New translations firefly.php (French) 2017-11-10 15:01:38 +01:00
James Cole
f88c311de7 New translations firefly.php (Dutch) 2017-11-10 15:01:32 +01:00
James Cole
34564de5e2 New translations firefly.php (Indonesian) 2017-11-10 15:01:23 +01:00
James Cole
88fd257d2c New translations firefly.php (Russian) 2017-11-10 15:01:12 +01:00
James Cole
b899628dbe New code for #736 2017-11-10 15:00:24 +01:00
James Cole
8f57222098 fix for #988 2017-11-08 16:04:55 +01:00
James Cole
d6f2557793 New translations demo.php (French) 2017-11-08 11:30:49 +01:00
James Cole
e15e4808c2 New translations firefly.php (French) 2017-11-08 11:30:47 +01:00
James Cole
328fc1d9df New translations form.php (French) 2017-11-08 11:20:42 +01:00
James Cole
19cf814e19 New translations firefly.php (Polish) 2017-11-08 09:51:18 +01:00
James Cole
ce45076063 New translations firefly.php (Portuguese, Brazilian) 2017-11-08 09:51:13 +01:00
James Cole
52544fc20c New translations firefly.php (Slovenian) 2017-11-08 09:51:10 +01:00
James Cole
8e64b22c45 New translations firefly.php (Spanish) 2017-11-08 09:51:07 +01:00
James Cole
ed27918c98 New translations firefly.php (German) 2017-11-08 09:50:59 +01:00
James Cole
2470a38b32 New translations firefly.php (French) 2017-11-08 09:50:48 +01:00
James Cole
4c6ec557e9 New translations firefly.php (Dutch) 2017-11-08 09:50:41 +01:00
James Cole
ac62acef1a New translations firefly.php (Indonesian) 2017-11-08 09:50:30 +01:00
James Cole
35ef6e10ee New translations firefly.php (Russian) 2017-11-08 09:50:18 +01:00
James Cole
920c7a93bc Better cache for reconcile [skip ci] 2017-11-08 09:47:38 +01:00
James Cole
78009c1cc0 New strings for reconciled transactions. #736 2017-11-08 09:40:38 +01:00
James Cole
d65109885a New translations bank.php (Indonesian) 2017-11-08 09:31:20 +01:00
James Cole
e986a1fc05 New translations bank.php (Dutch) 2017-11-08 09:30:40 +01:00
James Cole
ce331ffaff New translations bank.php (French) 2017-11-08 09:30:39 +01:00
James Cole
eb5f8067c0 New translations bank.php (German) 2017-11-08 09:30:38 +01:00
James Cole
421ce0e8f7 New translations bank.php (Polish) 2017-11-08 09:30:37 +01:00
James Cole
043e72f96c New translations bank.php (Portuguese, Brazilian) 2017-11-08 09:30:36 +01:00
James Cole
57b6cab774 New translations bank.php (Russian) 2017-11-08 09:30:35 +01:00
James Cole
2448c97d4b New translations bank.php (Slovenian) 2017-11-08 09:30:34 +01:00
James Cole
3f7f63c308 New translations bank.php (Spanish) 2017-11-08 09:30:27 +01:00
James Cole
8707bc6612 Code cleanup. 2017-11-08 09:05:10 +01:00
James Cole
b6514c7e54 Fix #987 2017-11-08 08:28:04 +01:00
James Cole
428bdfbe6f Update debug information. 2017-11-08 08:23:58 +01:00
James Cole
b5e76c77d2 New translations firefly.php (Dutch) 2017-11-08 08:20:22 +01:00
James Cole
19c9fc794d Update env files. [skip ci] 2017-11-08 07:54:42 +01:00
James Cole
1dfdf48471 Fix for #987 2017-11-08 07:19:21 +01:00
James Cole
15e0010162 New translations firefly.php (German) 2017-11-07 07:50:09 +01:00
James Cole
a2889ea4c4 Reverse null. 2017-11-06 20:17:54 +01:00
James Cole
ad18e04ad6 Expand error reporting for bad databases. 2017-11-06 20:17:39 +01:00
James Cole
347be7f4fd Update sandstorm files. 2017-11-06 19:24:32 +01:00
James Cole
6c9616bbc4 Fix #985 2017-11-05 21:16:20 +01:00
James Cole
8145c23905 Fix list view. 2017-11-05 21:12:49 +01:00
James Cole
ca358fd869 New translations firefly.php (Polish) 2017-11-05 20:20:12 +01:00
James Cole
42f8ac50f5 New translations firefly.php (Polish) 2017-11-05 19:51:02 +01:00
James Cole
5ee3828acf New translations firefly.php (Portuguese, Brazilian) 2017-11-05 19:51:00 +01:00
James Cole
aad2d50091 New translations firefly.php (Slovenian) 2017-11-05 19:50:57 +01:00
James Cole
54ae2af0f1 New translations firefly.php (Spanish) 2017-11-05 19:50:55 +01:00
James Cole
e98a7b7196 New translations firefly.php (German) 2017-11-05 19:50:50 +01:00
James Cole
61b180759c New translations firefly.php (French) 2017-11-05 19:50:44 +01:00
James Cole
718356592c New translations firefly.php (Dutch) 2017-11-05 19:50:39 +01:00
James Cole
be18896f84 New translations firefly.php (Indonesian) 2017-11-05 19:50:29 +01:00
James Cole
6ffdc3a505 New translations firefly.php (Russian) 2017-11-05 19:50:20 +01:00
James Cole
d2ab03061f Various code cleanup. 2017-11-05 19:49:20 +01:00
James Cole
33d89d52c2 Code that allows transaction reconciliation. #736 2017-11-05 19:48:43 +01:00
James Cole
a3bd4ccfbf New translations firefly.php (Polish) 2017-11-04 07:20:56 +01:00
James Cole
5a8f8d2448 New translations firefly.php (Portuguese, Brazilian) 2017-11-04 07:20:53 +01:00
James Cole
3320b69cd8 New translations firefly.php (Slovenian) 2017-11-04 07:20:51 +01:00
James Cole
bc19919bed New translations firefly.php (Spanish) 2017-11-04 07:20:48 +01:00
James Cole
3d318abf1b New translations firefly.php (German) 2017-11-04 07:20:43 +01:00
James Cole
31b5899fb0 New translations firefly.php (French) 2017-11-04 07:20:38 +01:00
James Cole
e75ada49b7 New translations firefly.php (Dutch) 2017-11-04 07:20:33 +01:00
James Cole
71eeffdbf4 New translations firefly.php (Indonesian) 2017-11-04 07:20:24 +01:00
James Cole
a71e9e578d New translations firefly.php (Russian) 2017-11-04 07:20:13 +01:00
James Cole
bb46d034cd Various cleanup in transaction and journal display code. 2017-11-04 07:10:21 +01:00
James Cole
b4dc70244a Fix for #980 2017-11-04 06:23:52 +01:00
James Cole
8cb42d1114 New translations firefly.php (German) 2017-11-03 21:32:29 +01:00
James Cole
7db233d0e8 New translations demo.php (Dutch) 2017-11-03 20:20:20 +01:00
James Cole
25268fabb3 New translations firefly.php (Dutch) 2017-11-03 20:20:18 +01:00
James Cole
c6434991d3 New translations firefly.php (Polish) 2017-11-03 16:32:48 +01:00
James Cole
ac801c8b86 Update models. 2017-11-03 16:04:17 +01:00
James Cole
6a1265564b New translations firefly.php (Portuguese, Brazilian) 2017-11-03 15:52:21 +01:00
James Cole
75680aa3f7 New translations firefly.php (Slovenian) 2017-11-03 15:52:16 +01:00
James Cole
c2adfc23d3 New translations firefly.php (Spanish) 2017-11-03 15:52:11 +01:00
James Cole
00bc8cc81e New translations firefly.php (Polish) 2017-11-03 15:51:59 +01:00
James Cole
41ca02b2dd New translations firefly.php (German) 2017-11-03 15:51:49 +01:00
James Cole
29f3c40cbe New translations firefly.php (Dutch) 2017-11-03 15:51:44 +01:00
James Cole
65a3b2d74c New translations firefly.php (French) 2017-11-03 15:51:37 +01:00
James Cole
7ac041f036 New translations firefly.php (Indonesian) 2017-11-03 15:51:22 +01:00
James Cole
0bc7e244ec New translations firefly.php (Russian) 2017-11-03 15:50:57 +01:00
James Cole
a664451913 Merge pull request #979 from pkoziol/develop
Translate hard-coded strings
2017-11-03 15:35:28 +01:00
koziolek
62998f8d69 Translate hard-coded strings. 2017-11-03 14:53:00 +01:00
James Cole
b907f998d9 New translations demo.php (German) 2017-11-03 14:21:03 +01:00
James Cole
c74e65b391 New translations firefly.php (German) 2017-11-03 14:21:02 +01:00
James Cole
5dc9e16553 New translations firefly.php (Polish) 2017-11-03 14:10:35 +01:00
James Cole
80fd0fa419 New translations firefly.php (Polish) 2017-11-03 13:50:51 +01:00
James Cole
0c206c9a0f New translations firefly.php (Portuguese, Brazilian) 2017-11-03 13:50:47 +01:00
James Cole
10a2b2075e New translations firefly.php (Slovenian) 2017-11-03 13:50:42 +01:00
James Cole
69e3158144 New translations firefly.php (Spanish) 2017-11-03 13:50:38 +01:00
James Cole
5019946c65 New translations firefly.php (German) 2017-11-03 13:50:24 +01:00
James Cole
ea7bd15c3d New translations firefly.php (French) 2017-11-03 13:50:11 +01:00
James Cole
bf884175a7 New translations firefly.php (Dutch) 2017-11-03 13:49:59 +01:00
James Cole
fc9479e517 New translations firefly.php (Indonesian) 2017-11-03 13:49:45 +01:00
James Cole
b333af769e New translations firefly.php (Russian) 2017-11-03 13:49:30 +01:00
James Cole
ca5249d839 Fix #976 2017-11-03 13:48:52 +01:00
James Cole
ba57852513 New translations firefly.php (Polish) 2017-11-03 13:42:26 +01:00
James Cole
d6f93d3c13 New translations firefly.php (Portuguese, Brazilian) 2017-11-03 13:42:22 +01:00
James Cole
1fcad87de6 New translations firefly.php (Slovenian) 2017-11-03 13:42:17 +01:00
James Cole
359d366e6e New translations firefly.php (Spanish) 2017-11-03 13:42:13 +01:00
James Cole
cbc3326d4b New translations firefly.php (German) 2017-11-03 13:42:05 +01:00
James Cole
1a147ecdd5 New translations firefly.php (French) 2017-11-03 13:41:57 +01:00
James Cole
df9bb13df1 New translations firefly.php (Indonesian) 2017-11-03 13:41:37 +01:00
James Cole
c2ee12466c New translations demo.php (Indonesian) 2017-11-03 13:41:32 +01:00
James Cole
6d9a562d0f New translations demo.php (Dutch) 2017-11-03 13:41:25 +01:00
James Cole
9da16f2b78 New translations demo.php (French) 2017-11-03 13:41:24 +01:00
James Cole
8bcebee767 New translations demo.php (German) 2017-11-03 13:41:22 +01:00
James Cole
c8240ea54f New translations demo.php (Russian) 2017-11-03 13:41:21 +01:00
James Cole
5ac5206253 New translations demo.php (Polish) 2017-11-03 13:41:20 +01:00
James Cole
a73adaaba9 New translations demo.php (Slovenian) 2017-11-03 13:41:19 +01:00
James Cole
7031cbcd29 New translations demo.php (Spanish) 2017-11-03 13:41:18 +01:00
James Cole
2dad5fb066 New translations firefly.php (Russian) 2017-11-03 13:41:16 +01:00
James Cole
db0b1d1fa2 New translations demo.php (Portuguese, Brazilian) 2017-11-03 13:41:11 +01:00
James Cole
810d2a3d87 Fix language issues reported by Findus23 2017-11-03 13:40:11 +01:00
James Cole
75f38d20df New translations firefly.php (German) 2017-11-03 13:00:16 +01:00
James Cole
214f651831 New translations validation.php (German) 2017-11-03 12:50:17 +01:00
James Cole
bc1982fb7b New translations firefly.php (Polish) 2017-11-03 12:50:15 +01:00
James Cole
99c9b719e7 New translations firefly.php (German) 2017-11-03 12:50:12 +01:00
James Cole
15eeba4381 New translations demo.php (German) 2017-11-03 12:30:13 +01:00
James Cole
77a6e81f1f New translations firefly.php (German) 2017-11-03 12:30:12 +01:00
James Cole
129ba5ed30 New translations firefly.php (German) 2017-11-03 12:10:14 +01:00
James Cole
8d9aa9392e New translations intro.php (German) 2017-11-03 12:00:23 +01:00
James Cole
566aa66c8b New translations form.php (German) 2017-11-03 12:00:21 +01:00
James Cole
d3bec76ebd New translations firefly.php (German) 2017-11-03 12:00:14 +01:00
James Cole
4c6b4074f5 New translations intro.php (German) 2017-11-03 11:50:12 +01:00
James Cole
787470d629 New translations form.php (German) 2017-11-03 11:50:11 +01:00
James Cole
607f960b6b New translations firefly.php (German) 2017-11-03 11:50:10 +01:00
James Cole
a636e88f25 New translations intro.php (German) 2017-11-03 11:40:14 +01:00
James Cole
d3b5300fc9 New translations validation.php (German) 2017-11-03 11:40:12 +01:00
James Cole
7ba2f3243d New translations form.php (German) 2017-11-03 11:31:57 +01:00
James Cole
8c75f9af14 New translations firefly.php (German) 2017-11-03 11:31:55 +01:00
James Cole
1867294704 New translations form.php (German) 2017-11-03 11:20:30 +01:00
James Cole
2d7a83ca34 New translations firefly.php (German) 2017-11-03 11:20:29 +01:00
James Cole
39679f89cd New translations firefly.php (German) 2017-11-03 11:11:10 +01:00
James Cole
8c707f8918 New translations firefly.php (German) 2017-11-03 11:00:15 +01:00
James Cole
dac4f23d51 Expand debug page. 2017-11-03 10:28:45 +01:00
James Cole
9ac5657b52 Merge branch 'release/4.6.10' 2017-11-03 07:26:19 +01:00
James Cole
dc063a1587 New composer file 2017-11-03 07:21:27 +01:00
James Cole
f49f3408dd Updated composer file 2017-11-03 07:12:06 +01:00
James Cole
5c6117a37a Merge pull request #975 from firefly-iii/l10n_develop
New Crowdin translations
2017-11-03 07:11:35 +01:00
James Cole
3da76a4f10 New translations firefly.php (Dutch) 2017-11-03 07:04:35 +01:00
James Cole
4f2faf7d64 Updated file list for Sandstorm [skip ci] 2017-11-03 07:02:44 +01:00
James Cole
5e3729e4b4 Fix #948 2017-11-03 06:58:39 +01:00
James Cole
d30d6b5e19 Fix #962 2017-11-03 06:57:46 +01:00
James Cole
432e06ed11 New translations firefly.php (Polish) 2017-11-03 06:50:55 +01:00
James Cole
cfc5bbd36f New translations firefly.php (Portuguese, Brazilian) 2017-11-03 06:50:53 +01:00
James Cole
58af8ba4a8 New translations firefly.php (Slovenian) 2017-11-03 06:50:50 +01:00
James Cole
933f99f64d New translations firefly.php (Spanish) 2017-11-03 06:50:48 +01:00
James Cole
742f6b3791 New translations firefly.php (German) 2017-11-03 06:50:42 +01:00
James Cole
8a98c16229 New translations firefly.php (French) 2017-11-03 06:50:37 +01:00
James Cole
913a9ef132 New translations firefly.php (Dutch) 2017-11-03 06:50:31 +01:00
James Cole
0aa08ad58a New translations firefly.php (Indonesian) 2017-11-03 06:50:22 +01:00
James Cole
9d1ae437dd New translations firefly.php (Russian) 2017-11-03 06:50:12 +01:00
James Cole
0e34302898 Fix #974 2017-11-03 06:42:36 +01:00
James Cole
6a91ca0f9b Add a debug view. 2017-11-01 20:23:28 +01:00
James Cole
b4c2631ef7 Catch undefined index in account repository. 2017-11-01 20:04:25 +01:00
James Cole
e0a0dbb6da Update repository for #972 2017-11-01 19:30:13 +01:00
James Cole
d937a8c897 New release related files [skip ci] 2017-11-01 17:08:37 +01:00
James Cole
5cc3261ba2 Merge pull request #950 from firefly-iii/l10n_develop
New Crowdin translations
2017-11-01 17:07:42 +01:00
James Cole
59213ed605 Fix possible null pointer [skip ci] 2017-11-01 16:30:55 +01:00
James Cole
1e91be420b Fix for #967 2017-11-01 16:17:14 +01:00
James Cole
80897be6c9 A fix for #971 2017-11-01 15:34:08 +01:00
James Cole
d20b750722 Fix for #970 2017-11-01 15:21:28 +01:00
James Cole
a73a058f9b Update firefly.php
Update language set.
2017-10-31 13:05:31 +01:00
James Cole
2c9ee43961 Try decrypt routine [skip ci] 2017-10-30 17:39:25 +01:00
James Cole
7a50bf29ee Try decrypt routine [skip ci] 2017-10-30 17:37:39 +01:00
James Cole
f6ab6d285f Swapped search case. [skip ci] 2017-10-30 17:34:56 +01:00
James Cole
7696dd7148 Enable cache again. [skip ci] 2017-10-30 17:33:39 +01:00
James Cole
0f83e78513 Enable cache again. [skip ci] 2017-10-30 17:32:21 +01:00
James Cole
82dc0d4aac Add debug logging. 2017-10-30 17:31:31 +01:00
James Cole
5722622251 Modify search for #963 2017-10-30 17:28:43 +01:00
James Cole
0bb46dd184 Fix return type 2017-10-30 16:25:46 +01:00
James Cole
60b7157a97 Custom limit 2017-10-30 16:25:39 +01:00
James Cole
ce30b3c1a9 Update env files 2017-10-30 16:25:31 +01:00
James Cole
a37e3005fd Merge pull request #961 from alazare619/master
Docker-Compose Point To Dockerhub Builds
2017-10-30 08:16:56 +01:00
Justin
1dfcb1bd8a rename 2017-10-29 21:58:25 -05:00
Justin
86381a1474 Docker-Compose Point To Dockerhub Builds 2017-10-29 21:12:11 -05:00
James Cole
654b9d2022 Various code cleanup. 2017-10-29 20:02:34 +01:00
James Cole
4cb832eb00 New translations firefly.php (German) 2017-10-29 17:31:10 +01:00
James Cole
cac202616b New translations csv.php (German) 2017-10-29 17:31:08 +01:00
James Cole
6a8c30eaa5 New translations breadcrumbs.php (German) 2017-10-29 17:31:06 +01:00
James Cole
1dfcc7ab37 New translations firefly.php (German) 2017-10-29 17:21:02 +01:00
James Cole
60cde6c9b4 New translations form.php (German) 2017-10-29 17:11:11 +01:00
James Cole
c0e2e6a4b5 New translations firefly.php (German) 2017-10-29 17:11:09 +01:00
James Cole
1706b60dcb New translations firefly.php (German) 2017-10-29 17:01:03 +01:00
James Cole
bf2aec228f New translations firefly.php (German) 2017-10-29 16:50:59 +01:00
James Cole
fc835a1ea4 New translations csv.php (German) 2017-10-29 16:50:56 +01:00
James Cole
35b68460d1 New translations firefly.php (German) 2017-10-29 16:40:14 +01:00
James Cole
5df16f58ce Update data for Sandstorm. 2017-10-29 16:05:22 +01:00
James Cole
88a3c8aed9 Fix #911 again 2017-10-29 08:29:40 +01:00
James Cole
af4a188480 Updated transaction view. 2017-10-28 07:39:33 +02:00
James Cole
d3c34ca155 Update service provider. 2017-10-28 07:31:12 +02:00
James Cole
7f26b4e7a7 Overrule Laravel middleware [skip ci] 2017-10-27 18:56:38 +02:00
James Cole
f28d8b8597 Update some libraries…… 2017-10-27 18:39:41 +02:00
James Cole
c900716fe6 Merge branch 'develop' of github.com:JC5/firefly-iii into develop 2017-10-27 13:00:36 +02:00
James Cole
a5dd334b71 Log some errors for #960 2017-10-27 12:59:43 +02:00
James Cole
ef695bde60 Merge branch 'develop' of https://github.com/firefly-iii/firefly-iii into develop
* 'develop' of https://github.com/firefly-iii/firefly-iii:
  Update PiggyBankController.php
2017-10-26 19:58:54 +02:00
James Cole
94762847a2 Fix #849 2017-10-26 19:57:41 +02:00
James Cole
78584c7128 Add cache to search. 2017-10-26 19:56:03 +02:00
James Cole
ed909fce68 New translations form.php (Dutch) 2017-10-26 12:30:07 +02:00
James Cole
2f6b318793 New translations intro.php (Polish) 2017-10-24 10:40:26 +02:00
James Cole
295091a161 New translations intro.php (Polish) 2017-10-24 10:30:07 +02:00
James Cole
0ef35ecb9f New translations csv.php (Polish) 2017-10-24 10:20:12 +02:00
James Cole
ae57682196 New translations csv.php (Polish) 2017-10-24 10:00:08 +02:00
James Cole
b409d2bcc2 Update PiggyBankController.php 2017-10-23 13:25:12 +02:00
James Cole
1217ff7a7f Generate key [skip ci] 2017-10-22 20:25:40 +02:00
James Cole
3f681bf71b Key without lengt. [skip ci] 2017-10-22 20:22:02 +02:00
James Cole
1a325f4978 Some code cleanup. 2017-10-22 20:13:02 +02:00
James Cole
d72b652453 Add some links. 2017-10-22 18:39:09 +02:00
James Cole
c32608b0e1 Add route #937 2017-10-22 18:16:32 +02:00
James Cole
93bcc8f63d Code for #937 2017-10-22 18:15:12 +02:00
James Cole
fb0cd056b9 New file list. 2017-10-22 17:48:53 +02:00
James Cole
1d1661be94 Disable most logging for sandstorm instances. 2017-10-22 17:31:01 +02:00
James Cole
8ed1d16e16 Fix #951 2017-10-22 13:49:39 +02:00
James Cole
5befe95d36 New translations form.php (Polish) 2017-10-22 12:10:06 +02:00
James Cole
1dc0de975f New translations form.php (Dutch) 2017-10-22 10:40:51 +02:00
James Cole
87709ab5ed New translations form.php (French) 2017-10-22 10:40:50 +02:00
James Cole
a32c089dd5 New translations form.php (German) 2017-10-22 10:40:49 +02:00
James Cole
fca7eb523c New translations form.php (Polish) 2017-10-22 10:40:48 +02:00
James Cole
018589ad68 New translations form.php (Portuguese, Brazilian) 2017-10-22 10:40:47 +02:00
James Cole
43f7734258 New translations form.php (Slovenian) 2017-10-22 10:40:45 +02:00
James Cole
94e49b0dc9 New translations form.php (Spanish) 2017-10-22 10:40:44 +02:00
James Cole
4948ad6e1f New translations form.php (Indonesian) 2017-10-22 10:40:25 +02:00
James Cole
76c6f20b97 New translations form.php (Russian) 2017-10-22 10:40:16 +02:00
James Cole
97680d1713 Move fonts to local dir #947 2017-10-22 10:38:19 +02:00
James Cole
caa0ecf899 Remove unnecessary comment. 2017-10-22 09:59:04 +02:00
James Cole
0518b98409 New title for single user mode. 2017-10-22 09:58:53 +02:00
James Cole
10a9c7f987 New icon for opening balance. 2017-10-22 09:58:41 +02:00
James Cole
869845f32a Merge branch 'release/4.6.9' 2017-10-22 06:39:49 +02:00
James Cole
d79493b84c Updated file list. 2017-10-22 06:35:53 +02:00
James Cole
ebe275c37b Update composer file. 2017-10-22 06:35:04 +02:00
James Cole
8f728633ba Small layout changes. 2017-10-22 06:12:24 +02:00
James Cole
1b23bd1e98 Update issue template 2017-10-22 06:11:58 +02:00
James Cole
b2a0e22c48 Update changelog. 2017-10-22 06:11:44 +02:00
James Cole
578252a2c7 Merge pull request #930 from firefly-iii/l10n_develop
New Crowdin translations
2017-10-22 05:52:39 +02:00
James Cole
f326c5ec19 Fix #944 2017-10-22 05:47:07 +02:00
James Cole
0358d45614 Make new Sandstorm user an admin. 2017-10-21 21:51:09 +02:00
James Cole
69b26fcb5d Updated readme. 2017-10-21 20:50:15 +02:00
James Cole
2197438e3d Add sandstorm reference to read me. 2017-10-21 20:46:34 +02:00
James Cole
779c8b6753 Remove upstream author. 2017-10-21 20:45:08 +02:00
James Cole
dc784b346f Fix intro box thing. 2017-10-21 12:19:39 +02:00
James Cole
33fbf4c939 File list 2017-10-21 10:03:34 +02:00
James Cole
3d9f9770b4 More stuff for Sandstorm. 2017-10-21 09:58:44 +02:00
James Cole
a3d23aa43c Update license for Sandstorm file. 2017-10-21 08:50:47 +02:00
James Cole
ac461d64a8 New copyright notice. 2017-10-21 08:40:00 +02:00
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
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
3e85e4180a New translations firefly.php (Spanish) 2017-10-15 11:20:28 +02:00
James Cole
99500a1ee2 New translations firefly.php (Portuguese, Brazilian) 2017-10-15 11:20:24 +02:00
James Cole
4945356665 New translations config.php (Portuguese, Brazilian) 2017-10-15 10:50:26 +02:00
James Cole
2190fb972c New translations csv.php (Portuguese, Brazilian) 2017-10-15 10:50:23 +02:00
James Cole
dfa7e94f87 New translations bank.php (Slovenian) 2017-10-15 10:50:19 +02:00
James Cole
aa6a0f6e83 New translations breadcrumbs.php (Portuguese, Brazilian) 2017-10-15 10:50:13 +02:00
James Cole
02203fb38a New translations intro.php (French) 2017-10-15 10:50:12 +02:00
James Cole
64b957fda6 New translations bank.php (Slovenian) 2017-10-15 10:40:22 +02:00
James Cole
f82880a519 New translations firefly.php (Portuguese, Brazilian) 2017-10-15 10:40:16 +02:00
James Cole
e7a782359d New translations csv.php (Portuguese, Brazilian) 2017-10-15 10:40:14 +02:00
James Cole
7f9f83bb3f New translations config.php (Portuguese, Brazilian) 2017-10-15 10:40:12 +02:00
James Cole
7dca784091 New translations breadcrumbs.php (Portuguese, Brazilian) 2017-10-15 10:40:11 +02:00
James Cole
c633c800a5 New translations intro.php (French) 2017-10-15 10:10:09 +02:00
James Cole
9277ba60aa New translations firefly.php (Spanish) 2017-10-15 10:10:07 +02:00
James Cole
b30f76ccf5 Merge branch 'release/4.6.8' 2017-10-15 08:57:11 +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
James Cole
ca548e166f New translations intro.php (German) 2017-10-10 08:20:07 +02:00
James Cole
7b3ca053a5 New translations firefly.php (Polish) 2017-10-09 21:00:17 +02:00
James Cole
110d9278c4 Merge branch 'release/4.6.7' 2017-10-09 20:51:03 +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
9b30bbcf92 Merge pull request #898 from firefly-iii/l10n_develop
New Crowdin translations
2017-10-09 20:42:55 +02:00
James Cole
c64c5495f2 New translations firefly.php (Dutch) 2017-10-09 20:42:28 +02:00
James Cole
a6855349e8 New translations firefly.php (Polish) 2017-10-09 20:40:27 +02:00
James Cole
c02bb617cd New translations firefly.php (Portuguese, Brazilian) 2017-10-09 20:40:24 +02:00
James Cole
a95ff75531 New translations firefly.php (Slovenian) 2017-10-09 20:40:22 +02:00
James Cole
e726364eb7 New translations firefly.php (Spanish) 2017-10-09 20:40:19 +02:00
James Cole
301d76c1c5 New translations firefly.php (German) 2017-10-09 20:40:15 +02:00
James Cole
4cdf2184c3 New translations firefly.php (French) 2017-10-09 20:40:09 +02:00
James Cole
4d8736b3cf New translations firefly.php (Dutch) 2017-10-09 20:40:03 +02:00
James Cole
2a5182ba54 New translations firefly.php (Indonesian) 2017-10-09 20:39:54 +02:00
James Cole
4f307cf3ca New translations firefly.php (Russian) 2017-10-09 20:39:44 +02:00
James Cole
26ab5fea7b Merge pull request #912 from pkoziol/develop
Added missing translations in link type overview.
2017-10-09 20:38:16 +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
d5eb0c5724 New translations firefly.php (French) 2017-10-08 10:10:07 +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
3d6acf264c New translations form.php (Polish) 2017-10-06 23:50:19 +02:00
koziolek
730d5d72f3 Added missing translations in link type overview. 2017-10-06 23:39:15 +02:00
James Cole
81e86c9b81 New translations firefly.php (Polish) 2017-10-06 23:30:34 +02:00
James Cole
2215deb7a6 New translations list.php (Polish) 2017-10-06 23:20:27 +02:00
James Cole
950d5892c0 New translations form.php (Polish) 2017-10-06 23:20:26 +02:00
James Cole
8947226064 New translations firefly.php (Polish) 2017-10-06 23:20:25 +02:00
James Cole
42b5df48d3 New translations form.php (Polish) 2017-10-06 23:10:18 +02:00
James Cole
733d67defc New translations firefly.php (Polish) 2017-10-06 23:10:17 +02:00
James Cole
20cb3ff065 New translations list.php (Polish) 2017-10-06 23:00:18 +02:00
James Cole
ecd7aa95da New translations firefly.php (Polish) 2017-10-06 23:00:17 +02:00
James Cole
e4b2142dbf New translations firefly.php (Polish) 2017-10-06 22:50:18 +02:00
James Cole
4fd4d5b571 New translations firefly.php (Polish) 2017-10-06 22:30:21 +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
f737a4914b New translations csv.php (Indonesian) 2017-10-06 10:40:06 +02:00
James Cole
d1c6e2f8b1 New translations csv.php (Indonesian) 2017-10-06 10:30:06 +02:00
James Cole
3dcf6d892b New translations csv.php (Indonesian) 2017-10-06 10:20:11 +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
c50e180a4e Merge pull request #903 from hduijn/develop
Added SNS specifics code for removing quotes from description
2017-10-05 16:18:03 +02:00
Hugo van Duijn
a1e2814990 Added SNS specifics code for removing quotes from description 2017-10-05 16:00:03 +02:00
James Cole
e68594a93b Various code cleanup. 2017-10-05 11:49:06 +02:00
James Cole
9859541927 New translations config.php (Indonesian) 2017-10-05 10:30:17 +02:00
James Cole
1c124aec0d New translations bank.php (Indonesian) 2017-10-05 10:20:19 +02:00
James Cole
425d6d17f4 New translations config.php (Indonesian) 2017-10-05 10:20:18 +02:00
James Cole
6203139cb9 New translations breadcrumbs.php (Indonesian) 2017-10-05 10:20:17 +02:00
James Cole
e0e3d79ee5 New translations auth.php (Indonesian) 2017-10-05 10:20:16 +02:00
James Cole
b18012a36c Fix tests 2017-10-05 08:26:08 +02:00
James Cole
ef0bee6874 New translations list.php (Dutch) 2017-10-05 07:40:07 +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
0520b91c71 New translations firefly.php (Dutch) 2017-10-05 07:30:06 +02:00
James Cole
e4c883018b New translations firefly.php (Polish) 2017-10-05 07:21:04 +02:00
James Cole
c2f774ea7c New translations firefly.php (Portuguese, Brazilian) 2017-10-05 07:21:01 +02:00
James Cole
8302518a4f New translations firefly.php (Slovenian) 2017-10-05 07:20:58 +02:00
James Cole
357b258332 New translations firefly.php (Spanish) 2017-10-05 07:20:55 +02:00
James Cole
3fd72d0584 New translations firefly.php (German) 2017-10-05 07:20:47 +02:00
James Cole
91075084c7 New translations firefly.php (French) 2017-10-05 07:20:41 +02:00
James Cole
687dd0e659 New translations firefly.php (Dutch) 2017-10-05 07:20:34 +02:00
James Cole
f919769bcd New translations firefly.php (Indonesian) 2017-10-05 07:20:25 +02:00
James Cole
8c109fc212 New translations firefly.php (Russian) 2017-10-05 07:20:13 +02:00
James Cole
1ba304462f make search query a string 2017-10-05 07:19:23 +02:00
James Cole
b92222b8e5 Merge pull request #900 from pkoziol/develop
Add missing translations strings in search
2017-10-05 07:15:10 +02:00
koziolek
8cb2a47a38 Add missing translations strings in search
firefly-iii/firefly-iii#899
2017-10-04 21:39:08 +02:00
James Cole
035ef6035d New translations intro.php (Polish) 2017-10-04 21:10:11 +02:00
James Cole
e74793ccbc New translations form.php (Polish) 2017-10-04 21:10:10 +02:00
James Cole
b89e7f9307 New translations firefly.php (Polish) 2017-10-04 21:10:08 +02:00
James Cole
5e6fbdad1a New translations firefly.php (Polish) 2017-10-04 21:00:08 +02:00
James Cole
f18aeee1fb New translations bank.php (Polish) 2017-10-04 20:50:09 +02:00
James Cole
cea4db785e New translations firefly.php (Polish) 2017-10-04 20:50:08 +02:00
James Cole
3ab0a44bd9 New translations form.php (Polish) 2017-10-04 20:40:09 +02:00
James Cole
9d2fdb8f07 New translations firefly.php (Polish) 2017-10-04 20:40:07 +02:00
James Cole
1e0806efa7 New translations list.php (Polish) 2017-10-04 20:30:19 +02:00
James Cole
c596506d37 New translations form.php (Polish) 2017-10-04 20:30:17 +02:00
James Cole
f1081d78ea New translations firefly.php (Polish) 2017-10-04 20:30:16 +02:00
James Cole
8202cd8e22 New translations list.php (Polish) 2017-10-04 20:20:08 +02:00
James Cole
b56d1a2a2b New translations firefly.php (Polish) 2017-10-04 20:20:07 +02:00
James Cole
3eb96ff593 New translations firefly.php (Polish) 2017-10-04 20:10:15 +02:00
James Cole
c6f521ec1b Merge pull request #879 from firefly-iii/l10n_develop
New Crowdin translations
2017-10-04 16:44:37 +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
8267678593 New translations intro.php (French) 2017-10-04 12:20:15 +02:00
James Cole
675be5fb57 New translations intro.php (French) 2017-10-04 12:10:52 +02:00
James Cole
8058a8dfce New translations intro.php (French) 2017-10-04 12:01:43 +02:00
James Cole
5182a5cdc0 New translations list.php (French) 2017-10-04 12:01:41 +02:00
James Cole
ca86b81448 New translations intro.php (French) 2017-10-04 11:50:28 +02:00
James Cole
44e1262447 New translations form.php (French) 2017-10-04 11:50:27 +02:00
James Cole
d37a443854 New translations firefly.php (French) 2017-10-04 11:50:25 +02:00
James Cole
d426d7ddd1 New translations firefly.php (French) 2017-10-04 11:40:20 +02:00
James Cole
156ecf98f6 New translations firefly.php (French) 2017-10-04 11:30:49 +02:00
James Cole
f022789342 New translations firefly.php (French) 2017-10-04 11:25:33 +02:00
James Cole
593e9b5946 New translations bank.php (French) 2017-10-04 11:13:40 +02:00
James Cole
95ac1f5013 New translations firefly.php (French) 2017-10-04 11:13:39 +02:00
James Cole
35a5310485 Fix #893 2017-10-04 07:19:19 +02:00
James Cole
3b9ec379b5 New translations firefly.php (Polish) 2017-10-03 13:41:06 +02:00
James Cole
7df0230777 New translations firefly.php (Portuguese, Brazilian) 2017-10-03 13:41:03 +02:00
James Cole
66d36850a4 New translations firefly.php (Slovenian) 2017-10-03 13:41:01 +02:00
James Cole
97a655016f New translations firefly.php (Spanish) 2017-10-03 13:40:58 +02:00
James Cole
35bac16ccc New translations firefly.php (German) 2017-10-03 13:40:51 +02:00
James Cole
cb593da5b7 New translations firefly.php (French) 2017-10-03 13:40:49 +02:00
James Cole
2b09a00d3a New translations firefly.php (Dutch) 2017-10-03 13:40:42 +02:00
James Cole
f2383513e2 New translations firefly.php (Indonesian) 2017-10-03 13:40:32 +02:00
James Cole
25aaeead0e New translations firefly.php (Russian) 2017-10-03 13:40:23 +02:00
James Cole
a22a2fb4ef Fix #891 and 892 [skip ci] 2017-10-03 13:30:43 +02:00
James Cole
995fd0cfb9 New translations auth.php (Indonesian) 2017-10-03 12:30:31 +02:00
James Cole
011e0b1f29 New translations form.php (Indonesian) 2017-10-03 12:30:30 +02:00
James Cole
3c964e81de New translations firefly.php (Indonesian) 2017-10-03 12:30:29 +02:00
James Cole
b4f28504a3 New translations csv.php (Indonesian) 2017-10-03 12:30:26 +02:00
James Cole
92f22abb01 New translations breadcrumbs.php (Indonesian) 2017-10-03 12:30:25 +02:00
James Cole
7bdb8bd162 New translations config.php (Indonesian) 2017-10-03 12:30:24 +02:00
James Cole
9b687b3566 New translations list.php (Indonesian) 2017-10-03 12:30:23 +02:00
James Cole
9f622285ca New translations pagination.php (Indonesian) 2017-10-03 12:30:22 +02:00
James Cole
cbe123c25d New translations bank.php (Indonesian) 2017-10-03 12:30:21 +02:00
James Cole
3d30502dd9 New translations intro.php (Indonesian) 2017-10-03 12:30:20 +02:00
James Cole
7547e944a1 New translations demo.php (Indonesian) 2017-10-03 12:30:19 +02:00
James Cole
bed5e630af New translations passwords.php (Indonesian) 2017-10-03 12:30:18 +02:00
James Cole
418d75ad60 New translations validation.php (Indonesian) 2017-10-03 12:30:17 +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
4b3814d33a New translations list.php (Slovenian) 2017-10-03 05:41:19 +02:00
James Cole
c691957c54 New translations list.php (Spanish) 2017-10-03 05:41:18 +02:00
James Cole
2c26c42339 New translations list.php (Portuguese, Brazilian) 2017-10-03 05:41:16 +02:00
James Cole
ccd93bc442 New translations list.php (Polish) 2017-10-03 05:41:14 +02:00
James Cole
5b21cebec8 New translations list.php (Dutch) 2017-10-03 05:41:13 +02:00
James Cole
f2d1436b82 New translations list.php (German) 2017-10-03 05:41:12 +02:00
James Cole
2d1f6a22d3 New translations list.php (French) 2017-10-03 05:41:10 +02:00
James Cole
484d70ca86 New translations list.php (Russian) 2017-10-03 05:40:59 +02:00
James Cole
4af0c18020 Add missing translation [skip ci] 2017-10-03 05:31:48 +02:00
James Cole
a4b6589cbd New translations firefly.php (Spanish) 2017-10-03 05:31:05 +02:00
James Cole
b4affabb67 New translations firefly.php (Slovenian) 2017-10-03 05:31:02 +02:00
James Cole
1cb29ff395 New translations firefly.php (Portuguese, Brazilian) 2017-10-03 05:30:59 +02:00
James Cole
55739c801c New translations firefly.php (Dutch) 2017-10-03 05:30:56 +02:00
James Cole
c68777f385 New translations firefly.php (French) 2017-10-03 05:30:54 +02:00
James Cole
4f1d545468 New translations firefly.php (Polish) 2017-10-03 05:30:51 +02:00
James Cole
0f9220edc9 New translations firefly.php (German) 2017-10-03 05:30:48 +02:00
James Cole
6696513ef9 New translations firefly.php (Russian) 2017-10-03 05:30:35 +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
782d675259 New translations firefly.php (Dutch) 2017-10-01 08:30:07 +02:00
James Cole
158ebdad30 New translations form.php (Dutch) 2017-10-01 08:30:05 +02:00
James Cole
9addbb979a Merge pull request #878 from Findus23/master
fix typo in nofollow
2017-09-30 18:03:02 +02:00
James Cole
b5375a5629 New translations firefly.php (Spanish) 2017-09-30 18:01:01 +02:00
James Cole
04200203a4 New translations form.php (Dutch) 2017-09-30 18:00:59 +02:00
James Cole
05a0dfdc2e New translations form.php (French) 2017-09-30 18:00:58 +02:00
James Cole
543a1d7835 New translations form.php (German) 2017-09-30 18:00:57 +02:00
James Cole
ec87651123 New translations firefly.php (Slovenian) 2017-09-30 18:00:55 +02:00
James Cole
c4bb05caf5 New translations firefly.php (Portuguese, Brazilian) 2017-09-30 18:00:53 +02:00
James Cole
52fdd35a66 New translations firefly.php (Dutch) 2017-09-30 18:00:50 +02:00
James Cole
6ee40342dc New translations firefly.php (French) 2017-09-30 18:00:48 +02:00
James Cole
42b7ae096c New translations firefly.php (Polish) 2017-09-30 18:00:45 +02:00
James Cole
95acbf69d3 New translations firefly.php (German) 2017-09-30 18:00:42 +02:00
James Cole
19326bb8ff New translations form.php (Polish) 2017-09-30 18:00:40 +02:00
James Cole
c208ba4d8f New translations form.php (Portuguese, Brazilian) 2017-09-30 18:00:39 +02:00
James Cole
9c4d3134ef New translations form.php (Slovenian) 2017-09-30 18:00:36 +02:00
James Cole
6b61883281 New translations form.php (Spanish) 2017-09-30 18:00:35 +02:00
James Cole
6bec07bdd3 New translations firefly.php (Russian) 2017-09-30 18:00:24 +02:00
James Cole
28b68bf0fd New translations form.php (Russian) 2017-09-30 18:00:21 +02:00
Lukas Winkler
85797a5d70 fix typo in nofollow 2017-09-30 17:56:51 +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
73f3675966 Merge pull request #877 from pkoziol/develop
Fix dates in CHANGELOG
2017-09-30 12:38:55 +02:00
koziolek
5a28b285c2 Fix dates in CHANGELOG. [skip ci] 2017-09-30 12:36:56 +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
a34d888024 Merge pull request #874 from firefly-iii/l10n_develop
New Crowdin translations
2017-09-29 15:02:54 +02:00
James Cole
2932689c53 New translations form.php (Dutch) 2017-09-29 14:50:26 +02:00
James Cole
b0b8a8cc25 New translations intro.php (Dutch) 2017-09-29 14:50:24 +02:00
James Cole
ce8056424f New translations bank.php (Dutch) 2017-09-29 14:50:23 +02:00
James Cole
1567a0181b Merge pull request #821 from firefly-iii/l10n_develop
New Crowdin translations
2017-09-29 14:49:39 +02:00
James Cole
b60ad97150 New translations firefly.php (Dutch) 2017-09-29 14:40:08 +02:00
James Cole
cc93e4442b New translations firefly.php (Spanish) 2017-09-29 14:30:58 +02:00
James Cole
1f4ec8211e New translations firefly.php (Slovenian) 2017-09-29 14:30:51 +02:00
James Cole
3a9cbcc565 New translations firefly.php (Portuguese, Brazilian) 2017-09-29 14:30:49 +02:00
James Cole
fe6cce7495 New translations firefly.php (Dutch) 2017-09-29 14:30:45 +02:00
James Cole
f98e24e443 New translations firefly.php (French) 2017-09-29 14:30:43 +02:00
James Cole
4ffbc0932c New translations firefly.php (Polish) 2017-09-29 14:30:40 +02:00
James Cole
9eec12a4de New translations firefly.php (German) 2017-09-29 14:30:37 +02:00
James Cole
40d1011c37 New translations firefly.php (Russian) 2017-09-29 14:30:23 +02:00
James Cole
aa4682af6a Expand budget box and clear some languages. 2017-09-29 14:22:40 +02:00
James Cole
47bea97c96 New translations firefly.php (Spanish) 2017-09-29 09:02:15 +02:00
James Cole
78b76d0f65 New translations firefly.php (Slovenian) 2017-09-29 09:02:05 +02:00
James Cole
3a70a85283 New translations firefly.php (Portuguese, Brazilian) 2017-09-29 09:01:59 +02:00
James Cole
aa7e6166c1 New translations firefly.php (Dutch) 2017-09-29 09:01:51 +02:00
James Cole
08dcd9407b New translations firefly.php (French) 2017-09-29 09:01:47 +02:00
James Cole
2c263d6e82 New translations firefly.php (Polish) 2017-09-29 09:01:41 +02:00
James Cole
ca9a4e44b4 New translations firefly.php (German) 2017-09-29 09:01:35 +02:00
James Cole
a1b74eaa8e New translations intro.php (Dutch) 2017-09-29 09:01:14 +02:00
James Cole
a3732a65c9 New translations intro.php (French) 2017-09-29 09:01:13 +02:00
James Cole
f6a162def1 New translations intro.php (German) 2017-09-29 09:01:11 +02:00
James Cole
7e96f212c6 New translations firefly.php (Russian) 2017-09-29 09:01:08 +02:00
James Cole
67c4ae5d49 New translations intro.php (Polish) 2017-09-29 09:01:01 +02:00
James Cole
c0ce65e71f New translations intro.php (Portuguese, Brazilian) 2017-09-29 09:00:59 +02:00
James Cole
77cc04d9b3 New translations intro.php (Russian) 2017-09-29 09:00:56 +02:00
James Cole
5c8ed110f5 New translations intro.php (Slovenian) 2017-09-29 09:00:54 +02:00
James Cole
3104ee1263 New translations intro.php (Spanish) 2017-09-29 09:00:53 +02:00
James Cole
76ed261441 A basic box for #786 2017-09-29 08:52:15 +02:00
James Cole
0b36facec3 New translations firefly.php (Spanish) 2017-09-28 09:01:14 +02:00
James Cole
2a4f6d6f1f New translations firefly.php (Slovenian) 2017-09-28 09:01:10 +02:00
James Cole
ffe9eaaae5 New translations firefly.php (Portuguese, Brazilian) 2017-09-28 09:01:07 +02:00
James Cole
2a2c6335a5 New translations firefly.php (Dutch) 2017-09-28 09:01:04 +02:00
James Cole
8b36c17e30 New translations firefly.php (French) 2017-09-28 09:01:00 +02:00
James Cole
dae3c4ccc7 New translations firefly.php (Polish) 2017-09-28 09:00:57 +02:00
James Cole
0514258290 New translations firefly.php (German) 2017-09-28 09:00:54 +02:00
James Cole
c5fdeacc87 New translations firefly.php (Russian) 2017-09-28 09:00:30 +02:00
James Cole
b11ea13b1d New translations bank.php (Portuguese, Brazilian) 2017-09-28 09:00:24 +02:00
James Cole
9823603a0c New translations bank.php (Russian) 2017-09-28 09:00:23 +02:00
James Cole
366a618d00 New translations bank.php (Slovenian) 2017-09-28 09:00:22 +02:00
James Cole
dee681ed2a New translations bank.php (Spanish) 2017-09-28 09:00:22 +02:00
James Cole
8c116862e2 New translations bank.php (Polish) 2017-09-28 09:00:20 +02:00
James Cole
9a86b907d7 New translations bank.php (German) 2017-09-28 09:00:19 +02:00
James Cole
b70861df30 New translations bank.php (French) 2017-09-28 09:00:18 +02:00
James Cole
f8a1e9b6d5 New translations bank.php (Dutch) 2017-09-28 09:00:17 +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
1fc54f5207 New translations form.php (Dutch) 2017-09-28 08:20:50 +02:00
James Cole
04efdf75db New translations form.php (French) 2017-09-28 08:20:49 +02:00
James Cole
eee4909755 New translations form.php (German) 2017-09-28 08:20:48 +02:00
James Cole
c8bf7e9c28 New translations form.php (Polish) 2017-09-28 08:20:35 +02:00
James Cole
07e2c1000c New translations form.php (Portuguese, Brazilian) 2017-09-28 08:20:34 +02:00
James Cole
e9afd21375 New translations form.php (Slovenian) 2017-09-28 08:20:31 +02:00
James Cole
b1ea6f5595 New translations form.php (Spanish) 2017-09-28 08:20:30 +02:00
James Cole
69b454da7d New translations form.php (Russian) 2017-09-28 08:20:17 +02:00
James Cole
c19c7c680b Small improvements to bunq import. 2017-09-28 08:17:32 +02:00
James Cole
12ceecd57b New translations firefly.php (Polish) 2017-09-27 15:52:11 +02:00
James Cole
75f64225ee New translations firefly.php (Portuguese, Brazilian) 2017-09-27 15:52:07 +02:00
James Cole
f157eff2c3 New translations firefly.php (Slovenian) 2017-09-27 15:52:01 +02:00
James Cole
95a185ec39 New translations firefly.php (Spanish) 2017-09-27 15:51:55 +02:00
James Cole
7963e511b9 New translations firefly.php (German) 2017-09-27 15:51:50 +02:00
James Cole
2608e1ae74 New translations firefly.php (French) 2017-09-27 15:51:43 +02:00
James Cole
13a6dd56a3 New translations firefly.php (Dutch) 2017-09-27 15:51:35 +02:00
James Cole
a7969dd4b4 New translations firefly.php (Russian) 2017-09-27 15:51:06 +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
12df3d7b8e New translations firefly.php (Polish) 2017-09-27 14:52:47 +02:00
James Cole
e564a4a0d3 New translations firefly.php (Portuguese, Brazilian) 2017-09-27 14:52:40 +02:00
James Cole
b2a9128b2b New translations firefly.php (Slovenian) 2017-09-27 14:52:33 +02:00
James Cole
866bcbf702 New translations firefly.php (Spanish) 2017-09-27 14:52:27 +02:00
James Cole
6d538dc568 New translations firefly.php (German) 2017-09-27 14:52:20 +02:00
James Cole
c5737c7fc9 New translations firefly.php (French) 2017-09-27 14:52:12 +02:00
James Cole
c60c0a93a4 New translations firefly.php (Dutch) 2017-09-27 14:52:02 +02:00
James Cole
ed7119bae5 New translations firefly.php (Russian) 2017-09-27 14:51:30 +02:00
James Cole
c9cb310a2f Remove crappy translation of link types. Still needs a solution. 2017-09-27 14:50:04 +02:00
James Cole
fdfe18a952 Fix code for boxes. 2017-09-27 14:42:12 +02:00
James Cole
5631daa173 New translations firefly.php (Polish) 2017-09-27 14:42:02 +02:00
James Cole
38aa22fa5f New translations firefly.php (Portuguese, Brazilian) 2017-09-27 14:41:55 +02:00
James Cole
eab7d400e5 New translations firefly.php (Slovenian) 2017-09-27 14:41:50 +02:00
James Cole
29e6fba089 New translations firefly.php (Spanish) 2017-09-27 14:41:44 +02:00
James Cole
979cb605f5 New translations firefly.php (German) 2017-09-27 14:41:39 +02:00
James Cole
be4db5983d New translations firefly.php (French) 2017-09-27 14:41:31 +02:00
James Cole
aabcbaa665 New translations firefly.php (Dutch) 2017-09-27 14:41:23 +02:00
James Cole
dc18db5a17 New translations firefly.php (Russian) 2017-09-27 14:40:56 +02:00
James Cole
fb140b1379 Missing language strings [skip ci] 2017-09-27 14:31:02 +02:00
James Cole
97be088716 Add FF version in CSS for easier updates [skip ci] 2017-09-27 08:49:59 +02:00
James Cole
3e39deec36 Updated website boxes. 2017-09-27 08:45:27 +02:00
James Cole
6f55049fb6 Complex but workable code for #865 2017-09-26 10:59:17 +02:00
James Cole
066d114dfe New translations firefly.php (Polish) 2017-09-26 09:21:11 +02:00
James Cole
acb8bd7244 New translations firefly.php (Portuguese, Brazilian) 2017-09-26 09:21:08 +02:00
James Cole
d75a1583cc New translations firefly.php (Slovenian) 2017-09-26 09:21:05 +02:00
James Cole
c553f9eee0 New translations firefly.php (Spanish) 2017-09-26 09:21:02 +02:00
James Cole
117059077f New translations firefly.php (German) 2017-09-26 09:20:58 +02:00
James Cole
c3555bae1f New translations firefly.php (French) 2017-09-26 09:20:55 +02:00
James Cole
2c7ab07b41 New translations firefly.php (Dutch) 2017-09-26 09:20:51 +02:00
James Cole
12f31ffb81 New translations form.php (Dutch) 2017-09-26 09:20:48 +02:00
James Cole
3cb4cc88e8 New translations form.php (French) 2017-09-26 09:20:47 +02:00
James Cole
82ea17d2eb New translations form.php (Spanish) 2017-09-26 09:20:43 +02:00
James Cole
61ac8adc7d New translations form.php (German) 2017-09-26 09:20:42 +02:00
James Cole
7681a2a544 New translations form.php (Polish) 2017-09-26 09:20:40 +02:00
James Cole
5a5bce953c New translations form.php (Portuguese, Brazilian) 2017-09-26 09:20:39 +02:00
James Cole
1263fd7b98 New translations form.php (Slovenian) 2017-09-26 09:20:38 +02:00
James Cole
c3ea62aa44 New translations firefly.php (Russian) 2017-09-26 09:20:29 +02:00
James Cole
82ebf92b06 New translations form.php (Russian) 2017-09-26 09:20:26 +02:00
James Cole
d99adb515a More code for #857 2017-09-26 09:15:21 +02:00
James Cole
5ca239e177 New translations firefly.php (Polish) 2017-09-26 09:01:19 +02:00
James Cole
b525893c39 New translations firefly.php (Portuguese, Brazilian) 2017-09-26 09:01:16 +02:00
James Cole
7cdc159a50 New translations firefly.php (Slovenian) 2017-09-26 09:01:13 +02:00
James Cole
0f441aef42 New translations firefly.php (Spanish) 2017-09-26 09:01:11 +02:00
James Cole
6497dc1701 New translations firefly.php (German) 2017-09-26 09:01:08 +02:00
James Cole
bbe13487d3 New translations firefly.php (French) 2017-09-26 09:01:05 +02:00
James Cole
8fc6f82a04 New translations firefly.php (Dutch) 2017-09-26 09:01:01 +02:00
James Cole
e791215bb8 New translations form.php (Dutch) 2017-09-26 09:00:59 +02:00
James Cole
db83d541b4 New translations form.php (French) 2017-09-26 09:00:58 +02:00
James Cole
08bc3e7596 New translations form.php (Spanish) 2017-09-26 09:00:55 +02:00
James Cole
9c47c6173f New translations form.php (German) 2017-09-26 09:00:53 +02:00
James Cole
1458300768 New translations form.php (Polish) 2017-09-26 09:00:52 +02:00
James Cole
1752ea527d New translations form.php (Portuguese, Brazilian) 2017-09-26 09:00:50 +02:00
James Cole
acea869a98 New translations form.php (Slovenian) 2017-09-26 09:00:49 +02:00
James Cole
91426b9491 New translations firefly.php (Russian) 2017-09-26 09:00:41 +02:00
James Cole
0491623313 New translations form.php (Russian) 2017-09-26 09:00:38 +02:00
James Cole
91e96aa4b9 New code for email address change in profile. See #857 2017-09-26 08:52:16 +02:00
James Cole
c099572fd8 New translations firefly.php (Polish) 2017-09-25 09:31:43 +02:00
James Cole
7d481efff9 New translations firefly.php (Portuguese, Brazilian) 2017-09-25 09:31:41 +02:00
James Cole
a210112dc6 New translations firefly.php (Slovenian) 2017-09-25 09:31:38 +02:00
James Cole
04e4eea735 New translations firefly.php (Spanish) 2017-09-25 09:31:35 +02:00
James Cole
3e0fb03a0b New translations firefly.php (German) 2017-09-25 09:31:32 +02:00
James Cole
17d042d4a2 New translations firefly.php (French) 2017-09-25 09:31:28 +02:00
James Cole
a54883ab91 New translations firefly.php (Dutch) 2017-09-25 09:31:24 +02:00
James Cole
dfb3f81b69 New translations firefly.php (Russian) 2017-09-25 09:31:10 +02:00
James Cole
ea1d543795 Fix #853 2017-09-25 09:28:16 +02:00
James Cole
c917d2b1c4 Improve readme [skip ci] 2017-09-25 07:40:49 +02:00
James Cole
96419fb359 Fix #847 2017-09-25 07:32:29 +02:00
James Cole
0b0e0054b3 Fix tests. 2017-09-25 07:01:52 +02:00
James Cole
1199a44f92 New translations firefly.php (Dutch) 2017-09-25 06:20:08 +02:00
James Cole
1a81cd45f2 Fix #866 2017-09-25 06:14:37 +02:00
James Cole
6134372101 New translations list.php (Dutch) 2017-09-25 06:10:05 +02:00
James Cole
4ec830a2e3 Fix list overview [skip ci] 2017-09-25 06:10:04 +02:00
James Cole
73df3040ca Fix list overview [skip ci] 2017-09-25 06:04:37 +02:00
James Cole
0dc5282898 New translations firefly.php (Polish) 2017-09-24 21:20:58 +02:00
James Cole
fafa0bfeef New translations firefly.php (Portuguese, Brazilian) 2017-09-24 21:20:55 +02:00
James Cole
e7e512e2f8 New translations firefly.php (Slovenian) 2017-09-24 21:20:52 +02:00
James Cole
467571d3bb New translations firefly.php (Spanish) 2017-09-24 21:20:50 +02:00
James Cole
11b01f0cd8 New translations firefly.php (German) 2017-09-24 21:20:47 +02:00
James Cole
f069ee1b0f New translations firefly.php (French) 2017-09-24 21:20:44 +02:00
James Cole
e51ff88671 New translations firefly.php (Dutch) 2017-09-24 21:20:42 +02:00
James Cole
ee68f1df3e New translations list.php (French) 2017-09-24 21:20:39 +02:00
James Cole
456ec4ee0a New translations list.php (German) 2017-09-24 21:20:37 +02:00
James Cole
9c17594c34 New translations list.php (Polish) 2017-09-24 21:20:36 +02:00
James Cole
2dfc37c1d8 New translations list.php (Portuguese, Brazilian) 2017-09-24 21:20:35 +02:00
James Cole
1d36221607 New translations list.php (Dutch) 2017-09-24 21:20:34 +02:00
James Cole
388c886552 New translations list.php (Slovenian) 2017-09-24 21:20:26 +02:00
James Cole
fde2dd1c92 New translations list.php (Spanish) 2017-09-24 21:20:25 +02:00
James Cole
42898846c6 New translations firefly.php (Russian) 2017-09-24 21:20:24 +02:00
James Cole
a475c99987 New translations list.php (Russian) 2017-09-24 21:20:21 +02:00
James Cole
ac0e2c9885 Merge branch 'develop' of https://github.com/firefly-iii/firefly-iii into develop
* 'develop' of https://github.com/firefly-iii/firefly-iii:
  New translation strings.
  Update JournalRepository.php
  Update Amount.php
  Update ImportStorage.php
  Fix #854
  Enable mod_ssl by default
2017-09-24 21:18:57 +02:00
James Cole
260ef1a07e Tag view update. 2017-09-24 21:18:43 +02:00
James Cole
9d59a9b83e New translations form.php (Dutch) 2017-09-21 09:00:21 +02:00
James Cole
c5434aba13 New translations firefly.php (Polish) 2017-09-21 07:00:59 +02:00
James Cole
dd33b96c12 New translations firefly.php (Portuguese, Brazilian) 2017-09-21 07:00:57 +02:00
James Cole
349e449cb8 New translations firefly.php (Slovenian) 2017-09-21 07:00:54 +02:00
James Cole
0524ca0297 New translations firefly.php (Spanish) 2017-09-21 07:00:51 +02:00
James Cole
7bdaf8bac3 New translations firefly.php (German) 2017-09-21 07:00:48 +02:00
James Cole
1dd62a1934 New translations firefly.php (French) 2017-09-21 07:00:45 +02:00
James Cole
0a4c4729cf New translations firefly.php (Dutch) 2017-09-21 07:00:42 +02:00
James Cole
daf4c2ad49 New translations form.php (Dutch) 2017-09-21 07:00:40 +02:00
James Cole
2e60ab8763 New translations form.php (French) 2017-09-21 07:00:39 +02:00
James Cole
62d58afb68 New translations form.php (Spanish) 2017-09-21 07:00:36 +02:00
James Cole
93cd7310f4 New translations form.php (German) 2017-09-21 07:00:34 +02:00
James Cole
1b8f4f7735 New translations form.php (Polish) 2017-09-21 07:00:33 +02:00
James Cole
d446c1c5e7 New translations form.php (Portuguese, Brazilian) 2017-09-21 07:00:32 +02:00
James Cole
d5bfe682fe New translations form.php (Slovenian) 2017-09-21 07:00:31 +02:00
James Cole
47fc3398e0 New translations firefly.php (Russian) 2017-09-21 07:00:24 +02:00
James Cole
62bd6d13d1 New translations form.php (Russian) 2017-09-21 07:00:21 +02:00
James Cole
9f1ea0807b Merge branch 'develop' of github.com:JC5/firefly-iii into develop 2017-09-21 06:51:31 +02:00
James Cole
9c5b639986 New translation strings. 2017-09-21 06:50:58 +02:00
James Cole
ec73607974 Update JournalRepository.php
Fix #860
2017-09-20 08:35:20 +02:00
James Cole
e442eb6ce2 Update Amount.php
Fix null pointer #854
2017-09-20 08:31:00 +02:00
James Cole
a7e5072c8e New translations firefly.php (Dutch) 2017-09-19 08:00:07 +02:00
James Cole
db9c0600a8 Update ImportStorage.php
Fix for #854
2017-09-19 07:51:16 +02:00
James Cole
cea1673058 New translations list.php (Dutch) 2017-09-18 14:40:07 +02:00
James Cole
3f93941dd9 Fix #854 2017-09-17 19:21:03 +02:00
James Cole
4fa33c892a Merge pull request #855 from ms32035/mod_ssl
Enable mod_ssl in docker container
2017-09-17 19:14:26 +02:00
Marcin Szymanski
fb3230845d Enable mod_ssl by default 2017-09-17 14:42:29 +01:00
James Cole
37250cbde3 Various code cleanup. 2017-09-16 09:24:48 +02:00
James Cole
3424ec1c27 Various code cleanup. 2017-09-16 07:41:03 +02:00
James Cole
fe9adba7fb Reinstate secure pw check and single user verification. 2017-09-16 07:18:15 +02:00
James Cole
b1135cee60 Various code cleanup 2017-09-16 07:17:58 +02:00
James Cole
d44347d7d6 New translations firefly.php (Polish) 2017-09-16 07:00:54 +02:00
James Cole
f04a28215e New translations firefly.php (Portuguese, Brazilian) 2017-09-16 07:00:51 +02:00
James Cole
7b54d93c52 New translations firefly.php (Slovenian) 2017-09-16 07:00:48 +02:00
James Cole
a61999baff New translations firefly.php (Spanish) 2017-09-16 07:00:46 +02:00
James Cole
fbeb4b60a3 New translations firefly.php (German) 2017-09-16 07:00:43 +02:00
James Cole
91b7c307b6 New translations firefly.php (French) 2017-09-16 07:00:40 +02:00
James Cole
92239322f9 New translations firefly.php (Dutch) 2017-09-16 07:00:37 +02:00
James Cole
128f9cc9eb New translations firefly.php (Russian) 2017-09-16 07:00:22 +02:00
James Cole
bbab89d884 Fixes #848 2017-09-16 06:52:53 +02:00
James Cole
6fd040d420 Fix null pointer exception. #846 2017-09-15 17:35:44 +02:00
James Cole
c8cec91a93 Add debug info to job change status [skip ci] 2017-09-15 07:00:53 +02:00
James Cole
38bb074751 Fix storage bug in #845 2017-09-15 06:26:09 +02:00
James Cole
337088b567 New translations firefly.php (Portuguese, Brazilian) 2017-09-14 21:21:18 +02:00
James Cole
1727273d98 New translations firefly.php (Spanish) 2017-09-14 21:21:14 +02:00
James Cole
adeb569d84 New translations firefly.php (German) 2017-09-14 21:21:11 +02:00
James Cole
dd8142e26a New translations firefly.php (French) 2017-09-14 21:21:08 +02:00
James Cole
50df395f72 New translations firefly.php (Dutch) 2017-09-14 21:21:04 +02:00
James Cole
519ca4b2af Improve export routine and cron job for #837 2017-09-14 21:17:19 +02:00
James Cole
f54b4c3abc Implement access token for command line things. 2017-09-14 18:27:22 +02:00
James Cole
43a66fd378 Export job. 2017-09-14 18:10:38 +02:00
James Cole
f4938cfed7 Debug text in import routine. 2017-09-14 18:10:31 +02:00
James Cole
6badf101d7 Small cosmetic changes to export routine. 2017-09-14 18:03:39 +02:00
James Cole
3d27f22d2e New translations firefly.php (Polish) 2017-09-14 17:51:05 +02:00
James Cole
acac5f8ea2 New translations firefly.php (Portuguese, Brazilian) 2017-09-14 17:51:02 +02:00
James Cole
1d1b3afab5 New translations firefly.php (Slovenian) 2017-09-14 17:50:59 +02:00
James Cole
ad2c6390a6 New translations firefly.php (Spanish) 2017-09-14 17:50:56 +02:00
James Cole
c16bcf7b57 New translations firefly.php (German) 2017-09-14 17:50:51 +02:00
James Cole
7ecf5804bc New translations firefly.php (French) 2017-09-14 17:50:48 +02:00
James Cole
b43e197dde New translations firefly.php (Dutch) 2017-09-14 17:50:44 +02:00
James Cole
48bd80d4c4 New translations firefly.php (Russian) 2017-09-14 17:50:28 +02:00
James Cole
fc67c9a476 Add missing translation for #843 2017-09-14 17:45:43 +02:00
James Cole
ca861e2a5d New translations list.php (French) 2017-09-14 17:42:53 +02:00
James Cole
a626f71b9f New translations list.php (German) 2017-09-14 17:42:52 +02:00
James Cole
d0f1509a9e New translations list.php (Polish) 2017-09-14 17:42:50 +02:00
James Cole
64194da2f2 New translations list.php (Portuguese, Brazilian) 2017-09-14 17:42:49 +02:00
James Cole
f4ac589eab New translations list.php (Dutch) 2017-09-14 17:42:48 +02:00
James Cole
96b2184d27 New translations list.php (Slovenian) 2017-09-14 17:42:39 +02:00
James Cole
e196ff7281 New translations list.php (Spanish) 2017-09-14 17:42:38 +02:00
James Cole
bc05afeabb New translations list.php (Russian) 2017-09-14 17:42:35 +02:00
James Cole
5e900736f8 Various code cleanup. 2017-09-14 17:40:02 +02:00
James Cole
761e9effae Fix tests 2017-09-14 17:34:22 +02:00
James Cole
e0f1211896 Update config to account for namespace. 2017-09-14 17:29:21 +02:00
James Cole
fc5494e7f4 Restore test env. file. 2017-09-14 17:10:33 +02:00
James Cole
45a05111e6 New translations firefly.php (Dutch) 2017-09-14 16:40:12 +02:00
James Cole
afe9d109b3 Small layout change [skip ci] 2017-09-14 16:13:25 +02:00
James Cole
768c7e53b4 Show message when locale is invalid. 2017-09-14 16:12:07 +02:00
James Cole
a20d9fa8f1 Add missing translations #843 2017-09-14 16:11:55 +02:00
James Cole
d60ae63153 New translations firefly.php (Polish) 2017-09-14 16:11:24 +02:00
James Cole
1a1c85b268 New translations firefly.php (Portuguese, Brazilian) 2017-09-14 16:11:20 +02:00
James Cole
dd3ddaa838 New translations firefly.php (Slovenian) 2017-09-14 16:11:16 +02:00
James Cole
56fcf73ce1 New translations firefly.php (Spanish) 2017-09-14 16:11:13 +02:00
James Cole
c9e7018490 Fix null pointer 2017-09-14 16:11:10 +02:00
James Cole
bc6a34bb47 New translations firefly.php (German) 2017-09-14 16:11:09 +02:00
James Cole
fcf350b06b New translations firefly.php (French) 2017-09-14 16:11:03 +02:00
James Cole
6c393fb8e0 New translations firefly.php (Dutch) 2017-09-14 16:10:57 +02:00
James Cole
d7ef5df8c3 New translations firefly.php (Russian) 2017-09-14 16:10:37 +02:00
James Cole
e250ffbd18 Add missing translations #843 2017-09-14 16:03:27 +02:00
James Cole
4b5f500dc1 Filter out opening balances. #839 2017-09-14 10:39:24 +02:00
James Cole
6d69832711 Extra big buttons for ##838 2017-09-14 10:32:58 +02:00
James Cole
233305ecb4 Change namespace of rules. 2017-09-13 07:49:58 +02:00
James Cole
78f9fbae40 New translations firefly.php (Polish) 2017-09-12 23:10:10 +02:00
James Cole
be46aa77f2 New translations firefly.php (Polish) 2017-09-12 22:41:07 +02:00
James Cole
e741ba2f65 New translations firefly.php (Portuguese, Brazilian) 2017-09-12 22:41:03 +02:00
James Cole
3203f7e1b7 New translations firefly.php (Slovenian) 2017-09-12 22:40:59 +02:00
James Cole
f4aa982247 New translations firefly.php (Spanish) 2017-09-12 22:40:55 +02:00
James Cole
27c1f1d0d5 New translations firefly.php (German) 2017-09-12 22:40:51 +02:00
James Cole
e291e32a29 New translations firefly.php (French) 2017-09-12 22:40:48 +02:00
James Cole
9072388dd0 New translations firefly.php (Dutch) 2017-09-12 22:40:44 +02:00
James Cole
5f4da0f6a4 New translations firefly.php (Russian) 2017-09-12 22:40:26 +02:00
James Cole
0583aa53a9 Fix typo [skip ci] #836 2017-09-12 22:30:48 +02:00
James Cole
1d3ace5f21 Fix for #835 2017-09-12 22:28:14 +02:00
James Cole
3e8fe70915 Update error handler. 2017-09-12 22:14:43 +02:00
James Cole
bf8ce5471e Fix bug in #836 2017-09-12 22:11:45 +02:00
James Cole
262f8a33c6 Fixed validation rules. 2017-09-12 21:44:31 +02:00
James Cole
4f934e54cf Easier upgrade, include FF version in JS 2017-09-12 19:59:07 +02:00
James Cole
158bf06efb Update version (is also a test) 2017-09-12 19:57:56 +02:00
James Cole
436017baee Introduce version to template. Rename Javascript URI 2017-09-12 19:57:41 +02:00
James Cole
05e55696bb New translations firefly.php (Polish) 2017-09-12 19:51:09 +02:00
James Cole
f825b5923c New translations firefly.php (Portuguese, Brazilian) 2017-09-12 19:51:06 +02:00
James Cole
9a9893236e New translations firefly.php (Slovenian) 2017-09-12 19:51:02 +02:00
James Cole
0ee843988f New translations firefly.php (Spanish) 2017-09-12 19:50:59 +02:00
James Cole
adf7e10879 New translations firefly.php (German) 2017-09-12 19:50:56 +02:00
James Cole
59e449c806 New translations firefly.php (French) 2017-09-12 19:50:52 +02:00
James Cole
cc05bfa181 New translations firefly.php (Dutch) 2017-09-12 19:50:49 +02:00
James Cole
b8c7aa68b4 New translations firefly.php (Russian) 2017-09-12 19:50:31 +02:00
James Cole
6e80b2f4c8 Update tests. 2017-09-12 19:47:29 +02:00
James Cole
ce205ab413 Various small fixes. 2017-09-12 18:24:42 +02:00
James Cole
626a9aac4b Update gitignore. 2017-09-12 18:24:19 +02:00
James Cole
73d85ca8c6 Update kernel so it works. 2017-09-12 18:24:12 +02:00
James Cole
96795fe197 New translations form.php (French) 2017-09-12 17:30:17 +02:00
James Cole
5cacf15322 New translations firefly.php (French) 2017-09-12 17:30:11 +02:00
James Cole
590ce971bf New translations firefly.php (French) 2017-09-12 17:20:12 +02:00
James Cole
7d5e93650b New translations firefly.php (French) 2017-09-12 15:20:12 +02:00
James Cole
561dc57c03 New translations firefly.php (French) 2017-09-12 15:10:14 +02:00
James Cole
625d626b25 New translations firefly.php (French) 2017-09-12 15:00:15 +02:00
James Cole
dcfec9bd89 New translations firefly.php (French) 2017-09-12 14:50:11 +02:00
James Cole
f1ff681b06 New translations firefly.php (French) 2017-09-12 14:40:14 +02:00
James Cole
9bc9aa0bb0 Add bcscale again. 2017-09-10 09:54:00 +02:00
James Cole
24ea20f769 Various changes to make things work again. 2017-09-10 09:46:50 +02:00
James Cole
1faa520168 Update composer files. 2017-09-10 08:43:03 +02:00
James Cole
7e30d761c5 No longer necessary 2017-09-10 08:42:48 +02:00
James Cole
750aa80b7c Updated docker example file. 2017-09-10 08:40:02 +02:00
James Cole
861941353b Update env example file. 2017-09-10 08:39:00 +02:00
James Cole
3fda7aa1e5 Update Kernel file to work with Laravel 5.5 2017-09-10 08:33:51 +02:00
James Cole
6f886e6eaa Changes required to make FF work again. 2017-09-10 08:30:27 +02:00
James Cole
9223f3ef71 Various updated files. 2017-09-09 22:32:11 +02:00
James Cole
6dbf4a3e49 New translations firefly.php (Polish) 2017-09-09 22:30:07 +02:00
James Cole
3b9b74b5ea Example test should point to /login 2017-09-09 22:11:33 +02:00
James Cole
418a6ab5ad This removes the bcscale thing which is very necessary. 2017-09-09 22:10:56 +02:00
James Cole
2268155994 Various files 2017-09-09 22:10:43 +02:00
James Cole
b219283d66 New validation thing is taking my namespace 2017-09-09 22:06:30 +02:00
James Cole
f077adaefd Separated providers. 2017-09-09 22:06:13 +02:00
James Cole
8823666aa9 CSRF middleware separated. 2017-09-09 22:03:54 +02:00
James Cole
ff9146ab91 Authentication in separate commit. 2017-09-09 22:03:27 +02:00
James Cole
c40be5299c Kernel middleware in separate commit. 2017-09-09 22:02:20 +02:00
James Cole
dcb2f45124 New translations firefly.php (Polish) 2017-09-09 22:00:55 +02:00
James Cole
f6322440cf New translations firefly.php (Portuguese, Brazilian) 2017-09-09 22:00:52 +02:00
James Cole
21e4108fd8 New translations firefly.php (Slovenian) 2017-09-09 22:00:49 +02:00
James Cole
8e33688268 New translations firefly.php (Spanish) 2017-09-09 22:00:47 +02:00
James Cole
a3fb2717cb New translations firefly.php (German) 2017-09-09 22:00:44 +02:00
James Cole
8017cf9d34 New translations firefly.php (French) 2017-09-09 22:00:41 +02:00
James Cole
8fe304e65b New translations firefly.php (Dutch) 2017-09-09 22:00:38 +02:00
James Cole
28485e461e New translations firefly.php (Russian) 2017-09-09 22:00:23 +02:00
James Cole
bf270745f0 Separate commit for error handler. 2017-09-09 21:57:45 +02:00
James Cole
d1e60cd546 First step towards Laravel 5.5 2017-09-09 21:57:24 +02:00
James Cole
834db4d02f New sentence for journal links. 2017-09-09 21:52:12 +02:00
James Cole
2f8d75eb73 Fix for #827 2017-09-09 18:44:05 +02:00
James Cole
53eef3fda7 Catch for #822 2017-09-09 18:37:47 +02:00
James Cole
0bcc010de8 Create link types when they do not exist in verify routine. #826 2017-09-09 18:36:17 +02:00
James Cole
b43bf35e98 Merge pull request #824 from DieBauer/823-dockerfile
Docker: Use working directory instead of hardcoded dist version
2017-09-09 18:22:59 +02:00
James Cole
769023e36c New translations firefly.php (Polish) 2017-09-09 17:20:07 +02:00
Jens Kat
2bf47f6d58 Use environment variable for install dir 2017-09-09 13:17:01 +02:00
Jens Kat
a3e1821ca0 Docker: Use working directory instead of hardcoded dist version
- By using the current (.) working directory, we can get the latest changes in the Docker image.
  If the building of Docker images is automated, it will automatically pick up the checked out version.
- Rearrange some Docker layers things that don't invalidate that much.
2017-09-09 12:51:37 +02:00
James Cole
dc1754bca7 New translations firefly.php (Polish) 2017-09-09 08:41:03 +02:00
James Cole
8879d76dd9 New translations firefly.php (Portuguese, Brazilian) 2017-09-09 08:41:01 +02:00
James Cole
cec99b83a0 New translations firefly.php (Slovenian) 2017-09-09 08:40:59 +02:00
James Cole
498873c208 New translations firefly.php (Spanish) 2017-09-09 08:40:56 +02:00
James Cole
80c8f131c8 New translations firefly.php (German) 2017-09-09 08:40:53 +02:00
James Cole
7344bd9054 New translations firefly.php (French) 2017-09-09 08:40:49 +02:00
James Cole
44b4e146eb New translations firefly.php (Dutch) 2017-09-09 08:40:45 +02:00
James Cole
e330eafc91 New translations form.php (Dutch) 2017-09-09 08:40:44 +02:00
James Cole
b9e7541cf6 New translations form.php (French) 2017-09-09 08:40:43 +02:00
James Cole
0d595d576a New translations list.php (French) 2017-09-09 08:40:41 +02:00
James Cole
ab602c98d9 New translations list.php (German) 2017-09-09 08:40:40 +02:00
James Cole
a0722fe022 New translations list.php (Polish) 2017-09-09 08:40:39 +02:00
James Cole
4454c0b911 New translations list.php (Portuguese, Brazilian) 2017-09-09 08:40:38 +02:00
James Cole
ae61064029 New translations list.php (Dutch) 2017-09-09 08:40:37 +02:00
James Cole
21168b8a49 New translations form.php (Spanish) 2017-09-09 08:40:36 +02:00
James Cole
077a3fb5a8 New translations form.php (German) 2017-09-09 08:40:35 +02:00
James Cole
8266cdba66 New translations form.php (Polish) 2017-09-09 08:40:34 +02:00
James Cole
aa0d3fd54c New translations form.php (Portuguese, Brazilian) 2017-09-09 08:40:32 +02:00
James Cole
86080ad871 New translations form.php (Slovenian) 2017-09-09 08:40:31 +02:00
James Cole
6b8144e8af New translations list.php (Slovenian) 2017-09-09 08:40:26 +02:00
James Cole
10ab561fbb New translations list.php (Spanish) 2017-09-09 08:40:24 +02:00
James Cole
5d3606c12d New translations firefly.php (Russian) 2017-09-09 08:40:23 +02:00
James Cole
e8d74bd735 New translations form.php (Russian) 2017-09-09 08:40:20 +02:00
James Cole
7c791d4fbf New translations list.php (Russian) 2017-09-09 08:40:19 +02:00
James Cole
ee2fba415a Remove unused translations. 2017-09-09 08:32:45 +02:00
James Cole
81bef28607 Merge branch 'release/4.6.5' 2017-09-09 07:21:53 +02:00
James Cole
d46ba4325f Updated composer file 2017-09-09 07:21:20 +02:00
James Cole
e044670c55 Merge pull request #789 from firefly-iii/l10n_develop
New Crowdin translations
2017-09-09 07:09:46 +02:00
James Cole
66c13f35e7 Various code cleanup. 2017-09-09 07:03:43 +02:00
James Cole
f2cb675267 New change log. [skip ci] 2017-09-09 06:57:03 +02:00
James Cole
6f9b69a032 Version upgrade. 2017-09-09 06:42:09 +02:00
James Cole
3a3eb4e84f Various code cleanup. 2017-09-09 06:41:45 +02:00
James Cole
c81955d84a New translations firefly.php (Dutch) 2017-09-09 06:30:07 +02:00
James Cole
0543733e3d Various code cleanup. 2017-09-09 06:28:21 +02:00
James Cole
336fb5f5a6 Fix #820 2017-09-09 06:25:20 +02:00
James Cole
6d592d45b0 New translations firefly.php (Polish) 2017-09-08 21:20:14 +02:00
James Cole
45d2467772 New translations firefly.php (Spanish) 2017-09-08 20:41:15 +02:00
James Cole
643248f9e4 New translations firefly.php (Slovenian) 2017-09-08 20:41:10 +02:00
James Cole
94b18798ed New translations firefly.php (Portuguese, Brazilian) 2017-09-08 20:41:07 +02:00
James Cole
4a18178a86 New translations firefly.php (Dutch) 2017-09-08 20:41:03 +02:00
James Cole
7bdde6822b New translations firefly.php (French) 2017-09-08 20:40:59 +02:00
James Cole
a118588fe7 New translations firefly.php (Polish) 2017-09-08 20:40:55 +02:00
James Cole
88bc81b9f5 New translations firefly.php (German) 2017-09-08 20:40:51 +02:00
James Cole
1af68843b0 New translations firefly.php (Russian) 2017-09-08 20:40:33 +02:00
James Cole
f704ade86b Fix #818 2017-09-08 20:37:46 +02:00
James Cole
2dff8aec69 Code for #819 2017-09-08 20:24:11 +02:00
James Cole
aae26c5da9 Can edit rule group #794 2017-09-08 20:12:55 +02:00
James Cole
2dbdcf73ed Possible fix for #724 2017-09-08 20:07:22 +02:00
James Cole
9960b063e7 New translations firefly.php (French) 2017-09-06 14:40:17 +02:00
James Cole
13834a276e New translations firefly.php (Dutch) 2017-09-06 08:50:12 +02:00
James Cole
a50945ad53 Fix #814 2017-09-05 20:50:19 +02:00
James Cole
068b9e388f New code for double transfer routine. #797 2017-09-05 06:43:33 +02:00
James Cole
6158288295 New translations firefly.php (German) 2017-09-03 21:00:07 +02:00
James Cole
b9fc298a0a New translations firefly.php (Polish) 2017-09-03 19:30:10 +02:00
James Cole
a697b0735f New translations firefly.php (Polish) 2017-09-03 19:20:09 +02:00
James Cole
6b82a8b29a New translations list.php (Dutch) 2017-09-03 18:30:44 +02:00
James Cole
158377a522 New translations list.php (French) 2017-09-03 18:30:43 +02:00
James Cole
3d32b8eb59 New translations list.php (German) 2017-09-03 18:30:34 +02:00
James Cole
9bc53c6644 New translations list.php (Polish) 2017-09-03 18:30:34 +02:00
James Cole
a1b9baae30 New translations list.php (Russian) 2017-09-03 18:30:28 +02:00
James Cole
6b6132b91b New translations validation.php (Russian) 2017-09-03 18:30:26 +02:00
James Cole
fdf26905c6 New translations list.php (Portuguese, Brazilian) 2017-09-03 18:30:22 +02:00
James Cole
8f3731dabe New translations list.php (Slovenian) 2017-09-03 18:30:21 +02:00
James Cole
e3521692ca New translations list.php (Spanish) 2017-09-03 18:30:19 +02:00
James Cole
dc8df37f5a New translations validation.php (Polish) 2017-09-03 18:30:17 +02:00
James Cole
141ae05cd6 New translations validation.php (Portuguese, Brazilian) 2017-09-03 18:30:16 +02:00
James Cole
584f4fb286 New translations validation.php (Slovenian) 2017-09-03 18:30:14 +02:00
James Cole
fdec8ab6a2 New translations validation.php (Spanish) 2017-09-03 18:30:13 +02:00
James Cole
3f79ffecaf New translations validation.php (German) 2017-09-03 18:30:12 +02:00
James Cole
5ee071fdc7 New translations validation.php (French) 2017-09-03 18:30:11 +02:00
James Cole
88e0985776 New translations validation.php (Dutch) 2017-09-03 18:30:08 +02:00
James Cole
a942313f85 Remove obsolete strings. 2017-09-03 18:20:08 +02:00
James Cole
f2446d46aa Code for #797 2017-09-03 18:19:58 +02:00
James Cole
78c8680300 Expand log for #797 2017-09-03 18:18:19 +02:00
James Cole
1cb979404b New translations form.php (Polish) 2017-09-03 17:00:09 +02:00
James Cole
44a017db99 New translations list.php (Polish) 2017-09-03 17:00:07 +02:00
James Cole
69a67ca977 New translations firefly.php (Polish) 2017-09-03 16:50:09 +02:00
James Cole
dd579cc19b New translations form.php (Polish) 2017-09-03 16:50:06 +02:00
James Cole
0346b09cb0 New translations firefly.php (Polish) 2017-09-03 16:40:07 +02:00
James Cole
eb15d2bbd8 New translations firefly.php (Polish) 2017-09-03 16:30:50 +02:00
James Cole
6a20f3113a New translations firefly.php (Polish) 2017-09-03 16:20:07 +02:00
James Cole
b4e8bb1e0f New translations firefly.php (Polish) 2017-09-03 16:10:09 +02:00
James Cole
83754960a6 Add messages for all levels. 2017-09-03 16:09:27 +02:00
James Cole
892f262261 Fix transaction controller tests 2017-09-03 16:06:37 +02:00
James Cole
0bccf0d734 New translations firefly.php (Polish) 2017-09-03 16:00:10 +02:00
James Cole
826dce324f New translations form.php (Polish) 2017-09-03 16:00:07 +02:00
James Cole
d9dad4387e Fix rule validation issues. 2017-09-03 15:57:13 +02:00
James Cole
62c4a9a7fc New translations firefly.php (Polish) 2017-09-03 15:50:06 +02:00
James Cole
386b069c83 New translations firefly.php (Polish) 2017-09-03 15:40:21 +02:00
James Cole
6a48c354b7 New translations firefly.php (Polish) 2017-09-03 15:30:07 +02:00
James Cole
ff0b1d0ec9 New translations firefly.php (Polish) 2017-09-03 15:20:09 +02:00
James Cole
ceaba5a11c New translations firefly.php (Polish) 2017-09-03 15:10:08 +02:00
James Cole
560bd6a92b New translations firefly.php (Polish) 2017-09-03 14:30:07 +02:00
James Cole
05103c0676 New translations firefly.php (Polish) 2017-09-03 14:20:07 +02:00
James Cole
88ea2aad28 New translations csv.php (Polish) 2017-09-03 14:10:06 +02:00
James Cole
55cd717df4 New translations demo.php (German) 2017-09-03 14:10:05 +02:00
James Cole
812e3d4a74 New translations firefly.php (Polish) 2017-09-03 14:00:17 +02:00
James Cole
5946e4b9b5 New translations firefly.php (German) 2017-09-03 14:00:14 +02:00
James Cole
ef54e0a845 New translations form.php (Polish) 2017-09-03 14:00:11 +02:00
James Cole
20597c5ee1 New translations help.php (German) 2017-09-03 14:00:09 +02:00
James Cole
057e76acd0 New translations breadcrumbs.php (Polish) 2017-09-03 14:00:08 +02:00
James Cole
3582d79530 New translations demo.php (German) 2017-09-03 14:00:07 +02:00
James Cole
1c72e742cf New translations validation.php (German) 2017-09-03 14:00:06 +02:00
James Cole
2ac582cd18 New translations firefly.php (German) 2017-09-03 13:50:08 +02:00
James Cole
e36302315c New translations form.php (German) 2017-09-03 13:50:06 +02:00
James Cole
e48d14e14a New translations firefly.php (German) 2017-09-03 13:40:10 +02:00
James Cole
608aa5c31e New translations firefly.php (Polish) 2017-09-03 13:40:07 +02:00
James Cole
533398115d New translations firefly.php (German) 2017-09-03 13:30:07 +02:00
James Cole
a8d69f850a New translations csv.php (German) 2017-09-03 13:20:08 +02:00
James Cole
98cb74e00c New translations firefly.php (German) 2017-09-03 13:20:07 +02:00
James Cole
49c5c9ba15 Include id in test. 2017-09-03 13:16:11 +02:00
James Cole
64979fd941 Add missing ID field. 2017-09-03 13:11:40 +02:00
James Cole
dccafee383 New translations firefly.php (German) 2017-09-03 13:10:07 +02:00
James Cole
0444ad5221 Debug message for #797 2017-09-03 13:02:19 +02:00
James Cole
693c6fb71b Debug message for #797 2017-09-03 13:00:36 +02:00
James Cole
d5bcaf42ac New translations firefly.php (German) 2017-09-03 13:00:07 +02:00
James Cole
b002635d1b Fixes #809 2017-09-03 12:56:45 +02:00
James Cole
19e3a10a28 Fixed #801 2017-09-03 12:50:29 +02:00
James Cole
1d87da7745 Fix nullpointer 2017-09-03 11:13:45 +02:00
James Cole
0840883546 New translations firefly.php (Spanish) 2017-09-03 11:10:53 +02:00
James Cole
9d283b85e2 New translations firefly.php (Slovenian) 2017-09-03 11:10:49 +02:00
James Cole
f031b6fa3f New translations firefly.php (Portuguese, Brazilian) 2017-09-03 11:10:47 +02:00
James Cole
4b03bc92c0 New translations firefly.php (Dutch) 2017-09-03 11:10:44 +02:00
James Cole
487c81eeb2 New translations firefly.php (French) 2017-09-03 11:10:41 +02:00
James Cole
26f71400e9 New translations firefly.php (Polish) 2017-09-03 11:10:39 +02:00
James Cole
daeb06ede8 New translations firefly.php (German) 2017-09-03 11:10:36 +02:00
James Cole
fe9705d33e New translations firefly.php (Russian) 2017-09-03 11:10:24 +02:00
James Cole
25ea1c8f5f Add text for empty box #800 2017-09-03 11:02:18 +02:00
James Cole
80a2fd485e New translations firefly.php (Spanish) 2017-09-03 11:00:54 +02:00
James Cole
18f8b102c3 New translations firefly.php (Slovenian) 2017-09-03 11:00:50 +02:00
James Cole
b99c8dd32a New translations firefly.php (Portuguese, Brazilian) 2017-09-03 11:00:47 +02:00
James Cole
52f1d96cfb New translations firefly.php (Dutch) 2017-09-03 11:00:44 +02:00
James Cole
c143d54c97 New translations firefly.php (French) 2017-09-03 11:00:41 +02:00
James Cole
ac3881779c New translations firefly.php (Polish) 2017-09-03 11:00:38 +02:00
James Cole
65e0700f2c New translations firefly.php (German) 2017-09-03 11:00:36 +02:00
James Cole
733cee5c8c New translations firefly.php (Russian) 2017-09-03 11:00:23 +02:00
James Cole
6b09466819 Implement #803 2017-09-03 10:51:02 +02:00
James Cole
b29c0f9d74 New translations auth.php (Dutch) 2017-09-03 10:42:27 +02:00
James Cole
5d239b896c New translations firefly.php (Spanish) 2017-09-03 10:42:26 +02:00
James Cole
52770a970b New translations form.php (French) 2017-09-03 10:42:23 +02:00
James Cole
bbf923b849 New translations form.php (German) 2017-09-03 10:42:21 +02:00
James Cole
d735c5d10b New translations firefly.php (Slovenian) 2017-09-03 10:42:20 +02:00
James Cole
2417224991 New translations firefly.php (Portuguese, Brazilian) 2017-09-03 10:42:18 +02:00
James Cole
d515bda868 New translations csv.php (Spanish) 2017-09-03 10:42:14 +02:00
James Cole
8e332119e3 New translations firefly.php (Dutch) 2017-09-03 10:42:13 +02:00
James Cole
5ac3dccb37 New translations firefly.php (French) 2017-09-03 10:42:11 +02:00
James Cole
e9354e1b6a New translations firefly.php (Polish) 2017-09-03 10:42:08 +02:00
James Cole
8700393e61 New translations firefly.php (German) 2017-09-03 10:42:06 +02:00
James Cole
8d76eaf633 New translations form.php (Polish) 2017-09-03 10:42:04 +02:00
James Cole
99b6eb3cd9 New translations form.php (Portuguese, Brazilian) 2017-09-03 10:42:02 +02:00
James Cole
36ffa46441 New translations help.php (Slovenian) 2017-09-03 10:42:01 +02:00
James Cole
d110fea710 New translations help.php (Spanish) 2017-09-03 10:41:59 +02:00
James Cole
09bd94d44e New translations list.php (Dutch) 2017-09-03 10:41:58 +02:00
James Cole
3b8b45d12d New translations list.php (French) 2017-09-03 10:41:57 +02:00
James Cole
39045fe2fc New translations help.php (Portuguese, Brazilian) 2017-09-03 10:41:56 +02:00
James Cole
b7e7c82bd7 New translations help.php (Polish) 2017-09-03 10:41:55 +02:00
James Cole
473eeaa206 New translations form.php (Slovenian) 2017-09-03 10:41:54 +02:00
James Cole
36b93d6d2b New translations help.php (Dutch) 2017-09-03 10:41:52 +02:00
James Cole
f24feb62c8 New translations help.php (German) 2017-09-03 10:41:51 +02:00
James Cole
69b82a5043 New translations help.php (French) 2017-09-03 10:41:50 +02:00
James Cole
547db2f27b New translations csv.php (Slovenian) 2017-09-03 10:41:48 +02:00
James Cole
6b6599eb79 New translations csv.php (Portuguese, Brazilian) 2017-09-03 10:41:47 +02:00
James Cole
fcad295809 New translations breadcrumbs.php (German) 2017-09-03 10:41:45 +02:00
James Cole
9a1e3701a3 New translations breadcrumbs.php (Polish) 2017-09-03 10:41:44 +02:00
James Cole
ba3b82cc87 New translations breadcrumbs.php (Portuguese, Brazilian) 2017-09-03 10:41:43 +02:00
James Cole
c768949034 New translations breadcrumbs.php (Dutch) 2017-09-03 10:41:42 +02:00
James Cole
4749c854bc New translations auth.php (Spanish) 2017-09-03 10:41:41 +02:00
James Cole
3887231051 New translations auth.php (French) 2017-09-03 10:41:40 +02:00
James Cole
3078adac2d New translations auth.php (German) 2017-09-03 10:41:39 +02:00
James Cole
ec40d91f85 New translations auth.php (Polish) 2017-09-03 10:41:38 +02:00
James Cole
399cb3bc3f New translations auth.php (Slovenian) 2017-09-03 10:41:37 +02:00
James Cole
fe2bba2c40 New translations auth.php (Portuguese, Brazilian) 2017-09-03 10:41:35 +02:00
James Cole
2bbdd76ee1 New translations breadcrumbs.php (Slovenian) 2017-09-03 10:41:34 +02:00
James Cole
a8ace43470 New translations breadcrumbs.php (Spanish) 2017-09-03 10:41:33 +02:00
James Cole
9c5c5b56ef New translations csv.php (Dutch) 2017-09-03 10:41:32 +02:00
James Cole
109b9000d2 New translations csv.php (French) 2017-09-03 10:41:30 +02:00
James Cole
2194cd9da1 New translations csv.php (German) 2017-09-03 10:41:27 +02:00
James Cole
ac2834954c New translations csv.php (Polish) 2017-09-03 10:41:26 +02:00
James Cole
136043bb23 New translations config.php (Spanish) 2017-09-03 10:41:24 +02:00
James Cole
459c0fc136 New translations config.php (Slovenian) 2017-09-03 10:41:23 +02:00
James Cole
22ab01c9ff New translations config.php (Dutch) 2017-09-03 10:41:22 +02:00
James Cole
cb7466247c New translations config.php (French) 2017-09-03 10:41:21 +02:00
James Cole
a87b1fca1b New translations config.php (German) 2017-09-03 10:41:20 +02:00
James Cole
0d4b971bd0 New translations config.php (Portuguese, Brazilian) 2017-09-03 10:41:18 +02:00
James Cole
2b6fe7cae7 New translations config.php (Polish) 2017-09-03 10:41:18 +02:00
James Cole
beb1ac4c9d New translations list.php (German) 2017-09-03 10:41:16 +02:00
James Cole
923cdcde16 New translations list.php (Polish) 2017-09-03 10:41:15 +02:00
James Cole
4ff4ca642c New translations csv.php (Russian) 2017-09-03 10:41:14 +02:00
James Cole
a968525d3f New translations firefly.php (Russian) 2017-09-03 10:41:12 +02:00
James Cole
f73a23db97 New translations form.php (Russian) 2017-09-03 10:41:09 +02:00
James Cole
4437cb67b9 New translations help.php (Russian) 2017-09-03 10:41:08 +02:00
James Cole
abfb47674c New translations config.php (Russian) 2017-09-03 10:41:06 +02:00
James Cole
f4deaf78e7 New translations breadcrumbs.php (Russian) 2017-09-03 10:41:05 +02:00
James Cole
38f588da1d New translations demo.php (Polish) 2017-09-03 10:41:04 +02:00
James Cole
d7be6fc9f6 New translations demo.php (Portuguese, Brazilian) 2017-09-03 10:41:02 +02:00
James Cole
dd4b640424 New translations demo.php (Slovenian) 2017-09-03 10:41:01 +02:00
James Cole
ffbe400e33 New translations auth.php (Russian) 2017-09-03 10:41:00 +02:00
James Cole
533ea67278 New translations demo.php (Spanish) 2017-09-03 10:40:59 +02:00
James Cole
9ad0bea76d New translations list.php (Russian) 2017-09-03 10:40:57 +02:00
James Cole
7d6bc09f18 New translations pagination.php (Russian) 2017-09-03 10:40:56 +02:00
James Cole
40a8a5a8e7 New translations intro.php (Portuguese, Brazilian) 2017-09-03 10:40:55 +02:00
James Cole
47c0a2cf03 New translations intro.php (Russian) 2017-09-03 10:40:54 +02:00
James Cole
2c787dd96d New translations intro.php (Slovenian) 2017-09-03 10:40:53 +02:00
James Cole
de340130b8 New translations intro.php (Polish) 2017-09-03 10:40:51 +02:00
James Cole
abc71e4cd6 New translations intro.php (German) 2017-09-03 10:40:50 +02:00
James Cole
444c2af5b0 New translations passwords.php (Russian) 2017-09-03 10:40:49 +02:00
James Cole
07277b7282 New translations validation.php (Russian) 2017-09-03 10:40:47 +02:00
James Cole
41f1bb1dbd New translations demo.php (Russian) 2017-09-03 10:40:45 +02:00
James Cole
ee337b9476 New translations intro.php (Dutch) 2017-09-03 10:40:44 +02:00
James Cole
1cbe63e293 New translations demo.php (German) 2017-09-03 10:40:42 +02:00
James Cole
eae3bf4d0e New translations demo.php (French) 2017-09-03 10:40:42 +02:00
James Cole
7502497827 New translations pagination.php (Portuguese, Brazilian) 2017-09-03 10:40:40 +02:00
James Cole
a66541fd04 New translations pagination.php (Slovenian) 2017-09-03 10:40:38 +02:00
James Cole
522d99477c New translations pagination.php (Spanish) 2017-09-03 10:40:37 +02:00
James Cole
3a4869205d New translations passwords.php (Dutch) 2017-09-03 10:40:36 +02:00
James Cole
5ae49e8e3e New translations pagination.php (Polish) 2017-09-03 10:40:35 +02:00
James Cole
915321db61 New translations pagination.php (German) 2017-09-03 10:40:34 +02:00
James Cole
bcd5b580cb New translations list.php (Portuguese, Brazilian) 2017-09-03 10:40:32 +02:00
James Cole
70226a24c9 New translations list.php (Slovenian) 2017-09-03 10:40:30 +02:00
James Cole
dd4995e02b New translations list.php (Spanish) 2017-09-03 10:40:29 +02:00
James Cole
46d3b70154 New translations pagination.php (French) 2017-09-03 10:40:28 +02:00
James Cole
540c03670b New translations pagination.php (Dutch) 2017-09-03 10:40:27 +02:00
James Cole
8037e4a4c4 New translations passwords.php (French) 2017-09-03 10:40:26 +02:00
James Cole
15a13be329 New translations passwords.php (German) 2017-09-03 10:40:24 +02:00
James Cole
9509825552 New translations validation.php (Polish) 2017-09-03 10:40:23 +02:00
James Cole
e46ef2f92c New translations validation.php (Portuguese, Brazilian) 2017-09-03 10:40:22 +02:00
James Cole
dc21afe14a New translations validation.php (Slovenian) 2017-09-03 10:40:21 +02:00
James Cole
7667c0fa4a New translations demo.php (Dutch) 2017-09-03 10:40:20 +02:00
James Cole
7f747cd4ef New translations validation.php (Spanish) 2017-09-03 10:40:18 +02:00
James Cole
1e3693101b New translations validation.php (German) 2017-09-03 10:40:17 +02:00
James Cole
d31640734c New translations validation.php (French) 2017-09-03 10:40:16 +02:00
James Cole
ce3478041a New translations passwords.php (Polish) 2017-09-03 10:40:15 +02:00
James Cole
ad2752a62c New translations passwords.php (Portuguese, Brazilian) 2017-09-03 10:40:13 +02:00
James Cole
d29ebdbf26 New translations passwords.php (Slovenian) 2017-09-03 10:40:12 +02:00
James Cole
491b3547b5 New translations validation.php (Dutch) 2017-09-03 10:40:11 +02:00
James Cole
71cb8fe038 New translations passwords.php (Spanish) 2017-09-03 10:40:10 +02:00
James Cole
816b291ed3 Code for #805 2017-09-03 10:39:05 +02:00
James Cole
b9f6119c68 Fix rule title. 2017-09-03 10:38:41 +02:00
James Cole
c87d7458fc New lines for triggers. 2017-09-03 10:16:53 +02:00
James Cole
aed5ef3fba Sort triggers and actions 2017-09-03 10:16:45 +02:00
James Cole
523824225e Fix test coverage 2017-09-03 10:09:27 +02:00
James Cole
2a2a18f378 Add new triggers 2017-09-03 10:09:10 +02:00
James Cole
c29fb13941 Commit changes. 2017-09-03 10:08:56 +02:00
James Cole
30549da044 Merge pull request #806 from pkoziol/develop
Fix formatting when currency symbol is separated and follows amount
2017-09-03 09:45:21 +02:00
James Cole
e81775fbce Merge pull request #807 from pkoziol/issue-799
Fix reseting action type when editing rule
2017-09-03 09:45:07 +02:00
James Cole
e7520a82c4 Merge pull request #808 from pkoziol/issue-798
Fix search that worked only for lowercase queries
2017-09-03 09:44:43 +02:00
James Cole
cf0e089616 New translations firefly.php (French) 2017-09-02 22:10:14 +02:00
James Cole
df8207bd9f New translations firefly.php (French) 2017-09-02 22:00:18 +02:00
James Cole
d65d555d63 New translations intro.php (French) 2017-09-02 22:00:15 +02:00
James Cole
159920296a New translations breadcrumbs.php (French) 2017-09-02 22:00:14 +02:00
James Cole
bfd7e009cc New translations intro.php (French) 2017-09-02 21:50:06 +02:00
koziolek
682f9283a6 Fix search that worked only for lowercase queries
firefly-iii/firefly-iii#798
2017-09-02 20:38:56 +02:00
koziolek
bbe8a97945 Fix reseting action type when editing rule
firefly-iii/firefly-iii#799
2017-09-02 20:30:55 +02:00
koziolek
f93d11643f Fix formatting when currency symbol is separated and follows amount 2017-09-02 20:11:37 +02:00
James Cole
78bae33433 Remove experimental multi period thing. 2017-09-02 07:40:39 +02:00
James Cole
7cab89a291 Remove experimental multi period thing. 2017-09-02 07:40:05 +02:00
James Cole
95e91b9af8 Fix tests 2017-09-01 21:54:17 +02:00
James Cole
5e08461385 Fix broken dev installation. 2017-09-01 21:22:55 +02:00
James Cole
632d95f1fb Should fix rule, category and other name checks. #793 2017-09-01 11:20:51 +02:00
James Cole
edd1b25330 Revert "Should fix rule, category and other name checks. #793"
This reverts commit ffaf48dda7.
2017-09-01 11:19:49 +02:00
Dorigo
ffaf48dda7 Should fix rule, category and other name checks. #793 2017-09-01 11:15:36 +02:00
James Cole
0e465ade48 Merge pull request #792 from jleeong/master
Fixing Dockerization of application
2017-09-01 08:48:11 +02:00
James Cole
ab80803f0f Fix order for bills. 2017-09-01 06:28:26 +02:00
jleeong
88d3db4dc8 Fixed dockerization 2017-08-31 12:05:43 -07:00
James Cole
da4dbb7319 New translations form.php (Spanish) 2017-08-31 17:10:14 +02:00
James Cole
808b405dd6 New translations intro.php (Spanish) 2017-08-31 17:10:12 +02:00
James Cole
a429aaa6fd New translations intro.php (Spanish) 2017-08-31 17:00:08 +02:00
James Cole
8db9641480 Experimental multi-budget overview. 2017-08-31 07:29:23 +02:00
James Cole
8dec769d64 Add newlines to files [skip ci] 2017-08-31 06:47:18 +02:00
James Cole
06ad377729 New translations form.php (Dutch) 2017-08-31 06:20:07 +02:00
James Cole
569f736831 Merge pull request #778 from firefly-iii/l10n_develop
New Crowdin translations
2017-08-31 06:07:31 +02:00
James Cole
7702ed027b Expand view for #780 2017-08-30 07:40:39 +02:00
James Cole
7c068afe05 New translations form.php (Dutch) 2017-08-30 07:21:13 +02:00
James Cole
211d136b7a New translations form.php (French) 2017-08-30 07:21:12 +02:00
James Cole
434e0653fe New translations form.php (German) 2017-08-30 07:21:10 +02:00
James Cole
cb134a7e13 New translations form.php (Polish) 2017-08-30 07:20:51 +02:00
James Cole
08db90f606 New translations form.php (Portuguese, Brazilian) 2017-08-30 07:20:49 +02:00
James Cole
964d552d28 New translations list.php (Dutch) 2017-08-30 07:20:47 +02:00
James Cole
40d3d9906a New translations list.php (French) 2017-08-30 07:20:46 +02:00
James Cole
122467799f New translations form.php (Slovenian) 2017-08-30 07:20:45 +02:00
James Cole
b1ca56a296 New translations form.php (Spanish) 2017-08-30 07:20:43 +02:00
James Cole
cb3504642c New translations list.php (German) 2017-08-30 07:20:34 +02:00
James Cole
a8f10bbb09 New translations list.php (Polish) 2017-08-30 07:20:33 +02:00
James Cole
b75849d4ab New translations form.php (Russian) 2017-08-30 07:20:30 +02:00
James Cole
0c88bea772 New translations list.php (Russian) 2017-08-30 07:20:26 +02:00
James Cole
7aaddf2a60 New translations list.php (Portuguese, Brazilian) 2017-08-30 07:20:19 +02:00
James Cole
35d6db5e73 New translations list.php (Slovenian) 2017-08-30 07:20:17 +02:00
James Cole
6642e93581 New translations list.php (Spanish) 2017-08-30 07:20:16 +02:00
James Cole
4aaacf8e2e Ask for CC number when asset is a CC. #784 2017-08-30 07:14:35 +02:00
James Cole
0a8e6e9f07 Code for #784 2017-08-30 07:10:06 +02:00
James Cole
062272a6e8 Format translations [skip ci] 2017-08-30 07:09:52 +02:00
James Cole
d610302e79 Code for #782 2017-08-30 07:00:17 +02:00
James Cole
69846bfb18 New translations firefly.php (Spanish) 2017-08-29 09:50:10 +02:00
James Cole
c4bca4c214 New translations firefly.php (Spanish) 2017-08-29 09:40:13 +02:00
James Cole
14a8c686c0 New translations firefly.php (Spanish) 2017-08-29 09:30:09 +02:00
James Cole
c6cc750166 New translations firefly.php (Spanish) 2017-08-29 09:20:12 +02:00
James Cole
3cce84dfa7 New translations firefly.php (Spanish) 2017-08-28 19:00:14 +02:00
James Cole
c8f4c6bd49 New translations form.php (Spanish) 2017-08-28 19:00:12 +02:00
James Cole
17501c6cad New translations help.php (Spanish) 2017-08-28 18:50:05 +02:00
James Cole
aa64e7947e New translations help.php (Spanish) 2017-08-28 18:40:07 +02:00
James Cole
9adfbf1668 New translations csv.php (Spanish) 2017-08-28 18:40:06 +02:00
James Cole
c6f2d4a0c4 New translations list.php (Spanish) 2017-08-28 18:30:08 +02:00
James Cole
4b7fc7b80b New translations breadcrumbs.php (Spanish) 2017-08-28 18:20:07 +02:00
James Cole
5c30146ee0 New translations firefly.php (German) 2017-08-28 13:30:12 +02:00
James Cole
28af10444d New translations form.php (German) 2017-08-28 13:30:09 +02:00
James Cole
a6f0faa058 New translations list.php (German) 2017-08-28 13:30:07 +02:00
James Cole
b6227e633c Fix tests 2017-08-27 11:07:14 +02:00
James Cole
47dd8610c6 New translations breadcrumbs.php (Russian) 2017-08-27 11:00:05 +02:00
James Cole
6ffdbcafc5 New translations csv.php (German) 2017-08-27 09:20:06 +02:00
James Cole
d89f45d534 New translations validation.php (German) 2017-08-27 09:20:05 +02:00
James Cole
f014828423 New translations csv.php (German) 2017-08-27 09:10:10 +02:00
James Cole
f26c672421 New translations breadcrumbs.php (German) 2017-08-27 09:10:08 +02:00
James Cole
b1b9804aca New translations firefly.php (German) 2017-08-27 09:10:06 +02:00
James Cole
5c2c947785 New translations firefly.php (Dutch) 2017-08-27 09:00:07 +02:00
James Cole
1319cb2e4e Improving bunq import. 2017-08-27 08:54:58 +02:00
James Cole
1ecf3d04d9 Fix attachment count 2017-08-27 08:53:48 +02:00
James Cole
b8d4776671 Remove unused code. 2017-08-26 21:28:14 +02:00
James Cole
43b829bf02 New translations firefly.php (Spanish) 2017-08-26 15:02:58 +02:00
James Cole
6c150f9d06 New translations firefly.php (Slovenian) 2017-08-26 15:02:54 +02:00
James Cole
bf818e1ede New translations firefly.php (Portuguese, Brazilian) 2017-08-26 15:02:51 +02:00
James Cole
4022b6b9cd New translations firefly.php (Dutch) 2017-08-26 15:02:48 +02:00
James Cole
ab5ff6446e New translations firefly.php (French) 2017-08-26 15:02:46 +02:00
James Cole
ef4bc0ca0c New translations firefly.php (Polish) 2017-08-26 15:02:44 +02:00
James Cole
07e31d6745 New translations firefly.php (German) 2017-08-26 15:02:42 +02:00
James Cole
e0bcbb0396 New translations firefly.php (Russian) 2017-08-26 15:00:20 +02:00
James Cole
6a5bdebb7c New translations firefly.php (Spanish) 2017-08-26 14:52:56 +02:00
James Cole
bfcc1d8f03 New translations firefly.php (Slovenian) 2017-08-26 14:52:53 +02:00
James Cole
eed6d6c49d New translations firefly.php (Portuguese, Brazilian) 2017-08-26 14:52:50 +02:00
James Cole
cf05970ccf New translations firefly.php (Dutch) 2017-08-26 14:52:47 +02:00
James Cole
fa6e82dd25 New translations firefly.php (French) 2017-08-26 14:52:45 +02:00
James Cole
16aaa0b5a6 New translations firefly.php (Polish) 2017-08-26 14:52:43 +02:00
James Cole
70e146aedd New translations firefly.php (German) 2017-08-26 14:52:40 +02:00
James Cole
338d7587b2 New translations firefly.php (Russian) 2017-08-26 14:50:21 +02:00
James Cole
50837af607 Expand tag view. 2017-08-26 14:50:08 +02:00
James Cole
989e931edf Add language string [skip ci] 2017-08-26 14:44:19 +02:00
James Cole
9238efbd3a Fix tag cloud 2017-08-26 14:44:05 +02:00
James Cole
ea2af2378d Expand budget pages to work with new date view. 2017-08-26 14:30:41 +02:00
James Cole
094ddfcf5f Fix rounding for amounts. 2017-08-26 10:01:48 +02:00
James Cole
7329098ed8 Fix rounding for amounts. 2017-08-26 10:00:08 +02:00
James Cole
0f229e4d7b Improved extraction of bunq data. 2017-08-26 06:21:22 +02:00
James Cole
b08eccd076 New translations firefly.php (French) 2017-08-25 18:30:07 +02:00
James Cole
4e6e7c0562 New translations firefly.php (Dutch) 2017-08-25 16:30:41 +02:00
James Cole
eb331104df New translations firefly.php (Spanish) 2017-08-25 16:11:01 +02:00
James Cole
d6b664375e New translations firefly.php (Slovenian) 2017-08-25 16:10:56 +02:00
James Cole
90c4f449e8 New translations firefly.php (Portuguese, Brazilian) 2017-08-25 16:10:53 +02:00
James Cole
d5e8f5810d New translations firefly.php (Dutch) 2017-08-25 16:10:50 +02:00
James Cole
6215ec8cf6 New translations firefly.php (French) 2017-08-25 16:10:48 +02:00
James Cole
f484785395 New translations firefly.php (Polish) 2017-08-25 16:10:45 +02:00
James Cole
4eb93dd139 New translations firefly.php (German) 2017-08-25 16:10:42 +02:00
James Cole
2da3f74057 New translations firefly.php (Russian) 2017-08-25 16:10:25 +02:00
James Cole
4b2abb6f25 Add ability to translate links. 2017-08-25 16:03:36 +02:00
James Cole
c38429d3a3 New translations firefly.php (Slovenian) 2017-08-25 07:37:27 +02:00
James Cole
d78a5d1225 New translations firefly.php (Spanish) 2017-08-25 07:37:25 +02:00
James Cole
907ff89609 New translations form.php (Chinese Traditional) 2017-08-25 07:37:23 +02:00
James Cole
7758dcaaba New translations firefly.php (Portuguese, Brazilian) 2017-08-25 07:37:20 +02:00
James Cole
ed6da918e1 New translations firefly.php (Polish) 2017-08-25 07:37:18 +02:00
James Cole
30373db89c New translations csv.php (Spanish) 2017-08-25 07:37:16 +02:00
James Cole
7e032fdbb3 New translations firefly.php (Chinese Traditional) 2017-08-25 07:37:15 +02:00
James Cole
d232a7abbb New translations firefly.php (German) 2017-08-25 07:37:11 +02:00
James Cole
6b6b9ae242 New translations firefly.php (French) 2017-08-25 07:37:08 +02:00
James Cole
241bcce6c1 New translations form.php (German) 2017-08-25 07:37:06 +02:00
James Cole
f490d9ebe8 New translations form.php (Polish) 2017-08-25 07:37:04 +02:00
James Cole
fb09843e5a New translations help.php (Slovenian) 2017-08-25 07:37:03 +02:00
James Cole
ab95698181 New translations help.php (Spanish) 2017-08-25 07:37:02 +02:00
James Cole
28b3134ae2 New translations list.php (Chinese Traditional) 2017-08-25 07:37:01 +02:00
James Cole
ec47c9cd00 New translations form.php (Slovenian) 2017-08-25 07:36:59 +02:00
James Cole
5e062908a5 New translations form.php (Portuguese, Brazilian) 2017-08-25 07:36:58 +02:00
James Cole
d0cefd7005 New translations form.php (Spanish) 2017-08-25 07:36:57 +02:00
James Cole
c1276e789a New translations csv.php (Slovenian) 2017-08-25 07:36:54 +02:00
James Cole
7ac4cd4665 New translations csv.php (Portuguese, Brazilian) 2017-08-25 07:36:54 +02:00
James Cole
1797bf8108 New translations breadcrumbs.php (French) 2017-08-25 07:36:52 +02:00
James Cole
8c32e619cb New translations breadcrumbs.php (German) 2017-08-25 07:36:51 +02:00
James Cole
a0d800bbb9 New translations breadcrumbs.php (Portuguese, Brazilian) 2017-08-25 07:36:50 +02:00
James Cole
0f276f10ee New translations breadcrumbs.php (Polish) 2017-08-25 07:36:49 +02:00
James Cole
473c6aad84 New translations breadcrumbs.php (Chinese Traditional) 2017-08-25 07:36:48 +02:00
James Cole
f9b60fef85 New translations breadcrumbs.php (Slovenian) 2017-08-25 07:36:46 +02:00
James Cole
f7ea140018 New translations breadcrumbs.php (Spanish) 2017-08-25 07:36:44 +02:00
James Cole
0287416aa5 New translations csv.php (Chinese Traditional) 2017-08-25 07:36:43 +02:00
James Cole
0dfcfbb97e New translations csv.php (Polish) 2017-08-25 07:36:41 +02:00
James Cole
d82c386402 New translations csv.php (German) 2017-08-25 07:36:40 +02:00
James Cole
3c3a32b1fa New translations config.php (Chinese Traditional) 2017-08-25 07:36:39 +02:00
James Cole
8e2f78226a New translations list.php (German) 2017-08-25 07:36:36 +02:00
James Cole
617360c631 New translations breadcrumbs.php (Russian) 2017-08-25 07:36:35 +02:00
James Cole
0f2bd34a62 New translations csv.php (Russian) 2017-08-25 07:36:34 +02:00
James Cole
23a028f011 New translations form.php (Russian) 2017-08-25 07:36:33 +02:00
James Cole
6c8da850a7 New translations firefly.php (Russian) 2017-08-25 07:36:31 +02:00
James Cole
1bf5ae2d3d New translations demo.php (Polish) 2017-08-25 07:36:28 +02:00
James Cole
37a25625de New translations demo.php (Slovenian) 2017-08-25 07:36:27 +02:00
James Cole
206887bc71 New translations list.php (Russian) 2017-08-25 07:36:25 +02:00
James Cole
1e8551da4a New translations intro.php (Polish) 2017-08-25 07:36:24 +02:00
James Cole
6dd88d25dd New translations intro.php (Portuguese, Brazilian) 2017-08-25 07:36:23 +02:00
James Cole
81089e989b New translations intro.php (Russian) 2017-08-25 07:36:22 +02:00
James Cole
8a4355e786 New translations intro.php (Spanish) 2017-08-25 07:36:21 +02:00
James Cole
20947bc8c1 New translations intro.php (Slovenian) 2017-08-25 07:36:20 +02:00
James Cole
da0436c60e New translations intro.php (German) 2017-08-25 07:36:18 +02:00
James Cole
04af43a9fa New translations intro.php (French) 2017-08-25 07:36:17 +02:00
James Cole
9a2d87eb42 New translations validation.php (Russian) 2017-08-25 07:36:15 +02:00
James Cole
cb66925f22 New translations demo.php (Russian) 2017-08-25 07:36:14 +02:00
James Cole
c7b6688250 New translations intro.php (Chinese Traditional) 2017-08-25 07:36:13 +02:00
James Cole
129dacbfe2 New translations demo.php (Chinese Traditional) 2017-08-25 07:36:12 +02:00
James Cole
568ef92f79 New translations list.php (Portuguese, Brazilian) 2017-08-25 07:36:09 +02:00
James Cole
75671dc982 New translations list.php (Polish) 2017-08-25 07:36:02 +02:00
James Cole
4d55dbea6c New translations list.php (Slovenian) 2017-08-25 07:36:01 +02:00
James Cole
67b7f90c26 New translations list.php (Spanish) 2017-08-25 07:35:59 +02:00
James Cole
3efd112d8b New translations validation.php (German) 2017-08-25 07:35:58 +02:00
James Cole
df5830b5f9 New translations validation.php (Portuguese, Brazilian) 2017-08-25 07:35:56 +02:00
James Cole
a6d8b985b2 New translations validation.php (Slovenian) 2017-08-25 07:35:54 +02:00
James Cole
e76a6dc00f New translations validation.php (Chinese Traditional) 2017-08-25 07:35:52 +02:00
James Cole
77ee046b3f New translations firefly.php (Slovenian) 2017-08-25 07:08:15 +02:00
James Cole
464f86eb1d New translations firefly.php (Spanish) 2017-08-25 07:08:13 +02:00
James Cole
b9bbd2872e New translations form.php (Chinese Traditional) 2017-08-25 07:08:10 +02:00
James Cole
7a70b8234c New translations firefly.php (Portuguese, Brazilian) 2017-08-25 07:08:08 +02:00
James Cole
e6bf9faa3e New translations firefly.php (Polish) 2017-08-25 07:08:05 +02:00
James Cole
ede7b1b35c New translations csv.php (Spanish) 2017-08-25 07:08:02 +02:00
James Cole
6c095d8efa New translations firefly.php (Chinese Traditional) 2017-08-25 07:08:00 +02:00
James Cole
95bb8fa6ec New translations firefly.php (German) 2017-08-25 07:07:57 +02:00
James Cole
bbe8fff1e6 New translations firefly.php (French) 2017-08-25 07:07:54 +02:00
James Cole
5dc4cf4c17 New translations form.php (German) 2017-08-25 07:07:51 +02:00
James Cole
5b135ada24 New translations form.php (Polish) 2017-08-25 07:07:50 +02:00
James Cole
65b3dab916 New translations help.php (Slovenian) 2017-08-25 07:07:49 +02:00
James Cole
e2643ead1a New translations help.php (Spanish) 2017-08-25 07:07:48 +02:00
James Cole
0dcfddc169 New translations list.php (Chinese Traditional) 2017-08-25 07:07:47 +02:00
James Cole
b36589b2e6 New translations form.php (Slovenian) 2017-08-25 07:07:45 +02:00
James Cole
57bea64ad4 New translations form.php (Portuguese, Brazilian) 2017-08-25 07:07:44 +02:00
James Cole
5b5bbd29c3 New translations form.php (Spanish) 2017-08-25 07:07:43 +02:00
James Cole
e80822f1c5 New translations csv.php (Slovenian) 2017-08-25 07:07:41 +02:00
James Cole
c7978150c4 New translations csv.php (Portuguese, Brazilian) 2017-08-25 07:07:39 +02:00
James Cole
70ed0af475 New translations breadcrumbs.php (French) 2017-08-25 07:07:38 +02:00
James Cole
57d196fdce New translations breadcrumbs.php (German) 2017-08-25 07:07:37 +02:00
James Cole
8dd61e1f86 New translations breadcrumbs.php (Portuguese, Brazilian) 2017-08-25 07:07:36 +02:00
James Cole
d36801c589 New translations breadcrumbs.php (Polish) 2017-08-25 07:07:35 +02:00
James Cole
9f62df36dc New translations breadcrumbs.php (Chinese Traditional) 2017-08-25 07:07:34 +02:00
James Cole
aa66cfaae7 New translations breadcrumbs.php (Slovenian) 2017-08-25 07:07:32 +02:00
James Cole
e36abd2dfb New translations breadcrumbs.php (Spanish) 2017-08-25 07:07:31 +02:00
James Cole
9d5a021b1e New translations csv.php (Chinese Traditional) 2017-08-25 07:07:30 +02:00
James Cole
5ddad51911 New translations csv.php (Polish) 2017-08-25 07:07:29 +02:00
James Cole
ef5a950ecb New translations csv.php (German) 2017-08-25 07:07:28 +02:00
James Cole
8419cfae2b New translations config.php (Chinese Traditional) 2017-08-25 07:07:26 +02:00
James Cole
289e144521 New translations list.php (German) 2017-08-25 07:07:24 +02:00
James Cole
97ab06ea22 New translations breadcrumbs.php (Russian) 2017-08-25 07:07:23 +02:00
James Cole
3d06fba918 New translations csv.php (Russian) 2017-08-25 07:07:22 +02:00
James Cole
f9aa33315a New translations form.php (Russian) 2017-08-25 07:07:21 +02:00
James Cole
8eb6092f91 New translations firefly.php (Russian) 2017-08-25 07:07:20 +02:00
James Cole
06a50a5e45 New translations demo.php (Polish) 2017-08-25 07:07:17 +02:00
James Cole
4759713d9d New translations demo.php (Slovenian) 2017-08-25 07:07:16 +02:00
James Cole
7061730abc New translations list.php (Russian) 2017-08-25 07:07:15 +02:00
James Cole
f62dee262c New translations intro.php (Polish) 2017-08-25 07:07:14 +02:00
James Cole
df3a4d0d45 New translations intro.php (Portuguese, Brazilian) 2017-08-25 07:07:13 +02:00
James Cole
33d1fc085b New translations intro.php (Russian) 2017-08-25 07:07:12 +02:00
James Cole
c5eb3923c1 New translations intro.php (Spanish) 2017-08-25 07:07:10 +02:00
James Cole
596dd03bb4 New translations intro.php (Slovenian) 2017-08-25 07:07:09 +02:00
James Cole
d72bdcfe9b New translations intro.php (German) 2017-08-25 07:07:08 +02:00
James Cole
0c3174c2b5 New translations intro.php (French) 2017-08-25 07:07:07 +02:00
James Cole
6abb219499 New translations validation.php (Russian) 2017-08-25 07:07:06 +02:00
James Cole
eea1ddc288 New translations demo.php (Russian) 2017-08-25 07:07:05 +02:00
James Cole
42cbb7b723 New translations intro.php (Chinese Traditional) 2017-08-25 07:07:03 +02:00
James Cole
a06097b012 New translations demo.php (Chinese Traditional) 2017-08-25 07:07:02 +02:00
James Cole
d7b8115724 New translations list.php (Portuguese, Brazilian) 2017-08-25 07:07:00 +02:00
James Cole
c7703cd70c New translations list.php (Polish) 2017-08-25 07:06:59 +02:00
James Cole
8dec3717eb New translations list.php (Slovenian) 2017-08-25 07:06:57 +02:00
James Cole
c0673b10b5 New translations list.php (Spanish) 2017-08-25 07:06:56 +02:00
James Cole
91c3f2fb2d New translations validation.php (German) 2017-08-25 07:06:55 +02:00
James Cole
f83afd82d1 New translations validation.php (Portuguese, Brazilian) 2017-08-25 07:06:53 +02:00
James Cole
cf2cda6694 New translations validation.php (Slovenian) 2017-08-25 07:06:52 +02:00
James Cole
455c6e0d39 New translations validation.php (Chinese Traditional) 2017-08-25 07:06:48 +02:00
James Cole
72b7900ce2 Merge pull request #762 from firefly-iii/l10n_develop
New Crowdin translations
2017-08-25 07:04:51 +02:00
James Cole
dba3d89027 Update form for linking. 2017-08-25 06:58:28 +02:00
James Cole
8e4a480f05 New translations intro.php (Dutch) 2017-08-25 06:50:05 +02:00
James Cole
7fe2ed81e2 New translations intro.php (Dutch) 2017-08-25 06:40:14 +02:00
James Cole
58db856b9d New translations intro.php (Polish) 2017-08-25 06:27:25 +02:00
James Cole
62a854c2ea New translations intro.php (Portuguese, Brazilian) 2017-08-25 06:27:24 +02:00
James Cole
acb15e5209 New translations intro.php (Russian) 2017-08-25 06:27:22 +02:00
James Cole
ebf4395bc9 New translations intro.php (Spanish) 2017-08-25 06:27:21 +02:00
James Cole
8af45e8091 New translations intro.php (Slovenian) 2017-08-25 06:27:20 +02:00
James Cole
32d6951c34 New translations intro.php (German) 2017-08-25 06:27:18 +02:00
James Cole
a172762558 New translations intro.php (French) 2017-08-25 06:27:17 +02:00
James Cole
7abedd176f New translations intro.php (Dutch) 2017-08-25 06:27:15 +02:00
James Cole
f63be8a47d New translations intro.php (Chinese Traditional) 2017-08-25 06:27:14 +02:00
James Cole
86aa27d92c Fix language string [skip ci] 2017-08-25 06:23:01 +02:00
James Cole
972480269a Updated strings [skip ci] 2017-08-25 06:21:26 +02:00
James Cole
b829e5c0f6 New translations intro.php (Dutch) 2017-08-25 06:20:06 +02:00
James Cole
fe4b3c6f36 New translations firefly.php (Dutch) 2017-08-24 21:40:49 +02:00
James Cole
cad3921c95 New translations intro.php (Polish) 2017-08-24 21:40:27 +02:00
James Cole
24a84de463 New translations intro.php (Portuguese, Brazilian) 2017-08-24 21:40:25 +02:00
James Cole
3abf949e3f New translations intro.php (Russian) 2017-08-24 21:40:24 +02:00
James Cole
b561d86410 New translations intro.php (Spanish) 2017-08-24 21:40:22 +02:00
James Cole
59ff1ff856 New translations intro.php (Slovenian) 2017-08-24 21:40:21 +02:00
James Cole
88a911f6b7 New translations intro.php (German) 2017-08-24 21:40:20 +02:00
James Cole
55aa3f1198 New translations intro.php (French) 2017-08-24 21:40:19 +02:00
James Cole
a6f78aad73 New translations intro.php (Dutch) 2017-08-24 21:40:17 +02:00
James Cole
54bfbf174b New translations intro.php (Chinese Traditional) 2017-08-24 21:40:16 +02:00
James Cole
be6757c290 Fix some strings [skip ci] 2017-08-24 21:36:26 +02:00
James Cole
dda2080d01 New translations firefly.php (Slovenian) 2017-08-24 21:31:03 +02:00
James Cole
8ba63338fc New translations firefly.php (Spanish) 2017-08-24 21:31:00 +02:00
James Cole
8ebb39b8d5 New translations firefly.php (Portuguese, Brazilian) 2017-08-24 21:30:55 +02:00
James Cole
0f230834a1 New translations firefly.php (Polish) 2017-08-24 21:30:52 +02:00
James Cole
2dc41df0c8 New translations firefly.php (Chinese Traditional) 2017-08-24 21:30:49 +02:00
James Cole
995b879a28 New translations firefly.php (Dutch) 2017-08-24 21:30:46 +02:00
James Cole
b72e8559f6 New translations firefly.php (German) 2017-08-24 21:30:44 +02:00
James Cole
733b5c62af New translations firefly.php (French) 2017-08-24 21:30:41 +02:00
James Cole
b192b5366a New translations firefly.php (Russian) 2017-08-24 21:30:24 +02:00
James Cole
14aa261aca Remove unused translations. 2017-08-24 21:23:48 +02:00
James Cole
14a218e319 New translations breadcrumbs.php (Dutch) 2017-08-24 19:50:07 +02:00
James Cole
4ac5f25279 Expand config for links. 2017-08-24 19:47:31 +02:00
James Cole
c37ade8f5b Catch link error. 2017-08-24 19:42:23 +02:00
James Cole
1a179c7a45 New translations form.php (Dutch) 2017-08-24 18:41:00 +02:00
James Cole
237983cecf New translations breadcrumbs.php (Dutch) 2017-08-24 18:40:40 +02:00
James Cole
c1985b2fa2 New translations breadcrumbs.php (French) 2017-08-24 18:40:39 +02:00
James Cole
fc13df9a09 New translations breadcrumbs.php (German) 2017-08-24 18:40:37 +02:00
James Cole
8389b87556 New translations breadcrumbs.php (Portuguese, Brazilian) 2017-08-24 18:40:36 +02:00
James Cole
b77a783f94 New translations breadcrumbs.php (Polish) 2017-08-24 18:40:35 +02:00
James Cole
cdffd4a995 New translations breadcrumbs.php (Chinese Traditional) 2017-08-24 18:40:34 +02:00
James Cole
e75d17ed24 New translations breadcrumbs.php (Slovenian) 2017-08-24 18:40:32 +02:00
James Cole
087b4d5c7f New translations breadcrumbs.php (Spanish) 2017-08-24 18:40:31 +02:00
James Cole
7ce631d529 New translations breadcrumbs.php (Russian) 2017-08-24 18:40:26 +02:00
James Cole
829d3680d9 Broken translation. 2017-08-24 18:39:46 +02:00
James Cole
dbad6e4e8c New translations firefly.php (French) 2017-08-24 16:20:10 +02:00
James Cole
7453f89827 New translations form.php (French) 2017-08-23 23:10:06 +02:00
James Cole
3d639c7d45 New translations firefly.php (Slovenian) 2017-08-23 21:31:26 +02:00
James Cole
9348316b12 New translations firefly.php (Spanish) 2017-08-23 21:31:23 +02:00
James Cole
d7d874d48c New translations form.php (Chinese Traditional) 2017-08-23 21:31:20 +02:00
James Cole
7aec367a3c New translations form.php (French) 2017-08-23 21:31:19 +02:00
James Cole
6a29c64f08 New translations form.php (Dutch) 2017-08-23 21:31:18 +02:00
James Cole
0ee825212e New translations firefly.php (Portuguese, Brazilian) 2017-08-23 21:31:16 +02:00
James Cole
8dfd2b9b07 New translations firefly.php (Polish) 2017-08-23 21:31:13 +02:00
James Cole
343909f87a New translations firefly.php (Chinese Traditional) 2017-08-23 21:31:10 +02:00
James Cole
5e85d5ef32 New translations firefly.php (Dutch) 2017-08-23 21:31:07 +02:00
James Cole
1b14d7aa2d New translations firefly.php (German) 2017-08-23 21:31:04 +02:00
James Cole
139282a39e New translations firefly.php (French) 2017-08-23 21:31:02 +02:00
James Cole
e9724d8b41 New translations form.php (German) 2017-08-23 21:30:58 +02:00
James Cole
adc9f92125 New translations form.php (Polish) 2017-08-23 21:30:57 +02:00
James Cole
1c93153d83 New translations form.php (Slovenian) 2017-08-23 21:30:54 +02:00
James Cole
c73a32f76d New translations form.php (Portuguese, Brazilian) 2017-08-23 21:30:53 +02:00
James Cole
068af6b0d5 New translations form.php (Spanish) 2017-08-23 21:30:51 +02:00
James Cole
01a2d5e017 New translations breadcrumbs.php (Dutch) 2017-08-23 21:30:48 +02:00
James Cole
ca9f0fde9b New translations breadcrumbs.php (French) 2017-08-23 21:30:47 +02:00
James Cole
b16a9053b4 New translations breadcrumbs.php (German) 2017-08-23 21:30:45 +02:00
James Cole
5e6e7ed152 New translations breadcrumbs.php (Portuguese, Brazilian) 2017-08-23 21:30:44 +02:00
James Cole
93d1c06892 New translations breadcrumbs.php (Polish) 2017-08-23 21:30:43 +02:00
James Cole
e22745d1ff New translations breadcrumbs.php (Chinese Traditional) 2017-08-23 21:30:42 +02:00
James Cole
3308bc8a0f New translations breadcrumbs.php (Slovenian) 2017-08-23 21:30:38 +02:00
James Cole
f94193ad53 New translations breadcrumbs.php (Spanish) 2017-08-23 21:30:37 +02:00
James Cole
6f5eb45144 New translations breadcrumbs.php (Russian) 2017-08-23 21:30:32 +02:00
James Cole
9bfa7acdee New translations form.php (Russian) 2017-08-23 21:30:31 +02:00
James Cole
e38b259094 New translations firefly.php (Russian) 2017-08-23 21:30:29 +02:00
James Cole
394e92d538 Improvements for #616 and others. 2017-08-23 21:21:42 +02:00
James Cole
02ee9451d8 New translations firefly.php (Polish) 2017-08-23 21:10:09 +02:00
James Cole
093fe22ab5 New translations firefly.php (Polish) 2017-08-23 21:00:09 +02:00
James Cole
2bb4d7c8b9 New translations firefly.php (Polish) 2017-08-23 20:50:07 +02:00
James Cole
ea2732b38c New translations firefly.php (Polish) 2017-08-23 20:40:46 +02:00
James Cole
6bb3cf5719 New translations firefly.php (Polish) 2017-08-23 20:30:19 +02:00
James Cole
54e277e773 New translations firefly.php (Polish) 2017-08-23 20:20:10 +02:00
James Cole
dec29b3e22 New translations firefly.php (Polish) 2017-08-23 20:10:09 +02:00
James Cole
9974f71f3e New translations list.php (Polish) 2017-08-23 20:10:06 +02:00
James Cole
25256601a6 New translations validation.php (Polish) 2017-08-23 20:00:06 +02:00
James Cole
d3e9fe37eb New translations config.php (Polish) 2017-08-23 19:50:07 +02:00
James Cole
9ccbebdc4f New translations breadcrumbs.php (Polish) 2017-08-23 19:20:06 +02:00
James Cole
73ddd239aa New translations firefly.php (French) 2017-08-23 00:20:08 +02:00
James Cole
598eec219f New translations firefly.php (French) 2017-08-23 00:10:18 +02:00
James Cole
f2f6239b59 New translations firefly.php (French) 2017-08-23 00:00:19 +02:00
James Cole
ce53cdd4a4 New translations firefly.php (French) 2017-08-22 23:50:08 +02:00
James Cole
4a97a6403d New translations firefly.php (French) 2017-08-22 23:10:07 +02:00
James Cole
6ec397b934 New translations firefly.php (French) 2017-08-22 23:00:17 +02:00
James Cole
23be3afc9d New translations list.php (French) 2017-08-22 14:50:07 +02:00
James Cole
bf6b12cf57 New translations form.php (French) 2017-08-22 14:50:06 +02:00
James Cole
3936251363 New translations firefly.php (French) 2017-08-22 14:40:09 +02:00
James Cole
b50d97c3b7 New translations firefly.php (French) 2017-08-22 14:30:16 +02:00
James Cole
ef29d4efe8 New translations firefly.php (French) 2017-08-22 14:20:13 +02:00
James Cole
92ddf9bb2d New translations firefly.php (Polish) 2017-08-22 14:10:44 +02:00
James Cole
875d5d50b8 New translations firefly.php (French) 2017-08-22 14:10:39 +02:00
James Cole
83fa13ea4b New translations firefly.php (Chinese Traditional) 2017-08-22 14:10:35 +02:00
James Cole
8b24716372 New translations firefly.php (Portuguese, Brazilian) 2017-08-22 14:10:31 +02:00
James Cole
670ac4a34f New translations firefly.php (Slovenian) 2017-08-22 14:10:27 +02:00
James Cole
82eb923689 New translations firefly.php (Spanish) 2017-08-22 14:10:21 +02:00
James Cole
18aeda4713 New translations firefly.php (German) 2017-08-21 19:00:49 +02:00
James Cole
a388493030 New translations firefly.php (French) 2017-08-21 19:00:46 +02:00
James Cole
c3f8573950 New translations firefly.php (Russian) 2017-08-21 19:00:29 +02:00
James Cole
36778bb87e New translations firefly.php (Dutch) 2017-08-21 19:00:23 +02:00
James Cole
1a89e379a4 Language fix [skip ci] 2017-08-21 18:55:25 +02:00
James Cole
0aae349816 Missing translations 2017-08-21 18:53:02 +02:00
James Cole
434291b592 New translations firefly.php (Slovenian) 2017-08-21 18:21:12 +02:00
James Cole
668ceda86c New translations firefly.php (Spanish) 2017-08-21 18:21:09 +02:00
James Cole
e3ef729adf New translations firefly.php (Portuguese, Brazilian) 2017-08-21 18:21:04 +02:00
James Cole
baafba1774 New translations firefly.php (Polish) 2017-08-21 18:21:01 +02:00
James Cole
2ccf82749f New translations firefly.php (Chinese Traditional) 2017-08-21 18:20:58 +02:00
James Cole
5663fd386a New translations firefly.php (Dutch) 2017-08-21 18:20:55 +02:00
James Cole
6d1ebf3952 New translations firefly.php (German) 2017-08-21 18:20:52 +02:00
James Cole
0ea28c646a New translations firefly.php (French) 2017-08-21 18:20:49 +02:00
James Cole
fab5dc64e9 New translations firefly.php (Russian) 2017-08-21 18:20:31 +02:00
James Cole
a5013ecbc3 Expand link view and more features #616 2017-08-21 18:16:15 +02:00
James Cole
5f82e947b2 New translations demo.php (Dutch) 2017-08-21 17:20:12 +02:00
James Cole
d00b9515de fix #770 2017-08-21 17:11:18 +02:00
James Cole
eebbbdd0dc New translations list.php (Dutch) 2017-08-21 10:50:16 +02:00
James Cole
46adb7644a New translations firefly.php (Dutch) 2017-08-21 10:40:18 +02:00
James Cole
49e7b4f4ea New translations form.php (Dutch) 2017-08-21 10:40:15 +02:00
James Cole
55b1c533cf Fix division by zero. [skip ci] 2017-08-21 08:48:02 +02:00
James Cole
f1a7f30167 Fix division by zero. [skip ci] 2017-08-21 08:47:03 +02:00
James Cole
9f5c2b74eb Fix division by zero. 2017-08-21 08:44:04 +02:00
James Cole
78b44af7a2 New translations firefly.php (Slovenian) 2017-08-21 07:21:12 +02:00
James Cole
a8442ca0bb New translations firefly.php (Spanish) 2017-08-21 07:21:10 +02:00
James Cole
926b1ae28b New translations form.php (Chinese Traditional) 2017-08-21 07:21:08 +02:00
James Cole
109c1ce245 New translations form.php (French) 2017-08-21 07:21:06 +02:00
James Cole
637ccf1b2a New translations form.php (Dutch) 2017-08-21 07:21:05 +02:00
James Cole
a428aedf14 New translations firefly.php (Portuguese, Brazilian) 2017-08-21 07:21:04 +02:00
James Cole
2747049986 New translations firefly.php (Polish) 2017-08-21 07:21:02 +02:00
James Cole
9a52fcf66d New translations firefly.php (Chinese Traditional) 2017-08-21 07:20:59 +02:00
James Cole
a2b2e01e39 New translations firefly.php (Dutch) 2017-08-21 07:20:57 +02:00
James Cole
be48a2ed91 New translations firefly.php (German) 2017-08-21 07:20:54 +02:00
James Cole
245db56771 New translations firefly.php (French) 2017-08-21 07:20:52 +02:00
James Cole
ba4616371b New translations form.php (German) 2017-08-21 07:20:50 +02:00
James Cole
62a3bbbcf5 New translations form.php (Polish) 2017-08-21 07:20:48 +02:00
James Cole
235c7a3bb8 New translations list.php (Dutch) 2017-08-21 07:20:46 +02:00
James Cole
9a1219c70c New translations list.php (Chinese Traditional) 2017-08-21 07:20:45 +02:00
James Cole
5e692e10bc New translations form.php (Slovenian) 2017-08-21 07:20:43 +02:00
James Cole
22b6916ac2 New translations form.php (Portuguese, Brazilian) 2017-08-21 07:20:42 +02:00
James Cole
e628ec6ff0 New translations form.php (Spanish) 2017-08-21 07:20:41 +02:00
James Cole
863f812dbb New translations list.php (French) 2017-08-21 07:20:33 +02:00
James Cole
21dbf0f14b New translations list.php (German) 2017-08-21 07:20:32 +02:00
James Cole
9c392461e8 New translations form.php (Russian) 2017-08-21 07:20:30 +02:00
James Cole
5b9178b18d New translations firefly.php (Russian) 2017-08-21 07:20:29 +02:00
James Cole
7f4a80f17f New translations list.php (Russian) 2017-08-21 07:20:25 +02:00
James Cole
2798837450 New translations list.php (Portuguese, Brazilian) 2017-08-21 07:20:19 +02:00
James Cole
381ca70517 New translations list.php (Polish) 2017-08-21 07:20:18 +02:00
James Cole
fe2beaf96a New translations list.php (Slovenian) 2017-08-21 07:20:17 +02:00
James Cole
c962ec34c8 New translations list.php (Spanish) 2017-08-21 07:20:16 +02:00
James Cole
ff390fcb7c Less complex links 2017-08-21 07:14:41 +02:00
James Cole
35ab4a5ff4 Management of links and first form for link storing #616 2017-08-21 07:13:03 +02:00
James Cole
cac498fd9e New translations firefly.php (Slovenian) 2017-08-20 14:50:58 +02:00
James Cole
06fcf8f079 New translations firefly.php (Spanish) 2017-08-20 14:50:55 +02:00
James Cole
5dad1fe2af New translations firefly.php (Portuguese, Brazilian) 2017-08-20 14:50:51 +02:00
James Cole
81ae860134 New translations firefly.php (Polish) 2017-08-20 14:50:48 +02:00
James Cole
91558049d9 New translations firefly.php (Chinese Traditional) 2017-08-20 14:50:45 +02:00
James Cole
aa78948c90 New translations firefly.php (Dutch) 2017-08-20 14:50:43 +02:00
James Cole
7cbe0768f2 New translations firefly.php (German) 2017-08-20 14:50:41 +02:00
James Cole
05be2fe25a New translations firefly.php (French) 2017-08-20 14:50:38 +02:00
James Cole
59f46b8265 New translations firefly.php (Russian) 2017-08-20 14:50:24 +02:00
James Cole
c5cdd748fc Make sure tests work again. 2017-08-20 14:36:14 +02:00
James Cole
6fcbe5a37f Various HTML fixes. 2017-08-20 12:43:31 +02:00
James Cole
4d595c1380 More link types for #616 2017-08-20 12:42:51 +02:00
James Cole
7684e966fc First code for #616 2017-08-20 12:41:31 +02:00
James Cole
40639dfa37 New view for tags 2017-08-20 12:40:14 +02:00
James Cole
5769d0121e New translations intro.php (Dutch) 2017-08-20 12:40:06 +02:00
James Cole
1d6f3fc57f Update composer file. 2017-08-20 12:39:31 +02:00
James Cole
2609f3425b Fix #738 2017-08-19 21:59:13 +02:00
James Cole
bd924b993b This fixes part of #738 (not everything). 2017-08-19 18:24:04 +02:00
James Cole
c4fe9a6a51 More code for bunq import, must now wait for reply from bunq itself 2017-08-19 16:46:06 +02:00
James Cole
4694e31e35 Expand bunq related code. 2017-08-19 09:22:44 +02:00
James Cole
ca0f09c8f7 Various cleanup. 2017-08-18 23:02:29 +02:00
James Cole
684c9773c9 Can now register with Bunq and get device server ID. 2017-08-18 21:09:22 +02:00
James Cole
df443aa34c Add copyright things. 2017-08-18 21:08:51 +02:00
James Cole
33e381b5da New translations form.php (Spanish) 2017-08-18 17:50:07 +02:00
James Cole
4b5d363f55 New translations validation.php (Spanish) 2017-08-18 17:50:06 +02:00
James Cole
4c3dbc6deb New translations validation.php (Spanish) 2017-08-18 17:40:06 +02:00
James Cole
519ad64e1d New translations validation.php (Spanish) 2017-08-18 17:30:06 +02:00
James Cole
93068659e5 Bunq code. 2017-08-18 17:08:30 +02:00
James Cole
4b46a3d298 Update composer.lock file. 2017-08-18 15:38:33 +02:00
James Cole
3e64028e29 Reinstate export javascript 2017-08-18 15:38:23 +02:00
James Cole
9b17715175 Fix the unit tests. 2017-08-18 15:32:11 +02:00
James Cole
7d8876f03c new export routine 2017-08-18 15:14:44 +02:00
James Cole
b955486f14 Updated export routine. 2017-08-18 14:45:42 +02:00
James Cole
6068cfbd70 New translations intro.php (Dutch) 2017-08-18 08:00:06 +02:00
James Cole
9cda8c8bcf New translations csv.php (Spanish) 2017-08-17 20:10:13 +02:00
James Cole
b7522288b5 New translations breadcrumbs.php (Spanish) 2017-08-17 20:00:18 +02:00
James Cole
18bc91734f New translations firefly.php (Spanish) 2017-08-17 20:00:16 +02:00
James Cole
ef21ac3d5a New translations firefly.php (Spanish) 2017-08-17 19:50:08 +02:00
James Cole
08af0aab75 New translations form.php (Spanish) 2017-08-17 19:50:06 +02:00
James Cole
a29292e018 New translations form.php (Spanish) 2017-08-17 19:40:06 +02:00
James Cole
ebb37c09e5 New translations form.php (Spanish) 2017-08-17 19:32:05 +02:00
James Cole
6666d1a2f4 Add debug information to getAmount routine. 2017-08-15 21:12:49 +02:00
James Cole
431bcf20ea Add list button [skip ci] #763 2017-08-15 17:37:48 +02:00
James Cole
7b3ef0e3ab Fix #764 2017-08-15 17:34:34 +02:00
James Cole
34894fb76b Add some comments [skip ci] 2017-08-15 17:26:43 +02:00
James Cole
e5afcbd013 New translations firefly.php (French) 2017-08-15 16:50:07 +02:00
James Cole
253a98143c New translations firefly.php (French) 2017-08-15 16:40:08 +02:00
James Cole
59a7feafef New translations firefly.php (French) 2017-08-15 16:30:08 +02:00
James Cole
0b2c3d7ca8 New translations firefly.php (French) 2017-08-15 10:10:22 +02:00
James Cole
bd8afc67dd New translations firefly.php (French) 2017-08-15 10:00:14 +02:00
James Cole
08e5b018b8 New translations csv.php (French) 2017-08-15 01:20:08 +02:00
James Cole
3d58a0c0f3 New translations firefly.php (French) 2017-08-15 01:20:07 +02:00
James Cole
56f7ca388d New translations firefly.php (French) 2017-08-15 01:10:06 +02:00
James Cole
ddf0ee9972 New translations firefly.php (French) 2017-08-15 01:00:07 +02:00
James Cole
298e6d38a0 New translations firefly.php (French) 2017-08-15 00:50:07 +02:00
James Cole
7bb5d243a0 New translations firefly.php (French) 2017-08-15 00:40:07 +02:00
James Cole
207b0194c2 New translations firefly.php (French) 2017-08-15 00:30:07 +02:00
James Cole
f1081e058c New translations firefly.php (French) 2017-08-15 00:20:07 +02:00
James Cole
7974319c73 New translations firefly.php (French) 2017-08-15 00:10:08 +02:00
James Cole
e84b37fc66 New translations firefly.php (French) 2017-08-14 23:50:14 +02:00
James Cole
4219edc089 New translations firefly.php (French) 2017-08-14 23:40:07 +02:00
James Cole
244dcc0465 New translations demo.php (French) 2017-08-14 19:10:07 +02:00
James Cole
5e423a8ede New translations list.php (French) 2017-08-14 18:10:11 +02:00
James Cole
fe24c8971f New translations breadcrumbs.php (French) 2017-08-14 18:10:10 +02:00
James Cole
2410c767f8 New translations form.php (French) 2017-08-14 18:10:09 +02:00
James Cole
a785fd27ec New translations validation.php (French) 2017-08-14 18:10:07 +02:00
James Cole
5d3df4579e New translations list.php (French) 2017-08-14 18:00:13 +02:00
James Cole
3182256580 New translations csv.php (French) 2017-08-14 18:00:11 +02:00
James Cole
84b5c3c789 New translations csv.php (French) 2017-08-14 17:50:12 +02:00
James Cole
4a1a70fa46 New translations csv.php (French) 2017-08-14 17:41:49 +02:00
James Cole
fe457d149c New translations csv.php (French) 2017-08-14 17:00:07 +02:00
James Cole
9a29747bbf New translations csv.php (French) 2017-08-14 16:50:08 +02:00
James Cole
c04eb6dc2a New translations csv.php (French) 2017-08-14 16:20:06 +02:00
James Cole
5a9a6a4680 New translations csv.php (French) 2017-08-14 16:10:14 +02:00
James Cole
1633994fbd Slight change in amount handler. #760 2017-08-13 15:30:39 +02:00
James Cole
f9c85d4d81 Catch the error in #760 2017-08-13 12:37:09 +02:00
James Cole
ec636c95a1 Improve update and verify routines. 2017-08-13 12:30:28 +02:00
James Cole
2915fae942 Merge branch 'release/4.6.4' 2017-08-13 09:04:40 +02:00
James Cole
f9b5468481 Last minute fixes for import routine. 2017-08-13 08:49:45 +02:00
James Cole
287f37eba5 Remove unused parameters. 2017-08-13 08:24:58 +02:00
James Cole
26740668da Import transfer error 2017-08-12 21:23:19 +02:00
James Cole
bdd72f0d30 Fix path for tag controller. 2017-08-12 21:22:59 +02:00
James Cole
7e79f25949 Merge languages. 2017-08-12 19:47:46 +02:00
James Cole
2d917e166c Merge pull request #755 from firefly-iii/l10n_develop
New Crowdin translations
2017-08-12 19:47:26 +02:00
James Cole
ad4a811d0a Small bug fixes [skip ci] 2017-08-12 19:11:24 +02:00
James Cole
ab1aa97af4 Read me says 7.1 too. [skip ci] 2017-08-12 19:11:11 +02:00
James Cole
018941c5b3 Actually use journal [skip ci] 2017-08-12 19:05:29 +02:00
James Cole
cc1439fb7b Revamped import routine. 2017-08-12 19:03:42 +02:00
James Cole
f684a2900b Include default currency. 2017-08-12 16:42:29 +02:00
James Cole
83b721a322 Small bug fix in map / roles. 2017-08-12 16:41:05 +02:00
James Cole
a879528ed8 Back to basics. 2017-08-12 16:40:51 +02:00
James Cole
accbff3ccb Small cleanup in CSV processor 2017-08-12 16:12:30 +02:00
James Cole
0375f77b73 Prevent asset account from being found by opposing account. #719 2017-08-12 13:49:40 +02:00
James Cole
9d01162f42 New translations auth.php (Chinese Traditional) 2017-08-12 10:42:10 +02:00
James Cole
3436dc1564 New translations firefly.php (Slovenian) 2017-08-12 10:42:09 +02:00
James Cole
089293079f New translations firefly.php (Spanish) 2017-08-12 10:42:06 +02:00
James Cole
00e2cd7c04 New translations form.php (Chinese Traditional) 2017-08-12 10:42:04 +02:00
James Cole
f5abb933b0 New translations form.php (French) 2017-08-12 10:42:03 +02:00
James Cole
848386bbaf New translations form.php (Dutch) 2017-08-12 10:42:01 +02:00
James Cole
5562a3c2ae New translations firefly.php (Portuguese, Brazilian) 2017-08-12 10:42:00 +02:00
James Cole
9e8738660b New translations firefly.php (Polish) 2017-08-12 10:41:57 +02:00
James Cole
178772d50d New translations firefly.php (Chinese Traditional) 2017-08-12 10:41:55 +02:00
James Cole
8d7f29c7c9 New translations firefly.php (Dutch) 2017-08-12 10:41:52 +02:00
James Cole
255f87f1c3 New translations firefly.php (German) 2017-08-12 10:41:50 +02:00
James Cole
975354d081 New translations firefly.php (French) 2017-08-12 10:41:48 +02:00
James Cole
ec6890ced1 New translations form.php (German) 2017-08-12 10:41:46 +02:00
James Cole
290efb4b62 New translations form.php (Polish) 2017-08-12 10:41:44 +02:00
James Cole
ab3ea76244 New translations help.php (Portuguese, Brazilian) 2017-08-12 10:41:43 +02:00
James Cole
21d07aef15 New translations help.php (Slovenian) 2017-08-12 10:41:42 +02:00
James Cole
6031cd02b9 New translations help.php (Spanish) 2017-08-12 10:41:41 +02:00
James Cole
2cdb4cab12 New translations list.php (Dutch) 2017-08-12 10:41:41 +02:00
James Cole
679217f2ef New translations list.php (Chinese Traditional) 2017-08-12 10:41:40 +02:00
James Cole
3aacc0a258 New translations help.php (Polish) 2017-08-12 10:41:39 +02:00
James Cole
254cf6cc5b New translations help.php (German) 2017-08-12 10:41:38 +02:00
James Cole
c06095259a New translations form.php (Slovenian) 2017-08-12 10:41:37 +02:00
James Cole
30fd98c8d7 New translations form.php (Portuguese, Brazilian) 2017-08-12 10:41:36 +02:00
James Cole
3a410f04fe New translations form.php (Spanish) 2017-08-12 10:41:35 +02:00
James Cole
4a0a58cdc1 New translations help.php (Chinese Traditional) 2017-08-12 10:41:34 +02:00
James Cole
c834f93539 New translations help.php (French) 2017-08-12 10:41:33 +02:00
James Cole
35bdb84e57 New translations help.php (Dutch) 2017-08-12 10:41:32 +02:00
James Cole
36a3a09fcc New translations breadcrumbs.php (Dutch) 2017-08-12 10:41:30 +02:00
James Cole
2c07b490e8 New translations breadcrumbs.php (French) 2017-08-12 10:41:29 +02:00
James Cole
5790311cbd New translations breadcrumbs.php (German) 2017-08-12 10:41:29 +02:00
James Cole
fde3322117 New translations breadcrumbs.php (Portuguese, Brazilian) 2017-08-12 10:41:28 +02:00
James Cole
5664e133d1 New translations breadcrumbs.php (Polish) 2017-08-12 10:41:27 +02:00
James Cole
a1dc38a83f New translations breadcrumbs.php (Chinese Traditional) 2017-08-12 10:41:26 +02:00
James Cole
df974f93ee New translations auth.php (Spanish) 2017-08-12 10:41:25 +02:00
James Cole
3dde64cdac New translations auth.php (French) 2017-08-12 10:41:24 +02:00
James Cole
6b4887df0f New translations auth.php (Dutch) 2017-08-12 10:41:23 +02:00
James Cole
ca8ef3961e New translations auth.php (German) 2017-08-12 10:41:22 +02:00
James Cole
114e0e5b1e New translations auth.php (Polish) 2017-08-12 10:41:22 +02:00
James Cole
c7a247cbba New translations auth.php (Slovenian) 2017-08-12 10:41:21 +02:00
James Cole
3a641a7020 New translations auth.php (Portuguese, Brazilian) 2017-08-12 10:41:20 +02:00
James Cole
0977859bf5 New translations breadcrumbs.php (Slovenian) 2017-08-12 10:41:19 +02:00
James Cole
a644253ee9 New translations breadcrumbs.php (Spanish) 2017-08-12 10:41:18 +02:00
James Cole
3403356be8 New translations config.php (Spanish) 2017-08-12 10:41:16 +02:00
James Cole
4a9ec0d0d4 New translations config.php (Slovenian) 2017-08-12 10:41:15 +02:00
James Cole
250c5c0745 New translations config.php (Dutch) 2017-08-12 10:41:14 +02:00
James Cole
120b5880b1 New translations config.php (Chinese Traditional) 2017-08-12 10:41:13 +02:00
James Cole
18eff73795 New translations config.php (French) 2017-08-12 10:41:12 +02:00
James Cole
89b9dbb1b4 New translations config.php (German) 2017-08-12 10:41:12 +02:00
James Cole
dde4b3ab93 New translations config.php (Portuguese, Brazilian) 2017-08-12 10:41:11 +02:00
James Cole
b1cc655ba5 New translations config.php (Polish) 2017-08-12 10:41:10 +02:00
James Cole
5645a12d5b New translations list.php (French) 2017-08-12 10:41:09 +02:00
James Cole
ce1a935c06 New translations list.php (German) 2017-08-12 10:41:08 +02:00
James Cole
58b90ad6c9 New translations breadcrumbs.php (Russian) 2017-08-12 10:41:07 +02:00
James Cole
4740e63e76 New translations config.php (Russian) 2017-08-12 10:41:06 +02:00
James Cole
319932c734 New translations form.php (Russian) 2017-08-12 10:41:05 +02:00
James Cole
7cf415288a New translations firefly.php (Russian) 2017-08-12 10:41:03 +02:00
James Cole
fe67c1db8f New translations auth.php (Russian) 2017-08-12 10:41:01 +02:00
James Cole
09afbd89b8 New translations demo.php (Spanish) 2017-08-12 10:41:00 +02:00
James Cole
824f7d827c New translations demo.php (French) 2017-08-12 10:40:59 +02:00
James Cole
3a8ca56f95 New translations demo.php (German) 2017-08-12 10:40:58 +02:00
James Cole
137e3fd083 New translations demo.php (Polish) 2017-08-12 10:40:57 +02:00
James Cole
1285944b1f New translations demo.php (Slovenian) 2017-08-12 10:40:56 +02:00
James Cole
cd8e9deab7 New translations demo.php (Portuguese, Brazilian) 2017-08-12 10:40:56 +02:00
James Cole
de424eac64 New translations help.php (Russian) 2017-08-12 10:40:55 +02:00
James Cole
d106a09766 New translations list.php (Russian) 2017-08-12 10:40:54 +02:00
James Cole
963e8ccd2c New translations intro.php (Polish) 2017-08-12 10:40:53 +02:00
James Cole
3474b8f2d0 New translations intro.php (Portuguese, Brazilian) 2017-08-12 10:40:52 +02:00
James Cole
e27b449ae9 New translations intro.php (Russian) 2017-08-12 10:40:51 +02:00
James Cole
7656818456 New translations intro.php (Spanish) 2017-08-12 10:40:50 +02:00
James Cole
d214be1215 New translations intro.php (Slovenian) 2017-08-12 10:40:49 +02:00
James Cole
c8678c3ee5 New translations intro.php (German) 2017-08-12 10:40:48 +02:00
James Cole
108ee40c3f New translations intro.php (French) 2017-08-12 10:40:47 +02:00
James Cole
de51d205dc New translations passwords.php (Russian) 2017-08-12 10:40:46 +02:00
James Cole
1f76246edc New translations pagination.php (Russian) 2017-08-12 10:40:45 +02:00
James Cole
f91974b766 New translations validation.php (Russian) 2017-08-12 10:40:44 +02:00
James Cole
df85936145 New translations demo.php (Russian) 2017-08-12 10:40:43 +02:00
James Cole
f39aa0f52a New translations intro.php (Dutch) 2017-08-12 10:40:42 +02:00
James Cole
180812394b New translations intro.php (Chinese Traditional) 2017-08-12 10:40:41 +02:00
James Cole
291fa9597f New translations demo.php (Dutch) 2017-08-12 10:40:40 +02:00
James Cole
6c4d8c25fc New translations demo.php (Chinese Traditional) 2017-08-12 10:40:39 +02:00
James Cole
bf4b32a8e9 New translations pagination.php (Polish) 2017-08-12 10:40:39 +02:00
James Cole
2e9dac7678 New translations pagination.php (Portuguese, Brazilian) 2017-08-12 10:40:38 +02:00
James Cole
369314c1cb New translations pagination.php (Slovenian) 2017-08-12 10:40:37 +02:00
James Cole
6ab86898af New translations passwords.php (Chinese Traditional) 2017-08-12 10:40:36 +02:00
James Cole
f3aa65d219 New translations pagination.php (Spanish) 2017-08-12 10:40:35 +02:00
James Cole
edf4f19de9 New translations pagination.php (German) 2017-08-12 10:40:34 +02:00
James Cole
91eaaae6d7 New translations pagination.php (French) 2017-08-12 10:40:34 +02:00
James Cole
ca0ae5a165 New translations list.php (Portuguese, Brazilian) 2017-08-12 10:40:33 +02:00
James Cole
86d788d294 New translations list.php (Polish) 2017-08-12 10:40:32 +02:00
James Cole
e345cea9be New translations list.php (Slovenian) 2017-08-12 10:40:31 +02:00
James Cole
779f7841c2 New translations list.php (Spanish) 2017-08-12 10:40:30 +02:00
James Cole
15fdca46b8 New translations pagination.php (Dutch) 2017-08-12 10:40:29 +02:00
James Cole
97e099c70f New translations pagination.php (Chinese Traditional) 2017-08-12 10:40:28 +02:00
James Cole
d5a58bb763 New translations passwords.php (Dutch) 2017-08-12 10:40:26 +02:00
James Cole
2774df0d30 New translations passwords.php (French) 2017-08-12 10:40:25 +02:00
James Cole
93a1799a4b New translations validation.php (German) 2017-08-12 10:40:24 +02:00
James Cole
f65f051c7c New translations validation.php (Polish) 2017-08-12 10:40:23 +02:00
James Cole
c46952dd4e New translations validation.php (Portuguese, Brazilian) 2017-08-12 10:40:22 +02:00
James Cole
1dad6b6118 New translations validation.php (Spanish) 2017-08-12 10:40:22 +02:00
James Cole
e964621f2c New translations validation.php (Slovenian) 2017-08-12 10:40:21 +02:00
James Cole
46ae62f693 New translations validation.php (French) 2017-08-12 10:40:20 +02:00
James Cole
7d578f5852 New translations validation.php (Dutch) 2017-08-12 10:40:19 +02:00
James Cole
467f257ad3 New translations passwords.php (Polish) 2017-08-12 10:40:18 +02:00
James Cole
55186c0a49 New translations passwords.php (German) 2017-08-12 10:40:17 +02:00
James Cole
1a0a4f7112 New translations passwords.php (Portuguese, Brazilian) 2017-08-12 10:40:16 +02:00
James Cole
658290ae80 New translations passwords.php (Slovenian) 2017-08-12 10:40:15 +02:00
James Cole
cb9f29c6fc New translations validation.php (Chinese Traditional) 2017-08-12 10:40:15 +02:00
James Cole
d8f4955292 New translations passwords.php (Spanish) 2017-08-12 10:40:13 +02:00
James Cole
9803932324 Various code clean up. 2017-08-12 10:27:45 +02:00
James Cole
a3a416b5e2 New composer file 2017-08-12 09:15:09 +02:00
James Cole
1453a318fe Merge branch 'develop' of https://github.com/firefly-iii/firefly-iii into develop
* 'develop' of https://github.com/firefly-iii/firefly-iii: (23 commits)
  New translations firefly.php (Dutch)
  New translations firefly.php (Chinese Traditional)
  New translations firefly.php (Dutch)
  New translations firefly.php (Polish)
  New translations firefly.php (Portuguese, Brazilian)
  New translations firefly.php (Slovenian)
  New translations firefly.php (Spanish)
  New translations firefly.php (German)
  New translations firefly.php (French)
  New translations firefly.php (Russian)
  New translations firefly.php (Dutch)
  New translations validation.php (Dutch)
  New translations form.php (Dutch)
  New translations csv.php (Dutch)
  New translations firefly.php (Slovenian)
  New translations firefly.php (Spanish)
  New translations firefly.php (Portuguese, Brazilian)
  New translations firefly.php (Polish)
  New translations firefly.php (Chinese Traditional)
  New translations firefly.php (Dutch)
  ...
2017-08-12 09:14:54 +02:00
James Cole
9ffa01d318 Merge pull request #754 from firefly-iii/l10n_develop
New Crowdin translations
2017-08-12 09:14:18 +02:00
James Cole
29b779c873 Remove intro popup. 2017-08-12 09:06:13 +02:00
James Cole
598307f676 Update change log 2017-08-12 09:06:02 +02:00
James Cole
aa9d546bf5 New translations firefly.php (Dutch) 2017-08-12 08:20:30 +02:00
James Cole
f2ef245eca New translations firefly.php (Chinese Traditional) 2017-08-12 08:10:24 +02:00
James Cole
458606381e New translations firefly.php (Dutch) 2017-08-12 08:10:21 +02:00
James Cole
244f174dc9 New translations firefly.php (Polish) 2017-08-12 08:10:19 +02:00
James Cole
8a577f3197 New translations firefly.php (Portuguese, Brazilian) 2017-08-12 08:10:17 +02:00
James Cole
2f1b24cc14 New translations firefly.php (Slovenian) 2017-08-12 08:10:13 +02:00
James Cole
d5f836db7a New translations firefly.php (Spanish) 2017-08-12 08:10:10 +02:00
James Cole
ffd7c36cb2 New translations firefly.php (German) 2017-08-12 08:05:26 +02:00
James Cole
dba543d539 New translations firefly.php (French) 2017-08-12 08:05:24 +02:00
James Cole
9753c0f8eb New translations firefly.php (Russian) 2017-08-12 08:05:09 +02:00
James Cole
c50b4d3d47 New translations firefly.php (Dutch) 2017-08-12 08:05:02 +02:00
James Cole
907f886cf0 New translations validation.php (Dutch) 2017-08-12 08:04:53 +02:00
James Cole
218a2d2004 Expand password modal. 2017-08-12 08:01:40 +02:00
James Cole
0e0f2c6833 New translations form.php (Dutch) 2017-08-12 08:00:06 +02:00
James Cole
e59090d3b6 Text and modal for password security. 2017-08-12 07:56:02 +02:00
James Cole
0404be8bef New translations csv.php (Dutch) 2017-08-12 07:50:05 +02:00
James Cole
337895cbaa Add newlines to files. 2017-08-12 07:48:39 +02:00
James Cole
743547096e Various code cleanup 2017-08-12 07:47:42 +02:00
James Cole
81fb3df45e Fix #747 2017-08-12 07:39:58 +02:00
James Cole
12624cab5b Improve foreign currency routine for #746 2017-08-12 07:38:22 +02:00
James Cole
7d62ea88d2 New translations firefly.php (Slovenian) 2017-08-12 07:10:58 +02:00
James Cole
abcc277430 New translations firefly.php (Spanish) 2017-08-12 07:10:55 +02:00
James Cole
4c4c9426ee New translations firefly.php (Portuguese, Brazilian) 2017-08-12 07:10:52 +02:00
James Cole
88fdeb2bf2 New translations firefly.php (Polish) 2017-08-12 07:10:50 +02:00
James Cole
f9ab868022 New translations firefly.php (Chinese Traditional) 2017-08-12 07:10:47 +02:00
James Cole
148d2cec8f New translations firefly.php (Dutch) 2017-08-12 07:10:45 +02:00
James Cole
5869f157f6 New translations firefly.php (German) 2017-08-12 07:10:43 +02:00
James Cole
69a2902161 New translations firefly.php (French) 2017-08-12 07:10:40 +02:00
James Cole
c19b048249 New translations firefly.php (Russian) 2017-08-12 07:10:26 +02:00
James Cole
cd2c8acdb2 Merge pull request #729 from firefly-iii/l10n_develop
New Crowdin translations
2017-08-12 07:01:33 +02:00
James Cole
7d0d1c764f Make sure we’re still at 4.6.4 and bunq import is unavailable. [skip ci] 2017-08-12 07:01:21 +02:00
James Cole
b5acf1d529 Merge early release branch
Code for #749
  Add link to split withdrawal
  Clarifies #751
  Text for #748
  Improve error reporting #752
  Small code cleanup.
  Add copyright markers.
2017-08-12 06:59:59 +02:00
James Cole
72b08384ad Code for #749 2017-08-12 06:55:46 +02:00
James Cole
f51e48f282 Add link to split withdrawal 2017-08-12 06:55:35 +02:00
James Cole
2e6d1f3642 Clarifies #751 2017-08-12 06:44:00 +02:00
James Cole
716af4ed93 Text for #748 2017-08-12 06:41:14 +02:00
James Cole
31de86c9eb Improve error reporting #752 2017-08-12 06:40:17 +02:00
James Cole
04a2cd1f1f Small code cleanup. 2017-08-11 05:42:15 +02:00
James Cole
bc0ef11a8c Add copyright markers. 2017-08-11 05:36:05 +02:00
James Cole
90c8420a4c Initial code for preparing bunq import #714 2017-08-11 05:21:00 +02:00
James Cole
657d5e0d74 Upgrade version in develop 2017-08-11 05:02:49 +02:00
James Cole
03fa4d957c Added upgrade instruction [skip ci] 2017-08-10 20:52:10 +02:00
James Cole
8d4530f1f2 Fixes #743 2017-08-10 20:48:29 +02:00
James Cole
6d15c503c3 Fix #515 2017-08-10 20:41:33 +02:00
James Cole
75ddb34398 Remove references to date range thing. 2017-08-10 19:57:18 +02:00
James Cole
6fbfe6fb72 Remove references to date range thing. 2017-08-10 19:55:52 +02:00
James Cole
db500e911c update date range picker 2017-08-10 19:55:23 +02:00
James Cole
c0c5ced6ad Fix multi currency edit display 2017-08-10 19:55:13 +02:00
James Cole
726270f8bc New translations form.php (Chinese Traditional) 2017-08-08 16:41:01 +02:00
James Cole
c3908450a0 New translations form.php (French) 2017-08-08 16:40:59 +02:00
James Cole
f7ba05f465 New translations form.php (Dutch) 2017-08-08 16:40:58 +02:00
James Cole
dea7f7d5d6 New translations form.php (German) 2017-08-08 16:40:46 +02:00
James Cole
ed7a0a2b9d New translations form.php (Polish) 2017-08-08 16:40:45 +02:00
James Cole
ac6b4db0f8 New translations form.php (Slovenian) 2017-08-08 16:40:41 +02:00
James Cole
b5d659c13c New translations form.php (Portuguese, Brazilian) 2017-08-08 16:40:40 +02:00
James Cole
919cb5d1f2 New translations form.php (Spanish) 2017-08-08 16:40:39 +02:00
James Cole
e504d3cc35 New translations form.php (Russian) 2017-08-08 16:40:28 +02:00
James Cole
1d67939e76 No password service in env file. [skip ci] 2017-08-08 16:30:43 +02:00
James Cole
5d1e90d29c Expand verify password routine. 2017-08-08 16:30:21 +02:00
James Cole
1678eba9cc New translations intro.php (Polish) 2017-08-08 16:10:35 +02:00
James Cole
cc142b2ba1 New translations intro.php (Portuguese, Brazilian) 2017-08-08 16:10:33 +02:00
James Cole
48cbffba14 New translations intro.php (Russian) 2017-08-08 16:10:32 +02:00
James Cole
d909bb1b25 New translations intro.php (Spanish) 2017-08-08 16:10:31 +02:00
James Cole
3313e66fc2 New translations intro.php (Slovenian) 2017-08-08 16:10:30 +02:00
James Cole
085892a4c8 New translations intro.php (German) 2017-08-08 16:10:28 +02:00
James Cole
817e059230 New translations intro.php (French) 2017-08-08 16:10:27 +02:00
James Cole
7ce8891246 New translations intro.php (Dutch) 2017-08-08 16:10:25 +02:00
James Cole
439b2589f9 New translations intro.php (Chinese Traditional) 2017-08-08 16:10:24 +02:00
James Cole
e7b5cf66d2 Fix #739 2017-08-08 16:06:58 +02:00
James Cole
b29fabf76c Include virtual balance in transaction overview #735 2017-08-07 20:36:23 +02:00
James Cole
5d837c3ee4 Bump version. [skip ci] 2017-08-07 20:27:58 +02:00
James Cole
4c0396ad1c Fixes #733 2017-08-07 17:59:26 +02:00
James Cole
97b62fce79 New translations firefly.php (Russian) 2017-08-05 02:00:07 +02:00
James Cole
e904a38735 New translations firefly.php (Russian) 2017-08-05 01:10:08 +02:00
James Cole
ae72187aed New translations form.php (Russian) 2017-08-05 01:10:05 +02:00
James Cole
e4ebeefa61 New translations firefly.php (Russian) 2017-08-05 01:00:09 +02:00
James Cole
417373ba70 New translations form.php (Russian) 2017-08-05 01:00:06 +02:00
James Cole
36f9ded08e New translations breadcrumbs.php (Russian) 2017-08-05 01:00:05 +02:00
James Cole
858925b8c8 New translations firefly.php (Slovenian) 2017-08-04 17:11:13 +02:00
James Cole
d36c96fba9 New translations firefly.php (Spanish) 2017-08-04 17:11:10 +02:00
James Cole
2be6fb329e New translations firefly.php (Portuguese, Brazilian) 2017-08-04 17:11:05 +02:00
James Cole
da56363ef9 New translations firefly.php (Polish) 2017-08-04 17:11:02 +02:00
James Cole
90d73228f3 New translations firefly.php (Chinese Traditional) 2017-08-04 17:10:59 +02:00
James Cole
1c76fcd26b New translations firefly.php (Dutch) 2017-08-04 17:10:55 +02:00
James Cole
c26c4ddf15 New translations firefly.php (German) 2017-08-04 17:10:53 +02:00
James Cole
537bdb62da New translations firefly.php (French) 2017-08-04 17:10:49 +02:00
James Cole
b2ac2bd97a New translations firefly.php (Russian) 2017-08-04 17:10:32 +02:00
James Cole
aee6ea56b5 New translations validation.php (Russian) 2017-08-04 17:10:24 +02:00
James Cole
ff5506c842 New translations validation.php (German) 2017-08-04 17:10:16 +02:00
James Cole
94c5340fbf New translations validation.php (Polish) 2017-08-04 17:10:15 +02:00
James Cole
0e11026b60 New translations validation.php (Portuguese, Brazilian) 2017-08-04 17:10:14 +02:00
James Cole
1d8e953ebc New translations validation.php (Spanish) 2017-08-04 17:10:13 +02:00
James Cole
8708fba4bc New translations validation.php (Slovenian) 2017-08-04 17:10:12 +02:00
James Cole
bc1294ae61 New translations validation.php (French) 2017-08-04 17:10:10 +02:00
James Cole
308f05101e New translations validation.php (Dutch) 2017-08-04 17:10:09 +02:00
James Cole
f368739303 New translations validation.php (Chinese Traditional) 2017-08-04 17:10:07 +02:00
James Cole
1bca1b921b Fix import tests. 2017-08-04 16:24:44 +02:00
James Cole
3e513e92b1 Import routine is prepped for multi-source import (such as banks). 2017-08-04 15:56:14 +02:00
James Cole
194fe178c0 Refactor for #732 2017-08-04 15:48:26 +02:00
James Cole
5d10a19bfa First version of routine #732 2017-08-04 15:46:52 +02:00
James Cole
8f52a68526 New translations firefly.php (French) 2017-08-04 13:10:13 +02:00
James Cole
c67d0d59bb New translations firefly.php (French) 2017-08-04 13:00:08 +02:00
James Cole
4477064f17 New translations firefly.php (French) 2017-08-04 12:50:08 +02:00
James Cole
9dbe24b37c New translations csv.php (Portuguese, Brazilian) 2017-08-04 08:20:13 +02:00
James Cole
46a85295e8 New translations firefly.php (Portuguese, Brazilian) 2017-08-04 08:20:11 +02:00
James Cole
63170324a8 New translations form.php (Portuguese, Brazilian) 2017-08-04 08:20:08 +02:00
James Cole
4fd157b5f4 New translations firefly.php (Polish) 2017-08-03 21:00:23 +02:00
James Cole
e5406a0ea3 New translations firefly.php (Chinese Traditional) 2017-08-03 21:00:20 +02:00
James Cole
9b64ba21fd New translations firefly.php (Portuguese, Brazilian) 2017-08-03 21:00:17 +02:00
James Cole
18fcf07971 New translations firefly.php (Slovenian) 2017-08-03 21:00:14 +02:00
James Cole
d3404c6570 New translations firefly.php (Spanish) 2017-08-03 21:00:10 +02:00
James Cole
1878b5287b Cheap solution for #730 [skip ci] 2017-08-03 20:50:16 +02:00
James Cole
7f74545586 New translations firefly.php (German) 2017-07-30 14:10:38 +02:00
James Cole
a920894a8f New translations firefly.php (French) 2017-07-30 14:10:35 +02:00
James Cole
2c912456ce New translations firefly.php (Russian) 2017-07-30 14:10:23 +02:00
James Cole
ebda475972 New translations firefly.php (Dutch) 2017-07-30 14:10:17 +02:00
James Cole
05aace84e1 Fix tests for show() routines. 2017-07-30 13:57:46 +02:00
James Cole
1cfa1faccc Remove all time jumps because they’re unclear and complex. 2017-07-30 13:53:04 +02:00
James Cole
1caa393974 Simple cache routine. 2017-07-30 13:44:36 +02:00
James Cole
ef357ab6e5 Fix tests 2017-07-30 13:42:38 +02:00
James Cole
c39c5492ea Simplify controllers 2017-07-30 13:42:30 +02:00
James Cole
1a5d54f74f New translations firefly.php (Slovenian) 2017-07-30 10:40:53 +02:00
James Cole
13dc6c7dfb New translations firefly.php (Spanish) 2017-07-30 10:40:50 +02:00
James Cole
4c7dee69c2 New translations firefly.php (Portuguese, Brazilian) 2017-07-30 10:40:47 +02:00
James Cole
dc9cf7689d New translations firefly.php (Polish) 2017-07-30 10:40:44 +02:00
James Cole
778a408c6c New translations firefly.php (Chinese Traditional) 2017-07-30 10:40:42 +02:00
James Cole
2b7f3061d0 New translations firefly.php (Dutch) 2017-07-30 10:40:40 +02:00
James Cole
92903e1ec3 New translations firefly.php (German) 2017-07-30 10:40:37 +02:00
James Cole
c5a621010e New translations firefly.php (French) 2017-07-30 10:40:35 +02:00
James Cole
0b5b636578 New translations firefly.php (Russian) 2017-07-30 10:40:20 +02:00
James Cole
8fcdb91ba3 Will no longer support extended tag modes. 2017-07-30 10:22:14 +02:00
James Cole
f67d5f1197 Fix bug in filter. 2017-07-30 10:21:45 +02:00
James Cole
6e0e6203cc Some help text for attachment decrypter 2017-07-30 10:21:35 +02:00
James Cole
2694ce4148 Decryption routine for #671 2017-07-30 08:22:39 +02:00
James Cole
7c02b032f6 New translations firefly.php (Slovenian) 2017-07-29 14:40:52 +02:00
James Cole
deb7754cb9 New translations firefly.php (Spanish) 2017-07-29 14:40:50 +02:00
James Cole
624f3c60bd New translations firefly.php (Portuguese, Brazilian) 2017-07-29 14:40:46 +02:00
James Cole
8a8e792faa New translations firefly.php (Polish) 2017-07-29 14:40:44 +02:00
James Cole
bc836011bc New translations firefly.php (Chinese Traditional) 2017-07-29 14:40:41 +02:00
James Cole
107eedfb49 New translations firefly.php (Dutch) 2017-07-29 14:40:38 +02:00
James Cole
61a7dcda23 New translations firefly.php (German) 2017-07-29 14:40:36 +02:00
James Cole
873ca4f438 New translations firefly.php (French) 2017-07-29 14:40:33 +02:00
James Cole
29221c2901 New translations firefly.php (Russian) 2017-07-29 14:40:19 +02:00
James Cole
eac9613df7 Fix for #648 2017-07-29 14:25:54 +02:00
James Cole
184d5d25a6 New translations csv.php (Spanish) 2017-07-29 08:40:46 +02:00
James Cole
ae33411566 New translations csv.php (Slovenian) 2017-07-29 08:40:34 +02:00
James Cole
479ebcc3fa New translations csv.php (Portuguese, Brazilian) 2017-07-29 08:40:33 +02:00
James Cole
1ae572cf30 New translations csv.php (Chinese Traditional) 2017-07-29 08:40:29 +02:00
James Cole
ac6e16688d New translations csv.php (Dutch) 2017-07-29 08:40:28 +02:00
James Cole
69159e0271 New translations csv.php (French) 2017-07-29 08:40:28 +02:00
James Cole
cae35d6a5a New translations csv.php (Polish) 2017-07-29 08:40:27 +02:00
James Cole
df9b65e296 New translations csv.php (German) 2017-07-29 08:40:26 +02:00
James Cole
fb0b34a6a0 New translations csv.php (Russian) 2017-07-29 08:40:22 +02:00
James Cole
db3b822aef Include warning for #722 2017-07-29 08:27:39 +02:00
James Cole
f4994ef151 Also store links when importing data. 2017-07-28 14:52:01 +02:00
James Cole
8e27291417 Tags no longer mappable. 2017-07-28 14:40:53 +02:00
James Cole
aae9ad78e5 This should fix the tests for now. 2017-07-26 18:40:48 +02:00
James Cole
fb3efbfc66 Fix parameter count. 2017-07-26 16:40:25 +02:00
James Cole
0f8a66609a Fix controller for #718 2017-07-26 16:40:14 +02:00
James Cole
b3bb8c386f Fix routes for #718 2017-07-26 16:40:00 +02:00
James Cole
b3b5e0e155 This will disable the PHP 7.0 tests. 2017-07-25 21:01:37 +02:00
James Cole
99a0bf1286 This fixes #717 2017-07-25 21:01:25 +02:00
James Cole
650f0ee752 Merge branch 'hotfix/4.6.3.1' into develop 2017-07-23 20:02:46 +02:00
James Cole
2ddcf1120f Merge branch 'hotfix/4.6.3.1' 2017-07-23 20:02:45 +02:00
James Cole
d45c74915c This fixes #715 2017-07-23 20:02:32 +02:00
James Cole
cd373791ac Updated composer file. 2017-07-23 20:00:26 +02:00
James Cole
7b03b0c5fc Some PHP 7.1 compatible code. 2017-07-23 19:06:24 +02:00
James Cole
57d6677131 Merge branch 'release/4.6.3' 2017-07-23 10:01:48 +02:00
James Cole
05e73344eb Various files for upgrade. 2017-07-23 09:54:07 +02:00
James Cole
fff8f96490 Merge pull request #706 from firefly-iii/l10n_develop
New Crowdin translations
2017-07-23 09:53:40 +02:00
James Cole
1ccfb34246 New translations firefly.php (Slovenian) 2017-07-23 09:50:53 +02:00
James Cole
b30bd00993 New translations firefly.php (Spanish) 2017-07-23 09:50:51 +02:00
James Cole
6b2d9fe816 New translations firefly.php (Portuguese, Brazilian) 2017-07-23 09:50:47 +02:00
James Cole
531114279d New translations firefly.php (Polish) 2017-07-23 09:50:45 +02:00
James Cole
944aaff0fa New translations firefly.php (Chinese Traditional) 2017-07-23 09:50:42 +02:00
James Cole
6bafa6819d New translations firefly.php (Dutch) 2017-07-23 09:50:40 +02:00
James Cole
8d7091285a New translations firefly.php (German) 2017-07-23 09:50:38 +02:00
James Cole
579e95219a New translations firefly.php (French) 2017-07-23 09:50:35 +02:00
James Cole
4a746881e3 New translations firefly.php (Russian) 2017-07-23 09:50:20 +02:00
James Cole
9122f1b642 New translations firefly.php (Dutch) 2017-07-23 09:40:08 +02:00
James Cole
8b033ed4a8 Update contributing and support guidelines [skip ci] 2017-07-23 09:37:51 +02:00
James Cole
8e53a63243 Broken translation. [skip ci] 2017-07-23 09:36:50 +02:00
James Cole
4de01e7387 New translations firefly.php (Dutch) 2017-07-23 09:30:10 +02:00
James Cole
f85ab74e2b Code cleanup and tests. 2017-07-23 08:32:51 +02:00
James Cole
8bb7d5de3f Various code clean up. 2017-07-23 08:16:11 +02:00
James Cole
68424e485c New translations firefly.php (Slovenian) 2017-07-23 07:41:00 +02:00
James Cole
ac34285eed New translations firefly.php (Spanish) 2017-07-23 07:40:58 +02:00
James Cole
e605a82573 New translations firefly.php (Portuguese, Brazilian) 2017-07-23 07:40:55 +02:00
James Cole
1061764426 New translations firefly.php (Polish) 2017-07-23 07:40:52 +02:00
James Cole
8d93e410f7 New translations firefly.php (Chinese Traditional) 2017-07-23 07:40:49 +02:00
James Cole
9336cdcc5d New translations firefly.php (Dutch) 2017-07-23 07:40:47 +02:00
James Cole
7639c03646 New translations firefly.php (German) 2017-07-23 07:40:45 +02:00
James Cole
2da55bff9c New translations firefly.php (French) 2017-07-23 07:40:43 +02:00
James Cole
6ea5d45dec New translations firefly.php (Russian) 2017-07-23 07:40:29 +02:00
James Cole
e9504a3899 New translations intro.php (Polish) 2017-07-23 07:40:25 +02:00
James Cole
7bff2fd1e5 New translations intro.php (Portuguese, Brazilian) 2017-07-23 07:40:23 +02:00
James Cole
694712e933 New translations intro.php (Russian) 2017-07-23 07:40:22 +02:00
James Cole
aa675559e6 New translations intro.php (Spanish) 2017-07-23 07:40:22 +02:00
James Cole
2af19d675a New translations intro.php (Slovenian) 2017-07-23 07:40:21 +02:00
James Cole
4588d16fc2 New translations intro.php (German) 2017-07-23 07:40:20 +02:00
James Cole
5dbd3031be New translations intro.php (French) 2017-07-23 07:40:19 +02:00
James Cole
59c16eba77 New translations intro.php (Dutch) 2017-07-23 07:40:17 +02:00
James Cole
8c21ec96d1 New translations intro.php (Chinese Traditional) 2017-07-23 07:40:16 +02:00
James Cole
2c00a8353d Fix small issue reenabling intro [skip ci] 2017-07-23 07:35:30 +02:00
James Cole
19e7a76f85 Forgot small statement [skip ci] 2017-07-23 07:32:06 +02:00
James Cole
f16a186faf Option to re-enable intro boxes. 2017-07-23 07:30:05 +02:00
James Cole
456dd39ec4 New intro texts. 2017-07-22 22:56:21 +02:00
James Cole
5b69a697e4 Improve pages to show intro texts. 2017-07-22 10:50:30 +02:00
James Cole
20d279fee4 New translations firefly.php (Slovenian) 2017-07-21 06:20:54 +02:00
James Cole
cd55d819af New translations firefly.php (Spanish) 2017-07-21 06:20:52 +02:00
James Cole
dce51da92f New translations firefly.php (Portuguese, Brazilian) 2017-07-21 06:20:48 +02:00
James Cole
6118cf6041 New translations firefly.php (Polish) 2017-07-21 06:20:45 +02:00
James Cole
4ae8bffd4d New translations firefly.php (Chinese Traditional) 2017-07-21 06:20:42 +02:00
James Cole
5ebe86d5b6 New translations firefly.php (Dutch) 2017-07-21 06:20:40 +02:00
James Cole
317d97a310 New translations firefly.php (German) 2017-07-21 06:20:38 +02:00
James Cole
082aa1d8e3 New translations firefly.php (French) 2017-07-21 06:20:36 +02:00
James Cole
2f2963676f New translations firefly.php (Russian) 2017-07-21 06:20:19 +02:00
James Cole
f2d388f742 Improve code for intro texts. 2017-07-21 06:00:10 +02:00
James Cole
d79008495a Remove some html comments. 2017-07-21 04:36:23 +02:00
James Cole
43f1867fb8 Language strings for #708 2017-07-21 04:36:09 +02:00
James Cole
043c28628c Fixes #708 2017-07-21 04:35:57 +02:00
James Cole
9540854c8a Language is not complete yet. [skip ci] 2017-07-21 04:26:13 +02:00
James Cole
b951a6ca66 Merge pull request #712 from simonsmiley/update-charts
Make charts easier to read
2017-07-19 16:11:58 +02:00
Simon Hanna
26561a395d Make charts easier to read
* Do not fill the area below the lines
* Provide border color
* Decrease transparency of border
2017-07-19 15:53:22 +02:00
James Cole
0a884c8718 New translations intro.php (Polish) 2017-07-16 18:40:23 +02:00
James Cole
b393e3c662 New translations intro.php (Portuguese, Brazilian) 2017-07-16 18:40:22 +02:00
James Cole
c36062210f New translations intro.php (Russian) 2017-07-16 18:40:21 +02:00
James Cole
861381fbb6 New translations intro.php (Spanish) 2017-07-16 18:40:20 +02:00
James Cole
b9019f9590 New translations intro.php (Slovenian) 2017-07-16 18:40:19 +02:00
James Cole
fcfa877e89 New translations intro.php (German) 2017-07-16 18:40:18 +02:00
James Cole
d61849eefe New translations intro.php (French) 2017-07-16 18:40:17 +02:00
James Cole
bc83bd6ec8 New translations intro.php (Dutch) 2017-07-16 18:40:15 +02:00
James Cole
c18c94e565 New translations intro.php (Chinese Traditional) 2017-07-16 18:40:15 +02:00
James Cole
77d077ec08 Fix help button. 2017-07-16 18:28:46 +02:00
James Cole
021d0e6359 More stuff for intro texts. 2017-07-16 18:14:29 +02:00
James Cole
7f4fd2c52f Fix tests. 2017-07-16 17:05:52 +02:00
James Cole
8ffe098e3b New translations firefly.php (Slovenian) 2017-07-16 13:20:56 +02:00
James Cole
a2ca86ca74 New translations firefly.php (Spanish) 2017-07-16 13:20:54 +02:00
James Cole
deef018806 New translations firefly.php (Portuguese, Brazilian) 2017-07-16 13:20:50 +02:00
James Cole
c3f8b2ea56 New translations firefly.php (Polish) 2017-07-16 13:20:47 +02:00
James Cole
e3696b6055 New translations firefly.php (Chinese Traditional) 2017-07-16 13:20:45 +02:00
James Cole
b82b340668 New translations firefly.php (Dutch) 2017-07-16 13:20:42 +02:00
James Cole
a8b01c439b New translations firefly.php (German) 2017-07-16 13:20:39 +02:00
James Cole
6ec686ca7e New translations firefly.php (French) 2017-07-16 13:20:37 +02:00
James Cole
fdb664fecb New translations firefly.php (Russian) 2017-07-16 13:20:21 +02:00
James Cole
09f838089b Allow rule to be applied to transactions (not just group). 2017-07-16 13:04:45 +02:00
James Cole
db0fe918b8 New translations firefly.php (Dutch) 2017-07-16 08:00:07 +02:00
James Cole
8ca696d547 New translations firefly.php (Dutch) 2017-07-16 07:50:41 +02:00
James Cole
b7ccb1ce5c New translations breadcrumbs.php (Dutch) 2017-07-16 07:50:33 +02:00
James Cole
5f0033e466 New translations intro.php (Polish) 2017-07-16 07:50:22 +02:00
James Cole
477adba3e1 New translations intro.php (Portuguese, Brazilian) 2017-07-16 07:50:21 +02:00
James Cole
eb15ca8ebd New translations intro.php (Russian) 2017-07-16 07:50:20 +02:00
James Cole
dbf5907c20 New translations intro.php (Spanish) 2017-07-16 07:50:19 +02:00
James Cole
e95deb9443 New translations intro.php (Slovenian) 2017-07-16 07:50:19 +02:00
James Cole
e19c36b5c4 New translations intro.php (German) 2017-07-16 07:50:18 +02:00
James Cole
fdd589db4f New translations intro.php (French) 2017-07-16 07:50:17 +02:00
James Cole
cd4e45d8f5 New translations intro.php (Dutch) 2017-07-16 07:50:16 +02:00
James Cole
e6e31b9cab New translations intro.php (Chinese Traditional) 2017-07-16 07:50:15 +02:00
James Cole
b676b1fef9 Simplify import storage routine. 2017-07-16 07:45:20 +02:00
James Cole
58bfb35fa6 Built a new routine for intro tours. 2017-07-16 07:35:08 +02:00
James Cole
09131e8c36 Add Russian language. 2017-07-15 22:42:14 +02:00
James Cole
1d6ca91c01 This fixes the tests. 2017-07-15 22:41:57 +02:00
James Cole
fa00ba2edd Expand tests and fix various small issues in strict comparison. 2017-07-15 22:17:24 +02:00
James Cole
65114c8483 New translations firefly.php (German) 2017-07-15 22:00:52 +02:00
James Cole
d033985141 New translations firefly.php (Polish) 2017-07-15 22:00:49 +02:00
James Cole
5badfbee93 New translations firefly.php (Portuguese, Brazilian) 2017-07-15 22:00:47 +02:00
James Cole
44a61842f0 New translations firefly.php (Slovenian) 2017-07-15 22:00:45 +02:00
James Cole
70b61af572 New translations firefly.php (French) 2017-07-15 22:00:42 +02:00
James Cole
53a53d393d New translations firefly.php (Chinese Traditional) 2017-07-15 22:00:38 +02:00
James Cole
6c95b5757b New translations firefly.php (Spanish) 2017-07-15 22:00:35 +02:00
James Cole
693b3e5a6f New translations firefly.php (Russian) 2017-07-15 22:00:18 +02:00
James Cole
aac1338bdd Merge pull request #705 from firefly-iii/l10n_develop
New Crowdin translations
2017-07-15 21:58:20 +02:00
James Cole
2979137102 New translations firefly.php (Dutch) 2017-07-15 21:50:12 +02:00
James Cole
0068675f3b Remove alert [skip ci] 2017-07-15 21:48:02 +02:00
James Cole
6c1a22ea7f Merge pull request #702 from firefly-iii/l10n_develop
New Crowdin translations
2017-07-15 21:42:33 +02:00
James Cole
2869b92e6b Merge branch 'develop' into l10n_develop 2017-07-15 21:42:27 +02:00
James Cole
8a38ce1964 Remove references to old tour but include code for new tour. 2017-07-15 21:40:42 +02:00
James Cole
3a7c5566ed New translations firefly.php (German) 2017-07-15 17:30:52 +02:00
James Cole
1bed8c2b08 New translations firefly.php (Polish) 2017-07-15 17:30:49 +02:00
James Cole
e24500b306 New translations firefly.php (Portuguese, Brazilian) 2017-07-15 17:30:47 +02:00
James Cole
6251914419 New translations firefly.php (Slovenian) 2017-07-15 17:30:45 +02:00
James Cole
8d9e943d57 New translations firefly.php (French) 2017-07-15 17:30:43 +02:00
James Cole
f71bc5d323 New translations firefly.php (Dutch) 2017-07-15 17:30:40 +02:00
James Cole
a8082b2b3f New translations firefly.php (Chinese Traditional) 2017-07-15 17:30:37 +02:00
James Cole
510b72303d New translations firefly.php (Spanish) 2017-07-15 17:30:35 +02:00
James Cole
4666d4bbaa New translations breadcrumbs.php (Chinese Traditional) 2017-07-15 17:30:28 +02:00
James Cole
025f1e9502 New translations breadcrumbs.php (Dutch) 2017-07-15 17:30:27 +02:00
James Cole
b4c05098a9 New translations breadcrumbs.php (French) 2017-07-15 17:30:27 +02:00
James Cole
3c8ee6f7f7 New translations breadcrumbs.php (German) 2017-07-15 17:30:26 +02:00
James Cole
8b34135b08 New translations breadcrumbs.php (Polish) 2017-07-15 17:30:24 +02:00
James Cole
d4b7c6689f New translations breadcrumbs.php (Portuguese, Brazilian) 2017-07-15 17:30:23 +02:00
James Cole
d72aadfb00 New translations breadcrumbs.php (Slovenian) 2017-07-15 17:30:21 +02:00
James Cole
00ff8ae166 New translations breadcrumbs.php (Spanish) 2017-07-15 17:30:20 +02:00
James Cole
cffcf49b26 New translations breadcrumbs.php (Russian) 2017-07-15 17:30:14 +02:00
James Cole
ad55aa8b85 New translations firefly.php (Russian) 2017-07-15 17:30:13 +02:00
James Cole
accbdea942 Improve search and display of results. 2017-07-15 17:19:12 +02:00
James Cole
22144b78ea Strict comparisons. 2017-07-15 16:41:07 +02:00
James Cole
c03ab269f0 Memory optimised, connect journal to tag. 2017-07-15 10:43:22 +02:00
James Cole
0c6c4d5959 Fix small issue in chart. 2017-07-15 10:26:27 +02:00
James Cole
e4e1873770 Improve import routine. 2017-07-15 10:26:16 +02:00
James Cole
3b3579025d Improve results when presented with invalid data. #701 2017-07-14 17:57:20 +02:00
James Cole
5cf8f2f4f4 Add sort flag for #698 2017-07-14 17:25:03 +02:00
James Cole
c4ff05b1ba Sort fix #698 [skip ci] 2017-07-14 17:21:30 +02:00
James Cole
2bf54d0b8e Remove extra X [skip ci] 2017-07-14 17:10:56 +02:00
James Cole
2a63888546 Table is sortable, #697 2017-07-14 17:10:06 +02:00
James Cole
cb8294cbd2 Disable button form on submit. 2017-07-14 17:05:32 +02:00
James Cole
c9a99be183 Fix #699 2017-07-14 17:04:18 +02:00
James Cole
5d2e026e5a New translations firefly.php (Polish) 2017-07-14 16:10:12 +02:00
James Cole
568fdad52a New translations form.php (Polish) 2017-07-14 16:10:08 +02:00
James Cole
174fb65fed New translations firefly.php (Polish) 2017-07-14 16:00:25 +02:00
James Cole
2e77c45ae8 New translations csv.php (Polish) 2017-07-14 15:50:27 +02:00
James Cole
1b674a0abf New translations firefly.php (Polish) 2017-07-14 15:50:25 +02:00
James Cole
4beb8b1f6b New translations csv.php (Polish) 2017-07-14 15:40:20 +02:00
James Cole
3c4abb7b60 Fixed some issues in import, should improve results for #701 2017-07-14 06:41:47 +02:00
James Cole
970c73c221 Fix path 2017-07-14 06:41:10 +02:00
James Cole
6797c1255f New translations firefly.php (Russian) 2017-07-13 14:40:45 +02:00
James Cole
0ed159b553 New translations firefly.php (Russian) 2017-07-13 14:30:23 +02:00
James Cole
faa8679804 New translations firefly.php (Russian) 2017-07-13 14:20:12 +02:00
James Cole
e3d2253958 New translations firefly.php (Russian) 2017-07-13 14:10:18 +02:00
James Cole
3f7b7996c0 New translations firefly.php (Russian) 2017-07-13 14:00:16 +02:00
James Cole
9229ff54df New translations csv.php (Russian) 2017-07-13 13:50:15 +02:00
James Cole
204ab8f427 New translations demo.php (Russian) 2017-07-13 13:50:13 +02:00
James Cole
8ee6c0789d New translations csv.php (Russian) 2017-07-13 13:40:21 +02:00
James Cole
be188e7266 New translations form.php (Russian) 2017-07-13 13:40:20 +02:00
James Cole
1a43b62750 New translations help.php (Russian) 2017-07-13 13:30:11 +02:00
James Cole
eaa8321aa8 New translations help.php (Russian) 2017-07-13 13:20:19 +02:00
James Cole
f01f0071dd New translations list.php (Russian) 2017-07-13 13:20:17 +02:00
James Cole
ec69cc3590 New translations list.php (Russian) 2017-07-13 13:10:16 +02:00
James Cole
102dac1eb8 New translations validation.php (Russian) 2017-07-13 13:10:14 +02:00
James Cole
d54c5f1f99 New translations passwords.php (Russian) 2017-07-13 12:10:27 +02:00
James Cole
c2e0e00c47 New translations pagination.php (Russian) 2017-07-13 12:10:26 +02:00
James Cole
f24e387363 New translations breadcrumbs.php (Russian) 2017-07-13 12:00:27 +02:00
James Cole
09715b83e4 New translations auth.php (Russian) 2017-07-13 11:50:19 +02:00
James Cole
e4f197bbc9 New translations breadcrumbs.php (Russian) 2017-07-13 11:50:18 +02:00
James Cole
de64cef48d New translations auth.php (Russian) 2017-07-13 11:01:08 +02:00
James Cole
b85329b371 New translations firefly.php (Russian) 2017-07-13 11:01:07 +02:00
James Cole
215f9a4245 New translations csv.php (Russian) 2017-07-13 11:00:58 +02:00
James Cole
80ce7a64ba New translations config.php (Russian) 2017-07-13 11:00:56 +02:00
James Cole
65f3dc0656 New translations breadcrumbs.php (Russian) 2017-07-13 11:00:55 +02:00
James Cole
f9b6b841b6 New translations form.php (Russian) 2017-07-13 11:00:53 +02:00
James Cole
d4f2d649e8 New translations help.php (Russian) 2017-07-13 11:00:50 +02:00
James Cole
15b057fe68 New translations demo.php (Russian) 2017-07-13 11:00:48 +02:00
James Cole
9cb549f4a1 New translations validation.php (Russian) 2017-07-13 11:00:47 +02:00
James Cole
4d67578458 New translations passwords.php (Russian) 2017-07-13 11:00:44 +02:00
James Cole
71faaf1c19 New translations list.php (Russian) 2017-07-13 11:00:43 +02:00
James Cole
0187f29b4b New translations pagination.php (Russian) 2017-07-13 11:00:40 +02:00
James Cole
9b6ccdd43a Fixes #694 2017-07-10 19:52:31 +02:00
James Cole
e82deddefb Merge branch 'release/4.6.2' 2017-07-08 09:55:44 +02:00
James Cole
780bec35bb Merge pull request #687 from firefly-iii/l10n_develop
New Crowdin translations
2017-07-08 09:47:01 +02:00
James Cole
27d80fd370 Updated libraries. 2017-07-08 06:53:15 +02:00
James Cole
952328d55c Routine to make sure imported entries have the correct opposing account and the correct amount. 2017-07-08 06:53:06 +02:00
James Cole
f747f3bd10 Updated changelog. 2017-07-08 06:30:41 +02:00
James Cole
11c3aca58d New version. 2017-07-08 06:28:52 +02:00
James Cole
5ef2067836 Some code cleanup. 2017-07-08 06:28:44 +02:00
James Cole
de9728895e Fixed #658 2017-07-08 06:09:17 +02:00
James Cole
19774f32c2 First code for #658 2017-07-07 17:51:14 +02:00
James Cole
e62b979708 Fix redirect error [skip ci] 2017-07-07 16:53:44 +02:00
James Cole
69eef30ad3 Various code clean up. 2017-07-07 13:50:15 +02:00
James Cole
71a41bc00d Add newlines [skip ci] 2017-07-07 08:09:42 +02:00
James Cole
dd508dbc49 This should fix #693. 2017-07-07 08:04:21 +02:00
James Cole
13ad40402a New translations firefly.php (German) 2017-07-06 11:30:11 +02:00
James Cole
98712f288c New translations firefly.php (German) 2017-07-04 20:40:08 +02:00
James Cole
a29a78e199 New translations csv.php (German) 2017-07-04 20:40:05 +02:00
James Cole
767267c89e New translations demo.php (German) 2017-07-04 20:20:16 +02:00
James Cole
b3801f65cf New translations demo.php (German) 2017-07-04 20:10:06 +02:00
James Cole
44a1d6b3d4 New translations csv.php (German) 2017-07-04 20:00:06 +02:00
James Cole
7a1528d1e4 New translations csv.php (German) 2017-07-04 19:50:10 +02:00
James Cole
c970a25d58 New translations firefly.php (German) 2017-07-04 19:50:09 +02:00
James Cole
0a78b0b130 New translations demo.php (German) 2017-07-04 19:50:06 +02:00
James Cole
69f6dc09d3 New translations demo.php (German) 2017-07-04 19:40:06 +02:00
James Cole
467e708617 New translations form.php (German) 2017-07-04 19:40:05 +02:00
James Cole
3a84591e61 Simplify edit transaction routine. 2017-07-04 16:31:16 +02:00
James Cole
a527066216 Add links to boxes for #688 2017-07-04 16:17:05 +02:00
James Cole
ef9823035f Add if-statement to catch unset POST data. 2017-07-04 16:03:00 +02:00
James Cole
513ee4c7d9 New translations firefly.php (Polish) 2017-07-03 18:00:20 +02:00
James Cole
fcc9b3a588 Merge branch 'release/4.6.1' 2017-07-02 09:36:20 +02:00
James Cole
71eed45b77 Merge branch 'develop' of https://github.com/firefly-iii/firefly-iii into develop
* 'develop' of https://github.com/firefly-iii/firefly-iii:
  New translations firefly.php (Dutch)
  New translations firefly.php (Chinese Traditional)
  New translations firefly.php (Dutch)
  New translations firefly.php (French)
  New translations firefly.php (German)
  New translations firefly.php (Polish)
  New translations firefly.php (Portuguese, Brazilian)
  New translations firefly.php (Slovenian)
  New translations firefly.php (Spanish)
2017-07-02 09:35:46 +02:00
James Cole
6940f00492 Merge pull request #686 from firefly-iii/l10n_develop
New Crowdin translations
2017-07-02 09:35:13 +02:00
James Cole
1c85c20fa9 New translations firefly.php (Dutch) 2017-07-02 09:35:03 +02:00
James Cole
ae30b02405 New version and changelog. 2017-07-02 09:32:19 +02:00
James Cole
89b7a9d3ac Updated composer file [skip ci] 2017-07-02 09:30:46 +02:00
James Cole
dc25fc99b3 New translations firefly.php (Chinese Traditional) 2017-07-02 09:30:42 +02:00
James Cole
6e6957a9ab New translations firefly.php (Dutch) 2017-07-02 09:30:40 +02:00
James Cole
0609e7db06 New translations firefly.php (French) 2017-07-02 09:30:38 +02:00
James Cole
f57097b79e New translations firefly.php (German) 2017-07-02 09:30:34 +02:00
James Cole
7e988d97d3 New translations firefly.php (Polish) 2017-07-02 09:30:32 +02:00
James Cole
2795042c2c Included some dev data by accident [skip ci] 2017-07-02 09:30:28 +02:00
James Cole
c3c86545fc New translations firefly.php (Portuguese, Brazilian) 2017-07-02 09:30:28 +02:00
James Cole
3fe14a3d56 New translations firefly.php (Slovenian) 2017-07-02 09:30:25 +02:00
James Cole
bad5740728 New translations firefly.php (Spanish) 2017-07-02 09:30:23 +02:00
James Cole
c164553ba1 Small cosmetic change. 2017-07-02 09:27:08 +02:00
James Cole
e6c72b2995 Fixed mobile display 2017-07-02 09:24:46 +02:00
James Cole
cbcefabbff Forgot a translation. 2017-07-02 09:24:30 +02:00
James Cole
97cfa3f3ae Remove old providers. 2017-07-02 09:24:20 +02:00
James Cole
803a008821 Improve bread crumbs 2017-07-02 09:24:11 +02:00
James Cole
658730928b Remove old JS 2017-07-02 09:24:00 +02:00
James Cole
310db374c8 Fix #678 2017-07-02 09:22:56 +02:00
James Cole
dc5bd648cf Fix for #685 2017-07-02 08:43:34 +02:00
James Cole
b6be9e6ade Fix for #682 2017-07-01 10:39:59 +02:00
James Cole
04f71496e3 Code for #678 2017-07-01 10:36:08 +02:00
James Cole
1eed142423 Small display bug related to #648 2017-07-01 10:29:07 +02:00
James Cole
f1e0ad0df0 CoC. [skip ci] 2017-06-30 07:22:12 +02:00
James Cole
f8fa5f1ba5 Improved mobile response, issue #678 2017-06-30 07:17:25 +02:00
James Cole
c187563267 Update report layout [skip ci] 2017-06-28 20:41:02 +02:00
James Cole
fcdbbd5dbc Update report layout [skip ci] 2017-06-28 20:39:12 +02:00
James Cole
6604d04c60 Slightly different report layout [skip ci] 2017-06-28 20:23:24 +02:00
James Cole
63be574a14 Merge branch 'release/4.6.0' 2017-06-28 18:13:00 +02:00
James Cole
2414f998ba Update git ignore file. 2017-06-28 18:09:32 +02:00
James Cole
90e2ecad4f Merge pull request #683 from firefly-iii/l10n_develop
New Crowdin translations
2017-06-28 18:08:27 +02:00
James Cole
87a3f5c715 New translations firefly.php (Dutch) 2017-06-28 18:07:52 +02:00
James Cole
a4ef81ebd8 Improve test coverage. 2017-06-28 18:05:38 +02:00
James Cole
67fc810fc2 Ignore test database. 2017-06-28 18:05:04 +02:00
James Cole
e13a61645d New change log 2017-06-28 18:04:42 +02:00
James Cole
aae4a78fd4 Possible fix for #649 [skip ci] 2017-06-28 15:52:13 +02:00
James Cole
3947da5e27 Possible fix for #682 2017-06-28 15:45:28 +02:00
James Cole
4e4ce2f77c Remove test database from Firefly III thing. [skip ci] 2017-06-28 15:31:11 +02:00
James Cole
d9a2e081bd Update travis script. 2017-06-28 15:27:31 +02:00
James Cole
e60dde7ce5 Merge pull request #681 from firefly-iii/l10n_develop
New Crowdin translations
2017-06-28 15:18:59 +02:00
James Cole
699b138999 Small link fixes [skip ci] 2017-06-28 15:18:11 +02:00
James Cole
8f191b497f Updated read me and contributing guidelines. 2017-06-28 15:17:19 +02:00
James Cole
fd013d617c New translations firefly.php (Chinese Traditional) 2017-06-28 15:11:10 +02:00
James Cole
a8bda38035 New translations firefly.php (Dutch) 2017-06-28 15:11:07 +02:00
James Cole
411de9aa23 New translations firefly.php (French) 2017-06-28 15:11:05 +02:00
James Cole
f0abe497ef New translations firefly.php (German) 2017-06-28 15:11:02 +02:00
James Cole
9c8be83f5d New translations firefly.php (Polish) 2017-06-28 15:10:58 +02:00
James Cole
45335af8cf New translations firefly.php (Portuguese, Brazilian) 2017-06-28 15:10:56 +02:00
James Cole
945e433bb7 New translations firefly.php (Slovenian) 2017-06-28 15:10:51 +02:00
James Cole
70729fdb0c New translations firefly.php (Spanish) 2017-06-28 15:10:48 +02:00
James Cole
4a435e5701 Updated composer file. 2017-06-28 15:01:06 +02:00
James Cole
427747c6b8 Merge pull request #666 from firefly-iii/l10n_develop
New Crowdin translations
2017-06-28 15:00:48 +02:00
James Cole
be9407cb57 New translations csv.php (Dutch) 2017-06-28 15:00:19 +02:00
James Cole
c380d3d2a0 New translations firefly.php (Dutch) 2017-06-28 15:00:13 +02:00
James Cole
489b0eb12d New translations firefly.php (Dutch) 2017-06-28 14:50:13 +02:00
James Cole
7c73629962 Merge pull request #680 from Xeli/l10n_develop
Fix en_US translation: no_accounts_imperative_revenue.
2017-06-28 12:41:26 +02:00
richard@xeli.eu
ff619eca1c Fix en_US translation: no_accounts_imperative_revenue. Change Expense to Revenue 2017-06-28 12:12:31 +02:00
James Cole
134a39fd71 New translations firefly.php (German) 2017-06-27 13:50:38 +02:00
James Cole
506509b1b2 Fix #677 2017-06-26 18:29:45 +02:00
James Cole
02a36316be Forgot to remove a variable. 2017-06-26 18:24:44 +02:00
James Cole
8549c7c81b This should fix #677 2017-06-26 18:24:29 +02:00
James Cole
5a0be7d2ad Push new version number. 2017-06-24 13:05:12 +02:00
James Cole
c6f44c6398 Composer update. 2017-06-24 13:04:50 +02:00
James Cole
04a8a0e6a1 Code clean up 2017-06-24 13:04:41 +02:00
James Cole
8a175d147b Remove JS console log. 2017-06-24 13:03:09 +02:00
James Cole
5fbc319b20 This fixes the tests (must still upload test database). 2017-06-24 12:38:24 +02:00
James Cole
8e3ba7caf2 Fix various import bugs. 2017-06-24 08:37:09 +02:00
James Cole
182aaa7d27 New translations csv.php (Spanish) 2017-06-24 07:30:48 +02:00
James Cole
ec17d466f7 New translations firefly.php (Chinese Traditional) 2017-06-24 07:30:46 +02:00
James Cole
79c2445117 New translations firefly.php (Dutch) 2017-06-24 07:30:44 +02:00
James Cole
aa59db1609 New translations firefly.php (French) 2017-06-24 07:30:42 +02:00
James Cole
814b106be2 New translations csv.php (Slovenian) 2017-06-24 07:30:40 +02:00
James Cole
3901ea0fbe New translations csv.php (Portuguese, Brazilian) 2017-06-24 07:30:39 +02:00
James Cole
65133107be New translations csv.php (Dutch) 2017-06-24 07:30:38 +02:00
James Cole
08d15cfc5e New translations csv.php (French) 2017-06-24 07:30:37 +02:00
James Cole
3c89f9a5f1 New translations csv.php (German) 2017-06-24 07:30:36 +02:00
James Cole
dbc6bc8206 New translations csv.php (Polish) 2017-06-24 07:30:35 +02:00
James Cole
dc38291ef5 New translations firefly.php (German) 2017-06-24 07:30:34 +02:00
James Cole
3bb634ed5b New translations firefly.php (Polish) 2017-06-24 07:30:32 +02:00
James Cole
4bdcfe4d30 New translations firefly.php (Portuguese, Brazilian) 2017-06-24 07:30:28 +02:00
James Cole
3b74784486 New translations firefly.php (Slovenian) 2017-06-24 07:30:25 +02:00
James Cole
5226664a3d New translations firefly.php (Spanish) 2017-06-24 07:30:23 +02:00
James Cole
6d23823b63 New translations csv.php (Chinese Traditional) 2017-06-24 07:30:20 +02:00
James Cole
da3a56c144 Further improve import storage. 2017-06-24 07:30:05 +02:00
James Cole
58aa54d8cf Improving import storage. 2017-06-24 07:21:10 +02:00
James Cole
e525e673a8 Import routine cleanup. 2017-06-24 06:57:24 +02:00
James Cole
445dbf8779 More and improved code for the import routine. 2017-06-24 05:49:33 +02:00
James Cole
6a27bea2a3 New translations firefly.php (Chinese Traditional) 2017-06-22 22:01:08 +02:00
James Cole
13163f9c5c New translations firefly.php (Dutch) 2017-06-22 22:01:05 +02:00
James Cole
fde08f922b New translations firefly.php (French) 2017-06-22 22:01:02 +02:00
James Cole
266ce00872 New translations firefly.php (German) 2017-06-22 22:00:56 +02:00
James Cole
623a70a0d1 New translations firefly.php (Polish) 2017-06-22 22:00:52 +02:00
James Cole
1d7b738040 New translations firefly.php (Portuguese, Brazilian) 2017-06-22 22:00:46 +02:00
James Cole
edc8dd2601 New translations firefly.php (Slovenian) 2017-06-22 22:00:43 +02:00
James Cole
31dc932ca4 New translations firefly.php (Spanish) 2017-06-22 22:00:40 +02:00
James Cole
edb355941c More code for import routine. 2017-06-22 21:50:10 +02:00
James Cole
cddaccb7f7 Further improve import routine 2017-06-21 20:04:35 +02:00
James Cole
a905cce2c9 Expand import routine. 2017-06-20 21:04:25 +02:00
James Cole
b9f110ac2b Refactor and rename some import things. 2017-06-17 22:49:44 +02:00
James Cole
7cc24417b3 Expanded import routine. 2017-06-14 20:13:19 +02:00
James Cole
b304284d70 Fix report bug. 2017-06-14 19:15:30 +02:00
James Cole
c382fb1577 Add debug info for #671 2017-06-12 19:58:32 +02:00
James Cole
77244f4e2c Lots of new code for new importer routine. 2017-06-12 19:12:07 +02:00
James Cole
8beab5f5bc Fix #672 2017-06-12 17:21:31 +02:00
James Cole
902ae3f0cf Fix for #671 2017-06-12 17:07:29 +02:00
James Cole
519ef4e486 New translations csv.php (French) 2017-06-10 15:21:17 +02:00
James Cole
699e04f371 New translations firefly.php (French) 2017-06-10 15:21:16 +02:00
James Cole
d73de0e60d New translations csv.php (German) 2017-06-10 15:21:12 +02:00
James Cole
8e0b7d2a73 New translations firefly.php (German) 2017-06-10 15:21:10 +02:00
James Cole
04283cf2d6 New translations csv.php (Polish) 2017-06-10 15:21:06 +02:00
James Cole
d60b4aa56f New translations csv.php (Chinese Traditional) 2017-06-10 15:20:57 +02:00
James Cole
9cfeda1b0c New translations firefly.php (Chinese Traditional) 2017-06-10 15:20:55 +02:00
James Cole
5e1bd8e1eb New translations csv.php (Dutch) 2017-06-10 15:20:48 +02:00
James Cole
9b495d212b New translations firefly.php (Polish) 2017-06-10 15:20:47 +02:00
James Cole
b6fdd0070b New translations firefly.php (Slovenian) 2017-06-10 15:20:40 +02:00
James Cole
eea387ad0c New translations csv.php (Spanish) 2017-06-10 15:20:33 +02:00
James Cole
9cdb0f173a New translations csv.php (Slovenian) 2017-06-10 15:20:31 +02:00
James Cole
51063230d0 New translations firefly.php (Dutch) 2017-06-10 15:20:30 +02:00
James Cole
1111478b7f New translations firefly.php (Portuguese, Brazilian) 2017-06-10 15:20:25 +02:00
James Cole
c99c9b441f New translations csv.php (Portuguese, Brazilian) 2017-06-10 15:20:17 +02:00
James Cole
b5065a0276 New translations firefly.php (Spanish) 2017-06-10 15:20:11 +02:00
James Cole
c79a577060 Remove unused files in import. 2017-06-10 15:10:46 +02:00
James Cole
091596e80e Lots of new code for new importer routine. 2017-06-10 15:09:41 +02:00
James Cole
0b4efe4ae1 Small typo in chart. [skip ci] 2017-06-09 12:53:31 +02:00
James Cole
1f9b7faa60 Code for #660 2017-06-09 11:52:20 +02:00
James Cole
762d7bcc34 Fix database for postgresql 2017-06-09 11:51:59 +02:00
James Cole
a2145f6b49 Possible fix for #667 2017-06-08 10:54:15 +02:00
James Cole
b48de98865 Fix a bug where the balance routine forgot to account for accounts without a currency preference. 2017-06-08 10:35:02 +02:00
James Cole
a23179dd83 Merge branch 'release/4.5.0' 2017-06-07 12:30:09 +02:00
James Cole
5c18794122 Update lock file, and update database. 2017-06-07 12:22:59 +02:00
James Cole
f04011f6a7 New translations firefly.php (Dutch) 2017-06-07 12:20:13 +02:00
James Cole
893498238e Merge pull request #647 from firefly-iii/l10n_develop
New Crowdin translations
2017-06-07 12:11:28 +02:00
James Cole
474fa9dea0 New translations firefly.php (Dutch) 2017-06-07 12:10:10 +02:00
James Cole
d8a8574dda Prep for new release. 2017-06-07 12:08:32 +02:00
James Cole
935fb015d3 Live update budget amounts. 2017-06-07 11:58:04 +02:00
James Cole
8bbd3063ec Move code around for simplicity and fix tests. 2017-06-07 11:13:04 +02:00
James Cole
92c5cabd70 Try to untangle complex repositories 2017-06-07 08:18:42 +02:00
James Cole
e5db5a7b5c Various code clean up. 2017-06-07 07:38:58 +02:00
James Cole
28cf123da3 New translations firefly.php (French) 2017-06-06 20:41:24 +02:00
James Cole
5069367873 New translations firefly.php (German) 2017-06-06 20:41:16 +02:00
James Cole
234e656ff6 New translations firefly.php (Chinese Traditional) 2017-06-06 20:40:59 +02:00
James Cole
aeadfbdd6a New translations firefly.php (Polish) 2017-06-06 20:40:50 +02:00
James Cole
39288cfb0b New translations firefly.php (Slovenian) 2017-06-06 20:40:41 +02:00
James Cole
5e430968c1 New translations firefly.php (Dutch) 2017-06-06 20:40:34 +02:00
James Cole
154b74ce6f New translations firefly.php (Portuguese, Brazilian) 2017-06-06 20:40:26 +02:00
James Cole
2e26303b66 New translations firefly.php (Spanish) 2017-06-06 20:40:11 +02:00
James Cole
51ddcd9ee1 Plus not minus [skip ci] 2017-06-06 20:37:24 +02:00
James Cole
9d5d1c0a41 Updated budget view. 2017-06-06 20:35:39 +02:00
James Cole
6058ccff0d Merge pull request #664 from kressh/master
Add pgsql dependencies to Dockerfile
2017-06-06 20:01:43 +02:00
James Cole
a8ec4fe2fd New interface for budget overview. 2017-06-06 19:30:31 +02:00
James Cole
65ccb2d443 Fix error display #662 2017-06-06 19:29:10 +02:00
James Cole
0e929602a8 Verify currency data routine. 2017-06-06 07:23:54 +02:00
James Cole
5329e026dc Fixed various currency displays. 2017-06-06 07:18:09 +02:00
James Cole
a7412e43b3 Beter message for #662 2017-06-06 06:56:32 +02:00
Sergey Besedin
eeae24e058 Add pgsql dependencies 2017-06-06 01:22:09 +03:00
James Cole
17b6cc43d5 Fix display of foreign currencies in charts. 2017-06-05 22:11:54 +02:00
James Cole
b69a2ef0cd Can handle multi-currency balances better. 2017-06-05 15:09:17 +02:00
James Cole
6d1296094e Fixes a lot of issues in scrutinizer. 2017-06-05 11:20:38 +02:00
James Cole
c4039b53e6 Various code cleanup. 2017-06-05 11:12:50 +02:00
James Cole
64831b4c86 Code cleanup and refactoring. 2017-06-05 08:31:22 +02:00
James Cole
1dec270907 These changes fix the tests. 2017-06-05 07:37:53 +02:00
James Cole
f72f8b03df Catch empty currency preference 2017-06-05 07:03:32 +02:00
James Cole
0b47e5d05d Removed unnecessary variable. 2017-06-05 07:03:20 +02:00
James Cole
a487c7b4b2 Make sure amounts are formatted, and fixed some issues. 2017-06-04 23:39:26 +02:00
James Cole
3838b21459 New translations firefly.php (French) 2017-06-04 13:41:19 +02:00
James Cole
7801274d33 New translations firefly.php (German) 2017-06-04 13:41:15 +02:00
James Cole
a505406ee7 New translations firefly.php (Chinese Traditional) 2017-06-04 13:41:03 +02:00
James Cole
9487a95c13 New translations firefly.php (Polish) 2017-06-04 13:40:54 +02:00
James Cole
3b2fe13902 New translations firefly.php (Slovenian) 2017-06-04 13:40:47 +02:00
James Cole
db2898dfe5 New translations auth.php (Spanish) 2017-06-04 13:40:44 +02:00
James Cole
e08fd399d2 New translations csv.php (Spanish) 2017-06-04 13:40:40 +02:00
James Cole
e45ffba010 New translations passwords.php (Spanish) 2017-06-04 13:40:39 +02:00
James Cole
f7fde93ed2 New translations firefly.php (Dutch) 2017-06-04 13:40:37 +02:00
James Cole
3cf53604a1 New translations firefly.php (Portuguese, Brazilian) 2017-06-04 13:40:31 +02:00
James Cole
e041a5e037 New translations help.php (Spanish) 2017-06-04 13:40:19 +02:00
James Cole
6c8e10255b New translations form.php (Spanish) 2017-06-04 13:40:17 +02:00
James Cole
3464ab1527 New translations firefly.php (Spanish) 2017-06-04 13:40:13 +02:00
James Cole
82e74a2afd Big update to properly support multi currencies. 2017-06-04 13:39:16 +02:00
James Cole
771ebde295 Update journal collector so currency information is taken from the transaction. 2017-06-04 08:49:37 +02:00
James Cole
4ce4c3138c Update export routine so currency information is taken from the transaction. 2017-06-04 08:49:22 +02:00
James Cole
d37b46effc Database upgrade routine. 2017-06-04 08:48:54 +02:00
James Cole
0868aac750 Small update for 4.5.0 SQL update. 2017-06-04 08:48:40 +02:00
James Cole
4ff5f33966 Prep for solid multi-currency configuration. 2017-06-02 13:01:43 +02:00
James Cole
e1aebbe12b Remove non-existing charts. 2017-06-02 13:01:24 +02:00
James Cole
8273f467b6 Refactor some JS functions. 2017-06-02 13:00:43 +02:00
James Cole
74664afa68 Was not able to remove opening balance. 2017-06-02 13:00:24 +02:00
James Cole
c05f344371 Code clean up [skip ci] 2017-06-02 13:00:09 +02:00
James Cole
ec1507d644 Add some documentation [skip ci] 2017-06-02 12:59:27 +02:00
James Cole
8cdc1f0014 Rename several twig files. 2017-06-02 12:59:14 +02:00
James Cole
2b1ab5c6ef Fixed edit of multi currency transaction, ##651 2017-06-02 07:05:42 +02:00
James Cole
01fedc0bf8 Fix for #593, as inspired by @nhaarman. 2017-06-02 06:45:38 +02:00
James Cole
1bd82d71a2 New translations list.php (Spanish) 2017-05-25 16:50:09 +02:00
James Cole
1e9dacb6e4 New translations pagination.php (Spanish) 2017-05-25 16:40:16 +02:00
James Cole
94939ea3d3 New translations firefly.php (Portuguese, Brazilian) 2017-05-25 16:40:13 +02:00
James Cole
c3ff69d147 New translations list.php (Spanish) 2017-05-25 16:40:09 +02:00
James Cole
0fad9d4ac7 New translations validation.php (Spanish) 2017-05-25 16:40:07 +02:00
James Cole
70cd8ffb72 New translations validation.php (Spanish) 2017-05-25 16:30:10 +02:00
James Cole
61535bf4b8 New translations firefly.php (Spanish) 2017-05-25 16:30:08 +02:00
James Cole
4adcbf9e48 New translations demo.php (Spanish) 2017-05-25 16:20:11 +02:00
James Cole
3eba3167fd New translations firefly.php (Spanish) 2017-05-25 16:20:07 +02:00
James Cole
0608fd7732 New translations demo.php (Spanish) 2017-05-25 16:10:06 +02:00
James Cole
1f41f27e89 New translations breadcrumbs.php (Spanish) 2017-05-25 16:00:11 +02:00
James Cole
ded0df9303 New translations config.php (Spanish) 2017-05-25 16:00:06 +02:00
James Cole
2a7ba1893a New translations form.php (Slovenian) 2017-05-16 15:10:18 +02:00
James Cole
6b3b19632a New translations help.php (Slovenian) 2017-05-16 15:10:15 +02:00
James Cole
98bb0731df New translations list.php (Slovenian) 2017-05-16 15:10:12 +02:00
James Cole
a102f7044e New translations list.php (Slovenian) 2017-05-15 09:20:09 +02:00
James Cole
f1028dbaed New translations list.php (Slovenian) 2017-05-15 09:10:14 +02:00
James Cole
438ce5c3db New translations list.php (Slovenian) 2017-05-15 09:00:35 +02:00
James Cole
b995a1d091 New translations list.php (Slovenian) 2017-05-15 08:50:08 +02:00
James Cole
e072f83507 New translations list.php (Slovenian) 2017-05-14 10:10:08 +02:00
James Cole
79154bba25 New translations pagination.php (Slovenian) 2017-05-14 10:10:06 +02:00
James Cole
613eb7522c New translations pagination.php (Slovenian) 2017-05-14 10:00:10 +02:00
James Cole
0eb5653713 New translations csv.php (Slovenian) 2017-05-14 10:00:08 +02:00
James Cole
0d624f021b New translations csv.php (Slovenian) 2017-05-14 09:30:23 +02:00
James Cole
b263047f4e New translations csv.php (Slovenian) 2017-05-14 09:20:21 +02:00
James Cole
4410e1bbd7 New translations csv.php (Slovenian) 2017-05-14 09:10:12 +02:00
James Cole
8c3871e8de New translations csv.php (Slovenian) 2017-05-14 09:00:09 +02:00
James Cole
2eafd3cc15 Should fix #644 2017-05-14 08:57:43 +02:00
James Cole
368df66947 New translations validation.php (Slovenian) 2017-05-14 08:40:06 +02:00
James Cole
9f9a3ea8fd New translations breadcrumbs.php (Slovenian) 2017-05-14 01:20:08 +02:00
James Cole
f66286105f New translations validation.php (Slovenian) 2017-05-14 01:20:07 +02:00
James Cole
0f0f912370 Partial JS focus [skip ci] 2017-05-12 06:21:26 +02:00
James Cole
9fa0e37a5d Merge pull request #641 from firefly-iii/l10n_develop
New Crowdin translations
2017-05-12 06:20:05 +02:00
James Cole
a0cb51ff70 Merge branch 'develop' into l10n_develop 2017-05-12 06:19:56 +02:00
James Cole
a6305ddea4 New translations auth.php (Spanish) 2017-05-10 20:40:44 +02:00
James Cole
fb8638fe6a New translations breadcrumbs.php (Spanish) 2017-05-10 20:40:42 +02:00
James Cole
0009f1f865 New translations csv.php (Spanish) 2017-05-10 20:40:41 +02:00
James Cole
d449c35025 New translations passwords.php (Spanish) 2017-05-10 20:40:39 +02:00
James Cole
1893d1a2c2 New translations demo.php (Spanish) 2017-05-10 20:40:37 +02:00
James Cole
0c4539e4fa New translations validation.php (Spanish) 2017-05-10 20:40:31 +02:00
James Cole
feacddd1d7 Merge pull request #645 from elamperti/unfinished-translations-es_ES
Unfinished translations for Spanish language
2017-05-10 20:36:55 +02:00
Enrico Lamperti
0c44fe6ce0 Add translations for Spanish language 2017-05-07 21:24:07 -03:00
James Cole
17fb6983d8 Fix issue #637 with cash accounts. 2017-05-07 19:45:40 +02:00
James Cole
5fb73bdb01 Fix bug #642 2017-05-07 19:24:53 +02:00
James Cole
7f082ea389 Remove focus thing 2017-05-06 10:20:27 +02:00
James Cole
9856a1831a New translations firefly.php (Slovenian) 2017-05-04 17:40:13 +02:00
James Cole
dd17a20b60 New translations firefly.php (Slovenian) 2017-05-04 17:30:12 +02:00
James Cole
665a52b106 Merge branch 'release/4.4.3' 2017-05-03 21:25:44 +02:00
James Cole
f68d33870b Composer lock file and version update. 2017-05-03 21:25:13 +02:00
James Cole
49d13b12a5 No code coverage. 2017-05-03 21:22:01 +02:00
James Cole
674ab7e41f Merge branch 'develop' of https://github.com/firefly-iii/firefly-iii into develop
* 'develop' of https://github.com/firefly-iii/firefly-iii: (45 commits)
  New translations validation.php (Slovenian)
  New translations csv.php (Slovenian)
  New translations csv.php (Slovenian)
  New translations csv.php (Slovenian)
  New translations csv.php (Slovenian)
  New translations passwords.php (Slovenian)
  New translations csv.php (Slovenian)
  New translations csv.php (Slovenian)
  New translations config.php (Slovenian)
  New translations breadcrumbs.php (Slovenian)
  New translations breadcrumbs.php (Slovenian)
  New translations auth.php (Slovenian)
  New translations firefly.php (Slovenian)
  New translations breadcrumbs.php (Slovenian)
  New translations demo.php (Slovenian)
  New translations firefly.php (Slovenian)
  New translations firefly.php (Slovenian)
  New translations firefly.php (Slovenian)
  New translations firefly.php (Slovenian)
  New translations form.php (Slovenian)
  ...
2017-05-03 21:21:03 +02:00
James Cole
5b3eb3ba82 Merge pull request #639 from firefly-iii/l10n_develop
New Crowdin translations
2017-05-03 21:20:36 +02:00
James Cole
e28d3f3b5a Remove unused languages. 2017-05-03 21:14:37 +02:00
James Cole
870d8b5008 No prefix key, issue #624 2017-05-03 21:12:49 +02:00
James Cole
6aa240e9a3 Update version and changelog. 2017-05-03 21:12:19 +02:00
James Cole
b55a4047d0 New translations validation.php (Slovenian) 2017-05-03 17:50:07 +02:00
James Cole
a07d87318c New translations csv.php (Slovenian) 2017-05-03 17:40:08 +02:00
James Cole
dd6555c903 New translations csv.php (Slovenian) 2017-05-03 17:30:12 +02:00
James Cole
e8c40b6044 New translations csv.php (Slovenian) 2017-05-03 17:21:14 +02:00
James Cole
91c17a0b2a New translations csv.php (Slovenian) 2017-05-03 09:40:10 +02:00
James Cole
2ed0ea0243 New translations passwords.php (Slovenian) 2017-05-03 09:00:11 +02:00
James Cole
df2f92433a New translations csv.php (Slovenian) 2017-05-03 01:10:06 +02:00
James Cole
68b3fc72bf New translations csv.php (Slovenian) 2017-05-03 01:00:11 +02:00
James Cole
df5bb14758 New translations config.php (Slovenian) 2017-05-03 01:00:08 +02:00
James Cole
e24199bbbe New translations breadcrumbs.php (Slovenian) 2017-05-03 00:40:06 +02:00
James Cole
2c6099556b New translations breadcrumbs.php (Slovenian) 2017-05-03 00:30:13 +02:00
James Cole
f98215a5da New translations auth.php (Slovenian) 2017-05-03 00:30:11 +02:00
James Cole
b6b6888493 New translations firefly.php (Slovenian) 2017-05-03 00:30:09 +02:00
James Cole
f8e5b9be43 New translations breadcrumbs.php (Slovenian) 2017-05-03 00:20:10 +02:00
James Cole
692210214f New translations demo.php (Slovenian) 2017-05-03 00:20:08 +02:00
James Cole
cff2546c0c New translations firefly.php (Slovenian) 2017-05-03 00:10:14 +02:00
James Cole
f0cc1200f3 New translations firefly.php (Slovenian) 2017-05-03 00:00:14 +02:00
James Cole
e83a9af455 New translations firefly.php (Slovenian) 2017-05-02 23:50:09 +02:00
James Cole
fb84f9d9cf New translations firefly.php (Slovenian) 2017-05-02 23:40:12 +02:00
James Cole
118a2515e1 New translations form.php (Slovenian) 2017-05-02 23:40:09 +02:00
James Cole
63e891b0f7 New translations firefly.php (Slovenian) 2017-05-02 23:30:11 +02:00
James Cole
9891080b57 New translations firefly.php (Slovenian) 2017-05-02 23:20:10 +02:00
James Cole
bc7a7e55af New translations firefly.php (Slovenian) 2017-05-02 23:00:13 +02:00
James Cole
9b8a029de1 New translations demo.php (Slovenian) 2017-05-02 22:40:10 +02:00
James Cole
11b5575422 New translations csv.php (Slovenian) 2017-05-02 22:40:09 +02:00
James Cole
06336aa580 New translations form.php (Slovenian) 2017-05-02 22:40:07 +02:00
James Cole
aa8c1d6e9c New translations demo.php (Slovenian) 2017-05-02 22:30:08 +02:00
James Cole
9a4d5d8abf New translations firefly.php (Slovenian) 2017-05-02 22:20:11 +02:00
James Cole
3c5631bca3 New translations firefly.php (Slovenian) 2017-05-02 22:10:17 +02:00
James Cole
84f85f87b2 New translations firefly.php (Slovenian) 2017-05-02 22:00:13 +02:00
James Cole
c35db5976f New translations form.php (Slovenian) 2017-05-02 22:00:10 +02:00
James Cole
8d1fcf988c New translations firefly.php (Slovenian) 2017-05-02 21:50:11 +02:00
James Cole
bbf8f2dd69 New translations form.php (Slovenian) 2017-05-02 21:50:07 +02:00
James Cole
2f6436e34f New translations list.php (Slovenian) 2017-05-02 21:10:34 +02:00
James Cole
9cbb03107d New translations help.php (Slovenian) 2017-05-02 21:10:33 +02:00
James Cole
ee44d7fb2e New translations pagination.php (Slovenian) 2017-05-02 21:10:31 +02:00
James Cole
6a0fcd9cf0 New translations passwords.php (Slovenian) 2017-05-02 21:10:30 +02:00
James Cole
43cfe3b858 New translations demo.php (Slovenian) 2017-05-02 21:10:29 +02:00
James Cole
dba83c1c03 New translations validation.php (Slovenian) 2017-05-02 21:10:28 +02:00
James Cole
053e139d00 New translations form.php (Slovenian) 2017-05-02 21:10:26 +02:00
James Cole
04f791a839 New translations firefly.php (Slovenian) 2017-05-02 21:10:24 +02:00
James Cole
a4029c9490 New translations auth.php (Slovenian) 2017-05-02 21:10:20 +02:00
James Cole
d471dfec43 New translations csv.php (Slovenian) 2017-05-02 21:10:19 +02:00
James Cole
494bbd46d0 New translations config.php (Slovenian) 2017-05-02 21:10:17 +02:00
James Cole
1525b9ad06 New translations breadcrumbs.php (Slovenian) 2017-05-02 21:10:16 +02:00
James Cole
19847ee80b Change log update and added Slovenian. 2017-05-02 21:08:29 +02:00
James Cole
fddf1f146c Pie chart tests. 2017-05-02 20:54:49 +02:00
James Cole
5f19cb1c0c Fix canvas things. 2017-04-29 08:56:08 +02:00
James Cole
aaeae992e1 Reinstate support class. 2017-04-29 08:55:50 +02:00
James Cole
a0e7be9d45 Fix binding. 2017-04-29 08:55:37 +02:00
James Cole
78faf7e14c Forgot call to sprintf. [skip ci] 2017-04-29 08:33:32 +02:00
James Cole
98f84c2c37 Introducing filters to the journal collector. 2017-04-29 08:22:56 +02:00
James Cole
278805043e Update gitignore file. 2017-04-28 20:18:07 +02:00
James Cole
dc5215e41e Update tests. 2017-04-28 20:17:10 +02:00
James Cole
7e11691ea4 Update code to work with filters. 2017-04-28 20:08:25 +02:00
James Cole
c83dfc44d6 Update internal filters. 2017-04-28 20:08:04 +02:00
James Cole
68a01b1735 More text about Heroku. 2017-04-28 20:07:26 +02:00
James Cole
0307b58d17 Small changes to make code more testable. 2017-04-28 18:04:57 +02:00
James Cole
9d1508049e Add comment [skip ci] 2017-04-28 18:03:27 +02:00
James Cole
42322055f9 New filters to clean up the journal collector. 2017-04-28 18:02:54 +02:00
James Cole
5de8fce156 Make event handlers easier to test (and then ignore them). 2017-04-28 10:34:11 +02:00
James Cole
29ff92f833 Clean up event related code. 2017-04-28 07:51:43 +02:00
James Cole
359007c5bf Clean up event related code. 2017-04-28 07:51:09 +02:00
James Cole
bbe40518e4 Can now also test event code. 2017-04-27 08:26:58 +02:00
James Cole
b26f3c0cc6 User registration is now a Mailable. See #636 2017-04-27 08:03:15 +02:00
James Cole
552b4b67a6 Merge branch 'release/4.4.2' 2017-04-27 07:45:50 +02:00
James Cole
7fbf359efd New version [skip ci] 2017-04-27 07:45:15 +02:00
James Cole
052b804855 Fixed a bug where the opening balance could not be stored. 2017-04-27 07:44:35 +02:00
James Cole
67cc611495 Merge branch 'release/4.4.1' 2017-04-27 03:32:16 +02:00
James Cole
7e2c24b82e New test config 2017-04-27 03:29:11 +02:00
James Cole
4a6bbd4dca Update example config 2017-04-27 03:26:54 +02:00
James Cole
166bfba5b9 New version. [skip ci] 2017-04-27 03:17:34 +02:00
James Cole
87b8ac5f4e Update read me with deploy button [skip ci] 2017-04-27 03:16:27 +02:00
James Cole
46b4100291 Default key for instant deployment [skip ci] 2017-04-27 03:11:50 +02:00
James Cole
83090ade94 Generate app key [skip ci] 2017-04-27 03:06:39 +02:00
James Cole
44b7a42d5a Experimental deploy button script [skip ci] 2017-04-27 03:03:31 +02:00
James Cole
1a5617d430 Fixes a bug in the new user handler [skip ci] 2017-04-27 02:56:57 +02:00
James Cole
fa818e0924 Configure nginx [skip ci] 2017-04-27 02:49:06 +02:00
James Cole
f87b531fe1 Configure nginx [skip ci] 2017-04-27 02:45:26 +02:00
James Cole
82fd0c4d37 Set default db driver to be pgsql. [skip ci] 2017-04-27 02:40:57 +02:00
James Cole
26ceb9e3be Include config for Heroku. [skip ci] 2017-04-27 02:39:48 +02:00
James Cole
743458b853 Include config for Heroku. [skip ci] 2017-04-27 02:38:29 +02:00
James Cole
920e5f6fbe Force seed. 2017-04-26 21:32:43 +02:00
James Cole
fc0dd22769 Deploy heroku database. [skip ci] 2017-04-26 21:31:46 +02:00
James Cole
c7c61ce280 Log to error log. 2017-04-26 21:26:44 +02:00
James Cole
5f5a603f71 Update example file and config file for Laravel thing. [skip ci] 2017-04-26 21:02:21 +02:00
James Cole
d611858883 Remove compile step [skip ci] 2017-04-26 20:59:34 +02:00
James Cole
dbc9ce76a0 Try herocu config [skip ci] 2017-04-26 20:57:50 +02:00
James Cole
62386e2e40 Procfile for Herocu deployment. [skip ci] 2017-04-26 20:51:06 +02:00
James Cole
5aa7ab5e37 Merge branch 'release/4.4.0' 2017-04-23 19:07:19 +02:00
James Cole
be1b57eab7 New test database [skip ci] 2017-04-23 19:06:45 +02:00
James Cole
ad5c8b41e2 Merge pull request #635 from firefly-iii/l10n_develop
New Crowdin translations
2017-04-23 19:05:42 +02:00
James Cole
09752b25ad New translations firefly.php (Dutch) 2017-04-23 19:05:23 +02:00
James Cole
3f317f961b New translations firefly.php (French) 2017-04-23 19:01:25 +02:00
James Cole
d6d6a62fda New translations firefly.php (Chinese Traditional) 2017-04-23 19:01:17 +02:00
James Cole
528833b831 New translations firefly.php (Croatian) 2017-04-23 19:01:11 +02:00
James Cole
95e2bca4a6 New translations firefly.php (Chinese Traditional, Hong Kong) 2017-04-23 19:01:06 +02:00
James Cole
dfd3327108 New translations firefly.php (German) 2017-04-23 19:01:01 +02:00
James Cole
653befbcd4 New translations firefly.php (Russian) 2017-04-23 19:00:55 +02:00
James Cole
33202efcdc New translations firefly.php (Spanish) 2017-04-23 19:00:50 +02:00
James Cole
77a37411ba New translations firefly.php (Dutch) 2017-04-23 19:00:45 +02:00
James Cole
491f221741 New translations firefly.php (Polish) 2017-04-23 19:00:37 +02:00
James Cole
e8e125a598 New translations firefly.php (Portuguese, Brazilian) 2017-04-23 19:00:25 +02:00
James Cole
cb01ae0ac5 New version and new change log. 2017-04-23 19:00:19 +02:00
James Cole
a09469c01f Merge pull request #633 from firefly-iii/l10n_develop
New Crowdin translations
2017-04-23 18:58:26 +02:00
James Cole
662f398b08 Update tests. 2017-04-23 18:53:00 +02:00
James Cole
d7aef627b8 Update composer file 2017-04-23 18:52:47 +02:00
James Cole
87bcf293aa New translations firefly.php (French) 2017-04-23 18:20:17 +02:00
James Cole
0171831ebb New translations form.php (French) 2017-04-23 18:10:19 +02:00
James Cole
50cc455f0f New translations firefly.php (French) 2017-04-23 18:10:18 +02:00
James Cole
47a7729358 New translations firefly.php (Dutch) 2017-04-23 09:40:30 +02:00
James Cole
6d508e61a0 New translations form.php (Dutch) 2017-04-23 09:40:28 +02:00
James Cole
8ef9223d84 Final code for #595 2017-04-23 09:33:33 +02:00
James Cole
e58ea4d0c7 New translations firefly.php (French) 2017-04-22 07:11:03 +02:00
James Cole
9629ba916e New translations firefly.php (Chinese Traditional) 2017-04-22 07:10:55 +02:00
James Cole
aad4df1596 New translations firefly.php (Croatian) 2017-04-22 07:10:51 +02:00
James Cole
30ed25f80a New translations firefly.php (Chinese Traditional, Hong Kong) 2017-04-22 07:10:47 +02:00
James Cole
8b7000681c New translations firefly.php (German) 2017-04-22 07:10:43 +02:00
James Cole
221adbf3db New translations firefly.php (Russian) 2017-04-22 07:10:38 +02:00
James Cole
39129d8cd0 New translations firefly.php (Spanish) 2017-04-22 07:10:34 +02:00
James Cole
2c2d444906 New translations firefly.php (Dutch) 2017-04-22 07:10:32 +02:00
James Cole
04a1d785bf New translations firefly.php (Polish) 2017-04-22 07:10:24 +02:00
James Cole
c0a0aa4652 New translations firefly.php (Portuguese, Brazilian) 2017-04-22 07:10:15 +02:00
James Cole
21c24fd7f0 Improved test coverage script. 2017-04-22 07:05:55 +02:00
James Cole
beb358f8ee Small code optimisation. 2017-04-22 07:05:44 +02:00
James Cole
e3cd11ec2e Various code coverage and test related fixes. 2017-04-22 07:05:31 +02:00
James Cole
ee08fc2421 All “all” views are now consistent #595 2017-04-22 07:04:39 +02:00
James Cole
ae30f7920b Fix bread crumbs for tags. 2017-04-19 17:11:07 +02:00
James Cole
f4786c3ec8 Fix balance view [skip ci] 2017-04-19 16:32:12 +02:00
James Cole
8b9e4d2539 New translations firefly.php (German) 2017-04-19 09:31:52 +02:00
James Cole
d7ca7ed632 New translations firefly.php (German) 2017-04-19 09:20:18 +02:00
James Cole
1346b25fc7 New translations firefly.php (German) 2017-04-19 09:10:18 +02:00
James Cole
15d9314503 New translations firefly.php (German) 2017-04-19 09:00:38 +02:00
James Cole
93f4006c9e New translations firefly.php (German) 2017-04-19 08:50:21 +02:00
James Cole
16182fec6c New translations validation.php (German) 2017-04-19 08:40:18 +02:00
James Cole
99606ba936 New translations form.php (German) 2017-04-19 08:40:15 +02:00
James Cole
be1ed56d42 New translations form.php (German) 2017-04-19 01:50:14 +02:00
James Cole
d7fb6f83b8 New translations firefly.php (German) 2017-04-19 00:30:15 +02:00
James Cole
665f1f470a New translations firefly.php (German) 2017-04-19 00:20:16 +02:00
James Cole
7867f26120 Improve report sums. 2017-04-17 08:31:42 +02:00
James Cole
8e195bf811 New translations firefly.php (French) 2017-04-16 22:21:16 +02:00
James Cole
e3403dc87f New translations firefly.php (Chinese Traditional) 2017-04-16 22:21:07 +02:00
James Cole
5844e95488 New translations firefly.php (Croatian) 2017-04-16 22:21:01 +02:00
James Cole
cb3a1f2ff6 New translations firefly.php (Chinese Traditional, Hong Kong) 2017-04-16 22:20:56 +02:00
James Cole
f95edb06a9 New translations firefly.php (German) 2017-04-16 22:20:52 +02:00
James Cole
86d13060bc New translations firefly.php (Russian) 2017-04-16 22:20:45 +02:00
James Cole
0b8c2f6f8d New translations firefly.php (Spanish) 2017-04-16 22:20:40 +02:00
James Cole
589cafc64f New translations firefly.php (Dutch) 2017-04-16 22:20:37 +02:00
James Cole
448dc7b5c3 New translations firefly.php (Polish) 2017-04-16 22:20:25 +02:00
James Cole
10cfde6cab New translations firefly.php (Portuguese, Brazilian) 2017-04-16 22:20:15 +02:00
James Cole
e48eb2ce2f Clean up account taker amount inconsistencies. 2017-04-16 22:15:05 +02:00
James Cole
20a30a2d1d Various cosmetic fixes for /all lists [skip ci] 2017-04-16 12:51:21 +02:00
James Cole
2e5b8418ae New translations firefly.php (French) 2017-04-15 23:01:27 +02:00
James Cole
054fd229d2 New translations firefly.php (Chinese Traditional) 2017-04-15 23:01:18 +02:00
James Cole
9bdf2c8877 New translations firefly.php (Croatian) 2017-04-15 23:01:12 +02:00
James Cole
04f858a355 New translations firefly.php (Chinese Traditional, Hong Kong) 2017-04-15 23:01:07 +02:00
James Cole
a9bf405a65 New translations firefly.php (German) 2017-04-15 23:01:01 +02:00
James Cole
463c866cfa New translations firefly.php (Russian) 2017-04-15 23:00:54 +02:00
James Cole
03fe0c8fff New translations firefly.php (Spanish) 2017-04-15 23:00:49 +02:00
James Cole
102d9f3510 New translations firefly.php (Dutch) 2017-04-15 23:00:44 +02:00
James Cole
3cf9a40c42 New translations firefly.php (Polish) 2017-04-15 23:00:33 +02:00
James Cole
ff33267296 New translations firefly.php (Portuguese, Brazilian) 2017-04-15 23:00:20 +02:00
James Cole
f0dab5bdb9 Code for #608 2017-04-15 22:52:01 +02:00
James Cole
209a907c61 Account chart can display multiple currencies. 2017-04-15 17:26:03 +02:00
James Cole
c7984d4363 Remove stray text. [skip ci] 2017-04-15 15:57:45 +02:00
James Cole
a388313e1c New translations form.php (French) 2017-04-15 08:21:13 +02:00
James Cole
a3933cb307 New translations form.php (Croatian) 2017-04-15 08:21:12 +02:00
James Cole
89c82d9be9 New translations form.php (Chinese Traditional) 2017-04-15 08:21:04 +02:00
James Cole
6e6311a1a1 New translations form.php (Chinese Traditional, Hong Kong) 2017-04-15 08:20:57 +02:00
James Cole
69b334ed8a New translations form.php (Russian) 2017-04-15 08:20:44 +02:00
James Cole
a84b6f377f New translations form.php (Dutch) 2017-04-15 08:20:37 +02:00
James Cole
ee5db4e4cc New translations form.php (Spanish) 2017-04-15 08:20:34 +02:00
James Cole
20f3322e5a New translations form.php (Polish) 2017-04-15 08:20:28 +02:00
James Cole
1e84bc3743 New translations form.php (German) 2017-04-15 08:20:24 +02:00
James Cole
7f198cbd50 New translations form.php (Portuguese, Brazilian) 2017-04-15 08:20:19 +02:00
James Cole
1c7d5ccefc Forgot some translations [skip ci] 2017-04-15 08:15:05 +02:00
James Cole
41dc4d994e Fix transaction journals that may be broken. 2017-04-15 08:13:05 +02:00
James Cole
490733bdd1 Some javascript clean up 2017-04-15 07:25:09 +02:00
James Cole
ed8cf8c431 New translations firefly.php (French) 2017-04-14 23:01:32 +02:00
James Cole
a7e1f85c4d New translations form.php (French) 2017-04-14 23:01:29 +02:00
James Cole
4b8919420d New translations form.php (Croatian) 2017-04-14 23:01:27 +02:00
James Cole
9afc5d67a4 New translations firefly.php (Chinese Traditional) 2017-04-14 23:01:21 +02:00
James Cole
72afaddd7c New translations form.php (Chinese Traditional) 2017-04-14 23:01:18 +02:00
James Cole
8ae3182e1c New translations firefly.php (Croatian) 2017-04-14 23:01:14 +02:00
James Cole
9d7e16b390 New translations form.php (Chinese Traditional, Hong Kong) 2017-04-14 23:01:10 +02:00
James Cole
3a2ed202ad New translations firefly.php (Chinese Traditional, Hong Kong) 2017-04-14 23:01:09 +02:00
James Cole
9e4b9b98ab New translations firefly.php (German) 2017-04-14 23:01:03 +02:00
James Cole
e65fb7d995 New translations firefly.php (Russian) 2017-04-14 23:00:56 +02:00
James Cole
7197830edc New translations form.php (Russian) 2017-04-14 23:00:53 +02:00
James Cole
687603ae84 New translations firefly.php (Spanish) 2017-04-14 23:00:50 +02:00
James Cole
23fc25f926 New translations firefly.php (Dutch) 2017-04-14 23:00:48 +02:00
James Cole
e0c1f07f92 New translations form.php (Dutch) 2017-04-14 23:00:45 +02:00
James Cole
9424aa3378 New translations form.php (Spanish) 2017-04-14 23:00:42 +02:00
James Cole
57e6e0945f New translations form.php (Polish) 2017-04-14 23:00:35 +02:00
James Cole
d87a033f29 New translations firefly.php (Polish) 2017-04-14 23:00:33 +02:00
James Cole
10481895e6 New translations form.php (German) 2017-04-14 23:00:29 +02:00
James Cole
813432f386 New translations form.php (Portuguese, Brazilian) 2017-04-14 23:00:23 +02:00
James Cole
aba78c9776 New translations firefly.php (Portuguese, Brazilian) 2017-04-14 23:00:19 +02:00
James Cole
8dc56bcee0 Fix line [skip ci] 2017-04-14 22:55:19 +02:00
James Cole
32b6e030ef Can now also edit transfers. 2017-04-14 22:49:12 +02:00
James Cole
a27f5d2474 Can now create transfers with different currencies. 2017-04-14 22:25:48 +02:00
James Cole
e2fe8cfb75 Clean up and consistency in foreign and native amounts. 2017-04-14 15:56:43 +02:00
James Cole
9f1c346365 New translations firefly.php (French) 2017-04-14 15:51:37 +02:00
James Cole
3e56803e95 New translations firefly.php (Chinese Traditional) 2017-04-14 15:51:26 +02:00
James Cole
fc5feb054d New translations firefly.php (Croatian) 2017-04-14 15:51:18 +02:00
James Cole
8fc233e436 New translations firefly.php (Chinese Traditional, Hong Kong) 2017-04-14 15:51:12 +02:00
James Cole
22303eb2ff New translations firefly.php (German) 2017-04-14 15:51:06 +02:00
James Cole
d6477ff9ff New translations firefly.php (Russian) 2017-04-14 15:50:56 +02:00
James Cole
a0f6f13650 New translations firefly.php (Spanish) 2017-04-14 15:50:51 +02:00
James Cole
1dd213d587 New translations firefly.php (Dutch) 2017-04-14 15:50:48 +02:00
James Cole
569e51afbe New translations firefly.php (Polish) 2017-04-14 15:50:35 +02:00
James Cole
ff06a4ed0d New translations firefly.php (Portuguese, Brazilian) 2017-04-14 15:50:21 +02:00
James Cole
ea3fdb0668 Clean up and consistency in foreign and native amounts. 2017-04-14 15:42:54 +02:00
James Cole
bd917f6484 Deposit works as well. 2017-04-14 14:48:44 +02:00
James Cole
ee96311222 New translations form.php (Dutch) 2017-04-14 14:41:44 +02:00
James Cole
135153ff9c New translations form.php (French) 2017-04-14 14:41:30 +02:00
James Cole
fdb98133c8 New translations firefly.php (French) 2017-04-14 14:41:29 +02:00
James Cole
ad4e2c0a85 New translations form.php (Croatian) 2017-04-14 14:41:26 +02:00
James Cole
e38cb263aa New translations firefly.php (Chinese Traditional) 2017-04-14 14:41:19 +02:00
James Cole
0922136389 New translations form.php (Chinese Traditional) 2017-04-14 14:41:17 +02:00
James Cole
2a05517a30 New translations firefly.php (Croatian) 2017-04-14 14:41:13 +02:00
James Cole
a0ee924aeb New translations form.php (Chinese Traditional, Hong Kong) 2017-04-14 14:41:09 +02:00
James Cole
1595afce68 New translations firefly.php (Chinese Traditional, Hong Kong) 2017-04-14 14:41:07 +02:00
James Cole
4919d730c8 New translations firefly.php (Russian) 2017-04-14 14:40:56 +02:00
James Cole
1407d6cc66 New translations form.php (Russian) 2017-04-14 14:40:53 +02:00
James Cole
55b092e7a0 New translations firefly.php (Dutch) 2017-04-14 14:40:49 +02:00
James Cole
93afb754f3 New translations form.php (Spanish) 2017-04-14 14:40:45 +02:00
James Cole
81c0ea8f5c New translations firefly.php (Spanish) 2017-04-14 14:40:44 +02:00
James Cole
6faacd3781 New translations firefly.php (Polish) 2017-04-14 14:40:36 +02:00
James Cole
ea1e9e407f New translations form.php (German) 2017-04-14 14:40:32 +02:00
James Cole
d4f5aa1578 New translations firefly.php (German) 2017-04-14 14:40:30 +02:00
James Cole
1cbbf3fa5d New translations form.php (Polish) 2017-04-14 14:40:25 +02:00
James Cole
dad3dc71ca New translations form.php (Portuguese, Brazilian) 2017-04-14 14:40:23 +02:00
James Cole
afb1e9f230 New translations firefly.php (Portuguese, Brazilian) 2017-04-14 14:40:22 +02:00
James Cole
c33dd1ecee Can now handle withdrawals in foreign currency. 2017-04-14 14:37:04 +02:00
James Cole
7e31a29b12 FF3 will now correctly store exchanged / foreign amounts. 2017-04-14 11:19:09 +02:00
James Cole
9a69ce309e Initial user ability to set foreign currency 2017-04-14 10:16:52 +02:00
James Cole
b99bfcd02e Fix null pointer [skip ci] 2017-04-14 07:46:19 +02:00
James Cole
adb16e4560 Also make sure that the account create screen sets the correct currency id. 2017-04-14 07:32:30 +02:00
James Cole
953c38563b Make sure that accounts and their opening balance values are the same currency. 2017-04-14 07:11:30 +02:00
James Cole
89ee9c058a Account list is capable of showing the selected currency 2017-04-13 21:36:23 +02:00
James Cole
bac7a73555 A transaction may now have a currency. This may proof to be useful when transferring money between accounts with different currencies. 2017-04-13 21:29:21 +02:00
James Cole
5fb6ff230b Two small code fixes. 2017-04-13 21:19:10 +02:00
James Cole
605a718418 Turns out open exchange rates is useless. 2017-04-13 21:19:00 +02:00
James Cole
994542c75d First basic code for currency exchange rate routines. 2017-04-13 20:47:59 +02:00
James Cole
d5fdce02fa New translations csv.php (Dutch) 2017-04-11 17:22:26 +02:00
James Cole
d3637de0c3 New translations csv.php (French) 2017-04-11 17:21:56 +02:00
James Cole
63acbb222d New translations csv.php (Chinese Traditional) 2017-04-11 17:21:44 +02:00
James Cole
5e1fe157b6 New translations csv.php (Chinese Traditional, Hong Kong) 2017-04-11 17:21:37 +02:00
James Cole
8e811da967 New translations csv.php (Croatian) 2017-04-11 17:21:30 +02:00
James Cole
fb23108f4e New translations csv.php (German) 2017-04-11 17:21:20 +02:00
James Cole
a0220eb5f8 New translations csv.php (Russian) 2017-04-11 17:21:08 +02:00
James Cole
c16cbd5bc8 New translations csv.php (Spanish) 2017-04-11 17:21:02 +02:00
James Cole
2d0673e1bc New translations csv.php (Portuguese, Brazilian) 2017-04-11 17:20:59 +02:00
James Cole
a90e00d577 New translations csv.php (Polish) 2017-04-11 17:20:40 +02:00
James Cole
8db96025a3 Code cleanup. 2017-04-09 07:56:46 +02:00
James Cole
595596d73f Apparently this is changed in PHPStorm’s formatting templates so there you go [skip ci]. 2017-04-09 07:44:22 +02:00
James Cole
240797e92a Fixes #630 [skip ci] 2017-04-09 07:36:58 +02:00
James Cole
6cafb91680 This fixes #629 2017-04-08 19:05:37 +02:00
James Cole
852ce3e32f Remove unused classes. 2017-04-08 18:02:16 +02:00
James Cole
6b9c9458fa This fixes possible null errors. 2017-04-08 18:00:45 +02:00
James Cole
970ce917b0 Merge branch 'release/4.3.8' 2017-04-08 17:54:10 +02:00
James Cole
db46d450bf New files for new release. 2017-04-08 17:51:34 +02:00
James Cole
db806b92dd Merge pull request #618 from firefly-iii/l10n_develop
New Crowdin translations
2017-04-08 10:20:55 +02:00
James Cole
6765f08b07 Fixed some tests. [skip ci] 2017-04-08 10:20:34 +02:00
James Cole
99d75ba14b New translations firefly.php (Dutch) 2017-04-08 10:10:23 +02:00
James Cole
0e8ce5680c New translations firefly.php (Dutch) 2017-04-08 10:00:17 +02:00
James Cole
fd01b54a14 Code for charts #628 [skip ci] 2017-04-08 09:18:04 +02:00
James Cole
ce6253bbd7 New translations firefly.php (Dutch) 2017-04-08 09:10:16 +02:00
James Cole
4fd33f19c6 Experimental code for #628 2017-04-08 09:00:37 +02:00
James Cole
01ae278f09 Float > intval. [skip ci] 2017-04-08 08:53:53 +02:00
James Cole
7907c71e47 Code to verify issue #620 2017-04-08 07:00:51 +02:00
James Cole
4e44733dcc Updated code for #624 2017-04-08 06:51:16 +02:00
James Cole
dd1d7bb02a Should fix issue #624 2017-04-01 08:56:39 +02:00
James Cole
6f933b3bd1 Small updates. 2017-04-01 08:13:43 +02:00
James Cole
243530b750 Forgot a return value. 2017-03-30 18:43:12 +02:00
James Cole
ea984281b0 Should fix tests. 2017-03-30 18:42:02 +02:00
James Cole
92cd3d60b9 Forgot two files. 2017-03-29 21:21:10 +02:00
James Cole
5920ccee04 Various code cleanup. 2017-03-29 21:20:54 +02:00
James Cole
569fec4610 Double check on NULL. [skip ci] 2017-03-25 22:07:07 +01:00
James Cole
5770edcde2 Expanded test coverage. 2017-03-25 13:41:17 +01:00
James Cole
1fb0a64f31 Various code cleanup [skip ci] 2017-03-24 15:15:12 +01:00
James Cole
fe66d089ad Expanded test coverage. 2017-03-24 15:01:53 +01:00
James Cole
cef10b4d4e New translations firefly.php (French) 2017-03-24 11:12:14 +01:00
James Cole
b45aa6446d New translations firefly.php (Chinese Traditional) 2017-03-24 11:11:56 +01:00
James Cole
61749312b2 New translations firefly.php (Croatian) 2017-03-24 11:11:48 +01:00
James Cole
842bb2c5a6 New translations firefly.php (Chinese Traditional, Hong Kong) 2017-03-24 11:11:40 +01:00
James Cole
4358fe99b1 New translations firefly.php (Russian) 2017-03-24 11:11:25 +01:00
James Cole
3fda8b3714 New translations firefly.php (Dutch) 2017-03-24 11:11:13 +01:00
James Cole
09f3274adc New translations firefly.php (Spanish) 2017-03-24 11:11:04 +01:00
James Cole
029224f708 New translations firefly.php (Polish) 2017-03-24 11:10:52 +01:00
James Cole
e87cce12f8 New translations firefly.php (German) 2017-03-24 11:10:43 +01:00
James Cole
7660667153 New translations firefly.php (Portuguese, Brazilian) 2017-03-24 11:10:33 +01:00
James Cole
222b3008d5 Expanded test coverage. 2017-03-24 11:07:38 +01:00
James Cole
398cf0b312 Small improvements in the search [skip ci] 2017-03-24 07:17:38 +01:00
James Cole
5ad8be2483 This fixes the tests 2017-03-22 17:37:34 +01:00
James Cole
6fe319702d Expand test coverage. Remove else-statement. 2017-03-22 17:02:15 +01:00
James Cole
32c89f9a98 Expand category view. 2017-03-22 17:00:01 +01:00
James Cole
64f983786e New translations firefly.php (French) 2017-03-22 01:20:18 +01:00
James Cole
16438b416d New translations list.php (French) 2017-03-22 01:10:26 +01:00
James Cole
52cd292a69 New translations form.php (French) 2017-03-22 01:10:24 +01:00
James Cole
53b501df19 New translations firefly.php (French) 2017-03-22 01:10:23 +01:00
James Cole
477acafc4c Improve test coverage. 2017-03-21 20:46:14 +01:00
James Cole
ab9146b7c6 Update README.md
New badge
2017-03-21 14:24:10 +01:00
James Cole
4d15913e18 New translations csv.php (French) 2017-03-21 13:50:24 +01:00
James Cole
63a91811e2 New translations firefly.php (French) 2017-03-21 13:50:23 +01:00
James Cole
9df4da6173 New translations validation.php (French) 2017-03-21 13:50:14 +01:00
James Cole
643927799b New translations demo.php (French) 2017-03-21 11:50:25 +01:00
James Cole
2652e23089 New translations firefly.php (French) 2017-03-21 11:50:23 +01:00
James Cole
b70c5ae41e New translations demo.php (French) 2017-03-21 10:11:17 +01:00
James Cole
c53d9b2855 New translations demo.php (French) 2017-03-21 10:00:35 +01:00
James Cole
2f6712be87 New translations config.php (French) 2017-03-21 09:50:13 +01:00
James Cole
37f78985ae Update AccountController.php 2017-03-21 08:17:27 +01:00
James Cole
34ac9bc71a Update AccountController.php 2017-03-21 08:15:21 +01:00
James Cole
19ff2484fd Merge branch 'develop' of https://github.com/firefly-iii/firefly-iii into develop
* 'develop' of https://github.com/firefly-iii/firefly-iii:
  Changed to get relative path and not absolute path
2017-03-21 06:29:38 +01:00
James Cole
b7ef2211d9 Include Firefly version in error mail [skip ci] 2017-03-21 06:28:06 +01:00
James Cole
c5206a4559 Merge pull request #623 from welbert/develop
Changed to get relative path and not absolute path
2017-03-20 20:29:01 +01:00
Welbert Serra
894296f63d Changed to get relative path and not absolute path
If you access with absolute path, favicon don't appear on site and the [progressive webApp](https://developers.google.com/web/progressive-web-apps/) is not correctly generate. Get 404 error
2017-03-19 17:51:32 -03:00
James Cole
61526df245 Make dir where json log will end up. 2017-03-19 20:39:27 +01:00
James Cole
92549c4485 No more script removal. 2017-03-19 18:01:09 +01:00
James Cole
6014892d4d New database and new test script. 2017-03-19 17:58:07 +01:00
James Cole
9515ce6807 Expand tests. 2017-03-19 17:54:21 +01:00
James Cole
1adb0f2f0e Improve test coverage. 2017-03-18 20:53:44 +01:00
James Cole
00b1b54347 New test database. 2017-03-18 11:02:21 +01:00
James Cole
282ce041e1 Code cleanup for #595 2017-03-18 11:02:02 +01:00
James Cole
3215c4ee4b Expand code and some refactoring for #595 2017-03-18 08:09:14 +01:00
James Cole
fce00c95c9 New translations firefly.php (French) 2017-03-18 07:51:13 +01:00
James Cole
0a69ab1dc2 New translations firefly.php (Chinese Traditional) 2017-03-18 07:51:05 +01:00
James Cole
94771d250a New translations firefly.php (Croatian) 2017-03-18 07:50:59 +01:00
James Cole
b8395a1dbb New translations firefly.php (Chinese Traditional, Hong Kong) 2017-03-18 07:50:54 +01:00
James Cole
0436cd1584 New translations firefly.php (Russian) 2017-03-18 07:50:44 +01:00
James Cole
2c774bb94c New translations firefly.php (Dutch) 2017-03-18 07:50:39 +01:00
James Cole
b879d90b0d New translations firefly.php (Spanish) 2017-03-18 07:50:35 +01:00
James Cole
ba52b5c328 New translations firefly.php (German) 2017-03-18 07:50:27 +01:00
James Cole
bf61de13f4 New translations firefly.php (Polish) 2017-03-18 07:50:22 +01:00
James Cole
b26e67ae07 New translations firefly.php (Portuguese, Brazilian) 2017-03-18 07:50:19 +01:00
James Cole
edafd16c75 Bread crumbs for #595 2017-03-18 07:46:57 +01:00
James Cole
c62e3dcb78 Code for #595 2017-03-18 07:46:42 +01:00
James Cole
68be58c9f2 Line chart 2017-03-18 07:46:14 +01:00
James Cole
a25a499ed4 Code cleanup 2017-03-18 07:45:52 +01:00
James Cole
97f67912f4 Remove logging 2017-03-18 07:45:40 +01:00
James Cole
e2f3788ff5 Expand tests. 2017-03-17 16:34:57 +01:00
James Cole
fd1f06c2cb Small fix. 2017-03-16 21:00:34 +01:00
James Cole
2db8d25038 This should fix tests 2017-03-16 20:46:18 +01:00
James Cole
d618ddc8c5 Lot of debug info for #619 2017-03-16 17:52:13 +01:00
James Cole
79aa0afc97 Possible fix for #619 2017-03-15 20:09:36 +01:00
James Cole
e53d294c1c Expand tests. 2017-03-12 21:24:34 +01:00
James Cole
aedc3fdff9 Fix #620 2017-03-12 20:43:37 +01:00
James Cole
b67dfeced2 Expand tests. 2017-03-12 09:22:33 +01:00
James Cole
65dbfcba5c Expand tests. 2017-03-12 08:38:13 +01:00
James Cole
8f14c78ba1 Expand some tests. 2017-03-11 22:28:51 +01:00
James Cole
be1b64bb78 New translations demo.php (French) 2017-03-11 12:10:17 +01:00
James Cole
a34c285820 New translations demo.php (French) 2017-03-11 12:00:19 +01:00
James Cole
298f0c194d New translations firefly.php (French) 2017-03-11 08:01:29 +01:00
James Cole
f5ad569aba New translations firefly.php (Chinese Traditional) 2017-03-11 08:01:20 +01:00
James Cole
c70df01532 New translations firefly.php (Croatian) 2017-03-11 08:01:13 +01:00
James Cole
03e115e066 New translations firefly.php (Chinese Traditional, Hong Kong) 2017-03-11 08:01:08 +01:00
James Cole
b88fce35ad New translations firefly.php (Russian) 2017-03-11 08:00:56 +01:00
James Cole
d214e9ff49 New translations firefly.php (Dutch) 2017-03-11 08:00:50 +01:00
James Cole
bd8382c005 New translations firefly.php (Spanish) 2017-03-11 08:00:45 +01:00
James Cole
18cb815e45 New translations firefly.php (German) 2017-03-11 08:00:34 +01:00
James Cole
800e8aca6e New translations firefly.php (Polish) 2017-03-11 08:00:27 +01:00
James Cole
63a6e0754b New translations firefly.php (Portuguese, Brazilian) 2017-03-11 08:00:23 +01:00
James Cole
4abc271805 Implemented #595 for transactions. 2017-03-11 07:41:26 +01:00
James Cole
22cca3858c New translations firefly.php (French) 2017-03-10 19:41:27 +01:00
James Cole
b816fbdf82 New translations firefly.php (Chinese Traditional) 2017-03-10 19:41:17 +01:00
James Cole
d400060b8b New translations firefly.php (Croatian) 2017-03-10 19:41:10 +01:00
James Cole
c88cfa2d9d New translations firefly.php (Chinese Traditional, Hong Kong) 2017-03-10 19:41:03 +01:00
James Cole
b060027304 New translations firefly.php (Russian) 2017-03-10 19:40:51 +01:00
James Cole
d4787aca9c New translations firefly.php (Dutch) 2017-03-10 19:40:45 +01:00
James Cole
69ae2e93f8 New translations firefly.php (Spanish) 2017-03-10 19:40:40 +01:00
James Cole
82a37c62c1 New translations firefly.php (German) 2017-03-10 19:40:30 +01:00
James Cole
ca69970242 New translations firefly.php (Polish) 2017-03-10 19:40:25 +01:00
James Cole
fac3853d95 New translations firefly.php (Portuguese, Brazilian) 2017-03-10 19:40:21 +01:00
James Cole
9dd2f447cc Fix in date range [skip ci] 2017-03-10 19:36:22 +01:00
James Cole
ecbd7ca95b Also implement #595 for the no-cat view. 2017-03-10 19:34:46 +01:00
James Cole
0c52d54d7d Optimized some views and fixed tests for #595 2017-03-10 18:54:50 +01:00
James Cole
78276ac66b New translations firefly.php (French) 2017-03-10 16:12:09 +01:00
James Cole
ca0a22d755 New translations firefly.php (Chinese Traditional) 2017-03-10 16:11:56 +01:00
James Cole
47361fd77a New translations firefly.php (Croatian) 2017-03-10 16:11:49 +01:00
James Cole
1af6fd5d74 New translations firefly.php (Chinese Traditional, Hong Kong) 2017-03-10 16:11:42 +01:00
James Cole
51df78ad2d New translations firefly.php (Russian) 2017-03-10 16:11:27 +01:00
James Cole
84a3e68eb5 New translations firefly.php (Dutch) 2017-03-10 16:11:18 +01:00
James Cole
b2904e09d8 New translations firefly.php (Spanish) 2017-03-10 16:11:11 +01:00
James Cole
fc42a621e4 New translations firefly.php (German) 2017-03-10 16:10:55 +01:00
James Cole
a1c4fb73cd New translations firefly.php (Polish) 2017-03-10 16:10:46 +01:00
James Cole
c18f19db97 New translations firefly.php (Portuguese, Brazilian) 2017-03-10 16:10:40 +01:00
James Cole
ebc712f6b5 Consistency for #595 2017-03-10 16:08:58 +01:00
James Cole
ef0057d88d Add opposing account info [skip ci] #595 2017-03-10 15:28:04 +01:00
James Cole
a8fdfdd5e0 Add opposing account info [skip ci] #595 2017-03-10 15:27:19 +01:00
James Cole
89f7e1ba2a New translations firefly.php (French) 2017-03-09 21:11:36 +01:00
James Cole
6508b4058f New translations firefly.php (Chinese Traditional) 2017-03-09 21:11:25 +01:00
James Cole
bec5d93af6 New translations firefly.php (Croatian) 2017-03-09 21:11:18 +01:00
James Cole
1125fcd6c5 New translations firefly.php (Chinese Traditional, Hong Kong) 2017-03-09 21:11:11 +01:00
James Cole
ff43a547a6 New translations firefly.php (Russian) 2017-03-09 21:10:57 +01:00
James Cole
ca8684146c New translations firefly.php (Dutch) 2017-03-09 21:10:51 +01:00
James Cole
44bea62383 New translations firefly.php (Spanish) 2017-03-09 21:10:45 +01:00
James Cole
8dc2faa5e5 New translations firefly.php (German) 2017-03-09 21:10:34 +01:00
James Cole
f4867d1d09 New translations firefly.php (Polish) 2017-03-09 21:10:29 +01:00
James Cole
8d172801b5 New translations firefly.php (Portuguese, Brazilian) 2017-03-09 21:10:24 +01:00
James Cole
db6e6dfe4a Fix tests for #595 2017-03-09 21:05:37 +01:00
James Cole
61007a95a6 Initial code for #595, transactions with no budget 2017-03-09 20:54:18 +01:00
James Cole
bf138670e8 New translations firefly.php (Dutch) 2017-03-09 08:20:49 +01:00
James Cole
0e59f7433c Code and tests for #615 2017-03-09 08:19:05 +01:00
James Cole
9a033ac62a New translations firefly.php (French) 2017-03-08 20:41:39 +01:00
James Cole
789412ee6a New translations firefly.php (Chinese Traditional) 2017-03-08 20:41:28 +01:00
James Cole
91125d20ef New translations firefly.php (Croatian) 2017-03-08 20:41:19 +01:00
James Cole
292b3672e2 New translations firefly.php (Chinese Traditional, Hong Kong) 2017-03-08 20:41:14 +01:00
James Cole
14ef6b753c New translations firefly.php (Russian) 2017-03-08 20:40:56 +01:00
James Cole
55fcb97a10 New translations firefly.php (Dutch) 2017-03-08 20:40:50 +01:00
James Cole
6b8ec544c1 New translations firefly.php (Spanish) 2017-03-08 20:40:44 +01:00
James Cole
c0aad385cd New translations firefly.php (German) 2017-03-08 20:40:33 +01:00
James Cole
ecfb5e4711 New translations firefly.php (Polish) 2017-03-08 20:40:26 +01:00
James Cole
46c9967a68 New translations firefly.php (Portuguese, Brazilian) 2017-03-08 20:40:23 +01:00
James Cole
176c44e2b9 Remove newline [skip ci] 2017-03-08 20:38:08 +01:00
James Cole
5957cf5ff8 Remove space. [skip ci] 2017-03-08 20:37:40 +01:00
James Cole
436a270524 Merge branch 'release/4.3.7' 2017-03-06 21:07:40 +01:00
James Cole
7a1c14b766 Update for new release. 2017-03-06 21:04:14 +01:00
James Cole
721c4aa888 Merge pull request #609 from firefly-iii/l10n_develop
New Crowdin translations
2017-03-06 20:54:52 +01:00
James Cole
638aab4eea Update TagRepository.php 2017-03-06 10:16:52 +01:00
James Cole
9aa44f7458 New translations 2017-03-05 19:00:15 +01:00
James Cole
1e887a2a8d Start replacing html comments with twig comments 2017-03-05 18:46:12 +01:00
James Cole
78571ad121 Update change log 2017-03-05 18:45:55 +01:00
James Cole
8e5ec79097 Wrote new tests. 2017-03-05 18:15:38 +01:00
James Cole
fc351f36b1 New translations 2017-03-05 13:31:21 +01:00
James Cole
80204147f7 New translations 2017-03-05 13:31:12 +01:00
James Cole
d599b8e5ea New translations 2017-03-05 13:31:06 +01:00
James Cole
208ef9d664 New translations 2017-03-05 13:31:00 +01:00
James Cole
c14da542d1 New translations 2017-03-05 13:30:48 +01:00
James Cole
451832cb2b New translations 2017-03-05 13:30:42 +01:00
James Cole
1409aeb8ed New translations 2017-03-05 13:30:38 +01:00
James Cole
342f24cfe4 New translations 2017-03-05 13:30:27 +01:00
James Cole
8aedfd5153 New translations 2017-03-05 13:30:22 +01:00
James Cole
33b099456f New translations 2017-03-05 13:30:18 +01:00
James Cole
42cb40102f Updated test database. 2017-03-05 13:26:31 +01:00
James Cole
2fbeaaccd3 Expand tests. 2017-03-05 13:21:36 +01:00
James Cole
57fb75bef4 Fix for #611 [skip ci] 2017-03-05 12:19:12 +01:00
James Cole
5c0e22cd31 Fix for #612 [skip ci] 2017-03-05 12:17:55 +01:00
James Cole
879f74e521 Code cleanup. 2017-03-05 11:19:06 +01:00
James Cole
e5a2e1a8c7 Updated tests 2017-03-05 11:18:34 +01:00
James Cole
884d6c59a2 Expand some tests. 2017-03-04 19:14:36 +01:00
James Cole
c206a95d55 Improved various tests. 2017-03-04 15:29:20 +01:00
James Cole
8b4ef4e2da Fix for #610 2017-03-04 13:08:16 +01:00
James Cole
bac5238589 New test database. 2017-03-04 11:21:42 +01:00
James Cole
ae05d4d51d Expand tests 2017-03-04 11:20:57 +01:00
James Cole
9d22bbee1c Add code coverage ignore instructions. 2017-03-04 11:19:44 +01:00
James Cole
1d6007b848 New translations 2017-03-04 07:31:20 +01:00
James Cole
3157339e44 New translations 2017-03-04 07:31:10 +01:00
James Cole
b31d5eefd1 New translations 2017-03-04 07:31:04 +01:00
James Cole
e47398dc71 New translations 2017-03-04 07:30:58 +01:00
James Cole
757d472704 New translations 2017-03-04 07:30:47 +01:00
James Cole
9d0ae99602 New translations 2017-03-04 07:30:41 +01:00
James Cole
0d9ceb6fde New translations 2017-03-04 07:30:37 +01:00
James Cole
cb665d4016 New translations 2017-03-04 07:30:27 +01:00
James Cole
9673dc96d9 New translations 2017-03-04 07:30:22 +01:00
James Cole
2295091427 New translations 2017-03-04 07:30:18 +01:00
James Cole
45f4395f26 Large commit to get rid of a lot of static methods. 2017-03-04 07:26:03 +01:00
James Cole
d9aa074330 Large commit to get rid of a lot of static methods. 2017-03-04 07:18:35 +01:00
James Cole
33c20c8dc4 Renamed a parameter 2017-03-04 06:54:05 +01:00
James Cole
8101f910f0 Update tests. 2017-03-04 06:53:46 +01:00
James Cole
8fb6c1a0c8 Various small changes. 2017-03-03 18:19:25 +01:00
James Cole
978e3e615c This prevented FF from displaying cash account properly. 2017-03-03 12:55:28 +01:00
James Cole
b3b8981b4b Catch null pointer exception. 2017-03-02 19:57:46 +01:00
James Cole
015064e5af Update composer.lock 2017-03-02 19:45:04 +01:00
James Cole
7ef8ff60a5 Update config files. 2017-03-02 19:41:17 +01:00
James Cole
4c3f54699e Merge pull request #590 from firefly-iii/l10n_develop
New Crowdin translations
2017-03-02 19:26:13 +01:00
James Cole
3bf5040324 Fixed null pointer in debug message [skip ci] 2017-03-02 16:42:33 +01:00
James Cole
ed9e5b31fa Merge pull request #606 from Zsub/fix-piggy-bank-interaction
Set default piggy for new transaction
2017-03-02 07:28:17 +01:00
Joris de Vries
506e97e12d Set default piggy for new transaction
Fixes #605. By explicitly setting the selected piggybank to the 0-piggy, new transactions will not inadvertently get coupled to a piggybank if the piggy’s name starts with characters that get sorted before `(` (such as `!` or `’`).
2017-03-01 22:45:37 +01:00
James Cole
9365f9ab60 This fixes #604 2017-03-01 21:13:45 +01:00
James Cole
dd1e9ecb32 This fixes #599 2017-03-01 21:02:47 +01:00
James Cole
d3a2bf174d This fixes #605 2017-03-01 20:57:52 +01:00
James Cole
311020ff2e This fixes #602 2017-03-01 20:49:16 +01:00
James Cole
a6df3ac1fb New translations 2017-02-26 14:40:10 +01:00
James Cole
d313b50e39 Updated composer.lock 2017-02-26 11:52:40 +01:00
James Cole
b23eb07018 Fix error when not-existing import job is submitted. 2017-02-26 11:48:38 +01:00
James Cole
2116486fe0 Various code cleanup 2017-02-25 17:39:50 +01:00
James Cole
eed8fe22c6 Make sure the loop is broken. #595 2017-02-25 13:34:44 +01:00
James Cole
1cec91e4bf New translations 2017-02-25 13:31:13 +01:00
James Cole
8decf8ab9f Make PHP modules mandatory in composer file. 2017-02-25 13:26:01 +01:00
James Cole
79b0c20adb Forgot about the date for account lists, #595 [skip ci] 2017-02-25 13:22:06 +01:00
James Cole
65647ca822 New translations 2017-02-25 13:21:20 +01:00
James Cole
18fafcd45f New translations 2017-02-25 13:21:10 +01:00
James Cole
b7723f4487 New translations 2017-02-25 13:21:04 +01:00
James Cole
6418df87bb New translations 2017-02-25 13:20:58 +01:00
James Cole
daa88c5be1 New translations 2017-02-25 13:20:47 +01:00
James Cole
707b70b136 New translations 2017-02-25 13:20:42 +01:00
James Cole
f9b3b6f7d3 New translations 2017-02-25 13:20:37 +01:00
James Cole
b295eef970 New translations 2017-02-25 13:20:28 +01:00
James Cole
f13dace7ad New translations 2017-02-25 13:20:22 +01:00
James Cole
8dfc40ed3e New translations 2017-02-25 13:20:18 +01:00
James Cole
2e637031ac Fix charts for #595, account overview. 2017-02-25 13:19:42 +01:00
James Cole
de9ef20014 First code for #595. Charts are still broken. 2017-02-25 13:13:51 +01:00
James Cole
4f50689d0e - Will now return 0 when nothing to save or when target date is in the past.
- Will calculate correctly when date difference with target date is more than a year.
- Will always return a string
- Will do calculations using bcmath module.
2017-02-25 13:05:33 +01:00
James Cole
082392f9e0 New translations 2017-02-25 13:01:34 +01:00
James Cole
aca2ef08f1 New translations 2017-02-25 13:01:24 +01:00
James Cole
90fcec4ca8 New translations 2017-02-25 13:01:17 +01:00
James Cole
c90db28b9e New translations 2017-02-25 13:01:11 +01:00
James Cole
56b617bd57 New translations 2017-02-25 13:00:56 +01:00
James Cole
06d58c16d8 New translations 2017-02-25 13:00:50 +01:00
James Cole
b1a807139a New translations 2017-02-25 13:00:45 +01:00
James Cole
ac07736040 New translations 2017-02-25 13:00:34 +01:00
James Cole
c68ba8d510 New translations 2017-02-25 13:00:28 +01:00
James Cole
470802c93b New translations 2017-02-25 13:00:24 +01:00
James Cole
c58745b6ce Merge pull request #597 from Zsub/make-text-translatable
Make suggested savings text translatable
2017-02-25 12:56:31 +01:00
James Cole
9eea4749f0 Remove IDE and environment specific files from gitignore, as inspired by #598. 2017-02-25 12:55:56 +01:00
Joris de Vries
251206fb75 Make suggested savings text translatable
PR #594 introduced suggested savings, this commit makes the text translatable.
2017-02-25 12:26:46 +01:00
James Cole
b53a6c5703 Update .travis.yml in this branch so it stops building this branch. 2017-02-25 06:13:08 +01:00
James Cole
8c6972d12d Various code cleanup. 2017-02-25 05:57:01 +01:00
James Cole
fe0d88b7b3 New translations 2017-02-25 05:31:24 +01:00
James Cole
658b6de9c7 New translations 2017-02-25 05:31:14 +01:00
James Cole
4ea89c3811 New translations 2017-02-25 05:31:07 +01:00
James Cole
2d3d71f46a New translations 2017-02-25 05:31:02 +01:00
James Cole
80a6f431b6 New translations 2017-02-25 05:30:49 +01:00
James Cole
0644729148 New translations 2017-02-25 05:30:43 +01:00
James Cole
07da48e5ea New translations 2017-02-25 05:30:38 +01:00
James Cole
b3f565819b New translations 2017-02-25 05:30:28 +01:00
James Cole
af4abfbed9 New translations 2017-02-25 05:30:22 +01:00
James Cole
eb0011cb46 New translations 2017-02-25 05:30:18 +01:00
James Cole
444439fdab Merge pull request #594 from Zsub/show-suggested-monthly-savings
Show suggested monthly savings for a piggybank
2017-02-25 05:24:05 +01:00
Joris de Vries
a0e66b913b Show suggested monthly savings for a piggybank
If a piggybank has both a target date and a target amount, show how much money needs to be added to the piggybank each month to achieve both targets.

Strings are currently hard-coded because I want to gauge the reaction to this :)
2017-02-24 22:00:49 +01:00
James Cole
96c780c804 New text for translation [skip ci] 2017-02-24 21:11:51 +01:00
James Cole
4f1f46aa93 New translations 2017-02-24 21:11:48 +01:00
James Cole
1d9f76ee5a New translations 2017-02-24 21:11:36 +01:00
James Cole
a7ceda7eea New translations 2017-02-24 21:11:28 +01:00
James Cole
baec4c4d70 New translations 2017-02-24 21:11:21 +01:00
James Cole
4fa850048c New translations 2017-02-24 21:11:04 +01:00
James Cole
8163655a24 New translations 2017-02-24 21:10:56 +01:00
James Cole
4cabf8d2e3 New translations 2017-02-24 21:10:49 +01:00
James Cole
db2f08fa96 New translations 2017-02-24 21:10:36 +01:00
James Cole
a68be2fed7 New translations 2017-02-24 21:10:29 +01:00
James Cole
c3e9aea3a7 New translations 2017-02-24 21:10:24 +01:00
James Cole
40c38af766 Final code for tag report. 2017-02-24 21:09:20 +01:00
James Cole
fc2cee7a54 Fixes tests. 2017-02-24 21:01:33 +01:00
James Cole
3d4feff7de More code for the tag report. 2017-02-24 20:27:26 +01:00
James Cole
f63c6875cd Initial code base for tag report. 2017-02-24 20:01:35 +01:00
James Cole
115b72149c New translations 2017-02-24 16:21:01 +01:00
James Cole
a7e8118c83 New translations 2017-02-24 16:11:55 +01:00
James Cole
8569cc5ac6 New translations 2017-02-24 16:11:43 +01:00
James Cole
7a0ffce36f New translations 2017-02-24 16:11:33 +01:00
James Cole
c573d95ec5 New translations 2017-02-24 16:11:27 +01:00
James Cole
d3e1fba4e0 New translations 2017-02-24 16:11:10 +01:00
James Cole
e7dd087b52 New translations 2017-02-24 16:10:59 +01:00
James Cole
c7cb79906c New translations 2017-02-24 16:10:53 +01:00
James Cole
3c3f80c5a0 New translations 2017-02-24 16:10:39 +01:00
James Cole
e20fb3c3ac New translations 2017-02-24 16:10:32 +01:00
James Cole
e3986a4dd4 New translations 2017-02-24 16:10:26 +01:00
James Cole
a3926e3996 New translations 2017-02-24 16:00:31 +01:00
James Cole
e737683efb Fine-tune some translations [skip ci] 2017-02-24 16:00:24 +01:00
James Cole
0157c4ed65 New translations 2017-02-24 15:50:41 +01:00
James Cole
058ade266d New translations 2017-02-24 09:21:23 +01:00
James Cole
e0adb4c397 New translations 2017-02-24 09:10:35 +01:00
James Cole
35aa61bb23 Different icon [skip ci] 2017-02-23 17:47:46 +01:00
James Cole
27236d19cf Clone, not copy [skip ci] 2017-02-23 17:47:36 +01:00
James Cole
063ca3121a Fixes #593 2017-02-23 17:43:29 +01:00
James Cole
b8521c6875 New translations 2017-02-23 07:41:38 +01:00
James Cole
e3798d6462 New translations 2017-02-23 07:41:28 +01:00
James Cole
387a3e541f New translations 2017-02-23 07:41:20 +01:00
James Cole
42a3b411e4 New translations 2017-02-23 07:41:15 +01:00
James Cole
25c7ec4175 New translations 2017-02-23 07:40:59 +01:00
James Cole
7ec11765da New translations 2017-02-23 07:40:52 +01:00
James Cole
d57ae126b7 New translations 2017-02-23 07:40:45 +01:00
James Cole
87f133555c New translations 2017-02-23 07:40:34 +01:00
James Cole
db9883d851 New translations 2017-02-23 07:40:27 +01:00
James Cole
8dad5ff7db New translations 2017-02-23 07:40:23 +01:00
James Cole
fc36f9cd8c Added empty box for bills as well. 2017-02-23 07:30:08 +01:00
James Cole
563c668e3f Code to catch empty lists and nudge user in the right direction. 2017-02-23 07:24:05 +01:00
James Cole
b3df1f3d26 Move template around 2017-02-23 07:02:28 +01:00
James Cole
1ac3f7af3b Included a message about translations after a PR was submitted that I had to close :( [skip ci] 2017-02-23 06:53:58 +01:00
James Cole
6cbb86aed7 New translations 2017-02-22 21:51:55 +01:00
James Cole
e459a8c88b New translations 2017-02-22 21:51:41 +01:00
James Cole
ca003b7d4d New translations 2017-02-22 21:51:33 +01:00
James Cole
03f873a6d3 New translations 2017-02-22 21:51:27 +01:00
James Cole
5dbec53847 New translations 2017-02-22 21:51:11 +01:00
James Cole
49dfad9b0c Approved. Step name: Proofread 2017-02-22 21:51:02 +01:00
James Cole
4ee0462d1b New translations 2017-02-22 21:50:55 +01:00
James Cole
3f78be4471 New translations 2017-02-22 21:50:41 +01:00
James Cole
d93fad39ac New translations 2017-02-22 21:50:33 +01:00
James Cole
aa3429bb0e New translations 2017-02-22 21:50:28 +01:00
James Cole
d88246f2f6 First code for #588 2017-02-22 21:40:27 +01:00
James Cole
201db34936 Update various sandstorm files. [skip ci] 2017-02-22 21:27:39 +01:00
James Cole
47709dfc7c Test catches some exceptions. 2017-02-22 20:35:31 +01:00
James Cole
2aaafc54ee Merge pull request #587 from Zsub/fix-tag-date
Fix saving a tag’s date
2017-02-22 20:21:25 +01:00
Joris de Vries
e211881691 Remove superfluous declaration of $date
The null check is already part of the `$this->date()` function and `$date` is never used.
2017-02-22 20:20:00 +01:00
Joris de Vries
0d32f16041 Fix saving a tag’s date
The `date` function takes the fieldname where a date is stored, not the literal date.
2017-02-22 20:07:30 +01:00
James Cole
2082e8d462 Small updates to read me [skip ci] 2017-02-22 17:58:57 +01:00
James Cole
bfc95cfc57 Update composer file. 2017-02-22 17:17:22 +01:00
James Cole
35aeb7e04a Update tag view 2017-02-22 17:15:54 +01:00
James Cole
adcddb09cd Updated link to installation guide. [skip ci] 2017-02-20 19:41:33 +01:00
James Cole
56199f899f Merge branch 'release/4.3.6' 2017-02-20 05:43:34 +01:00
James Cole
ca5c845064 Update to 4.3.6 2017-02-20 05:43:05 +01:00
James Cole
a8ac69f008 Fix #578 [skip ci] 2017-02-20 05:41:43 +01:00
James Cole
b9309bc7b1 Stop Travis from building weird branches. 2017-02-19 17:01:29 +01:00
James Cole
41596feb56 Merge branch 'release/4.3.5' 2017-02-19 16:49:45 +01:00
James Cole
cf1813b413 Updated composer.lock 2017-02-19 16:48:49 +01:00
James Cole
5b267c0e95 Update to version 4.3.5 2017-02-19 16:36:03 +01:00
James Cole
3741f70c29 Merge pull request #576 from firefly-iii/l10n_develop
New Crowdin translations
2017-02-19 16:33:54 +01:00
James Cole
1f37ea3d3c Translated 2017-02-19 12:30:11 +01:00
James Cole
283ee076c7 Expand view [skip ci] 2017-02-19 12:19:30 +01:00
James Cole
b13a878927 Slightly expanded modifiers [skip ci] 2017-02-19 12:17:07 +01:00
James Cole
364eb2838e Translated 2017-02-19 12:12:59 +01:00
James Cole
94631ca8d7 Approved. Step name: Proofread 2017-02-19 12:12:58 +01:00
James Cole
2ed095d58f Approved. Step name: Proofread 2017-02-19 12:12:56 +01:00
James Cole
9c10e3970d Approved. Step name: Proofread 2017-02-19 12:12:55 +01:00
James Cole
0cf4f44e95 Approved. Step name: Proofread 2017-02-19 12:12:54 +01:00
James Cole
89638a0094 Approved. Step name: Proofread 2017-02-19 12:12:52 +01:00
James Cole
d7531cf4ff Approved. Step name: Proofread 2017-02-19 12:12:51 +01:00
James Cole
2c5acb8ecd Approved. Step name: Proofread 2017-02-19 12:12:50 +01:00
James Cole
824c317f74 Translated 2017-02-19 12:12:49 +01:00
James Cole
d208fd1772 New translations 2017-02-19 12:12:48 +01:00
James Cole
f145aaded9 New translations 2017-02-19 12:12:46 +01:00
James Cole
c7043478f6 New translations 2017-02-19 12:12:45 +01:00
James Cole
d16bb7f394 Approved. Step name: Proofread 2017-02-19 12:12:44 +01:00
James Cole
3ed314dbc6 New translations 2017-02-19 12:12:43 +01:00
James Cole
e8c5942e33 Approved. Step name: Proofread 2017-02-19 12:12:42 +01:00
James Cole
96c704760c Approved. Step name: Proofread 2017-02-19 12:12:40 +01:00
James Cole
70c99f18e1 New translations 2017-02-19 12:12:39 +01:00
James Cole
5e2bdb6356 Translated 2017-02-19 12:12:38 +01:00
James Cole
dd13285f04 Translated 2017-02-19 12:12:37 +01:00
James Cole
561a5bf699 New translations 2017-02-19 12:12:35 +01:00
James Cole
f2d794e372 New translations 2017-02-19 12:12:34 +01:00
James Cole
f0931b8438 New translations 2017-02-19 12:12:33 +01:00
James Cole
aadb9addd5 New translations 2017-02-19 12:12:31 +01:00
James Cole
66abb50d23 Translated 2017-02-19 12:12:30 +01:00
James Cole
4eca99b745 New translations 2017-02-19 12:12:29 +01:00
James Cole
a95a265d47 Translated 2017-02-19 12:12:27 +01:00
James Cole
b0e70c25d0 New translations 2017-02-19 12:12:26 +01:00
James Cole
8914bd6b9a New translations 2017-02-19 12:12:25 +01:00
James Cole
26751e10ee Expand modifiers 2017-02-19 12:12:24 +01:00
James Cole
579ee9f199 New translations 2017-02-19 12:12:22 +01:00
James Cole
48fcb76ba4 New translations 2017-02-19 12:12:21 +01:00
James Cole
b872bbbb42 New translations 2017-02-19 12:12:19 +01:00
James Cole
73c88aa11f Translated 2017-02-19 12:12:18 +01:00
James Cole
aa1700b7b4 New translations 2017-02-19 12:12:16 +01:00
James Cole
1aa8e43bdf New translations 2017-02-19 12:12:15 +01:00
James Cole
fa8200d3e2 New translations 2017-02-19 12:12:14 +01:00
James Cole
bd9fcc6e8d New translations 2017-02-19 12:12:12 +01:00
James Cole
6167667f9a Translated 2017-02-19 12:12:11 +01:00
James Cole
1081379689 New translations 2017-02-19 12:12:10 +01:00
James Cole
712526f1c3 New translations 2017-02-19 12:12:08 +01:00
James Cole
7c0cfc5596 Translated 2017-02-19 12:12:07 +01:00
James Cole
edd0dcbcef New translations 2017-02-19 12:12:06 +01:00
James Cole
b322d67ffc New translations 2017-02-19 12:12:05 +01:00
James Cole
38dbac199d Translated 2017-02-19 12:12:02 +01:00
James Cole
6eb695c5eb New translations 2017-02-19 12:12:00 +01:00
James Cole
b0fd5889aa New translations 2017-02-19 12:11:58 +01:00
James Cole
b181f2edf0 New translations 2017-02-19 12:11:57 +01:00
James Cole
376940e089 New translations 2017-02-19 12:11:56 +01:00
James Cole
1c0762a3df New translations 2017-02-19 12:11:55 +01:00
James Cole
df39f5ab98 New translations 2017-02-19 12:11:54 +01:00
James Cole
9cd1ae1220 New translations 2017-02-19 12:11:52 +01:00
James Cole
3ddef6fe78 New translations 2017-02-19 12:11:50 +01:00
James Cole
b8c78217e8 New translations 2017-02-19 12:11:49 +01:00
James Cole
3a1b514982 New translations 2017-02-19 12:11:47 +01:00
James Cole
5d34dab2ef New translations 2017-02-19 12:11:46 +01:00
James Cole
541ed1e764 New translations 2017-02-19 12:11:45 +01:00
James Cole
5e764a345e New translations 2017-02-19 12:11:42 +01:00
James Cole
33de51c4aa New translations 2017-02-19 12:11:41 +01:00
James Cole
5aa038e195 New translations 2017-02-19 12:11:40 +01:00
James Cole
0fe437c66b New translations 2017-02-19 12:11:38 +01:00
James Cole
790d156503 Translated 2017-02-19 12:11:37 +01:00
James Cole
9f515bea20 Translated 2017-02-19 12:11:36 +01:00
James Cole
1422adac3f New translations 2017-02-19 12:11:35 +01:00
James Cole
5f17e41190 New translations 2017-02-19 12:11:33 +01:00
James Cole
0d9daaffe8 New translations 2017-02-19 12:11:32 +01:00
James Cole
e1f3bf8d45 New translations 2017-02-19 12:11:31 +01:00
James Cole
20a7723e63 New translations 2017-02-19 12:11:30 +01:00
James Cole
5ffa6d9500 New translations 2017-02-19 12:11:29 +01:00
James Cole
86956969ce New translations 2017-02-19 12:11:28 +01:00
James Cole
13beb888c1 Translated 2017-02-19 12:11:26 +01:00
James Cole
c1d4caf1a9 New translations 2017-02-19 12:11:25 +01:00
James Cole
5e9a605ae4 New translations 2017-02-19 12:11:23 +01:00
James Cole
c79d0ed276 Translated 2017-02-19 12:11:22 +01:00
James Cole
6204e575a2 New translations 2017-02-19 12:11:21 +01:00
James Cole
19f181723a New translations 2017-02-19 12:11:18 +01:00
James Cole
4a49bf8799 New translations 2017-02-19 12:11:17 +01:00
James Cole
8128c6aed6 New translations 2017-02-19 12:11:16 +01:00
James Cole
45dfc74ab3 New translations 2017-02-19 12:11:14 +01:00
James Cole
72c4ecced7 New translations 2017-02-19 12:11:13 +01:00
James Cole
d21187df6a Approved. Step name: Proofread 2017-02-19 12:11:12 +01:00
James Cole
bf33025569 Translated 2017-02-19 12:11:09 +01:00
James Cole
065620aec9 Translated 2017-02-19 12:11:08 +01:00
James Cole
e8e0fbc988 New translations 2017-02-19 12:11:07 +01:00
James Cole
21e61d08dd New translations 2017-02-19 12:11:06 +01:00
James Cole
ca9cc50423 New translations 2017-02-19 12:11:05 +01:00
James Cole
0fde74883f New translations 2017-02-19 12:11:03 +01:00
James Cole
c1d12e5129 New translations 2017-02-19 12:11:02 +01:00
James Cole
8ee6cd6c41 New translations 2017-02-19 12:10:59 +01:00
James Cole
bb09ea5fa2 New translations 2017-02-19 12:10:57 +01:00
James Cole
6b92ef9d71 New translations 2017-02-19 12:10:56 +01:00
James Cole
a49f8a27e2 Translated 2017-02-19 12:10:55 +01:00
James Cole
d0b3b4b186 Translated 2017-02-19 12:10:54 +01:00
James Cole
0bd688962b New translations 2017-02-19 12:10:52 +01:00
James Cole
c737ceb63f New translations 2017-02-19 12:10:51 +01:00
James Cole
d24e5b9eca Translated 2017-02-19 12:10:50 +01:00
James Cole
d68c2b5b8f New translations 2017-02-19 12:10:49 +01:00
James Cole
6803707b1f Translated 2017-02-19 12:10:47 +01:00
James Cole
13574d812f Translated 2017-02-19 12:10:46 +01:00
James Cole
f4e95bdbca Translated 2017-02-19 12:10:45 +01:00
James Cole
eb83023864 Translated 2017-02-19 12:10:44 +01:00
James Cole
10c81fdfba Translated 2017-02-19 12:10:42 +01:00
James Cole
7c47723992 New translations 2017-02-19 12:10:41 +01:00
James Cole
0154183800 New translations 2017-02-19 12:10:38 +01:00
James Cole
a2b0ea9c5b Translated 2017-02-19 12:10:37 +01:00
James Cole
c49caf663c Translated 2017-02-19 12:10:35 +01:00
James Cole
17e6698133 New translations 2017-02-19 12:10:34 +01:00
James Cole
a7b99b1bb5 New translations 2017-02-19 12:10:33 +01:00
James Cole
8d6a217f22 Translated 2017-02-19 12:10:30 +01:00
James Cole
d5b1722c0c Translated 2017-02-19 12:10:28 +01:00
James Cole
0d9a81f0e4 New translations 2017-02-19 12:10:27 +01:00
James Cole
821a443e44 New translations 2017-02-19 12:10:24 +01:00
James Cole
9d8d54e5c8 New translations 2017-02-19 12:10:23 +01:00
James Cole
411739277d Translated 2017-02-19 12:10:21 +01:00
James Cole
fa71feb9fb Translated 2017-02-19 12:10:20 +01:00
James Cole
00f9194bfa New translations 2017-02-19 12:10:19 +01:00
James Cole
a3e955400f Translated 2017-02-19 12:10:17 +01:00
James Cole
05060cee5b New translations 2017-02-19 12:10:16 +01:00
James Cole
c10148753a New translations 2017-02-19 12:10:14 +01:00
James Cole
53bb64641b Translated 2017-02-19 12:10:13 +01:00
James Cole
9a124bb3b2 New translations 2017-02-19 12:10:12 +01:00
James Cole
91568cf919 Translated 2017-02-19 12:10:10 +01:00
James Cole
b149a816dd Make search work. [skip ci] 2017-02-19 09:36:51 +01:00
James Cole
bf35ecc07a Fixed tests 2017-02-19 09:17:02 +01:00
James Cole
711a1a1d4f Final modifiers. 2017-02-19 09:07:14 +01:00
James Cole
a27b686446 Add budget keyword. 2017-02-19 07:41:12 +01:00
James Cole
1f6180ce5d Updated search modifiers. 2017-02-19 07:38:51 +01:00
James Cole
b5032a7597 Added a new helper function. 2017-02-19 07:34:39 +01:00
James Cole
5073fd937c Expand search with a bunch of keywords for #510 2017-02-18 20:10:03 +01:00
James Cole
f0cb63fd48 Some small optimisations. 2017-02-18 09:32:10 +01:00
James Cole
f7642beb7c Better 2fa handling 2017-02-17 20:15:17 +01:00
James Cole
48c26c5837 Update test coverage 2017-02-17 20:14:38 +01:00
James Cole
65a899bf25 Clean up session code 2017-02-17 20:14:22 +01:00
James Cole
5d0cdc4ffa Various code cleanup. 2017-02-17 06:42:36 +01:00
James Cole
1d979778e8 Merge pull request #573 from firefly-iii/l10n_develop
New Crowdin translations
2017-02-16 22:42:35 +01:00
James Cole
917b8b40cf Merge branch 'develop' into l10n_develop 2017-02-16 22:42:24 +01:00
James Cole
466ec92492 Remove some commented code. 2017-02-16 22:34:37 +01:00
James Cole
4ff5f526ba Add new lines to files. 2017-02-16 22:33:32 +01:00
James Cole
8460ee2dc4 Small fix in read me [skip ci] 2017-02-16 22:30:57 +01:00
James Cole
fa39330ceb New change log [skip ci] 2017-02-16 22:30:46 +01:00
James Cole
1857bb17d9 Approved. Step name: Proofread 2017-02-16 22:30:14 +01:00
James Cole
fe54b2fa3a Names are now links [skip ci] 2017-02-16 22:13:04 +01:00
James Cole
4fbf0291e6 Updated composer things. 2017-02-16 21:06:31 +01:00
James Cole
8bfcc3315a This fixes #572 2017-02-16 21:01:22 +01:00
James Cole
c8f6b42ce6 Fix tests 2017-02-15 22:02:02 +01:00
James Cole
8f5289b7dc Fixed some transaction list filter issues. 2017-02-15 21:55:50 +01:00
James Cole
281e3f706b New translations 2017-02-15 20:12:02 +01:00
James Cole
6dfa027ae2 New translations 2017-02-15 20:11:48 +01:00
James Cole
623cd51b1c New translations 2017-02-15 20:11:39 +01:00
James Cole
3d9e723a0e New translations 2017-02-15 20:11:33 +01:00
James Cole
4a2b7cfc4e New translations 2017-02-15 20:11:15 +01:00
James Cole
c15bee4511 New translations 2017-02-15 20:11:05 +01:00
James Cole
f4afcd29e0 New translations 2017-02-15 20:10:56 +01:00
James Cole
770e77a862 New translations 2017-02-15 20:10:41 +01:00
James Cole
684d1dc432 New translations 2017-02-15 20:10:33 +01:00
James Cole
ec9ddb2bfb New translations 2017-02-15 20:10:27 +01:00
James Cole
a5f8aa914f Build code for tag report. 2017-02-15 20:07:10 +01:00
James Cole
ae06f1b8f0 Yeah never mind. [skip ci] 2017-02-15 18:16:07 +01:00
James Cole
e8f76d896b Expand code climate config [skip ci] 2017-02-15 17:25:36 +01:00
James Cole
07ecb3f0e8 Expand code climate config [skip ci] 2017-02-15 17:23:56 +01:00
James Cole
893f2d2c55 Include code climate config [skip ci] 2017-02-15 17:17:15 +01:00
James Cole
395a7bb33c This should fix the tests 2017-02-15 17:07:56 +01:00
James Cole
636b371b86 Fixes #553 2017-02-15 16:20:16 +01:00
James Cole
f0783df123 This should fix #566 2017-02-15 15:24:01 +01:00
James Cole
fa54763425 This fixes #570 2017-02-15 15:22:04 +01:00
James Cole
cf2cd9680b This fixes #569 2017-02-15 15:18:52 +01:00
James Cole
47aa996b6b This fixes #567 2017-02-15 15:12:46 +01:00
James Cole
6442887c1a Merge pull request #562 from patrickkostjens/develop
Use Docker volumes created by docker-compose to persist data
2017-02-13 20:54:22 +01:00
James Cole
7a34536c80 Fixes #565 2017-02-13 20:39:23 +01:00
Patrick Kostjens
e9a67b1c82 Bugfix: Mount app in app container instead of db container 2017-02-12 21:38:58 +01:00
Patrick Kostjens
bc4cf1a367 Incorporate comments: Use Docker storage instead of local folder for app storage 2017-02-12 21:04:15 +01:00
Patrick Kostjens
a1d40a5748 Mount local code base in development docker-compose 2017-02-12 20:52:26 +01:00
Patrick Kostjens
e42f858166 Incorporate review comment: Remove unneeded container name setting in docker-compose 2017-02-12 20:41:29 +01:00
Patrick Kostjens
75e0d19b4e Refactored docker-compose files to use base with dev/prod overrides 2017-02-12 19:37:37 +01:00
James Cole
5801eba22a Updated composer.lock file. 2017-02-12 18:47:17 +01:00
James Cole
fd3f756640 Restored most pre-5.4 tests. 2017-02-12 18:40:39 +01:00
Patrick Kostjens
bd1672fd7b Use Docker volume for mysql data storage 2017-02-12 18:07:48 +01:00
James Cole
2c36820622 New tests 2017-02-12 17:58:16 +01:00
Patrick Kostjens
ff1d1e5b8f Revert docker-compose to development version and create separate production file 2017-02-12 17:55:56 +01:00
James Cole
de0371dd1c New translations 2017-02-12 17:51:53 +01:00
James Cole
d6f4bbf4bc New translations 2017-02-12 17:51:44 +01:00
James Cole
5fc1e6ad64 New translations 2017-02-12 17:51:37 +01:00
James Cole
c37d772759 New translations 2017-02-12 17:51:32 +01:00
James Cole
fe2efd88cf New translations 2017-02-12 17:51:21 +01:00
James Cole
5a2f48f529 Approved. Step name: Proofread 2017-02-12 17:51:16 +01:00
James Cole
4459d09a90 New translations 2017-02-12 17:51:10 +01:00
James Cole
79fcd874f7 New translations 2017-02-12 17:51:00 +01:00
James Cole
643655a612 New translations 2017-02-12 17:50:54 +01:00
James Cole
adb0717ade New translations 2017-02-12 17:50:50 +01:00
Patrick Kostjens
1feae802c2 Use local folders in containers created by docker-compose to persist data 2017-02-12 17:30:24 +01:00
James Cole
ec146d4cbe Make sure the /javascript/ url’s are ignored. 2017-02-12 16:50:35 +01:00
James Cole
3399b133ae New user controller tests. 2017-02-12 13:23:08 +01:00
James Cole
1637190c27 Fix various tests. 2017-02-12 13:15:23 +01:00
James Cole
79f94771c3 Make tests compatible with laravel 5.4 2017-02-12 12:32:13 +01:00
James Cole
018af62826 First set of new tests. 2017-02-12 12:21:44 +01:00
James Cole
69bd292ed8 Initial set of empty controller tests 2017-02-12 12:00:11 +01:00
James Cole
ac63a082aa Update attachment controller test. 2017-02-12 11:53:04 +01:00
James Cole
e15bb05823 New test for attachments. 2017-02-12 11:47:22 +01:00
James Cole
5528663727 Re-implemented basic account controller tests. 2017-02-12 11:25:17 +01:00
James Cole
1a204d31e7 Small fix for opening balance issues in reports. 2017-02-12 10:58:37 +01:00
James Cole
0fe4273d4d Merge pull request #560 from elamperti/fix-smooth-curves
Fix smooth curves around data points in graphs
2017-02-12 08:42:51 +01:00
Enrico Lamperti
abf0fdcf35 Fix smooth curves in graphs 2017-02-11 17:38:04 -03:00
James Cole
78074a5a54 Code for #553 2017-02-11 18:38:38 +01:00
James Cole
dcc2b9c1cb This fixes #559 2017-02-11 18:35:16 +01:00
James Cole
b5a005dcc5 Better 404 page [skip ci] 2017-02-11 16:32:03 +01:00
James Cole
4c2d9e0eee Small code cleanup. 2017-02-11 15:52:55 +01:00
James Cole
fb73baca6a Merge pull request #558 from crash7/improve-docker
Improve docker support
2017-02-11 10:13:51 +01:00
James Cole
0be3dd4fe4 Add EOF 2017-02-11 10:12:11 +01:00
James Cole
8e89899070 Add EOF 2017-02-11 10:11:57 +01:00
James Cole
5e47492318 Clean up budget report partial 2017-02-11 10:05:58 +01:00
James Cole
aa2d78f36a Expand filter 2017-02-11 09:34:04 +01:00
Christian Musa
0cbed2d5d2 Improve docker support
- Add docker-compose file
- Add environment variable to initialize the database
- Add custom entrypoint that generates the .env file based on the environment variables
- Update Dockerfile (gettext-base package)
2017-02-11 00:36:38 -03:00
James Cole
3914796e4e Experimental new transfer filter. 2017-02-10 17:21:44 +01:00
James Cole
b9dac5ff55 Merge branch 'develop' of https://github.com/firefly-iii/firefly-iii into develop
* 'develop' of https://github.com/firefly-iii/firefly-iii:
  Update config.php, see #521
2017-02-08 22:24:20 +01:00
James Cole
1285a88660 Different value for title field [skip ci] 2017-02-08 22:07:47 +01:00
James Cole
96e0d4e29f Translated 2017-02-06 13:20:57 +01:00
James Cole
9bb8a9ccd1 New translations 2017-02-06 13:20:54 +01:00
James Cole
d9611bd84f New translations 2017-02-06 13:20:51 +01:00
James Cole
915afa4534 Translated 2017-02-06 13:20:47 +01:00
James Cole
5105c94233 New translations 2017-02-06 13:12:31 +01:00
James Cole
899d4fe611 New translations 2017-02-06 13:12:04 +01:00
James Cole
d45a12e544 New translations 2017-02-06 13:11:44 +01:00
James Cole
302fc876d9 Translated 2017-02-06 13:11:28 +01:00
James Cole
f6a25db17c New translations 2017-02-06 13:11:26 +01:00
James Cole
da11303539 New translations 2017-02-06 13:11:25 +01:00
James Cole
07ebe71839 New translations 2017-02-06 13:11:23 +01:00
James Cole
eba9c4e039 New translations 2017-02-06 13:11:12 +01:00
James Cole
7d80120611 Approved. Step name: Proofread 2017-02-06 08:32:09 +01:00
James Cole
f2ea5fb253 New translations 2017-02-06 08:31:57 +01:00
James Cole
451ab6c531 New translations 2017-02-06 08:31:48 +01:00
James Cole
796b63fcc5 New translations 2017-02-06 08:31:42 +01:00
James Cole
7d8b3e6513 New translations 2017-02-06 08:31:40 +01:00
James Cole
b2026106ec Update config.php, see #521 2017-02-06 08:29:18 +01:00
James Cole
dba92d73c4 Include new line at the end of the file. 2017-02-05 19:51:58 +01:00
James Cole
b09a250a03 Better link for issues. [skip ci] 2017-02-05 18:50:19 +01:00
James Cole
c6f69f63fc Friendly error message. [skip ci] 2017-02-05 18:49:13 +01:00
James Cole
3a7faa7368 Small fixes for laravel 5.4 2017-02-05 18:44:37 +01:00
James Cole
f863c01a1d Merge laravel 5.4 into develop. 2017-02-05 16:20:02 +01:00
James Cole
8a98204a69 Update app() calls 2017-02-05 16:16:15 +01:00
James Cole
77e52f42a6 Update export routine. 2017-02-05 16:14:23 +01:00
James Cole
704c0922e8 Update collector classes 2017-02-05 15:58:55 +01:00
James Cole
371ce37be4 Update export classes 2017-02-05 15:58:42 +01:00
James Cole
152fb3f885 Update the last providers. 2017-02-05 15:58:27 +01:00
James Cole
3ff83cd431 Remove speed trap. 2017-02-05 15:43:56 +01:00
James Cole
a9d5b6ef92 Update to laravel 5.4 style tests 2017-02-05 15:42:00 +01:00
James Cole
229f718754 Update Composer files. 2017-02-05 15:41:41 +01:00
James Cole
646b65918d Remove tests since they’ve been changed in Laravel 5.4. 2017-02-05 15:41:23 +01:00
James Cole
5e596a9cb7 Remove speedtrap from oh-unit file. 2017-02-05 08:47:37 +01:00
James Cole
353db6c4a5 Updated composer.lock file. 2017-02-05 08:35:17 +01:00
James Cole
959a1a08f0 Tell view whether we’re in Sandstorm.IO mode. 2017-02-05 08:27:23 +01:00
James Cole
3e510bd3f6 This fixes #549 2017-02-05 08:26:54 +01:00
James Cole
b68d5c4374 Include CSRF token for Sandstorm. 2017-02-04 09:02:07 +01:00
James Cole
dc348a72c8 Various new scripts to improve sandstorm.io experience. 2017-02-04 08:42:06 +01:00
James Cole
5e5d4eca4b Update some sandstorm.io files. 2017-02-04 03:22:19 +01:00
James Cole
96b5d174d1 Initial code base for Sandstorm.IO support. Very beta. 2017-02-04 03:04:55 +01:00
James Cole
df1da32745 Update composer [skip ci] 2017-02-04 02:26:16 +01:00
James Cole
a7c198048e Add app log method. [skip ci] 2017-02-04 02:20:17 +01:00
James Cole
e3599c002b Updated contribution instructions [skip ci] 2017-02-04 02:19:47 +01:00
James Cole
094f6a7476 Merge branch 'release/4.3.4' 2017-02-02 20:55:46 +01:00
James Cole
c3b4849fa0 Various updates for upcoming release 4.3.4 2017-02-02 20:55:01 +01:00
James Cole
dfd6c5379c Merge pull request #546 from firefly-iii/l10n_develop
New Crowdin translations
2017-02-02 20:41:47 +01:00
James Cole
9aa53c11e0 This fixes #550 2017-02-02 20:37:39 +01:00
James Cole
b0d93621a8 This fixes #551 2017-02-02 20:36:32 +01:00
James Cole
a337d9a599 New route for JS file, may fix #550 2017-02-02 07:36:57 +01:00
James Cole
615d90c8f4 Update various service providers. 2017-02-02 07:35:53 +01:00
James Cole
7ffd77dc76 Translated 2017-01-31 01:17:32 +01:00
James Cole
96fdf4fd93 Translated 2017-01-31 01:17:29 +01:00
James Cole
27b8ce0f7f Translated 2017-01-31 01:17:27 +01:00
James Cole
e057c4d79c Removed reference to crud service provider. 2017-01-30 17:29:18 +01:00
James Cole
8263fa41dd Rewrote currency and export/import job service provider 2017-01-30 17:29:05 +01:00
James Cole
eeae4d215d Removed old service provider. 2017-01-30 17:20:00 +01:00
James Cole
646ed0d4dd Rewrote attachment, budget and category service providers. 2017-01-30 17:19:51 +01:00
James Cole
ac54032f55 Need to call everything from collector to work. 2017-01-30 17:10:23 +01:00
James Cole
3aaf356054 Rewrote bill service provider 2017-01-30 17:10:08 +01:00
James Cole
2c786e6a38 Small fixes to collector because constructor is gone. 2017-01-30 17:09:44 +01:00
James Cole
355baa7fef Rewrote account service provider. 2017-01-30 16:59:55 +01:00
James Cole
01468c2663 Rewrote journal service provider 2017-01-30 16:58:10 +01:00
James Cole
c7341c9194 Also extend collector. 2017-01-30 16:57:00 +01:00
James Cole
1e947870a6 Remove all constructors. 2017-01-30 16:46:30 +01:00
James Cole
311c1a3c84 Implement all setUser methods. 2017-01-30 16:42:58 +01:00
James Cole
84e380e4d0 Give all repositories a new setUser function. 2017-01-30 16:40:49 +01:00
James Cole
4cad2eb0c4 Upgraded validator 2017-01-30 16:35:41 +01:00
James Cole
4bc3af7176 Updated composer.lock file for change to bread crumbs. 2017-01-30 16:35:31 +01:00
James Cole
e80298f815 Include laravel bread crumbs and custom repository. 2017-01-30 16:31:41 +01:00
James Cole
14971cf249 Overrule logging. 2017-01-30 16:30:35 +01:00
James Cole
b79dcd7f23 Disable ConfigureLogging class. 2017-01-30 16:27:33 +01:00
James Cole
395aaad9c6 New class name. 2017-01-30 16:21:01 +01:00
James Cole
29f763d4e4 Update composer files. 2017-01-30 16:20:23 +01:00
James Cole
2f943c91d2 New contributing guidelines [skip ci] 2017-01-30 14:13:52 +01:00
James Cole
91c96311de Expand contributing guidelines. [skip ci] 2017-01-30 11:41:39 +01:00
James Cole
0f929faa16 Merge branch 'release/4.3.3' 2017-01-30 11:18:29 +01:00
James Cole
7a40c34cf0 New change log. 2017-01-30 11:18:02 +01:00
James Cole
462d987de9 Merge pull request #532 from firefly-iii/l10n_develop
New Crowdin translations
2017-01-30 11:11:36 +01:00
James Cole
f64e8d8973 Composer update. [skip ci] 2017-01-30 11:10:34 +01:00
James Cole
21222eb697 Mention new version. 2017-01-30 10:33:44 +01:00
James Cole
e47d6fb3ac Move default option to bottom. 2017-01-30 10:33:18 +01:00
James Cole
c7fc10ac89 Remove debug statements. 2017-01-30 08:32:16 +01:00
James Cole
e8b528f520 New translations 2017-01-29 22:05:43 +01:00
James Cole
b22de7bf70 New translations 2017-01-29 22:05:38 +01:00
James Cole
ec119c8f6e Translated 2017-01-29 21:55:32 +01:00
James Cole
a20b38598e New translations 2017-01-29 21:45:32 +01:00
James Cole
aa0eb47205 New translations 2017-01-29 21:35:31 +01:00
James Cole
723db9d71e New translations 2017-01-29 13:36:21 +01:00
James Cole
1d8dc3d65d Approved. Step name: Proofread 2017-01-24 16:17:57 +01:00
James Cole
fe2716876a New translations 2017-01-24 15:44:55 +01:00
James Cole
fac0e97e5d New translations 2017-01-24 15:44:27 +01:00
James Cole
449d009c28 New translations 2017-01-24 15:43:49 +01:00
James Cole
55b2e6fe25 New translations 2017-01-24 15:43:36 +01:00
James Cole
9989b3b9da New translations 2017-01-24 15:43:27 +01:00
James Cole
7ab1cbfc1f New translations 2017-01-24 15:43:13 +01:00
James Cole
62d19c3902 New translations 2017-01-24 15:42:34 +01:00
James Cole
19700e7ee3 New translations 2017-01-24 15:42:08 +01:00
James Cole
de3e8edd6d New translations 2017-01-24 15:41:44 +01:00
James Cole
deda48af4a New translations 2017-01-24 15:41:32 +01:00
James Cole
7688d7c619 Include trigger that responds to tags 2017-01-24 15:38:41 +01:00
James Cole
76328b5c45 New translations 2017-01-24 15:11:51 +01:00
James Cole
1de17bf06f New translations 2017-01-24 15:11:31 +01:00
James Cole
6724daf995 New translations 2017-01-24 15:11:11 +01:00
James Cole
7caca053a1 New translations 2017-01-24 15:10:54 +01:00
James Cole
ae1bf8c017 New translations 2017-01-24 15:10:33 +01:00
James Cole
d20b0da438 Approved. Step name: Proofread 2017-01-24 15:10:11 +01:00
James Cole
a0218d7df1 New translations 2017-01-24 15:09:55 +01:00
James Cole
5ae5d67b91 New translations 2017-01-24 15:09:39 +01:00
James Cole
8493ed7603 New translations 2017-01-24 15:09:28 +01:00
James Cole
804b681d40 New translations 2017-01-24 15:09:18 +01:00
James Cole
e8303bd059 Expand the multi-select to various other fields. 2017-01-24 15:07:01 +01:00
James Cole
ac6c5d4e32 New translations 2017-01-24 13:57:08 +01:00
James Cole
90b0d0d52c New translations 2017-01-24 13:37:12 +01:00
James Cole
4093bdbd3e New translations 2017-01-24 13:37:08 +01:00
James Cole
a2097cf981 New translations 2017-01-24 13:27:14 +01:00
James Cole
6a33d0c9dc New translations 2017-01-24 13:27:07 +01:00
James Cole
525d5fb427 New translations 2017-01-24 13:17:40 +01:00
James Cole
e4946b8cd5 New translations 2017-01-24 13:17:35 +01:00
James Cole
76b32df622 Remove nightly. 2017-01-24 12:33:16 +01:00
James Cole
bc1079364d This should fix the nightly. No more hhvm. 2017-01-24 12:24:02 +01:00
James Cole
8602febe9d If/then thing for HHVM 2017-01-24 12:15:52 +01:00
James Cole
d55dfe27dc Updated test script 2017-01-24 12:08:06 +01:00
James Cole
90c16e2a07 Update travis.yml. 2017-01-24 11:49:05 +01:00
James Cole
149c1cd9b1 Approved. Step name: Proofread 2017-01-24 08:17:31 +01:00
James Cole
20f1a43369 Approved. Step name: Proofread 2017-01-24 08:17:20 +01:00
James Cole
e8fb8f993d Approved. Step name: Proofread 2017-01-24 08:07:14 +01:00
James Cole
f0c782dc01 New translations 2017-01-24 08:03:02 +01:00
James Cole
50c13e6d20 New translations 2017-01-24 08:02:44 +01:00
James Cole
69bedd035f New translations 2017-01-24 08:02:30 +01:00
James Cole
85337f0a31 New translations 2017-01-24 08:02:22 +01:00
James Cole
f8a7e2f98e New translations 2017-01-24 08:02:15 +01:00
James Cole
ec90a49d43 New translations 2017-01-24 08:02:07 +01:00
James Cole
5812b150c6 New translations 2017-01-24 08:01:45 +01:00
James Cole
c7ebc7273f Translated 2017-01-24 08:01:36 +01:00
James Cole
5226c87304 Translated 2017-01-24 08:01:35 +01:00
James Cole
25dd1c5d35 New translations 2017-01-24 08:01:31 +01:00
James Cole
c5a9e5e56d New translations 2017-01-24 08:01:26 +01:00
James Cole
47ed70d671 New translations 2017-01-24 08:01:20 +01:00
James Cole
cb5526f469 New translations 2017-01-24 08:01:14 +01:00
James Cole
a4f128077f New translations 2017-01-24 08:01:10 +01:00
James Cole
7140ba76d5 Small language things [skip ci] 2017-01-24 07:53:46 +01:00
James Cole
872e8f2de6 Hip new multi select. 2017-01-24 07:37:29 +01:00
James Cole
6c14e9d083 No sleep for the wicked [skip ci] 2017-01-24 07:26:06 +01:00
James Cole
e4b1812b46 Fix small layout thing [skip ci] 2017-01-23 18:03:17 +01:00
James Cole
1c2c6bb1d0 Various small changes. 2017-01-22 11:23:56 +01:00
James Cole
baefd4f93b Two new rule triggers 2017-01-22 11:23:40 +01:00
James Cole
4270fe07ab Rules now have auto-complete. 2017-01-22 09:15:53 +01:00
James Cole
e4ae925d2b Include typeahead [skip ci] 2017-01-21 13:34:41 +01:00
James Cole
dc599361a4 Removed unused method. 2017-01-21 09:15:33 +01:00
James Cole
738a311f49 Various code cleanup. 2017-01-21 09:07:10 +01:00
James Cole
71f6ba3418 Make request code more uniform. 2017-01-21 08:32:23 +01:00
James Cole
d1d573c408 Fix some tests. 2017-01-20 19:50:32 +01:00
James Cole
50e39a4a75 Update rule controller to have some auto complete functionality. 2017-01-20 19:50:22 +01:00
James Cole
8635fe7ebb Update requests to use uniform methods. 2017-01-20 19:49:35 +01:00
James Cole
6b57d4397a Try with “true” instead of “1”. 2017-01-20 16:27:30 +01:00
James Cole
8f2b898b2b Update some tests. 2017-01-20 16:22:19 +01:00
James Cole
0d1d360d18 Can now clone transaction #538. Wasn’t that difficult. 2017-01-20 12:23:52 +01:00
James Cole
def3b3a155 Fix for #539 2017-01-20 12:23:09 +01:00
James Cole
d344512743 Update update and installation instructions. 2017-01-20 10:08:38 +01:00
James Cole
19eef71133 Make sure all date fields have a fallback. 2017-01-20 08:18:52 +01:00
James Cole
61d58a354e Various code cleanup. 2017-01-20 08:03:26 +01:00
James Cole
be868d37f2 Fixed some issues with the monthly report and missing amounts. 2017-01-19 21:54:27 +01:00
James Cole
20bb151cf3 Add updated_at value. 2017-01-18 07:28:49 +01:00
James Cole
77f889aba6 Include a batch of naughty strings to see what happens to Firefly. 2017-01-16 20:10:47 +01:00
James Cole
1e69a54972 Small JS issue. [skip ci] 2017-01-15 20:18:32 +01:00
James Cole
6b7a47ca28 Clean up JS. 2017-01-15 20:10:34 +01:00
James Cole
c3fdd3b5f7 Allow date picker for browsers that do not support it natively. See issue #535 2017-01-15 20:05:40 +01:00
James Cole
e9f2121667 Fix menu in Firefox. 2017-01-15 19:45:57 +01:00
James Cole
161e9e1e11 Final JS cleanup. 2017-01-15 19:28:54 +01:00
James Cole
e336a45f79 Edit JS file for split transaction 2017-01-15 19:16:46 +01:00
James Cole
9c09f93908 Update views and JS for delete (single) transaction. 2017-01-15 19:08:16 +01:00
James Cole
582398e7f6 Update views and JS for create (single) transaction. 2017-01-15 19:07:31 +01:00
James Cole
b118635abd Update views and JS for edit single transaction. 2017-01-15 19:00:06 +01:00
James Cole
ac0d4a75b5 Removed forgotten twig comment [skip ci] 2017-01-15 15:46:58 +01:00
James Cole
c212d5c5ea Order by date does not matter in this context. 2017-01-14 21:00:43 +01:00
James Cole
08ac27cccf Fix some scrutiniser issues. 2017-01-14 19:43:33 +01:00
James Cole
0b5cab99cf Fix some scrutiniser issues. 2017-01-14 18:52:52 +01:00
James Cole
cc0057cc56 Rename command [skip ci] 2017-01-14 17:24:30 +01:00
James Cole
1ce49b814b Fix rounding. [skip ci] 2017-01-14 17:23:47 +01:00
James Cole
5bbaaece38 Encryption is optional (but on by default) and a command to switch from one to the other 2017-01-14 17:13:57 +01:00
James Cole
30bc4ccfa7 More date fixes [skip ci] 2017-01-13 21:16:54 +01:00
James Cole
4f64f1d754 Force order by. [skip ci] 2017-01-13 21:14:46 +01:00
James Cole
c0e578dd47 Fix bug found by persistent user who kept mailing me about broken charts. Which turned out to be broken indeed! 2017-01-13 21:12:59 +01:00
James Cole
2b82fca2cf Small various bugs. 2017-01-13 20:48:51 +01:00
James Cole
f0028b33e9 Double check that deleted transaction journals are not included. 2017-01-13 16:12:09 +01:00
James Cole
7ddea23375 Merge branch 'master' into develop
* master:
  add firefly locales to Dockerfile fixes #521 for docker environment
  Code for 4.1.6
2017-01-12 20:58:06 +01:00
James Cole
83edccacc6 Delete CONTRIBUTING 2017-01-12 09:40:12 +01:00
James Cole
75e95d6452 With markdown 2017-01-12 09:39:53 +01:00
James Cole
423bb4bbcd Better layout 2017-01-12 09:37:12 +01:00
James Cole
43585c563c Merge pull request #534 from elohmeier/master
add firefly locales to Dockerfile
2017-01-12 08:48:58 +01:00
Enno Lohmeier
2564a41d05 add firefly locales to Dockerfile
fixes #521 for docker environment
2017-01-12 00:30:33 +01:00
James Cole
a0bb1e3625 CSS fix for #533 2017-01-10 19:55:52 +01:00
James Cole
9b4fd57f51 Optimize new JS code. 2017-01-10 18:35:00 +01:00
James Cole
e67709e339 Make index significantly simpler. 2017-01-10 18:25:03 +01:00
James Cole
0c4e913f30 New translations 2017-01-10 13:06:37 +01:00
James Cole
c6de0e51c7 New translations 2017-01-10 13:06:29 +01:00
James Cole
69e85adadf New translations 2017-01-10 12:54:39 +01:00
James Cole
b34068207f New translations 2017-01-10 12:54:32 +01:00
James Cole
68b7b4b3a4 New translations 2017-01-10 12:45:24 +01:00
James Cole
5e3ee30e66 New translations 2017-01-10 12:45:15 +01:00
James Cole
aaf7d12b46 New translations 2017-01-10 12:45:12 +01:00
James Cole
729a348657 New translations 2017-01-10 12:36:17 +01:00
James Cole
0fca6eb810 Merge branch 'release/4.3.2' 2017-01-09 18:20:32 +01:00
James Cole
5a0ae8530c Update version info [skip ci] 2017-01-09 18:19:47 +01:00
James Cole
7949c9ad74 Updated composer.lock file 2017-01-09 18:19:18 +01:00
James Cole
6fb9362f7e Updated changelog [skip ci] 2017-01-09 18:17:03 +01:00
James Cole
3481d364cc Merge pull request #520 from firefly-iii/l10n_develop
New Crowdin translations
2017-01-09 18:05:25 +01:00
James Cole
373b9cdd9f A better tag overview as preparation for #525 2017-01-09 17:57:29 +01:00
James Cole
75af63e6ac New translations 2017-01-09 17:04:01 +01:00
James Cole
5aa62a1be4 New translations 2017-01-09 16:52:44 +01:00
James Cole
aede8bf0e0 New translations 2017-01-09 16:42:59 +01:00
James Cole
9ab7abcb95 New translations 2017-01-08 18:38:55 +01:00
James Cole
f87b28afd9 Translated 2017-01-08 18:38:45 +01:00
James Cole
8661f6d1ac New translations 2017-01-08 18:33:12 +01:00
James Cole
4536b4b2b4 New translations 2017-01-08 18:33:08 +01:00
James Cole
655f03940b Approved. Step name: Proofread 2017-01-08 18:33:02 +01:00
James Cole
4122de7823 New translations 2017-01-08 18:32:53 +01:00
James Cole
0f4c67d24e New translations 2017-01-08 18:32:50 +01:00
James Cole
20e8c45819 New translations 2017-01-08 18:32:45 +01:00
James Cole
2b8b844fb2 New translations 2017-01-08 18:32:32 +01:00
James Cole
3284b8764f New translations 2017-01-08 18:32:21 +01:00
James Cole
d19946336e New translations 2017-01-08 18:32:14 +01:00
James Cole
770a220808 New translations 2017-01-08 18:31:52 +01:00
James Cole
78b71e72f1 Fix amount remove from piggy bug. 2017-01-08 18:23:07 +01:00
James Cole
19990f49b0 Update amount thing, simpler code (I hope). Includes config for negative values. 2017-01-08 17:54:52 +01:00
James Cole
8208d44466 This should fix locale information for specific languages. It’s not perfect yet though. 2017-01-08 16:55:02 +01:00
James Cole
002b2b6dee New translations 2017-01-08 13:51:40 +01:00
James Cole
c207167b14 New translations 2017-01-08 13:41:43 +01:00
James Cole
cfc066e911 New translations 2017-01-08 13:41:41 +01:00
James Cole
3a1d011841 New translations 2017-01-08 13:41:40 +01:00
James Cole
7d05c0da9c New translations 2017-01-08 13:41:39 +01:00
James Cole
1d7f2ca9e4 New translations 2017-01-08 13:31:46 +01:00
James Cole
ea2e0d7546 New translations 2017-01-08 13:31:42 +01:00
James Cole
64b79ee64c New translations 2017-01-08 13:31:38 +01:00
James Cole
8a00101470 Fix tests, remove some logging. 2017-01-08 11:41:09 +01:00
James Cole
01aba73f5b Forgot “show all” link [skip ci] 2017-01-08 10:20:59 +01:00
James Cole
71e31346e8 Better views for #475 2017-01-08 10:19:10 +01:00
James Cole
483cce9880 New translations 2017-01-07 16:02:10 +01:00
James Cole
c8db39a91e New translations 2017-01-07 15:51:56 +01:00
James Cole
6d398a2edf Added shiny new loading styles. [skip ci] 2017-01-07 08:08:37 +01:00
James Cole
bd3c8119ba Update composer.json because Twig and Twigbridge aren’t playing nice. 2017-01-06 14:51:04 +01:00
James Cole
16aa78d13c These changes fix #528 2017-01-06 14:50:32 +01:00
James Cole
3be5cca60a Use Crypt in attachment repository [skip ci] 2017-01-06 13:54:55 +01:00
James Cole
bc3dfb96fd New translations 2017-01-06 13:42:32 +01:00
James Cole
e78e98a6cf New translations 2017-01-06 13:42:26 +01:00
James Cole
9db0e48f63 Fixes #526 2017-01-05 21:32:54 +01:00
James Cole
3de52b6bc1 Some new files for layout [skip ci] 2017-01-05 21:05:34 +01:00
James Cole
be52abbe3b Add no-print tag to options box. [skip ci] 2017-01-05 21:02:24 +01:00
James Cole
ac55b0fafb This should fix the print thing. [skip ci] 2017-01-05 21:01:16 +01:00
James Cole
887b6789fc Translated 2017-01-05 11:02:31 +01:00
James Cole
ff50fec112 New translations 2017-01-05 10:42:40 +01:00
James Cole
4538ef3cf9 Various small optimisations [skip ci] 2017-01-05 10:06:46 +01:00
James Cole
a872cf7061 Renamed the other method. 2017-01-05 09:10:04 +01:00
James Cole
2d8ca363db Gave method old name back. 2017-01-05 09:08:35 +01:00
James Cole
8e8b011587 Removed unused budget methods. 2017-01-05 09:07:56 +01:00
James Cole
4241ae035e Add two new “spentInPeriod” methods that use the collector and not big queries. 2017-01-05 09:07:04 +01:00
James Cole
3ef569d280 Respond to empty account collection #524 2017-01-05 09:04:12 +01:00
James Cole
6fe28b15df Add some phpdoc [skip ci] 2017-01-05 08:56:14 +01:00
James Cole
a609a47138 Fix tests. 2017-01-05 08:52:45 +01:00
James Cole
b575b87f77 Refactor method to original name #524 2017-01-05 08:48:16 +01:00
James Cole
7c5ee8a67d Refactor method to original name #524 2017-01-05 08:47:45 +01:00
James Cole
452c14bece Refactor method to original name #524 2017-01-05 08:47:09 +01:00
James Cole
57f63ba752 Clean up class #524 2017-01-05 08:45:10 +01:00
James Cole
5f153b8a01 Fix a test 2017-01-05 08:45:01 +01:00
James Cole
1be49876df Remove complicated no longer used methods #524 2017-01-05 08:41:37 +01:00
James Cole
a79b2a7773 Remove old method and another unused method #524 2017-01-05 08:41:11 +01:00
James Cole
cdf6e5a487 Remove old method #524 2017-01-05 08:40:26 +01:00
James Cole
7c82f45604 Refactor code to use new “earned in period” method. #524 2017-01-05 08:40:05 +01:00
James Cole
4d49701203 Add new “earned in period” method. #524 2017-01-05 08:39:46 +01:00
James Cole
d48cc69898 Removed old versions of methods #524 2017-01-05 08:34:22 +01:00
James Cole
af466a1d75 Refactor code to verify these methods work #524 2017-01-05 08:33:22 +01:00
James Cole
b9599d3aa1 Add two methods that have a different way of collecting information #524 2017-01-05 08:33:04 +01:00
James Cole
dbebfe7c07 Remove unused method. 2017-01-05 08:32:31 +01:00
James Cole
ddf54fdb83 New translations 2017-01-04 17:33:38 +01:00
James Cole
619138d294 New translations 2017-01-04 17:33:30 +01:00
James Cole
126b19bf2d New translations 2017-01-04 17:32:55 +01:00
James Cole
cc76adf7b6 New translations 2017-01-04 17:32:51 +01:00
James Cole
83bcb56a6a New translations 2017-01-04 17:32:46 +01:00
James Cole
6e88a70661 New translations 2017-01-04 17:32:37 +01:00
James Cole
6755a9878b New translations 2017-01-04 17:32:23 +01:00
James Cole
b8ef7593ee Approved. Step name: Proofread 2017-01-04 17:32:09 +01:00
James Cole
602cc26f0f Translated 2017-01-04 17:32:05 +01:00
James Cole
62271fe064 New translations 2017-01-04 17:32:00 +01:00
James Cole
83f5f776a6 Code for #522 2017-01-04 17:25:28 +01:00
James Cole
2a5566a820 New translations 2017-01-04 17:02:21 +01:00
James Cole
398e547d06 New translations 2017-01-04 14:52:14 +01:00
James Cole
ba957196da Make sure correct locale is used. Debug info. #521 [skip ci] 2017-01-04 13:14:06 +01:00
James Cole
b5c4a24133 Translated 2017-01-04 10:51:54 +01:00
James Cole
cc688dc112 New translations 2017-01-04 10:51:52 +01:00
James Cole
91b5eaff80 New translations 2017-01-04 10:51:50 +01:00
James Cole
4a52503cb3 New translations 2017-01-04 10:42:07 +01:00
James Cole
bcd7e7ea94 New translations 2017-01-04 10:31:48 +01:00
James Cole
ba9ae54fbb New translations 2017-01-04 10:31:46 +01:00
James Cole
39e05c9991 New translations 2017-01-04 10:31:42 +01:00
James Cole
8962f90bcc New translations 2017-01-04 10:22:15 +01:00
James Cole
daf3a95db0 Updated laravel, removed GitHub move announcement. 2017-01-04 09:28:49 +01:00
James Cole
1c9ebafe2b Fix password reset routine. 2017-01-04 09:15:41 +01:00
James Cole
00b3df4455 Approved. Step name: Proofread 2017-01-04 05:13:14 +01:00
James Cole
600c3e75bb Merge branch 'release/4.3.1' 2017-01-04 05:06:13 +01:00
James Cole
6349fccd0f Merge pull request #518 from firefly-iii/l10n_develop
New Crowdin translations
2017-01-04 05:05:26 +01:00
James Cole
6ececdad26 New translations 2017-01-04 05:04:11 +01:00
James Cole
c67f1a7b93 New translations 2017-01-04 05:04:05 +01:00
James Cole
8617ea760a Approved. Step name: Proofread 2017-01-04 05:03:56 +01:00
James Cole
41a2406f07 New translations 2017-01-04 05:03:46 +01:00
James Cole
adae8e45a9 New translations 2017-01-04 05:03:42 +01:00
James Cole
e346ae533d New translations 2017-01-04 05:03:35 +01:00
James Cole
31789255c9 New translations 2017-01-04 05:03:19 +01:00
James Cole
dbe6edd133 New translations 2017-01-04 05:03:09 +01:00
James Cole
7cfbcec56e New translations 2017-01-04 05:02:52 +01:00
James Cole
9f9a055f64 New translations 2017-01-04 05:02:28 +01:00
James Cole
d3614d3505 New strings for translation [skip ci] 2017-01-04 04:57:04 +01:00
James Cole
800f67908e New change log. 2017-01-04 04:49:07 +01:00
James Cole
e2c613c422 New config. 2017-01-04 04:48:58 +01:00
James Cole
457037ed99 Should not be a final class, dummy. 2017-01-03 20:05:20 +01:00
James Cole
f9f21efd36 Update config to fix #519 2017-01-03 20:02:48 +01:00
James Cole
2d59b6718d Various code style fixes. 2017-01-03 17:46:08 +01:00
James Cole
0c6d213296 Update scrutiniser configuration. 2017-01-03 17:26:31 +01:00
James Cole
c34fb7f037 Cleaned up the category and budget pie charts. 2017-01-03 17:02:17 +01:00
James Cole
796be319b7 Piggy banks for #511 [skip ci] 2017-01-03 08:27:48 +01:00
James Cole
d28fcdc6a5 Translated 2017-01-02 23:12:00 +01:00
James Cole
d0afcb6cfa New translations 2017-01-02 23:11:57 +01:00
James Cole
7bd4de937a New translations 2017-01-02 23:11:54 +01:00
James Cole
3025693178 New translations 2017-01-02 23:01:50 +01:00
James Cole
c9cc3bf3ff New translations 2017-01-02 22:51:33 +01:00
James Cole
1f670f7a05 New translations 2017-01-02 22:51:31 +01:00
James Cole
48d735b53b New translations 2017-01-02 22:41:29 +01:00
James Cole
b91f6c7ce6 More alignment for #511 2017-01-02 21:04:17 +01:00
James Cole
ad116d1959 Various code cleanup [skip ci] 2017-01-02 20:42:29 +01:00
James Cole
a0de10870d New translations 2017-01-02 20:12:12 +01:00
James Cole
eb0c00896f New translations 2017-01-02 20:01:56 +01:00
James Cole
deccd4e9fe New translations 2017-01-02 19:51:50 +01:00
James Cole
8be4ec08ad New translations 2017-01-02 19:41:48 +01:00
James Cole
59ad0624f2 New translations 2017-01-02 19:32:00 +01:00
James Cole
f0c69ca84f New translations 2017-01-02 19:31:58 +01:00
James Cole
3ba1c07f68 New translations 2017-01-02 19:31:56 +01:00
James Cole
14cd4aaac8 New translations 2017-01-02 19:31:54 +01:00
James Cole
8a1fae5d9d New translations 2017-01-02 19:31:51 +01:00
James Cole
e323f5a2d5 This should fix most amounts for #511 2017-01-02 19:27:27 +01:00
James Cole
c5c1cbd66f New translations 2017-01-02 19:21:45 +01:00
James Cole
4cc9dbbe6a New translations 2017-01-02 19:21:42 +01:00
James Cole
3649991ad6 New translations 2017-01-02 19:11:55 +01:00
James Cole
1d25691aa2 New translations 2017-01-02 19:02:01 +01:00
James Cole
235076b465 New translations 2017-01-02 19:02:00 +01:00
James Cole
c2670fa379 New translations 2017-01-02 19:01:58 +01:00
James Cole
a769a5391d New translations 2017-01-02 19:01:55 +01:00
James Cole
1f58c46f67 New translations 2017-01-02 18:51:46 +01:00
James Cole
f4c9f2d0e7 New translations 2017-01-02 18:51:43 +01:00
James Cole
851b9136fe New translations 2017-01-02 18:51:41 +01:00
James Cole
0fe10e470d New translations 2017-01-02 18:41:49 +01:00
James Cole
8c8ea17fac New translations 2017-01-02 18:41:46 +01:00
James Cole
7c546b8d3a New translations 2017-01-02 18:32:01 +01:00
James Cole
63334a61ad New translations 2017-01-02 18:31:59 +01:00
James Cole
f61e65cf54 New translations 2017-01-02 18:31:56 +01:00
James Cole
05bf752629 Translated 2017-01-02 18:21:54 +01:00
James Cole
5096a90e34 New translations 2017-01-02 18:21:52 +01:00
James Cole
03792b3905 New translations 2017-01-02 18:12:05 +01:00
James Cole
995b049a5f New translations 2017-01-02 18:12:03 +01:00
James Cole
bde37ec2c7 New translations 2017-01-02 18:12:00 +01:00
James Cole
d6b3fe7e1b New translations 2017-01-02 18:02:21 +01:00
James Cole
954b394987 New translations 2017-01-02 15:32:39 +01:00
James Cole
97dae6dde5 New translations 2017-01-02 15:32:37 +01:00
James Cole
fe039500d6 New translations 2017-01-02 15:32:36 +01:00
James Cole
6952957794 New translations 2017-01-02 15:32:34 +01:00
James Cole
01cc97ad55 New translations 2017-01-02 15:32:32 +01:00
James Cole
b5c8e005e2 New translations 2017-01-02 15:32:28 +01:00
James Cole
1c2602438f New translations 2017-01-02 15:32:19 +01:00
James Cole
33da756a2f New translations 2017-01-02 15:32:18 +01:00
James Cole
488d4a38b8 New translations 2017-01-02 15:32:04 +01:00
James Cole
e60f60b0f8 New translations 2017-01-02 15:32:03 +01:00
James Cole
8aa2e3d2f5 Various code cleanup. 2017-01-02 15:22:30 +01:00
James Cole
d5f65e5d07 New translations 2017-01-02 15:22:00 +01:00
James Cole
c8511a6e2a New translations 2017-01-02 15:12:14 +01:00
James Cole
379b15be1d New translations 2017-01-02 14:51:54 +01:00
James Cole
2ee1fea293 New translations 2017-01-02 14:41:48 +01:00
James Cole
4385d71c6f New translations 2017-01-02 14:31:56 +01:00
James Cole
cf6ea64aba New translations 2017-01-02 14:22:06 +01:00
James Cole
101317cb16 New translations 2017-01-02 14:22:04 +01:00
James Cole
5990a21c46 Translated 2017-01-02 14:22:02 +01:00
James Cole
a9bc007327 New translations 2017-01-02 14:22:00 +01:00
James Cole
0c71770b1d New translations 2017-01-02 12:41:57 +01:00
James Cole
5bae7e9bdb New translations 2017-01-02 12:31:51 +01:00
James Cole
1818a596fe Translated 2017-01-02 12:21:47 +01:00
James Cole
8f7541b841 New translations 2017-01-02 12:21:45 +01:00
James Cole
090546cda3 New translations 2017-01-02 12:21:43 +01:00
James Cole
dcd89d38e7 Small JS fixes [skip ci] 2017-01-02 12:18:29 +01:00
James Cole
800478d437 Add support for Polish #517 [skip ci] 2017-01-02 12:18:18 +01:00
James Cole
f797344106 Default values [skip ci] 2017-01-02 12:15:33 +01:00
James Cole
9352ee3e25 Various Javascript fixes. 2017-01-02 12:09:46 +01:00
James Cole
811026dc4a Merge pull request #512 from firefly-iii/l10n_develop
New Crowdin translations
2017-01-02 11:48:57 +01:00
James Cole
479a4dac7b Missing translations [skip ci] #517 2017-01-02 11:41:14 +01:00
James Cole
499fbbeb17 New translations 2017-01-02 11:31:45 +01:00
James Cole
a35bcf6415 New translations 2017-01-02 11:21:43 +01:00
James Cole
818ffdfc85 New translations 2017-01-02 11:02:27 +01:00
James Cole
d5e19c7ac0 New translations 2017-01-02 11:02:26 +01:00
James Cole
37639b0ff4 New translations 2017-01-02 11:02:25 +01:00
James Cole
740d89dce6 New translations 2017-01-02 11:02:23 +01:00
James Cole
4a7b08fc4e New translations 2017-01-02 11:02:21 +01:00
James Cole
48a5f83f00 New translations 2017-01-02 11:02:20 +01:00
James Cole
48819c928d New translations 2017-01-02 11:02:18 +01:00
James Cole
45a6866dd0 New translations 2017-01-02 11:02:16 +01:00
James Cole
6690586406 New translations 2017-01-02 11:02:15 +01:00
James Cole
909e54845c New translations 2017-01-02 11:02:13 +01:00
James Cole
a7204eb9fa New translations 2017-01-02 11:02:10 +01:00
James Cole
6463166c00 New translations 2017-01-02 11:02:07 +01:00
James Cole
f8268a864b This should fix most Javascript errors. 2017-01-02 10:34:01 +01:00
James Cole
721fff29b3 Approved. Step name: Proofread 2017-01-02 10:12:07 +01:00
James Cole
4cf312d3d4 Approved. Step name: Proofread 2017-01-02 10:12:04 +01:00
James Cole
36f1b6a834 New account tests. 2017-01-02 10:05:02 +01:00
James Cole
050d7e8f00 Remove specific commands from composer installation routine. 2017-01-02 09:53:22 +01:00
James Cole
7c5bed2bb5 Fix export controller tests. 2017-01-02 09:23:24 +01:00
James Cole
87316cf7c1 Include local JS directory. [skip ci] 2017-01-02 09:09:37 +01:00
James Cole
f7d61e5a9b Update scrutinizer config. 2017-01-02 09:02:58 +01:00
James Cole
b2030a72a0 Fix some javascript things [skip ci] 2017-01-02 08:46:45 +01:00
James Cole
533797fc9e Update javascript code. 2017-01-02 08:30:20 +01:00
James Cole
5688234b9d New translations 2017-01-02 08:23:00 +01:00
James Cole
9335789362 New translations 2017-01-02 08:22:55 +01:00
James Cole
9e6a2a3fa4 New translations 2017-01-02 08:22:49 +01:00
James Cole
122fc77357 New translations 2017-01-02 08:22:35 +01:00
James Cole
c978e7965f New translations 2017-01-02 08:22:30 +01:00
James Cole
b0e4e24603 New translations 2017-01-02 08:22:25 +01:00
James Cole
56de307a3e New translations 2017-01-02 08:22:18 +01:00
James Cole
e1dd9ed41b New translations 2017-01-02 08:21:54 +01:00
James Cole
17a64764d3 New translations 2017-01-02 08:21:49 +01:00
James Cole
3cd0540474 Missing language lines [skip ci] 2017-01-02 08:13:10 +01:00
James Cole
27cd9fac8a This fixes #513 [skip ci] 2017-01-02 08:07:28 +01:00
James Cole
1d2012cc23 New translations 2017-01-01 20:42:59 +01:00
James Cole
1b00835dd1 New translations 2017-01-01 20:42:54 +01:00
James Cole
413dcf8164 New translations 2017-01-01 20:42:48 +01:00
James Cole
7f17e8fb2f New translations 2017-01-01 20:42:36 +01:00
James Cole
254d8994d0 New translations 2017-01-01 20:42:30 +01:00
James Cole
4f72519ad9 New translations 2017-01-01 20:42:23 +01:00
James Cole
900b246183 New translations 2017-01-01 20:42:17 +01:00
James Cole
abddb29f37 New translations 2017-01-01 20:41:56 +01:00
James Cole
8d429ef753 New translations 2017-01-01 20:41:50 +01:00
James Cole
b7679b5c60 Updated composer.lock. 2017-01-01 20:33:38 +01:00
James Cole
49982d6eb1 Updated various links to reflect the new repository location [skip ci] 2017-01-01 20:32:39 +01:00
James Cole
3191a6c12b Update readme [skip ci] 2017-01-01 20:21:51 +01:00
James Cole
32f8747f2e Update read [skip ci] 2017-01-01 20:14:32 +01:00
James Cole
38e45a62cf New translations 2017-01-01 20:13:12 +01:00
James Cole
c0e2e78780 New translations 2017-01-01 20:13:06 +01:00
James Cole
3fe3ddbc49 New translations 2017-01-01 20:12:59 +01:00
James Cole
5ca532a54a New translations 2017-01-01 20:12:48 +01:00
James Cole
a120df090a New translations 2017-01-01 20:12:43 +01:00
James Cole
22d359503a New translations 2017-01-01 20:12:38 +01:00
James Cole
e8d84abe43 New translations 2017-01-01 20:12:32 +01:00
James Cole
98937cedaa New translations 2017-01-01 20:12:10 +01:00
James Cole
d592d6cd7a New translations 2017-01-01 20:12:04 +01:00
James Cole
0341a04ee3 Warning about locale. [skip ci] 2017-01-01 20:10:30 +01:00
James Cole
540fc4f924 Fix sort [skip ci] 2017-01-01 17:01:29 +01:00
James Cole
04290bf9b6 Fix small issue with piggy banks. 2017-01-01 16:55:18 +01:00
James Cole
ecbc0c1778 Speed up various tests. 2016-12-30 14:24:16 +01:00
James Cole
44b8e48c3a Fix tests. 2016-12-30 13:54:11 +01:00
James Cole
a5036c86dc Updated test database. 2016-12-30 13:47:23 +01:00
James Cole
ac86e75233 Updated various files for #506 2016-12-30 13:45:02 +01:00
James Cole
9ec3febbfa Do not round pie chart values. #506 2016-12-30 12:00:37 +01:00
James Cole
1c5dc6ab6d Don’t round amount when exporting #506 2016-12-30 11:58:23 +01:00
James Cole
abb8eafec2 Fix tests. 2016-12-30 11:57:21 +01:00
James Cole
eb8f5512c5 Charts will respect decimal places #506 2016-12-30 11:51:58 +01:00
James Cole
d146476c91 Sort a nasty bug in budget limit collection #508 2016-12-30 09:02:48 +01:00
James Cole
7a57670925 Fix small bug in database verifier. [skip ci] 2016-12-30 08:51:26 +01:00
James Cole
8a49e98246 Fix small bug in database verifier. [skip ci] 2016-12-30 08:49:27 +01:00
James Cole
cf0845d190 Reinstated limit repetitions call #508 [skip ci] 2016-12-30 08:44:48 +01:00
James Cole
02bbdcc251 Fix reports and charts for #508 2016-12-30 08:41:48 +01:00
James Cole
13f6bd759b Views must pick up on this #508 2016-12-30 07:39:42 +01:00
James Cole
497400587d Update budget limit #508 2016-12-29 20:52:02 +01:00
James Cole
a58cd83ea7 Fixed routes and budgets.index #508 2016-12-29 20:48:33 +01:00
James Cole
3f802fe27a Removed limit repetition events #508 2016-12-29 20:48:12 +01:00
James Cole
6a13dd317d Will also upgrade database. #508 2016-12-29 20:19:20 +01:00
James Cole
a442d3d952 Migration for #508 2016-12-29 19:35:27 +01:00
James Cole
0d4febff85 New test database just to be sure. 2016-12-29 18:20:49 +01:00
James Cole
ba222eaf77 No changes to budget limit for now. 2016-12-29 18:10:29 +01:00
James Cole
b14719464c No changes to budget limit for now. 2016-12-29 18:10:14 +01:00
James Cole
c756b80962 These are changes to budget limit. FF must work with them. 2016-12-29 18:01:06 +01:00
James Cole
a54a886bf0 Chart was negative. [skip ci] 2016-12-29 17:56:12 +01:00
James Cole
dbe9628cc5 Update to budget limits. 2016-12-29 17:43:11 +01:00
James Cole
7a3b39886e Changed to budget controller chart. 2016-12-29 17:42:46 +01:00
James Cole
fab511cc53 Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop
* 'develop' of https://github.com/JC5/firefly-iii:
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  Approved. Step name: Proofread
2016-12-29 10:30:16 +01:00
James Cole
4979d9d0bf Merge pull request #507 from JC5/l10n_develop
New Crowdin translations
2016-12-29 10:29:59 +01:00
James Cole
45914b2e9e First set of views will respect decimal places configuration. 2016-12-29 09:15:50 +01:00
James Cole
1e9aaf2d2a Code cleanup. [skip ci] 2016-12-29 09:05:02 +01:00
James Cole
de56c18c6e Clean up some money formatting routines. 2016-12-29 09:02:23 +01:00
James Cole
eaefb7136a Looks like somebody had to google how the decimal thing works. 2016-12-28 22:21:55 +01:00
James Cole
fe9344cd0a Round on max number of decimals #506 2016-12-28 21:55:46 +01:00
James Cole
f010c17ae6 Up the scales for #506 2016-12-28 21:55:09 +01:00
James Cole
f63cd74965 New translations 2016-12-28 21:52:46 +01:00
James Cole
9e8f8f76a4 New translations 2016-12-28 21:52:43 +01:00
James Cole
d88c6a82d0 New translations 2016-12-28 21:52:41 +01:00
James Cole
a8fdf7ffad New translations 2016-12-28 21:52:36 +01:00
James Cole
245389d74f New translations 2016-12-28 21:52:33 +01:00
James Cole
26933637dd New translations 2016-12-28 21:52:31 +01:00
James Cole
98312ac554 New translations 2016-12-28 21:52:25 +01:00
James Cole
1ba03088c9 New translations 2016-12-28 21:52:21 +01:00
James Cole
c0dfc554b3 New translations 2016-12-28 21:52:18 +01:00
James Cole
5c691491e8 New translations 2016-12-28 21:52:15 +01:00
James Cole
9731b59174 New translations 2016-12-28 21:52:12 +01:00
James Cole
52bf358978 New translations 2016-12-28 21:52:07 +01:00
James Cole
c92a56c980 New translations 2016-12-28 21:52:04 +01:00
James Cole
3142151fc3 New translations 2016-12-28 21:51:47 +01:00
James Cole
fb555f5b96 New translations 2016-12-28 21:51:44 +01:00
James Cole
8f1c693d3d New translations 2016-12-28 21:51:41 +01:00
James Cole
b8a8becd0c New translations 2016-12-28 21:51:39 +01:00
James Cole
b71abd3f6a Approved. Step name: Proofread 2016-12-28 21:51:33 +01:00
James Cole
9ae74b4278 Expand views to allow editing of currency decimals #506 2016-12-28 21:48:37 +01:00
James Cole
bdbf434006 Increase number of decimals. #506 2016-12-28 21:34:02 +01:00
James Cole
1a5e93c739 Merge pull request #505 from JC5/l10n_develop
New Crowdin translations
2016-12-28 19:59:52 +01:00
James Cole
8e42ba74c6 New translations 2016-12-28 19:03:10 +01:00
James Cole
42bb083e99 New translations 2016-12-28 19:03:05 +01:00
James Cole
ae4eecc7f2 New translations 2016-12-28 19:02:59 +01:00
James Cole
c4f25b6191 New translations 2016-12-28 19:02:49 +01:00
James Cole
29b200040f New translations 2016-12-28 19:02:44 +01:00
James Cole
7cb1598fb1 New translations 2016-12-28 19:02:39 +01:00
James Cole
65b6f162d8 New translations 2016-12-28 19:02:31 +01:00
James Cole
c56d2e08f4 New translations 2016-12-28 19:02:10 +01:00
James Cole
ca0a0886b1 New translations 2016-12-28 19:02:04 +01:00
James Cole
e9822ae1a3 Code cleanup. [skip ci] 2016-12-28 19:00:39 +01:00
James Cole
04b284f030 No longer able to manage blocked domains. 2016-12-28 18:57:15 +01:00
James Cole
9ef24c0a43 Registration process no longer cares about blocked domains or previously deleted users. 2016-12-28 18:54:15 +01:00
James Cole
7ee650ba7a Some code cleanup [skip ci] 2016-12-28 18:49:30 +01:00
James Cole
96cafed154 New translations 2016-12-28 18:33:05 +01:00
James Cole
f65c2ff4fb New translations 2016-12-28 18:33:01 +01:00
James Cole
121deec62f New translations 2016-12-28 18:32:56 +01:00
James Cole
838d0808c0 New translations 2016-12-28 18:32:42 +01:00
James Cole
974fbe9e5b New translations 2016-12-28 18:32:37 +01:00
James Cole
f26f94ad3b New translations 2016-12-28 18:32:32 +01:00
James Cole
7410f1944c New translations 2016-12-28 18:32:12 +01:00
James Cole
c34947f657 New translations 2016-12-28 18:32:06 +01:00
James Cole
54092118e1 Approved. Step name: Proofread 2016-12-28 18:31:57 +01:00
James Cole
866a7d7401 Add missing translation [skip ci] 2016-12-28 18:27:32 +01:00
James Cole
32ab916707 Remove debug text [skip ci] 2016-12-28 18:26:44 +01:00
James Cole
1a245f1303 Fix import command instruction [skip ci] #504 2016-12-28 18:22:20 +01:00
James Cole
a23c61ee3c Fix tests 2016-12-28 17:14:32 +01:00
James Cole
f44336f7aa Remove a lot of stuff that deals with user activation. 2016-12-28 17:07:44 +01:00
James Cole
98d4bc48b6 Users can no longer be required to activate their account. They are always activated. 2016-12-28 16:55:53 +01:00
James Cole
a3f1b72bac Admin area reports on less user details. 2016-12-28 16:46:57 +01:00
James Cole
a37f70947b Various code cleanup. 2016-12-28 16:45:44 +01:00
James Cole
71195aa789 Merge pull request #503 from JC5/l10n_develop
New Crowdin translations
2016-12-28 15:16:31 +01:00
James Cole
f6511bed32 Called the wrong method [skip ci] 2016-12-28 13:05:40 +01:00
James Cole
619500ca64 Various cod e clean up. 2016-12-28 13:02:56 +01:00
James Cole
986d290434 New translations 2016-12-28 13:01:42 +01:00
James Cole
878f8c58bb New translations 2016-12-28 12:11:53 +01:00
James Cole
e067da1fe9 Translated 2016-12-28 12:01:50 +01:00
James Cole
f340c636fe New translations 2016-12-28 12:01:48 +01:00
James Cole
ce260a1a1e New translations 2016-12-28 11:51:38 +01:00
James Cole
a21c9f15e3 New translations 2016-12-28 11:41:39 +01:00
James Cole
e64b778d13 Various small fixes. 2016-12-28 11:34:00 +01:00
James Cole
a1f139f62a Translated 2016-12-28 11:31:16 +01:00
James Cole
8ae1d1c963 New translations 2016-12-28 10:23:19 +01:00
James Cole
8f8016179b New translations 2016-12-28 10:23:17 +01:00
James Cole
2e32e994c3 New translations 2016-12-28 10:23:14 +01:00
James Cole
1575e3b045 New translations 2016-12-28 10:23:11 +01:00
James Cole
9ab5f68601 New translations 2016-12-28 10:23:06 +01:00
James Cole
7fcb806dfe New translations 2016-12-28 10:23:02 +01:00
James Cole
5ae736c7cc New translations 2016-12-28 10:22:50 +01:00
James Cole
d77ba9970b New translations 2016-12-28 10:22:46 +01:00
James Cole
49f97a2c7b New translations 2016-12-28 10:22:42 +01:00
James Cole
659ff89062 New translations 2016-12-28 10:22:38 +01:00
James Cole
5529641bea New translations 2016-12-28 10:22:32 +01:00
James Cole
b38f1d7b2a New translations 2016-12-28 10:22:28 +01:00
James Cole
53ba202b14 New translations 2016-12-28 10:22:08 +01:00
James Cole
11cc333de7 New translations 2016-12-28 10:22:04 +01:00
James Cole
70e47ab4d0 New translations 2016-12-28 10:22:00 +01:00
James Cole
1582b35ae2 New translations 2016-12-28 10:21:58 +01:00
James Cole
62c27cee6c Approved. Step name: Proofread 2016-12-28 10:21:50 +01:00
James Cole
81b8bc9e93 Approved. Step name: Proofread 2016-12-28 10:21:47 +01:00
James Cole
49758c4e72 Remove deprecated settings. 2016-12-28 10:16:20 +01:00
James Cole
001ef4fe1c Removed deprecated event and handlers. (store ip addresses) 2016-12-28 10:08:34 +01:00
James Cole
94d0401f4e Removed deprecated event and handlers. (block use of email and deleted user) 2016-12-28 10:07:36 +01:00
James Cole
2dbd9bd0b1 Removed deprecated event and handlers. (block use of domain) 2016-12-28 10:05:37 +01:00
James Cole
9168c97eb6 Removed deprecated event and handlers. (locked out user) 2016-12-28 10:04:09 +01:00
James Cole
758953b6e3 Removed deprecated event and handlers. (blocked user login) 2016-12-28 10:02:43 +01:00
James Cole
8ccdf9ea83 Removed deprecated event and handlers. 2016-12-28 10:00:58 +01:00
James Cole
9c6a3e4ad5 This fixes the tests. 2016-12-28 09:56:07 +01:00
James Cole
6151d4a0ec Flash info message [skip ci] 2016-12-28 09:45:08 +01:00
James Cole
61014d45f4 Optimize view [skip ci] 2016-12-28 06:19:18 +01:00
James Cole
05a93a2426 Add budget information. [skip ci] 2016-12-28 06:14:58 +01:00
James Cole
a4c7412220 Hide more from account overview [skip ci] 2016-12-28 06:12:21 +01:00
James Cole
94e51952f4 More fields for query. 2016-12-28 06:09:48 +01:00
James Cole
ebdd64f46f Fix small issues in the category overview and the journal collector. 2016-12-28 05:48:41 +01:00
James Cole
2dc70ece44 Some tweaks for #502 2016-12-28 05:25:58 +01:00
James Cole
c23ea5ea76 Start of new change log. 2016-12-28 05:17:07 +01:00
James Cole
6521a7c604 This fixes #501 2016-12-28 05:16:55 +01:00
James Cole
02e792148c Forgot sprintf call. 2016-12-27 22:11:29 +01:00
James Cole
69c350dcca Merge pull request #500 from JC5/l10n_develop
New Crowdin translations
2016-12-27 20:52:16 +01:00
James Cole
1aee3d8e2c Various code cleanup 2016-12-27 20:52:00 +01:00
James Cole
02695d852c Various code cleanup 2016-12-27 20:45:23 +01:00
James Cole
7405138489 Various code cleanup 2016-12-27 20:07:28 +01:00
James Cole
4804257fd1 Various code cleanup 2016-12-27 19:59:56 +01:00
James Cole
67f2e3a32a New translations 2016-12-27 19:42:47 +01:00
James Cole
8d709f9cf4 New translations 2016-12-27 19:42:45 +01:00
James Cole
4d3132f1c9 New translations 2016-12-27 19:42:43 +01:00
James Cole
36b44f1814 New translations 2016-12-27 19:42:42 +01:00
James Cole
32761aeda0 New translations 2016-12-27 19:42:40 +01:00
James Cole
851b05c110 New translations 2016-12-27 19:42:38 +01:00
James Cole
997e951aca New translations 2016-12-27 19:42:32 +01:00
James Cole
448dc6b7c6 New translations 2016-12-27 19:42:30 +01:00
James Cole
84458fa46f New translations 2016-12-27 19:42:29 +01:00
James Cole
50bb8a0d91 New translations 2016-12-27 19:42:27 +01:00
James Cole
997b3c3061 New translations 2016-12-27 19:42:26 +01:00
James Cole
4f240c004c New translations 2016-12-27 19:42:24 +01:00
James Cole
597a8d36af New translations 2016-12-27 19:42:22 +01:00
James Cole
cf52a4c5c2 New translations 2016-12-27 19:42:21 +01:00
James Cole
c29180a094 Add support for Russian [skip ci] 2016-12-27 19:39:39 +01:00
James Cole
10f4304559 New demo text for the import routine. 2016-12-27 19:37:05 +01:00
James Cole
30447bcf70 New stubs for demo user. 2016-12-27 19:34:39 +01:00
James Cole
9ff9385c47 Demo user is no longer capable of uploading files. 2016-12-27 19:34:27 +01:00
James Cole
6c5499e848 Small code cleanup. 2016-12-27 19:34:05 +01:00
James Cole
3bacbe8536 Merge pull request #499 from JC5/l10n_develop
New Crowdin translations
2016-12-27 19:12:53 +01:00
James Cole
09c7a69050 New translations 2016-12-27 17:51:54 +01:00
James Cole
5dc727580f New translations 2016-12-27 17:51:53 +01:00
James Cole
248a4ed527 New translations 2016-12-27 17:51:52 +01:00
James Cole
db95185eee New translations 2016-12-27 17:51:50 +01:00
James Cole
85dae15a0d New translations 2016-12-27 17:51:49 +01:00
James Cole
3e61a1e12b New translations 2016-12-27 17:51:45 +01:00
James Cole
6cd4186ac9 Merge pull request #497 from JC5/l10n_develop
New Crowdin translations
2016-12-27 16:00:47 +01:00
James Cole
cbbadc3d6d Less logging in often used class. 2016-12-27 15:54:49 +01:00
James Cole
fc0024faa2 Can now inform about the lack of certain charts [skip ci] 2016-12-27 15:54:36 +01:00
James Cole
0f3d4062d7 Translated 2016-12-27 15:51:14 +01:00
James Cole
7ba8a88989 Merge pull request #496 from JC5/l10n_develop
New Crowdin translations
2016-12-27 15:47:53 +01:00
James Cole
349d254193 This fixes the tests. 2016-12-27 15:46:52 +01:00
James Cole
be201e811d Clean up report code. 2016-12-27 15:31:17 +01:00
James Cole
84a032fbb4 New translations 2016-12-27 13:12:24 +01:00
James Cole
4815602558 New translations 2016-12-27 13:12:22 +01:00
James Cole
e4b83392be New translations 2016-12-27 13:12:21 +01:00
James Cole
0658c17adb New translations 2016-12-27 13:12:20 +01:00
James Cole
bdc72aee42 New translations 2016-12-27 13:12:18 +01:00
James Cole
689d91e30f New translations 2016-12-27 13:12:17 +01:00
James Cole
6b785e4318 New translations 2016-12-27 13:12:14 +01:00
James Cole
f46cf55912 New translations 2016-12-27 13:12:13 +01:00
James Cole
d520849ce1 Some more demo text [skip ci] 2016-12-27 13:06:41 +01:00
James Cole
50661bbb3b Some more demo text [skip ci] 2016-12-27 13:05:31 +01:00
James Cole
d2d5b1ac76 More subtle currency warning [skip ci] 2016-12-27 11:08:52 +01:00
James Cole
244972e0f8 Better category overview [skip ci] 2016-12-27 11:02:14 +01:00
James Cole
f80e6c2efa New translations 2016-12-27 10:52:55 +01:00
James Cole
e9e32eda3c New translations 2016-12-27 10:52:50 +01:00
James Cole
73844e223f New translations 2016-12-27 10:52:46 +01:00
James Cole
6583a6d9c6 New translations 2016-12-27 10:52:36 +01:00
James Cole
ca4824adcd New translations 2016-12-27 10:52:27 +01:00
James Cole
80b5cc08bb New translations 2016-12-27 10:52:21 +01:00
James Cole
afbcc79a06 New translations 2016-12-27 10:52:12 +01:00
James Cole
3371bd2e04 New translations 2016-12-27 10:52:01 +01:00
James Cole
5efdf53c06 ShowAll method for category 2016-12-27 10:46:11 +01:00
James Cole
c9112de8ba New translations 2016-12-27 10:03:05 +01:00
James Cole
fd4b589a13 New translations 2016-12-27 10:03:00 +01:00
James Cole
df813dbac9 New translations 2016-12-27 10:02:50 +01:00
James Cole
004fb362ec New translations 2016-12-27 10:02:42 +01:00
James Cole
3cd749753a New translations 2016-12-27 10:02:37 +01:00
James Cole
c7964f7693 New translations 2016-12-27 10:02:30 +01:00
James Cole
57bba2fd3f New translations 2016-12-27 10:02:21 +01:00
James Cole
04c9b2a7a8 Approved. Step name: Proofread 2016-12-27 10:02:05 +01:00
James Cole
b9d142c2b7 Small view updates [skip ci] 2016-12-27 09:56:30 +01:00
James Cole
6ab52e282f Merge pull request #495 from JC5/l10n_develop
New Crowdin translations
2016-12-26 15:04:15 +01:00
James Cole
b14adf8c3f New translations 2016-12-26 12:42:09 +01:00
James Cole
4e0b162f5f New translations 2016-12-26 12:42:08 +01:00
James Cole
62d47ff7f0 New translations 2016-12-26 12:42:07 +01:00
James Cole
7f025380f0 New translations 2016-12-26 12:42:06 +01:00
James Cole
7d1e981bca New translations 2016-12-26 12:42:04 +01:00
James Cole
a08103f996 New translations 2016-12-26 12:42:03 +01:00
James Cole
dd4991a4f8 New translations 2016-12-26 12:42:00 +01:00
James Cole
5442292d23 New translations 2016-12-26 12:41:59 +01:00
James Cole
3f050d3d03 Some demo page text [skip ci] 2016-12-26 12:32:48 +01:00
James Cole
ad1e9c27e9 Merge branch 'release/4.3.0' 2016-12-26 10:46:22 +01:00
James Cole
ab761696bf New version indicator. 2016-12-26 10:45:45 +01:00
James Cole
0713273a99 New composer file. 2016-12-26 10:45:19 +01:00
James Cole
5668a3271b Updated change log. 2016-12-26 10:40:28 +01:00
James Cole
1eca105a91 Merge pull request #494 from JC5/l10n_develop
New Crowdin translations
2016-12-26 10:34:00 +01:00
James Cole
3883b99c24 New translations 2016-12-26 10:31:51 +01:00
James Cole
d6adbc697a New translations 2016-12-26 10:31:49 +01:00
James Cole
a5789b1085 New translations 2016-12-26 10:31:48 +01:00
James Cole
a6ccbcb795 New translations 2016-12-26 10:31:47 +01:00
James Cole
1a6067f7ae New translations 2016-12-26 10:31:46 +01:00
James Cole
cb735b18a9 New translations 2016-12-26 10:31:45 +01:00
James Cole
909bd11147 New translations 2016-12-26 10:31:42 +01:00
James Cole
1a76c606ed New translations 2016-12-26 10:31:41 +01:00
James Cole
8c9b6796a1 Approved. Step name: Proofread 2016-12-26 10:31:38 +01:00
James Cole
844ab608d4 More demo text [skip ci] 2016-12-26 10:23:47 +01:00
James Cole
dc39094975 New translations 2016-12-26 10:12:11 +01:00
James Cole
b32184d525 New translations 2016-12-26 10:12:09 +01:00
James Cole
d95ae53ce2 New translations 2016-12-26 10:12:07 +01:00
James Cole
5e3147ddeb New translations 2016-12-26 10:12:06 +01:00
James Cole
9e594c6075 New translations 2016-12-26 10:12:04 +01:00
James Cole
c0058c51ea New translations 2016-12-26 10:12:03 +01:00
James Cole
b0b68d4243 New translations 2016-12-26 10:12:00 +01:00
James Cole
22eb90212d New translations 2016-12-26 10:11:59 +01:00
James Cole
94e264b6ce Expand demo text [skip ci] 2016-12-26 10:00:40 +01:00
James Cole
7ea15761a6 Fix tests. 2016-12-26 09:50:37 +01:00
James Cole
1ced4a089d Update read me [skip ci] 2016-12-26 09:50:28 +01:00
James Cole
648e63628c Extra code for demo site. 2016-12-26 09:33:52 +01:00
James Cole
2847e2aff5 Code for the demo features. 2016-12-26 09:18:45 +01:00
James Cole
9dfaabb5d0 New translations 2016-12-26 09:12:28 +01:00
James Cole
6a21f98ea4 New translations 2016-12-26 09:12:22 +01:00
James Cole
4d5f4cc1c0 New translations 2016-12-26 09:12:14 +01:00
James Cole
970ce6cb0d New translations 2016-12-26 09:12:10 +01:00
James Cole
31cad5de00 New translations 2016-12-26 09:12:05 +01:00
James Cole
e06db9e620 New translations 2016-12-26 09:11:59 +01:00
James Cole
f57ac64dc2 New translations 2016-12-26 09:11:54 +01:00
James Cole
57d7c1623f New translations 2016-12-26 09:11:36 +01:00
James Cole
c86aa9cb3f Can no longer reset the demo user’s password. 2016-12-26 09:08:59 +01:00
James Cole
48209d0d22 Demo user cannot enable two factor auth. 2016-12-26 08:57:07 +01:00
James Cole
8f6a271cc0 Add the ability to prefix cache differently. 2016-12-25 13:38:30 +01:00
James Cole
a9b610f367 New translations 2016-12-25 13:12:12 +01:00
James Cole
1046930f29 New translations 2016-12-25 13:12:00 +01:00
James Cole
1b16e5e216 New translations 2016-12-25 13:11:56 +01:00
James Cole
e16ba9ac70 New translations 2016-12-25 13:11:53 +01:00
James Cole
71ac676b83 New translations 2016-12-25 13:11:47 +01:00
James Cole
1b6c0d5d86 New translations 2016-12-25 13:11:43 +01:00
James Cole
14db016e98 New translations 2016-12-25 13:11:27 +01:00
James Cole
7e2e1626ac Approved. Step name: Proofread 2016-12-25 13:11:15 +01:00
James Cole
bce4e7e2bf Add restrictions for demo accounts. 2016-12-25 13:09:29 +01:00
James Cole
ede327f3d3 Merge pull request #493 from JC5/l10n_develop
New Crowdin translations
2016-12-25 12:59:27 +01:00
James Cole
82718a74dc Fix tests 2016-12-25 12:55:22 +01:00
James Cole
eefd6141a1 Translated 2016-12-25 12:31:05 +01:00
James Cole
7894f1871e Make sure the attachment tests work. 2016-12-25 12:23:36 +01:00
James Cole
0ef9b5b462 Make sure database is present in tests. 2016-12-25 12:06:17 +01:00
James Cole
9ca75d134e This is the test database required to run the tests. 2016-12-25 12:03:21 +01:00
James Cole
b78776e1f7 This generates a lot of logging, let’s remove it. 2016-12-25 11:52:01 +01:00
James Cole
f2f9f8fbab Various bug fixes and extensions to test routine. 2016-12-25 11:50:42 +01:00
James Cole
5b5acba816 Clean up lots of models. 2016-12-24 17:36:51 +01:00
James Cole
9f2729d0ff Removed Firefly’s ability to generate test data. 2016-12-24 14:48:14 +01:00
James Cole
afe98cda9f Various code cleanup things and preparation for a new demo user. 2016-12-24 14:43:42 +01:00
James Cole
9c4d2e8791 Mention $other in chart cache. [skip ci] 2016-12-23 18:48:21 +01:00
James Cole
cea170359f Budget chart. 2016-12-23 18:34:58 +01:00
James Cole
70bb8fbc89 New translations 2016-12-23 17:53:16 +01:00
James Cole
82cd0adca6 New translations 2016-12-23 17:52:57 +01:00
James Cole
e821f5b2b6 New translations 2016-12-23 17:52:51 +01:00
James Cole
4cade467c6 New translations 2016-12-23 17:52:46 +01:00
James Cole
b6c9639948 New translations 2016-12-23 17:52:39 +01:00
James Cole
ca9319db34 New translations 2016-12-23 17:52:33 +01:00
James Cole
beaec9a4c1 New translations 2016-12-23 17:52:11 +01:00
James Cole
cbc44e8200 Approved. Step name: Proofread 2016-12-23 17:51:54 +01:00
James Cole
017b1a481a Committed bad code. 2016-12-23 17:51:33 +01:00
James Cole
e15932fe4a Make budget report actually more useful. 2016-12-23 17:50:26 +01:00
James Cole
08c044fe52 Merge pull request #491 from JC5/l10n_develop
New Crowdin translations
2016-12-23 15:52:34 +01:00
James Cole
0e11245cb4 Fix tests. 2016-12-23 15:52:12 +01:00
James Cole
cde494d3ef Fixed missing chart data. 2016-12-23 15:52:05 +01:00
James Cole
9a15decdff Translated 2016-12-23 15:02:25 +01:00
James Cole
186b986e02 New translations 2016-12-23 07:32:48 +01:00
James Cole
cdbf5653ac New translations 2016-12-23 07:32:34 +01:00
James Cole
c403dd7490 New translations 2016-12-23 07:32:28 +01:00
James Cole
d15d9fdf2a New translations 2016-12-23 07:32:24 +01:00
James Cole
0b618de44c New translations 2016-12-23 07:32:16 +01:00
James Cole
875f19f728 New translations 2016-12-23 07:32:11 +01:00
James Cole
7bb549732c New translations 2016-12-23 07:31:50 +01:00
James Cole
b9baa93ae4 Approved. Step name: Proofread 2016-12-23 07:31:36 +01:00
James Cole
315479fcd3 New translations [skip ci] 2016-12-23 07:24:38 +01:00
James Cole
1f1334a1fc Update chart to show sum 2016-12-23 07:20:47 +01:00
James Cole
bf0744e03a Updated some copyright notices [skip ci] 2016-12-23 07:02:45 +01:00
James Cole
8fb9577660 Add some debug, fix balance report bug. 2016-12-22 21:45:04 +01:00
James Cole
90d58c5c39 Update test scripts [skip ci] 2016-12-22 19:51:49 +01:00
James Cole
b6aa79bb38 Various code cleanup. Removed executable flags, added newlines. 2016-12-22 19:42:45 +01:00
James Cole
14a0de6b6a This should fix account-number. 2016-12-22 19:18:35 +01:00
James Cole
13e56b7249 Can handle account number, but do nothing with it. 2016-12-22 19:17:33 +01:00
James Cole
3753901e38 Expand flush routine because of issues. [skip ci] 2016-12-22 18:26:16 +01:00
James Cole
e76075e29f Various small fixes. 2016-12-22 18:19:50 +01:00
James Cole
284db7f90b Fixed some small display issues. 2016-12-22 17:04:41 +01:00
James Cole
cabdf4e380 This might fix the missing stack trace. [skip ci] 2016-12-22 16:55:27 +01:00
James Cole
9859052c4d Code for issue #489 2016-12-22 16:36:56 +01:00
James Cole
0feeac9160 Removed some unused imports [skip ci] 2016-12-22 15:24:16 +01:00
James Cole
54b33a0b69 Removed views no longer used. 2016-12-22 07:13:49 +01:00
James Cole
e08e7b2c9b Speed up some tests. 2016-12-22 07:13:37 +01:00
James Cole
782e2add88 Fix sort URI, smaller view [skip ci] 2016-12-21 20:34:47 +01:00
James Cole
f18a5a6f1b This fixes the broken tests. 2016-12-21 20:32:02 +01:00
James Cole
6fc971c4cb This is a fix for #487 2016-12-21 20:31:44 +01:00
James Cole
3250c4830d New seeds plus the preparation for some extended testing. 2016-12-21 19:56:06 +01:00
James Cole
9e1a69217d This fixes #484. 2016-12-21 17:50:00 +01:00
James Cole
46c26a64d8 Update import storage routine for issue #483, as suggested by @zjean 2016-12-21 17:21:36 +01:00
James Cole
2f12a70647 Add support for Spanish. [skip ci] 2016-12-20 17:21:16 +01:00
James Cole
be190d1fa0 Update favicon information. 2016-12-20 17:19:16 +01:00
James Cole
1e4888209b Fixed #479 2016-12-20 17:14:43 +01:00
James Cole
8aa2961c19 This should fix #482 2016-12-20 17:10:30 +01:00
James Cole
304cdabc96 Merge pull request #481 from JC5/l10n_develop
New Crowdin translations
2016-12-20 14:16:39 +01:00
James Cole
c60e272eb3 New translations 2016-12-20 10:42:06 +01:00
James Cole
c074f55cb2 New translations 2016-12-20 10:42:05 +01:00
James Cole
e6af29646e New translations 2016-12-20 10:42:03 +01:00
James Cole
b4213328fe New translations 2016-12-20 10:42:02 +01:00
James Cole
8a7628c9dc New translations 2016-12-20 10:42:00 +01:00
James Cole
d52c146e12 New translations 2016-12-20 10:41:58 +01:00
James Cole
1910a4bd4b New translations 2016-12-20 10:41:57 +01:00
James Cole
bd0c552f54 New translations 2016-12-20 10:41:55 +01:00
James Cole
b29ea98de4 New translations 2016-12-20 10:41:53 +01:00
James Cole
dd1db87806 New translations 2016-12-20 10:41:50 +01:00
James Cole
6f9e446577 New translations 2016-12-20 10:41:45 +01:00
James Cole
664230dca8 This fixes #478, again 2016-12-20 10:25:11 +01:00
James Cole
1a24e7e0aa Merge pull request #476 from JC5/l10n_develop
New Crowdin translations
2016-12-19 21:10:53 +01:00
James Cole
9239815ce6 Tiny view update. 2016-12-19 21:07:38 +01:00
James Cole
116e19ec06 These routines fix #477 2016-12-19 21:07:22 +01:00
James Cole
fc0ad622eb Clarify chart details [skip ci] 2016-12-19 20:47:26 +01:00
James Cole
2c5cdb8780 Clarify chart details [skip ci] 2016-12-19 20:46:24 +01:00
James Cole
9a309f32fa This fixes #478 2016-12-19 20:36:28 +01:00
James Cole
e2e54d342a This completes all controller acceptance tests 2016-12-19 20:21:14 +01:00
James Cole
42f7529495 Approved. Step name: Proofread 2016-12-19 20:01:50 +01:00
James Cole
f172151252 Expand read me [skip ci] 2016-12-19 17:31:23 +01:00
James Cole
e2ad38d3e0 Expand read me [skip ci] 2016-12-19 17:24:15 +01:00
James Cole
40cc32fc5a Updated favicon. 2016-12-19 17:15:31 +01:00
James Cole
436c034fdd New translations 2016-12-19 11:51:37 +01:00
James Cole
286b1848d9 New translations 2016-12-19 10:31:15 +01:00
James Cole
7fffebf6df New translations 2016-12-19 10:21:22 +01:00
James Cole
b1764478ec Translated 2016-12-19 10:11:53 +01:00
James Cole
6b6a799206 Translated 2016-12-18 21:41:01 +01:00
James Cole
0a82ed901e New translations 2016-12-18 21:12:00 +01:00
James Cole
d733c9ed14 New translations 2016-12-18 21:11:57 +01:00
James Cole
a752ea489c New translations 2016-12-18 21:11:51 +01:00
James Cole
876a24586f New translations 2016-12-18 21:11:47 +01:00
James Cole
ea2779cf9a New translations 2016-12-18 21:11:41 +01:00
James Cole
77aa36163d New translations 2016-12-18 21:11:38 +01:00
James Cole
b581d8ecb7 New translations 2016-12-18 21:11:18 +01:00
James Cole
83b404d01e More tests. 2016-12-18 21:04:53 +01:00
James Cole
8deb92c3e5 More tests. 2016-12-18 19:34:03 +01:00
James Cole
20a6e0170c New translations 2016-12-18 18:22:10 +01:00
James Cole
944a78807c New translations 2016-12-18 18:22:05 +01:00
James Cole
0b02d294f4 New translations 2016-12-18 18:22:00 +01:00
James Cole
a5d86536c3 New translations 2016-12-18 18:21:52 +01:00
James Cole
71c08cfe0c New translations 2016-12-18 18:21:48 +01:00
James Cole
8ab0d5fc48 New translations 2016-12-18 18:21:40 +01:00
James Cole
57f81ee4c8 Approved. Step name: Proofread 2016-12-18 18:21:29 +01:00
James Cole
5c28adf266 New tests. [skip ci] 2016-12-18 18:16:41 +01:00
James Cole
5a57398f81 New tests. 2016-12-18 17:54:11 +01:00
James Cole
8121a384ef Merge branch 'release/4.2.2' 2016-12-18 10:54:46 +01:00
James Cole
8666197e05 Changelog and version bump. 2016-12-18 10:48:05 +01:00
James Cole
1ea2b8bbcb Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop
* 'develop' of https://github.com/JC5/firefly-iii:
  Approved. Step name: Proofread
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
2016-12-18 10:41:49 +01:00
James Cole
a71cedd8a9 Merge pull request #474 from JC5/l10n_develop
New Crowdin translations
2016-12-18 10:41:39 +01:00
James Cole
04c5f583f6 Approved. Step name: Proofread 2016-12-18 10:41:08 +01:00
James Cole
7716ff4e8c Update various tests and the composer lock file. 2016-12-18 10:37:59 +01:00
James Cole
6b51a116d1 New translations 2016-12-18 09:41:52 +01:00
James Cole
b2f14dc177 New translations 2016-12-18 09:41:50 +01:00
James Cole
da1d3b82f9 New translations 2016-12-18 09:41:45 +01:00
James Cole
6282d8c828 New translations 2016-12-18 09:41:40 +01:00
James Cole
73129b0ce5 New translations 2016-12-18 09:41:35 +01:00
James Cole
f71e7a2f28 New translations 2016-12-18 09:41:31 +01:00
James Cole
341da327e3 New translations 2016-12-18 09:41:12 +01:00
James Cole
3d8adfa7e4 Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop
* 'develop' of https://github.com/JC5/firefly-iii:
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  Approved. Step name: Proofread
2016-12-18 09:27:42 +01:00
James Cole
279d7769f5 This fixes #470 2016-12-18 09:27:27 +01:00
James Cole
b7d3b40353 Merge pull request #471 from JC5/l10n_develop
New Crowdin translations
2016-12-18 09:16:27 +01:00
James Cole
7ecd691ee2 New tests. 2016-12-17 19:19:49 +01:00
James Cole
f3398c7dec This fixes #472 2016-12-17 17:09:46 +01:00
James Cole
90644e662d New translations 2016-12-17 08:41:52 +01:00
James Cole
f5c5cb7fb9 New translations 2016-12-17 08:41:47 +01:00
James Cole
312e79921a New translations 2016-12-17 08:41:43 +01:00
James Cole
b83d346a86 New translations 2016-12-17 08:41:37 +01:00
James Cole
3eed67f108 New translations 2016-12-17 08:41:33 +01:00
James Cole
15f0bc63b2 New translations 2016-12-17 08:41:27 +01:00
James Cole
0a4b0ec929 Approved. Step name: Proofread 2016-12-17 08:41:17 +01:00
James Cole
560f6cbf24 Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop
* 'develop' of https://github.com/JC5/firefly-iii: (23 commits)
  New translations
  Approved. Step name: Proofread
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  Approved. Step name: Proofread
  New translations
  Translated
  ...
2016-12-17 08:35:19 +01:00
James Cole
9165e0238f Import related tests. 2016-12-17 08:35:03 +01:00
James Cole
97d6be6809 Merge pull request #469 from JC5/l10n_develop
New Crowdin translations
2016-12-16 08:26:48 +01:00
James Cole
4de14eba0c Fix some routes for the budget report. 2016-12-16 08:07:31 +01:00
James Cole
6c64023bf7 New translations 2016-12-16 07:31:43 +01:00
James Cole
a923c288e6 Approved. Step name: Proofread 2016-12-16 07:31:41 +01:00
James Cole
4c1d8e8e85 New translations 2016-12-15 23:02:39 +01:00
James Cole
02f2def88b New translations 2016-12-15 23:02:38 +01:00
James Cole
4bcacc5d68 New translations 2016-12-15 23:02:35 +01:00
James Cole
913dbe6b1a New translations 2016-12-15 23:02:31 +01:00
James Cole
ce8164dd87 New translations 2016-12-15 23:02:28 +01:00
James Cole
a5b412f546 New translations 2016-12-15 23:02:26 +01:00
James Cole
82bb352624 New translations 2016-12-15 23:02:22 +01:00
James Cole
ebbf2659b1 New translations 2016-12-15 23:02:17 +01:00
James Cole
d0084becea New translations 2016-12-15 23:02:16 +01:00
James Cole
6af2b37ac2 New translations 2016-12-15 23:02:13 +01:00
James Cole
814fc6eabd New translations 2016-12-15 23:02:11 +01:00
James Cole
50278a679a New translations 2016-12-15 23:02:05 +01:00
James Cole
d42e9c75ef New translations 2016-12-15 23:02:03 +01:00
James Cole
00b3dced2c New translations 2016-12-15 23:02:02 +01:00
James Cole
5c0c00188f New translations 2016-12-15 23:01:59 +01:00
James Cole
2ec56626f3 Approved. Step name: Proofread 2016-12-15 23:01:56 +01:00
James Cole
e87456b2f8 New translations 2016-12-15 23:01:52 +01:00
James Cole
3609b515e5 Translated 2016-12-15 23:01:50 +01:00
James Cole
a1609542c3 Translated 2016-12-15 23:01:48 +01:00
James Cole
4c4625583a Approved. Step name: Proofread 2016-12-15 23:01:46 +01:00
James Cole
7b479316ea Approved. Step name: Proofread 2016-12-15 23:01:38 +01:00
James Cole
b021c7690f Basic edit user routine. 2016-12-15 22:56:31 +01:00
James Cole
2be060796e Merge pull request #468 from JC5/l10n_develop
New Crowdin translations
2016-12-15 21:56:24 +01:00
James Cole
1b4d55cca4 Fix various code style issues. 2016-12-15 21:35:33 +01:00
James Cole
a8cea4119d Approved. Step name: Proofread 2016-12-15 17:21:27 +01:00
James Cole
e247aace8d Various code cleanup. 2016-12-15 17:16:46 +01:00
James Cole
41553e9b86 New translations 2016-12-15 14:43:23 +01:00
James Cole
e875587260 New translations 2016-12-15 14:43:18 +01:00
James Cole
5377483345 New translations 2016-12-15 14:43:08 +01:00
James Cole
4112acfb8d New translations 2016-12-15 14:42:56 +01:00
James Cole
f3bc02e11c New translations 2016-12-15 14:42:46 +01:00
James Cole
8e411a898b New translations 2016-12-15 14:42:40 +01:00
James Cole
915edbecc9 New translations 2016-12-15 14:42:28 +01:00
James Cole
975a6c34bf Finished #452 2016-12-15 14:38:05 +01:00
James Cole
cdd988b4de Piggy banks and #452 2016-12-15 14:05:50 +01:00
James Cole
b58bc97422 Code for #452 2016-12-15 13:47:28 +01:00
James Cole
482688ac3c Merge pull request #467 from JC5/l10n_develop
New Crowdin translations
2016-12-15 11:20:24 +01:00
James Cole
aea31b5e28 Budget charts #452 2016-12-15 10:44:06 +01:00
James Cole
d7cbc53b4b Multiply by -1. 2016-12-15 10:41:56 +01:00
James Cole
f74c6c2d19 Updated budget charts [skip ci] 2016-12-15 10:41:10 +01:00
James Cole
3080d2ddc4 New translations 2016-12-15 10:03:53 +01:00
James Cole
4ad5881760 New translations 2016-12-15 10:03:43 +01:00
James Cole
7e55d1a4fd New translations 2016-12-15 10:03:36 +01:00
James Cole
7ef5eed6e2 New translations 2016-12-15 10:03:22 +01:00
James Cole
10aa41a7ea New translations 2016-12-15 10:03:15 +01:00
James Cole
1f9b362b6f New translations 2016-12-15 10:03:01 +01:00
James Cole
4bf9bfb521 Approved. Step name: Proofread 2016-12-15 10:02:26 +01:00
James Cole
1d7119114d New translations [skip ci] 2016-12-15 09:55:10 +01:00
James Cole
e1b6df6fb1 Include budgeted info as well. [skip ci] 2016-12-15 09:54:10 +01:00
James Cole
7cf38bb01e Include budgeted info as well. [skip ci] 2016-12-15 09:52:58 +01:00
James Cole
e34ec22845 Forgot to do * -1. [skip ci] 2016-12-15 09:51:22 +01:00
James Cole
46506abeb8 Forgot to do * -1. [skip ci] 2016-12-15 09:50:22 +01:00
James Cole
95654cc4d4 New budget chart generator 2016-12-15 09:49:35 +01:00
James Cole
47aded820d New test. 2016-12-15 08:53:10 +01:00
James Cole
24444ebf08 Merge pull request #466 from JC5/l10n_develop
New Crowdin translations
2016-12-15 08:41:53 +01:00
James Cole
bdc0df8350 Approved. Step name: Proofread 2016-12-15 08:31:26 +01:00
James Cole
b2c9a2973c Merge pull request #465 from JC5/l10n_develop
New Crowdin translations
2016-12-15 08:27:54 +01:00
James Cole
da2a347511 Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop
* 'develop' of https://github.com/JC5/firefly-iii:
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  Approved. Step name: Proofread
  Approved. Step name: Proofread
  Approved. Step name: Proofread
2016-12-15 08:17:17 +01:00
James Cole
6fbc3ba060 New screenshots [skip ci] 2016-12-15 08:16:34 +01:00
James Cole
02eff06cd3 New translations 2016-12-15 08:11:28 +01:00
James Cole
7586d4b494 New translations 2016-12-15 08:01:18 +01:00
James Cole
9059f0fee6 Translated 2016-12-15 07:51:13 +01:00
James Cole
c2af9e3d20 Merge pull request #464 from JC5/l10n_develop
New Crowdin translations
2016-12-14 22:53:58 +01:00
James Cole
0b51366526 New translations 2016-12-14 19:13:32 +01:00
James Cole
e40260bd9c New translations 2016-12-14 19:13:25 +01:00
James Cole
cf2842840d New translations 2016-12-14 19:13:18 +01:00
James Cole
17fa8fcb2c New translations 2016-12-14 19:13:06 +01:00
James Cole
0d2f9864e2 New translations 2016-12-14 19:12:59 +01:00
James Cole
89cbd91204 New translations 2016-12-14 19:12:46 +01:00
James Cole
f4d9b57887 Approved. Step name: Proofread 2016-12-14 19:12:39 +01:00
James Cole
4b2e4afca5 Approved. Step name: Proofread 2016-12-14 19:12:27 +01:00
James Cole
dd1ba30c48 Approved. Step name: Proofread 2016-12-14 19:12:18 +01:00
James Cole
3ba4570691 Merge pull request #463 from JC5/l10n_develop
New Crowdin translations
2016-12-14 18:59:39 +01:00
James Cole
848cfabcba Rearrange code [skip ci] 2016-12-14 18:59:12 +01:00
James Cole
1bbd10b909 New translations 2016-12-14 18:53:48 +01:00
James Cole
a16a4f813d New translations 2016-12-14 18:53:44 +01:00
James Cole
91cfa963b2 New translations 2016-12-14 18:53:42 +01:00
James Cole
a35557eb62 New translations 2016-12-14 18:53:34 +01:00
James Cole
aad4e47b6a New translations 2016-12-14 18:53:32 +01:00
James Cole
1b177723ae New translations 2016-12-14 18:53:25 +01:00
James Cole
99dba92bd3 New translations 2016-12-14 18:53:17 +01:00
James Cole
e13ccff056 New translations 2016-12-14 18:53:14 +01:00
James Cole
46528dd29d New translations 2016-12-14 18:53:08 +01:00
James Cole
4f611ad810 New translations 2016-12-14 18:52:57 +01:00
James Cole
af41985a64 New translations 2016-12-14 18:52:55 +01:00
James Cole
d0864e06b5 Translated 2016-12-14 18:52:41 +01:00
James Cole
6f0366e146 Translated 2016-12-14 18:52:38 +01:00
James Cole
e0cdbcb28c Approved. Step name: Proofread 2016-12-14 18:52:35 +01:00
James Cole
f19b99194c Wording 2016-12-14 18:47:32 +01:00
James Cole
43a55e2e35 Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop
* 'develop' of https://github.com/JC5/firefly-iii:
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  Translated
  Translated
  Approved. Step name: Proofread
  Approved. Step name: Proofread
2016-12-14 18:45:27 +01:00
James Cole
b2743825ca Sort account list by name [skip ci] 2016-12-14 18:44:56 +01:00
James Cole
d4f6cce56e New translations 2016-12-14 17:32:30 +01:00
James Cole
6092d206b6 New translations 2016-12-14 17:22:30 +01:00
James Cole
c8ad83cc91 New translations 2016-12-14 13:21:56 +01:00
James Cole
7d31071ff8 New translations 2016-12-14 13:12:12 +01:00
James Cole
c975ef15f1 Translated 2016-12-14 13:12:03 +01:00
James Cole
f855011d34 Translated 2016-12-14 13:12:00 +01:00
James Cole
fbcf0929d8 New translations 2016-12-14 13:01:30 +01:00
James Cole
d89e75cbe8 New translations 2016-12-14 12:51:23 +01:00
James Cole
ccaa42ad74 New translations 2016-12-14 12:41:14 +01:00
James Cole
56d8dce622 New translations 2016-12-14 12:31:07 +01:00
James Cole
c79baf98cf New translations 2016-12-14 12:21:22 +01:00
James Cole
d1cab9f68c Merge pull request #462 from JC5/l10n_develop
New Crowdin translations
2016-12-14 10:37:35 +01:00
James Cole
69c5c93353 This fixes the tests. 2016-12-13 21:09:04 +01:00
James Cole
28ebd683e4 New translations 2016-12-13 21:03:02 +01:00
James Cole
d752edd625 New translations 2016-12-13 21:02:58 +01:00
James Cole
1dab45d493 New translations 2016-12-13 21:02:54 +01:00
James Cole
b99982d02b New translations 2016-12-13 21:02:48 +01:00
James Cole
fff17ac6c1 New translations 2016-12-13 21:02:44 +01:00
James Cole
4086257983 New translations 2016-12-13 21:02:37 +01:00
James Cole
bd9e0ac281 New translations 2016-12-13 21:02:34 +01:00
James Cole
b075d6db5e New translations 2016-12-13 21:02:32 +01:00
James Cole
befd79cf14 New translations 2016-12-13 21:02:26 +01:00
James Cole
07f68d2b14 New translations 2016-12-13 21:02:22 +01:00
James Cole
d14889bd27 Translated 2016-12-13 21:02:11 +01:00
James Cole
91e40c14f9 Translated 2016-12-13 21:02:09 +01:00
James Cole
b7b2206262 Approved. Step name: Proofread 2016-12-13 21:02:01 +01:00
James Cole
f344d0319c Approved. Step name: Proofread 2016-12-13 21:01:50 +01:00
James Cole
0c8a1682b6 Wrong reference #461 [skip ci] 2016-12-13 20:58:51 +01:00
James Cole
39866be3f1 Translations. #461 2016-12-13 20:57:10 +01:00
James Cole
947e82fa0f Fixed final mails for #461 2016-12-13 20:51:10 +01:00
James Cole
0335a64a21 Code for #461 2016-12-13 20:37:38 +01:00
James Cole
a9e57e1c34 First set of code for #461 2016-12-13 17:21:28 +01:00
James Cole
8a8279f97a Merge pull request #459 from JC5/l10n_develop
New Crowdin translations
2016-12-12 20:22:49 +01:00
James Cole
b968889552 Approved. Step name: Proofread 2016-12-12 20:21:52 +01:00
James Cole
4068df5e50 Approved. Step name: Proofread 2016-12-12 20:21:33 +01:00
James Cole
dc42370322 Merge pull request #458 from JC5/l10n_develop
New Crowdin translations
2016-12-12 20:13:58 +01:00
James Cole
8c24f14ee5 New translations 2016-12-12 20:12:47 +01:00
James Cole
494d1743a2 New translations 2016-12-12 20:12:43 +01:00
James Cole
4a30d9f6bb New translations 2016-12-12 20:12:37 +01:00
James Cole
ed6d25067c New translations 2016-12-12 20:12:32 +01:00
James Cole
445ae7e10e New translations 2016-12-12 20:12:25 +01:00
James Cole
6f45609161 New translations 2016-12-12 20:12:20 +01:00
James Cole
f1230e47f7 New translations 2016-12-12 20:11:52 +01:00
James Cole
7e0ef6d43e Better view for accounts and I fixed a html error. 2016-12-12 20:02:33 +01:00
James Cole
14f9da544a This fixes #454 2016-12-12 19:39:54 +01:00
James Cole
5a84036e16 Merge pull request #457 from JC5/l10n_develop
New Crowdin translations
2016-12-12 17:42:05 +01:00
James Cole
4dccf7b7b5 Properly check hashes, issue #456 2016-12-12 17:17:36 +01:00
James Cole
66060dbed4 New translations 2016-12-12 15:32:47 +01:00
James Cole
cfb824588f New translations 2016-12-12 15:32:36 +01:00
James Cole
d2b4316d7a New translations 2016-12-12 15:32:24 +01:00
James Cole
3af69b433d New translations 2016-12-12 15:32:13 +01:00
James Cole
a6733fa255 Translated 2016-12-12 15:32:04 +01:00
James Cole
4277c54009 Approved. Step name: Proofread 2016-12-12 15:32:00 +01:00
James Cole
66baa7554a New translations 2016-12-12 15:31:48 +01:00
James Cole
ffca4b0543 More code for #456 2016-12-12 15:27:56 +01:00
James Cole
3e3c48314f Code for #456 2016-12-12 15:24:47 +01:00
James Cole
06ff450d31 Fixed sort 2016-12-12 08:14:38 +01:00
James Cole
07c57cc640 Merge pull request #453 from JC5/l10n_develop
New Crowdin translations
2016-12-12 07:45:59 +01:00
James Cole
a67f10c99e Wrote export tests. 2016-12-11 18:34:18 +01:00
James Cole
2882bcbf7b New translations 2016-12-11 17:51:47 +01:00
James Cole
67cc5b0280 New translations 2016-12-11 17:51:45 +01:00
James Cole
b42b178b71 New translations 2016-12-11 17:51:38 +01:00
James Cole
7de05cd173 New translations 2016-12-11 17:51:34 +01:00
James Cole
3db43743d9 New translations 2016-12-11 17:51:28 +01:00
James Cole
14638e4ed8 New translations 2016-12-11 17:51:25 +01:00
James Cole
e756b93810 New translations 2016-12-11 17:51:18 +01:00
James Cole
358d83dcfc Changed language strings [skip ci] 2016-12-11 17:49:02 +01:00
James Cole
331c231a94 Small bug fix in bill chart [skip ci] 2016-12-11 17:47:47 +01:00
James Cole
4403b65bae Experimental bill chart [skip ci] 2016-12-11 17:46:30 +01:00
James Cole
a27d80d765 Fix sort [skip ci] 2016-12-11 17:32:48 +01:00
James Cole
04272fff81 Fixed a small bug in the account frontpage chart. 2016-12-11 17:30:55 +01:00
James Cole
e963708c54 Remove from provider as well (#452) 2016-12-11 17:06:23 +01:00
James Cole
08c4542847 Clean up chart code. 2016-12-11 17:05:48 +01:00
James Cole
553e9270e5 More code for #452 2016-12-11 16:38:21 +01:00
James Cole
8a7297e131 Code for currency controller tests. 2016-12-11 16:25:46 +01:00
James Cole
0f260da8e6 More code for issue #452 2016-12-11 16:25:25 +01:00
James Cole
77560ab3a8 Wrote more tests. 2016-12-11 16:02:15 +01:00
James Cole
e3b2f2d9a8 Experimental code for issue #452 2016-12-11 16:02:04 +01:00
James Cole
74e01a52b9 More tests 2016-12-11 14:03:30 +01:00
James Cole
dc28ba42ef More tests 2016-12-11 13:28:13 +01:00
James Cole
406150620a Fixed more tests. 2016-12-11 13:16:56 +01:00
James Cole
43f59a1135 Fixed missing chart. 2016-12-11 11:15:19 +01:00
James Cole
5c02eaa66c Split controller tests. 2016-12-11 11:04:53 +01:00
James Cole
b4eac84097 Update tests, fixes some bugs. 2016-12-11 10:38:06 +01:00
James Cole
ec3b356f86 Fix mass edit and mass delete routes. [skip ci] 2016-12-10 17:55:47 +01:00
James Cole
bf99d5c299 Fixed the account view, changed routes. 2016-12-10 17:54:35 +01:00
James Cole
a297131440 Finished even more tests 2016-12-10 17:46:19 +01:00
James Cole
bae2161ee3 Expand tests. 2016-12-10 16:32:52 +01:00
James Cole
0fe0de1a7f New tests 2016-12-10 07:29:36 +01:00
James Cole
e7845115f6 New tests 2016-12-10 06:54:50 +01:00
James Cole
bc11c3fab2 Working but fairly useless budget report 2016-12-10 06:50:13 +01:00
James Cole
1b7546f3f9 Expand tests. 2016-12-09 18:53:13 +01:00
James Cole
663be30117 Fixed the account overview chart 2016-12-09 18:52:27 +01:00
James Cole
cf34713518 Fix some tests. 2016-12-09 16:30:33 +01:00
James Cole
3f56a8ec53 Expand test routines 2016-12-09 15:17:57 +01:00
James Cole
35d105588b Fix tag assignment for multiple deposits [skip ci] 2016-12-09 14:50:28 +01:00
James Cole
122d988ed2 Add some debug. [skip ci] 2016-12-09 14:42:14 +01:00
James Cole
9fcc5e7a67 Fix decryption bug. 2016-12-09 14:21:26 +01:00
James Cole
9a492c3731 Merge pull request #450 from JC5/l10n_develop
New Crowdin translations
2016-12-09 14:18:18 +01:00
James Cole
4f752031f3 New translations 2016-12-09 07:42:04 +01:00
James Cole
19be8bb891 New translations 2016-12-09 07:42:01 +01:00
James Cole
693e1b08c7 New translations 2016-12-09 07:41:55 +01:00
James Cole
9aad380518 New translations 2016-12-09 07:41:51 +01:00
James Cole
8c518c8d58 New translations 2016-12-09 07:41:44 +01:00
James Cole
9af89a19db New translations 2016-12-09 07:41:40 +01:00
James Cole
939b18b86c New translations 2016-12-09 07:41:31 +01:00
James Cole
108e775a15 New routes 2016-12-09 07:40:00 +01:00
James Cole
653692ade0 Try to test for confirmation errors. 2016-12-09 07:20:48 +01:00
James Cole
72c6bfee7e New bread crumb for user edit 2016-12-09 07:08:43 +01:00
James Cole
ac92939429 Test to see if bread crumb present. 2016-12-09 07:08:31 +01:00
James Cole
052957bbd0 New view for edit user 2016-12-09 07:08:20 +01:00
James Cole
97e6afe3dc New text to be translated. 2016-12-09 07:08:09 +01:00
James Cole
1fd028dfb8 First code for #426 2016-12-09 07:07:53 +01:00
James Cole
c73866f47c Fixed date [skip ci] 2016-12-09 06:28:51 +01:00
James Cole
b0e120abee New translations 2016-12-08 21:52:28 +01:00
James Cole
b2da38d401 New translations 2016-12-08 21:52:22 +01:00
James Cole
cabe2579fa New translations 2016-12-08 21:52:16 +01:00
James Cole
18a845ac55 New translations 2016-12-08 21:52:06 +01:00
James Cole
a4d14f8259 New translations 2016-12-08 21:52:01 +01:00
James Cole
9d084e62f7 New translations 2016-12-08 21:51:53 +01:00
James Cole
0393fcd704 Approved. Step name: Proofread 2016-12-08 21:51:30 +01:00
James Cole
edb5b2ed5e Initial code for new budget report #426 2016-12-08 21:50:20 +01:00
James Cole
529bab1112 Merge branch 'release/4.2.1' 2016-12-08 21:23:19 +01:00
James Cole
ab9212a4c9 last code for 4.2.1 2016-12-08 21:22:42 +01:00
James Cole
b2cbba0f3b Merge pull request #449 from JC5/l10n_develop
New Crowdin translations
2016-12-08 21:04:16 +01:00
James Cole
ca73ef8531 Approved. Step name: Proofread 2016-12-08 20:41:30 +01:00
James Cole
d13490cb6e Approved. Step name: Proofread 2016-12-08 20:41:27 +01:00
James Cole
73566e11c0 Removed some JS code that was not necessary. [skip ci] 2016-12-08 20:33:41 +01:00
James Cole
36ebd0f0ee Expand view. 2016-12-07 21:38:35 +01:00
James Cole
efe290d96c This fixes the tests. 2016-12-07 20:45:26 +01:00
James Cole
da3988cc63 New tests 2016-12-07 20:06:06 +01:00
James Cole
df6f4aecf8 Update tests. 2016-12-07 19:53:41 +01:00
Sander
db1a60b6df Fix display bug 2016-12-07 07:58:55 +00:00
James Cole
d79866f115 Fix route [skip ci] 2016-12-07 06:27:27 +01:00
James Cole
cdd18b229e Refactor some duplicated code 2016-12-06 16:58:39 +01:00
James Cole
cca2de9f1b This should remove some issues from scrutinizer. 2016-12-06 16:55:13 +01:00
James Cole
6a58dbb207 Generic code cleanup. 2016-12-06 16:44:58 +01:00
James Cole
779f461491 Merge pull request #447 from JC5/l10n_develop
New Crowdin translations
2016-12-06 16:44:39 +01:00
James Cole
085eca6c02 New translations 2016-12-06 14:42:07 +01:00
James Cole
25db11a8c7 Translated 2016-12-06 14:22:19 +01:00
James Cole
76bcc68ab9 Merge pull request #446 from JC5/l10n_develop
New Crowdin translations
2016-12-06 10:52:05 +01:00
James Cole
9daefaaca4 Fix sort [skip ci] 2016-12-06 10:42:49 +01:00
James Cole
fbbbcc4e74 Fix category report. 2016-12-06 10:42:13 +01:00
James Cole
2e1f31a7f8 Fix sort. 2016-12-06 10:19:43 +01:00
James Cole
8a0ac81fd0 Fix decrypt exception. 2016-12-06 10:13:48 +01:00
James Cole
cdd50dfdd2 Fix decrypt exception. 2016-12-06 10:12:08 +01:00
James Cole
a05c8ca351 New test files. 2016-12-06 09:16:36 +01:00
James Cole
2ca584f097 Fix test. 2016-12-06 09:12:04 +01:00
James Cole
687da83feb Remove unused collections [skip ci] 2016-12-06 09:09:05 +01:00
James Cole
c799fc655d Final set of route changes. 2016-12-06 09:07:50 +01:00
James Cole
27848f55ce New translations 2016-12-06 09:02:19 +01:00
James Cole
001a6e310e New translations 2016-12-06 09:02:13 +01:00
James Cole
ad00bc2806 New translations 2016-12-06 09:02:08 +01:00
James Cole
d8e3365345 New translations 2016-12-06 09:01:58 +01:00
James Cole
5849fe2c30 New translations 2016-12-06 09:01:55 +01:00
James Cole
690b498197 New translations 2016-12-06 09:01:47 +01:00
James Cole
d5ddd447bc Approved. Step name: Proofread 2016-12-06 09:01:26 +01:00
James Cole
628c7cd055 Many more route fixes. 2016-12-06 08:59:08 +01:00
James Cole
f4887bbbf7 More routes and pages fixed. 2016-12-06 08:15:53 +01:00
James Cole
d8f291be6e Clean up code after changing routes. 2016-12-06 07:48:41 +01:00
James Cole
02257e3887 More routes fixed. 2016-12-06 07:06:20 +01:00
James Cole
bebfbf0b90 Fixing routes 2016-12-06 06:52:17 +01:00
James Cole
9cb3bfaa57 Clean up routes 2016-12-06 06:15:42 +01:00
James Cole
8e2c035536 Cleaned up a lot of routes [skip ci] 2016-12-05 22:19:24 +01:00
James Cole
6b56c2bf7c Many new renamed routes that will break half of Firefly. 2016-12-05 21:58:23 +01:00
James Cole
d91b9e71d5 Remove unused code. 2016-12-05 20:44:20 +01:00
James Cole
344916d57e Catch encrypted opposing accounts. [skip ci] 2016-12-05 20:39:17 +01:00
James Cole
b1ef225bd0 Also fix income/expenses sum 2016-12-05 20:35:13 +01:00
James Cole
b713eae009 Fixed some issues with expense/income overview. 2016-12-05 20:19:26 +01:00
James Cole
098cc88d5f Fix various routes. 2016-12-05 20:01:01 +01:00
James Cole
2476dd38b3 Route clean up 2016-12-04 19:55:15 +01:00
James Cole
8fec569dbb Merge pull request #443 from JC5/l10n_develop
New Crowdin translations
2016-12-04 19:05:34 +01:00
James Cole
ba92aa207c New translations 2016-12-04 18:11:51 +01:00
James Cole
f7abf132e2 New translations 2016-12-04 18:11:44 +01:00
James Cole
38919ae300 New translations 2016-12-04 18:11:34 +01:00
James Cole
bba15cef24 New translations 2016-12-04 18:11:28 +01:00
James Cole
e8792fa218 Translated 2016-12-04 18:11:20 +01:00
James Cole
c5f81d4a94 Approved. Step name: Proofread 2016-12-04 18:11:19 +01:00
James Cole
a7b8c9d94d Translated 2016-12-04 18:11:16 +01:00
James Cole
f4b9b7ae84 Various report updates and code cleanup. 2016-12-04 18:02:19 +01:00
James Cole
905a2432c6 Remove todo from code, as we are supposed to. 2016-12-04 17:17:25 +01:00
James Cole
89e4c3de25 A fairly primitive data validation routine for split transactions. 2016-12-04 17:13:37 +01:00
James Cole
86ea9db37e Extend currency data for issue #439 2016-12-04 09:33:41 +01:00
James Cole
62a9fda1c2 New tests. 2016-12-04 08:11:29 +01:00
James Cole
49f7c1bbc1 Updated composer file [skip ci] 2016-12-03 21:53:08 +01:00
James Cole
9dc6f41c18 Include chart with report 2016-12-03 21:48:40 +01:00
James Cole
0a844e4313 Use format amount routine [skip ci] 2016-12-03 21:26:34 +01:00
James Cole
53daa89fcb Display optimisations. [skip ci] 2016-12-03 21:24:55 +01:00
James Cole
c5d31bccc5 Small table optimisations [skip ci] 2016-12-03 21:12:02 +01:00
James Cole
b032825342 Building report from issue #386 2016-12-03 21:03:20 +01:00
James Cole
8377a2a0de Building report from issue #386 2016-12-03 20:38:13 +01:00
James Cole
57e49c225b Merge pull request #438 from JC5/l10n_develop
New Crowdin translations
2016-12-01 08:05:21 +01:00
James Cole
6638f6fb5c Approved. Step name: Proofread 2016-12-01 08:01:07 +01:00
James Cole
71e1b58f1d Experimental code for issue #435. Let’s try this a few times, see how it works. 2016-11-29 19:34:54 +01:00
James Cole
a87cb0fc0b Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop
* 'develop' of https://github.com/JC5/firefly-iii:
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  Translated
  Translated
  Translated
  New translations
  Translated
  Translated
  Translated
  New translations
  New translations
2016-11-29 19:34:11 +01:00
James Cole
2e65f63e4a Merge pull request #436 from JC5/l10n_develop
New Crowdin translations
2016-11-29 19:33:51 +01:00
James Cole
5fb2db4e28 New translations 2016-11-29 17:41:26 +01:00
James Cole
238ae125b5 New translations 2016-11-29 17:41:20 +01:00
James Cole
110d7f691c New translations 2016-11-29 17:31:42 +01:00
James Cole
9fb9c7e3ee New translations 2016-11-29 17:31:36 +01:00
James Cole
a95b1857fe New translations 2016-11-29 17:21:56 +01:00
James Cole
ea97b817fc New translations 2016-11-29 17:21:49 +01:00
James Cole
0eea85a884 Translated 2016-11-29 17:21:45 +01:00
James Cole
eae4e988be Translated 2016-11-29 17:21:43 +01:00
James Cole
bdf752bf7e Translated 2016-11-29 17:21:42 +01:00
James Cole
a19fed5959 New translations 2016-11-29 17:12:07 +01:00
James Cole
7474553832 Translated 2016-11-29 17:12:04 +01:00
James Cole
52567116c2 Translated 2016-11-29 17:12:02 +01:00
James Cole
a70b369aaf Translated 2016-11-29 17:12:00 +01:00
James Cole
33a9e80d9d New translations 2016-11-29 17:11:58 +01:00
James Cole
96ef409f75 Merge pull request #434 from JC5/l10n_develop
New Crowdin translations
2016-11-29 13:23:05 +01:00
James Cole
8f5152e185 Small code cleanup [skip ci] 2016-11-28 20:52:56 +01:00
James Cole
f5f17d1f40 New translations 2016-11-28 20:41:22 +01:00
James Cole
b960f50f38 Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop
* 'develop' of https://github.com/JC5/firefly-iii:
  Approved. Step name: Proofread
  New translations
  New translations
  New translations
  New translations
  New translations
  Approved. Step name: Proofread
  New translations
2016-11-28 20:41:04 +01:00
James Cole
72e357b673 Merge pull request #433 from JC5/l10n_develop
New Crowdin translations
2016-11-28 20:40:39 +01:00
James Cole
b33aa733c7 Fix some minor scrutinizer issues. 2016-11-28 20:38:03 +01:00
James Cole
a6a2c0c182 Remove unused language files. 2016-11-28 20:35:12 +01:00
James Cole
3097ab84fa Approved. Step name: Proofread 2016-11-28 20:31:24 +01:00
James Cole
dd9ce3e06d New translations 2016-11-28 19:52:36 +01:00
James Cole
560fc8b01c New translations 2016-11-28 19:52:30 +01:00
James Cole
f72aba6939 New translations 2016-11-28 19:52:24 +01:00
James Cole
03bc74cae9 New translations 2016-11-28 19:52:16 +01:00
James Cole
7eaf8e3eeb New translations 2016-11-28 19:52:11 +01:00
James Cole
b2b4732657 Approved. Step name: Proofread 2016-11-28 19:51:57 +01:00
James Cole
70473b7635 New translations 2016-11-28 19:51:40 +01:00
James Cole
e4a9e23dfb Merge pull request #432 from JC5/l10n_develop
New Crowdin translations
2016-11-28 19:45:44 +01:00
James Cole
f0fd5324ea Fixes #417 2016-11-28 19:45:36 +01:00
James Cole
addebad810 Approved. Step name: Proofread 2016-11-28 19:41:17 +01:00
James Cole
253466c533 Translated 2016-11-28 19:41:15 +01:00
James Cole
885d0f1464 Merge pull request #431 from JC5/l10n_develop
New Crowdin translations
2016-11-28 19:35:46 +01:00
James Cole
4743cc40a2 New translations 2016-11-28 19:02:46 +01:00
James Cole
92bf9c9214 New translations 2016-11-28 19:02:40 +01:00
James Cole
cd80d82ad4 New translations 2016-11-28 19:02:37 +01:00
James Cole
1b7b6a676d New translations 2016-11-28 19:02:34 +01:00
James Cole
1c61afca07 New translations 2016-11-28 19:02:27 +01:00
James Cole
d4d812c195 New translations 2016-11-28 19:02:23 +01:00
James Cole
ab7803f210 New translations 2016-11-28 19:02:18 +01:00
James Cole
11007f0476 New translations 2016-11-28 19:02:13 +01:00
James Cole
6b1884a9e0 New translations 2016-11-28 19:02:10 +01:00
James Cole
1112a0761f Approved. Step name: Proofread 2016-11-28 19:02:04 +01:00
James Cole
807947fcd8 Approved. Step name: Proofread 2016-11-28 19:01:58 +01:00
James Cole
7afd8f99cb Translated 2016-11-28 19:01:53 +01:00
James Cole
b14a15ce49 New translations 2016-11-28 19:01:50 +01:00
James Cole
2e6ad0ce5d New translations 2016-11-28 19:01:48 +01:00
James Cole
8cdbc96aa5 Add BIC support. This fixes #430 2016-11-28 18:55:56 +01:00
James Cole
956019ff4a Merge branch 'release/4.2.0' 2016-11-27 16:00:47 +01:00
James Cole
8279cf0e88 New version. 2016-11-27 15:59:13 +01:00
James Cole
43c32abfe8 Various code cleanup. 2016-11-26 13:02:44 +01:00
James Cole
0e66939408 Various code cleanup. 2016-11-26 10:53:20 +01:00
James Cole
22d2a523fb Some minor code fixes. 2016-11-26 10:39:05 +01:00
James Cole
bc825a8603 Remove unused code. 2016-11-26 09:29:41 +01:00
James Cole
c9cfda34a1 Remove duplicate code. 2016-11-26 09:21:49 +01:00
James Cole
e8dfbff73f Various code cleanup. 2016-11-26 09:16:06 +01:00
James Cole
62e41f1997 Remove TODO annotations 2016-11-26 09:07:16 +01:00
James Cole
8c9f90f1b4 Some code cleanup. 2016-11-26 09:01:00 +01:00
James Cole
1453a78e49 Remove todo annotations. 2016-11-26 08:55:26 +01:00
James Cole
7efaf51595 Merge pull request #428 from JC5/l10n_develop
New Crowdin translations
2016-11-26 08:41:35 +01:00
James Cole
6bc6674ab1 Some code simplification. 2016-11-26 08:41:15 +01:00
James Cole
d6c7ff0ccb Chart for budget report will also include split journals. 2016-11-26 07:18:20 +01:00
James Cole
28f655dba1 This code makes sure the budget report also includes split expenses. 2016-11-26 07:09:02 +01:00
James Cole
6a3de12894 Approved. Step name: Proofread 2016-11-25 23:01:03 +01:00
James Cole
c7940333ec Approved. Step name: Proofread 2016-11-25 23:01:01 +01:00
James Cole
8860378757 Fix budget in split journals. 2016-11-25 19:06:06 +01:00
James Cole
728fda0116 This allows the user to set the “default” currency for an asset account (#305). It doesn’t do anything other than this yet. 2016-11-25 18:00:29 +01:00
James Cole
0c72e1831f Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop
* 'develop' of https://github.com/JC5/firefly-iii:
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  Approved. Step name: Proofread
  Translated
  New translations
  New translations
2016-11-25 17:43:38 +01:00
James Cole
7da21976ec Merge pull request #425 from JC5/l10n_develop
New Crowdin translations
2016-11-25 17:43:17 +01:00
James Cole
b739859c64 Expand journal meta with soft delete. This pushes Firefly to 4.2.0. 2016-11-25 17:42:45 +01:00
James Cole
d25665f843 New translations 2016-11-25 17:02:24 +01:00
James Cole
1f41f7bd0f New translations 2016-11-25 17:02:20 +01:00
James Cole
dd8638ca98 New translations 2016-11-25 17:02:17 +01:00
James Cole
4ba9ff05b0 New translations 2016-11-25 17:02:12 +01:00
James Cole
618aad5432 New translations 2016-11-25 17:02:08 +01:00
James Cole
e46fc7501e New translations 2016-11-25 17:02:06 +01:00
James Cole
7b91e98d46 New translations 2016-11-25 17:01:58 +01:00
James Cole
85be218f92 New translations 2016-11-25 17:01:55 +01:00
James Cole
71206e395e New translations 2016-11-25 17:01:53 +01:00
James Cole
9b2d2e16b0 New translations 2016-11-25 17:01:48 +01:00
James Cole
5ae01b382e Approved. Step name: Proofread 2016-11-25 17:01:40 +01:00
James Cole
d92a0753a6 Translated 2016-11-25 17:01:35 +01:00
James Cole
f937a74507 New translations 2016-11-25 17:01:27 +01:00
James Cole
c3584ad20c New translations 2016-11-25 17:01:25 +01:00
James Cole
c049d5cfa6 Various small fixes. 2016-11-25 16:55:04 +01:00
James Cole
6c9990e0be Various Javascript related fixes. 2016-11-25 16:54:13 +01:00
James Cole
b34e4cd31b This fixes #422 2016-11-25 16:52:43 +01:00
James Cole
7852b8a785 Make sure ff does not create accounts when balance is said to be 0. 2016-11-25 16:26:03 +01:00
James Cole
6eeb60db5c Multiply sum by -1. 2016-11-24 21:37:09 +01:00
James Cole
d076cfc08f Attempt to fix issue #417 2016-11-24 21:35:23 +01:00
James Cole
68a93ff97c Made fonts local 2016-11-24 19:26:47 +01:00
James Cole
295dcb4f65 Whoops ;) 2016-11-24 19:20:04 +01:00
James Cole
d9849f60c0 Parse error 2016-11-24 19:16:15 +01:00
James Cole
7ebb68e36c This fixes #419 2016-11-24 19:15:16 +01:00
James Cole
f029f7607b Rewrote all email messages. 2016-11-22 21:21:11 +01:00
James Cole
2ba5733ebc Merge pull request #415 from JC5/l10n_develop
New Crowdin translations
2016-11-22 19:31:51 +01:00
James Cole
3fe1d1d368 New translations 2016-11-22 19:12:25 +01:00
James Cole
438c372583 New translations 2016-11-22 19:12:19 +01:00
James Cole
797aa4858e New translations 2016-11-22 19:12:13 +01:00
James Cole
8c858cd066 New translations 2016-11-22 19:12:05 +01:00
James Cole
85aebd39b9 New translations 2016-11-22 19:12:00 +01:00
James Cole
9a5a037424 Approved. Step name: Proofread 2016-11-22 19:11:48 +01:00
James Cole
7d557cbf91 New translations 2016-11-22 19:11:30 +01:00
James Cole
dbbc85a576 Hide some boxes when the user has no bills. 2016-11-22 19:10:38 +01:00
James Cole
eb78cf20c2 This fixes #414 2016-11-22 19:10:17 +01:00
James Cole
4a99399952 Fix chart for account/all overview. 2016-11-21 20:23:25 +01:00
James Cole
6075d75ee2 Fix debug code [skip ci] 2016-11-21 20:15:59 +01:00
James Cole
f4c56fee66 Merge pull request #412 from JC5/l10n_develop
New Crowdin translations
2016-11-20 19:32:54 +01:00
James Cole
04c59304da Add sorting to a report table [skip ci] 2016-11-20 19:11:10 +01:00
James Cole
4b3c31a11a Ignore deleted transactions. [skip ci] 2016-11-20 19:03:08 +01:00
James Cole
14576d2753 Approved. Step name: Proofread 2016-11-20 18:51:13 +01:00
James Cole
72ca1c20c7 Merge pull request #411 from JC5/l10n_develop
New Crowdin translations
2016-11-20 18:45:16 +01:00
James Cole
93645819b8 New translations 2016-11-20 18:41:48 +01:00
James Cole
39468f871b New translations 2016-11-20 18:41:42 +01:00
James Cole
faa47781d2 New translations 2016-11-20 18:41:37 +01:00
James Cole
2c196bab6d New translations 2016-11-20 18:41:30 +01:00
James Cole
9ae71075ef New translations 2016-11-20 18:41:26 +01:00
James Cole
0013cdfa78 Translated 2016-11-20 18:41:14 +01:00
James Cole
52f3f64f7b New translations 2016-11-20 18:41:03 +01:00
James Cole
670fa77dd7 New tests. 2016-11-20 18:34:49 +01:00
James Cole
8baea2feb9 Code for #385 2016-11-20 18:31:29 +01:00
James Cole
c56f937521 Improved sorting in various views. 2016-11-20 17:36:11 +01:00
James Cole
0b613c3b8c Improve sortability in various lists. 2016-11-20 15:30:16 +01:00
James Cole
78f297e18f Fixed some display bugs for split journals. 2016-11-20 14:17:16 +01:00
James Cole
bd8a285d6d Merge pull request #410 from JC5/l10n_develop
New Crowdin translations
2016-11-20 13:06:14 +01:00
James Cole
b44602fd55 New translations 2016-11-20 13:01:38 +01:00
James Cole
41238903e1 New translations 2016-11-20 13:01:33 +01:00
James Cole
a0c88e9b33 New translations 2016-11-20 13:01:30 +01:00
James Cole
5d184aa53e New translations 2016-11-20 13:01:23 +01:00
James Cole
9f9bf86a9f New translations 2016-11-20 13:01:19 +01:00
James Cole
53af9345eb Approved. Step name: Proofread 2016-11-20 13:01:10 +01:00
James Cole
da6bcf04df New translations 2016-11-20 13:00:58 +01:00
James Cole
ec4ec1a147 New (not implemented) tests. 2016-11-20 12:53:04 +01:00
James Cole
350e0b08b1 This implements #377 2016-11-20 12:51:33 +01:00
James Cole
9340ca09e6 Fixed #408 2016-11-20 12:08:43 +01:00
James Cole
a1cef5c339 Found a bug in the import routine where "default accounts" (an account type no longer used by default) is found. 2016-11-20 11:44:27 +01:00
James Cole
94875adb6c Various code cleanup. 2016-11-20 11:43:19 +01:00
James Cole
75a524c656 Added debug code for a possible import issue. 2016-11-20 11:40:05 +01:00
James Cole
e1e94a788c Register and use interface. 2016-11-20 08:57:48 +01:00
James Cole
8417f45d02 Fixed some tests. 2016-11-20 08:54:52 +01:00
James Cole
685310a368 First account controller tests 2016-11-20 08:46:02 +01:00
James Cole
45e7a4576a Extend some test stuff. 2016-11-20 08:30:25 +01:00
James Cole
f8c5c15655 Updated some tests. 2016-11-20 07:24:18 +01:00
James Cole
26190524f4 Skeletons for test 2016-11-19 20:30:30 +01:00
James Cole
5d901a7ecb Remove local development file. [skip ci] 2016-11-19 18:21:48 +01:00
James Cole
929d8b3adc Merge branch 'release/4.1.7' 2016-11-19 16:47:02 +01:00
James Cole
cd6e37b9cb Update composer.lock file. [skip ci] 2016-11-19 16:45:33 +01:00
James Cole
b647386541 New release imminent. [skip ci] 2016-11-19 16:44:17 +01:00
James Cole
174fd88435 Merge pull request #409 from JC5/l10n_develop
New Crowdin translations
2016-11-19 16:43:44 +01:00
James Cole
cc9211b7c2 Translated 2016-11-19 16:40:48 +01:00
James Cole
a9795fb095 Update ignore file [skip ci] 2016-11-19 16:34:52 +01:00
James Cole
8554aae21e Update read me file [skip ci] 2016-11-19 16:31:39 +01:00
James Cole
5a2ef36f2a Fix travis script. 2016-11-19 16:28:04 +01:00
James Cole
01e3f91ece Do not test hhvm. Fix script. 2016-11-19 16:17:04 +01:00
James Cole
7ec9c090cc Fix test script. 2016-11-19 16:13:57 +01:00
James Cole
b057d69f8e Correct travis configuration. 2016-11-19 16:07:02 +01:00
James Cole
ff4e1838bc Update travis configuration. 2016-11-19 16:03:59 +01:00
James Cole
e4ecd0b7ff Empty travis CI file. 2016-11-19 16:01:19 +01:00
James Cole
1ba35f73e1 Fixed a test 2016-11-19 16:00:20 +01:00
James Cole
240f3c126b Restored some tests. 2016-11-19 15:55:49 +01:00
James Cole
23925a0076 Enabled cache [skip ci] 2016-11-19 15:17:00 +01:00
James Cole
50b72cf229 More chart optimisations. 2016-11-19 13:37:44 +01:00
James Cole
ee6b72afa5 Fix some bugs related to cash accounts. 2016-11-19 12:57:35 +01:00
James Cole
781621960d Make sure chart is displayed. 2016-11-19 09:26:32 +01:00
James Cole
e15ea04186 Join two charts, simpler code. 2016-11-19 07:27:54 +01:00
James Cole
73f0cc705b Code cleanup. 2016-11-18 20:06:08 +01:00
James Cole
0c072c7d51 Some code cleanup. 2016-11-18 19:58:06 +01:00
James Cole
884bed85a1 Update composer file. 2016-11-18 19:54:21 +01:00
James Cole
a319264428 fixed #406 2016-11-18 18:58:48 +01:00
James Cole
6506e70a91 Merge pull request #407 from JC5/l10n_develop
New Crowdin translations
2016-11-18 10:03:08 +01:00
James Cole
e6fcb19db7 New translations 2016-11-18 02:01:10 +01:00
James Cole
a3fba53182 Translated 2016-11-18 02:01:03 +01:00
James Cole
f8438dd9d3 New translations 2016-11-18 01:51:04 +01:00
James Cole
028a0dcae1 New translations 2016-11-18 01:41:05 +01:00
James Cole
b4a06b5bbd Translated 2016-11-18 01:41:01 +01:00
James Cole
4fe1a5d527 New translations 2016-11-18 01:30:59 +01:00
James Cole
865930c5b2 New translations 2016-11-18 01:30:58 +01:00
James Cole
96b4e2c196 New translations 2016-11-18 01:20:59 +01:00
James Cole
b7e7c7e9e2 New translations 2016-11-18 01:11:02 +01:00
James Cole
7771669db7 New translations 2016-11-18 01:01:09 +01:00
James Cole
ef59eb6e1f Translated 2016-11-18 01:01:05 +01:00
James Cole
a14b2bc5a7 Translated 2016-11-18 01:01:04 +01:00
James Cole
47349589cb New translations 2016-11-18 00:51:00 +01:00
James Cole
79afe84f30 Merge pull request #405 from JC5/l10n_develop
New Crowdin translations
2016-11-17 20:35:32 +01:00
James Cole
171187b25c New translations 2016-11-17 20:12:21 +01:00
James Cole
7f1b661e61 New translations 2016-11-17 20:12:18 +01:00
James Cole
2c2a3a5475 New translations 2016-11-17 20:12:08 +01:00
James Cole
1677ca9619 New translations 2016-11-17 20:12:00 +01:00
James Cole
204da3e846 New translations 2016-11-17 20:11:55 +01:00
James Cole
f36d423b1e New translations 2016-11-17 20:11:46 +01:00
James Cole
79c7280046 New translations 2016-11-17 20:11:32 +01:00
James Cole
e10fc4a854 Forgotten a translation. 2016-11-17 20:04:53 +01:00
James Cole
5088df103f Finished category report. 2016-11-17 20:02:55 +01:00
James Cole
13b96f6136 New text for translations. 2016-11-16 20:59:32 +01:00
James Cole
757662ca4b Removed duplicate code. 2016-11-16 20:59:21 +01:00
James Cole
4ef324cf24 Optimized chart code. 2016-11-16 20:35:25 +01:00
James Cole
cb02e0ee71 Merge pull request #404 from JC5/l10n_develop
New Crowdin translations
2016-11-16 18:59:17 +01:00
James Cole
ec3a90688e New translations 2016-11-16 15:01:33 +01:00
James Cole
6dcecdcc64 New translations 2016-11-16 06:40:59 +01:00
James Cole
25d917240d Translated 2016-11-16 06:30:58 +01:00
James Cole
0906915a87 New translations 2016-11-16 06:30:57 +01:00
James Cole
9c92a94177 Translated 2016-11-16 06:20:52 +01:00
James Cole
1b125ecd22 New translations 2016-11-16 04:50:52 +01:00
James Cole
25a2bcd76e New translations 2016-11-16 04:20:53 +01:00
James Cole
b2e09f4240 New translations 2016-11-15 23:11:13 +01:00
James Cole
560165850f New translations 2016-11-15 23:01:17 +01:00
James Cole
0bb07e1eeb Small extension of category report. 2016-11-13 20:18:01 +01:00
James Cole
0c0f2109f6 Fix chart size [skip ci] 2016-11-13 11:31:48 +01:00
James Cole
f546670342 Merge pull request #403 from JC5/l10n_develop
New Crowdin translations
2016-11-12 21:58:23 +01:00
James Cole
eecb6c6679 Optimize again for account name [skip ci] 2016-11-12 21:08:14 +01:00
James Cole
750b9d8038 Reduce number of queries. 2016-11-12 21:06:48 +01:00
James Cole
9ce28fdd2e Remove unused route. [skip ci] 2016-11-12 20:54:05 +01:00
James Cole
07af64ada5 New translations 2016-11-12 20:51:40 +01:00
James Cole
a0ab0ec902 New translations 2016-11-12 20:51:33 +01:00
James Cole
752f8582aa New translations 2016-11-12 20:51:27 +01:00
James Cole
4d0eed8c9b New translations 2016-11-12 20:51:23 +01:00
James Cole
0d7a8305f3 New translations 2016-11-12 20:51:17 +01:00
James Cole
2e8c0ec537 Approved. Step name: Proofread 2016-11-12 20:51:12 +01:00
James Cole
3155ec9e2b New translations 2016-11-12 20:51:01 +01:00
James Cole
7bbca7f6a8 Final code check for something with the debug bar [skip ci] 2016-11-12 20:48:29 +01:00
James Cole
f7579db4ad Clean up config [skip ci] 2016-11-12 20:41:15 +01:00
James Cole
2f47c58df5 New string for translation [skip ci] 2016-11-12 20:30:39 +01:00
James Cole
7e7ac264d2 Fixed category chart 2016-11-12 20:29:16 +01:00
James Cole
98d6c90e90 Removed some duplicate code. 2016-11-12 19:22:03 +01:00
James Cole
da49afa37b Removed duplicate code. 2016-11-12 19:12:16 +01:00
James Cole
64364c3e77 Sending of error email message is optional but enabled. 2016-11-12 19:11:59 +01:00
James Cole
b6f0fd1949 Translated 2016-11-12 19:11:04 +01:00
James Cole
0663a18f3a Translated 2016-11-12 19:11:03 +01:00
James Cole
c5928897eb New translations 2016-11-12 19:01:05 +01:00
James Cole
570373e875 Merge pull request #402 from JC5/l10n_develop
New Crowdin translations
2016-11-12 19:00:18 +01:00
James Cole
228afc2eea New translations 2016-11-12 12:31:45 +01:00
James Cole
6b61621d6a New translations 2016-11-12 12:31:42 +01:00
James Cole
424133fa83 New translations 2016-11-12 12:31:35 +01:00
James Cole
02e30c1fcc New translations 2016-11-12 12:31:28 +01:00
James Cole
e17a9d559b New translations 2016-11-12 12:31:25 +01:00
James Cole
36744377f6 New translations 2016-11-12 12:31:07 +01:00
James Cole
7c479f73c0 New translations 2016-11-12 12:31:00 +01:00
James Cole
85b3c4683b Fix redraw bug in category report. 2016-11-12 12:23:55 +01:00
James Cole
c5d2fabfec Optimize some views for category report 2016-11-12 12:12:11 +01:00
James Cole
a294f757ff Fixes all charts in future category report. 2016-11-12 10:14:20 +01:00
James Cole
04515da0bc Fixed the charts 2016-11-12 07:02:32 +01:00
James Cole
6d60d64a82 Some extended code for the category report. 2016-11-12 06:48:38 +01:00
James Cole
32b5a84a0c Fixes #401 2016-11-12 06:34:54 +01:00
James Cole
4b42ef0db8 Fixes #398 2016-11-12 06:27:48 +01:00
James Cole
abc7b9912d Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop
* 'develop' of https://github.com/JC5/firefly-iii:
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
2016-11-11 20:53:07 +01:00
James Cole
727717931a Do something fancy with colours. 2016-11-11 20:52:48 +01:00
James Cole
1d66b16468 Merge pull request #397 from JC5/l10n_develop
New Crowdin translations
2016-11-11 11:26:59 +01:00
James Cole
b918429c43 New translations 2016-11-10 06:30:56 +01:00
James Cole
888273d4a0 New translations 2016-11-10 06:30:54 +01:00
James Cole
31b5d5ba72 New translations 2016-11-10 06:30:47 +01:00
James Cole
b148d0868e New translations 2016-11-10 06:30:39 +01:00
James Cole
c1491383a8 New translations 2016-11-10 06:30:36 +01:00
James Cole
5f07918682 New translations 2016-11-10 06:30:17 +01:00
James Cole
8de6bd7ceb New translations 2016-11-10 06:30:10 +01:00
James Cole
5d4f1bc76d First working example of category report. No content, just place holders. #396 2016-11-10 06:23:21 +01:00
James Cole
8583b574ac Multi year was not visible. 2016-11-09 21:46:32 +01:00
James Cole
3600e1b5e7 Extend report capability for issue #396 and related report issues. 2016-11-09 21:36:54 +01:00
James Cole
fe57648349 Allow report options to be pulled using AJAX. Ajax is cool. 2016-11-09 19:25:09 +01:00
James Cole
f0e0cdb49b New website 2016-11-09 11:04:14 +01:00
James Cole
cf69333c6d This fixes #395 2016-11-08 21:34:13 +01:00
James Cole
3f7e16d270 Merge pull request #394 from JC5/l10n_develop
New Crowdin translations
2016-11-08 20:50:57 +01:00
James Cole
a63f1638f4 Upgrade some libraries for #391 2016-11-08 20:50:05 +01:00
James Cole
8ec2a3a391 New translations 2016-11-08 20:41:15 +01:00
James Cole
d875f0e580 New translations 2016-11-08 20:41:12 +01:00
James Cole
729534b4f3 New translations 2016-11-08 20:41:06 +01:00
James Cole
bd6a56a55e New translations 2016-11-08 20:41:04 +01:00
James Cole
96976db350 New translations 2016-11-08 20:40:58 +01:00
James Cole
8735190461 New translations 2016-11-08 20:40:55 +01:00
James Cole
709a14e5c9 New translations 2016-11-08 20:40:53 +01:00
James Cole
c89d2a52b5 New translations 2016-11-08 20:40:48 +01:00
James Cole
6084d16ea8 New translations 2016-11-08 20:40:45 +01:00
James Cole
1688fdb786 Approved. Step name: Proofread 2016-11-08 20:40:38 +01:00
James Cole
6cfb5ee2e9 Approved. Step name: Proofread 2016-11-08 20:40:33 +01:00
James Cole
2db560ed7d New translations 2016-11-08 20:40:27 +01:00
James Cole
45567cdf65 New translations 2016-11-08 20:40:24 +01:00
James Cole
508ad5157b New translations 2016-11-08 20:40:21 +01:00
James Cole
8fc41e0226 Fixes #390 2016-11-08 20:37:53 +01:00
James Cole
a08dfe1e3c Add interface for journal collector. 2016-11-08 20:36:09 +01:00
James Cole
49cc8a97a3 Clean up code, fixes #392 2016-11-08 20:35:30 +01:00
James Cole
5b8583dd2b Make sure scripts don't crash when no database present. 2016-11-07 20:25:09 +01:00
James Cole
f653bc5f6e Expand firefly config. 2016-11-07 18:49:35 +01:00
James Cole
a6a9794fc7 Merge branch 'release/4.1.6' into develop 2016-11-06 16:18:20 +01:00
James Cole
fdb8f61e37 Merge branch 'release/4.1.6' 2016-11-06 16:18:19 +01:00
James Cole
69422cc796 Code for 4.1.6 2016-11-06 16:17:22 +01:00
James Cole
5f9a9bc89a Change log for 4.1.6 2016-11-06 16:16:05 +01:00
James Cole
4d0d05e0f8 Merge pull request #383 from JC5/l10n_develop
New Crowdin translations
2016-11-06 16:14:05 +01:00
James Cole
0113fedbd4 Translated 2016-11-06 15:10:25 +01:00
James Cole
a7d35cd1c3 Fix multi year report. [skip ci] 2016-11-06 15:09:44 +01:00
James Cole
43600fe6cb Merge pull request #382 from JC5/l10n_develop
New Crowdin translations
2016-11-06 15:09:23 +01:00
James Cole
0b5e25960f Fix small JS bug. 2016-11-06 15:04:35 +01:00
James Cole
0c8a1b51e9 Quick bug fix: missing class. 2016-11-06 15:01:04 +01:00
James Cole
cb49f5e8d8 New translations 2016-11-06 15:01:02 +01:00
James Cole
a0e3088ca3 New translations 2016-11-06 15:00:54 +01:00
James Cole
b86be6f52f New translations 2016-11-06 15:00:47 +01:00
James Cole
4c573e1300 New translations 2016-11-06 15:00:43 +01:00
James Cole
1a3d77f117 New translations 2016-11-06 15:00:36 +01:00
James Cole
2656da13b1 Approved. Step name: Proofread 2016-11-06 15:00:29 +01:00
James Cole
d272ebd95c New translations 2016-11-06 15:00:18 +01:00
James Cole
7612f1f91a Small changes to twig files. 2016-11-06 14:52:48 +01:00
James Cole
22a2fe3f61 Improved search. 2016-11-06 14:52:31 +01:00
James Cole
1ebb59b352 Remove .twig extension. [skip ci] 2016-11-06 08:11:43 +01:00
James Cole
77e2cf40df Removed more getJournals functions in favour of the collector. 2016-11-06 08:08:06 +01:00
James Cole
0edffd8ea1 Lighter icon [skip ci] 2016-11-05 18:57:45 +01:00
James Cole
ee6e047596 Do not order the count query. 2016-11-05 18:55:09 +01:00
James Cole
bd55636b3f Add repository move info. 2016-11-05 18:51:26 +01:00
James Cole
b24e97a449 Update version and change log. 2016-11-05 18:50:13 +01:00
James Cole
d45355fc3f Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop
* 'develop' of https://github.com/JC5/firefly-iii:
  Translated
2016-11-05 18:46:10 +01:00
James Cole
b2206f640a Merge pull request #381 from JC5/l10n_develop
New Crowdin translations
2016-11-05 18:45:42 +01:00
James Cole
962cad33e2 Code cleanup. 2016-11-05 18:43:18 +01:00
James Cole
d65214b75a Translated 2016-11-05 18:40:12 +01:00
James Cole
7b4c151df5 Merge pull request #380 from JC5/l10n_develop
New Crowdin translations
2016-11-05 18:30:52 +01:00
James Cole
28d6f51961 New translations 2016-11-05 18:10:55 +01:00
James Cole
d2f9deb82b New translations 2016-11-05 18:10:48 +01:00
James Cole
d9b05b5f59 New translations 2016-11-05 18:10:42 +01:00
James Cole
a8f4b33c57 New translations 2016-11-05 18:10:39 +01:00
James Cole
ee849ea12f New translations 2016-11-05 18:10:32 +01:00
James Cole
f9d3cf231f Approved. Step name: Proofread 2016-11-05 18:10:27 +01:00
James Cole
0713ca7709 New translations 2016-11-05 18:10:17 +01:00
James Cole
1e2124c5ed Moved more stuff to the journal collector. 2016-11-05 18:08:44 +01:00
James Cole
37435da459 Moved more stuff to the journal collector. 2016-11-05 17:47:50 +01:00
James Cole
05dbd30bbd Rename another collector. 2016-11-05 17:17:56 +01:00
James Cole
4b947638a7 Merge pull request #379 from JC5/l10n_develop
New Crowdin translations
2016-11-05 15:16:25 +01:00
James Cole
3d113b9aae New translations 2016-11-05 14:30:14 +01:00
James Cole
d1b3681bf3 New translations 2016-11-05 14:20:16 +01:00
James Cole
9dd4b07314 New translations 2016-11-05 14:20:15 +01:00
James Cole
3814f0f3c3 New translations 2016-11-05 14:20:13 +01:00
James Cole
b1e907fae9 New translations 2016-11-05 14:10:15 +01:00
James Cole
5c03a1a9c8 New translations 2016-11-05 14:10:14 +01:00
James Cole
20ac07a386 Translated 2016-11-05 14:10:11 +01:00
James Cole
13e1292bb7 Automated code cleanup [skip ci] 2016-11-05 11:47:21 +01:00
James Cole
8e542531b3 Move collecting journals to the collector. 2016-11-05 11:44:41 +01:00
James Cole
43afdb021a Move collecting journals to the collector. 2016-11-05 11:24:15 +01:00
James Cole
aeca2ef3b2 Move some code around 2016-11-05 10:42:31 +01:00
James Cole
205a593721 Removed unused method. 2016-11-05 10:28:10 +01:00
James Cole
46649fe228 Solved group thing. 2016-11-05 10:26:57 +01:00
James Cole
adb97fcb05 Fix small javascript bug. 2016-11-05 08:47:05 +01:00
James Cole
98160e9b63 Expand use of journal collector. 2016-11-05 08:46:55 +01:00
James Cole
9c5d192d90 Journal collector may not have been a bad idea after all! 2016-11-05 08:27:25 +01:00
James Cole
47bebb614e Only withdrawal can have a budget. 2016-11-05 07:43:23 +01:00
James Cole
5f7fb77db2 Code to fix #378 2016-11-04 16:04:36 +01:00
James Cole
1d15bc0b10 I am changing some string concatenations to sprintf() routines because they are more readable and safer. [skip ci] 2016-11-03 21:54:07 +01:00
James Cole
7bc4c6d115 Update change log [skip ci] 2016-11-03 21:49:08 +01:00
James Cole
45973a53f5 Merge pull request #376 from JC5/l10n_develop
New Crowdin translations
2016-11-03 21:45:55 +01:00
James Cole
8e5e3de8b0 Update change log (prematurely). [skip ci] 2016-11-03 21:45:35 +01:00
James Cole
8738cd4b04 Approved. Step name: Proofread 2016-11-03 21:40:29 +01:00
James Cole
24a7dac235 Approved. Step name: Proofread 2016-11-03 21:40:28 +01:00
James Cole
a3088f6806 Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop
* 'develop' of https://github.com/JC5/firefly-iii:
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  Approved. Step name: Proofread
  Approved. Step name: Proofread
  New translations
  New translations
  New translations
  Translated
2016-11-03 21:07:48 +01:00
James Cole
72f7b5f3ea This fixes #375 2016-11-03 21:07:12 +01:00
James Cole
a636c508a2 Merge pull request #374 from JC5/l10n_develop
New Crowdin translations
2016-11-03 16:42:52 +01:00
James Cole
599db95f73 New translations 2016-11-02 22:31:16 +01:00
James Cole
f5f78ab79b New translations 2016-11-02 22:31:15 +01:00
James Cole
9af9383c29 New translations 2016-11-02 22:31:08 +01:00
James Cole
4b97b86c09 New translations 2016-11-02 22:31:07 +01:00
James Cole
11fb46830c New translations 2016-11-02 22:31:00 +01:00
James Cole
e8dec6d95c New translations 2016-11-02 22:31:00 +01:00
James Cole
bb4ee7470d New translations 2016-11-02 22:30:57 +01:00
James Cole
2e8071db9e New translations 2016-11-02 22:30:54 +01:00
James Cole
4d2901aa02 New translations 2016-11-02 22:30:50 +01:00
James Cole
37bbfab20a Approved. Step name: Proofread 2016-11-02 22:30:46 +01:00
James Cole
fb9161b82d Approved. Step name: Proofread 2016-11-02 22:30:43 +01:00
James Cole
000c9d8974 New translations 2016-11-02 22:30:36 +01:00
James Cole
878b664930 New translations 2016-11-02 22:30:33 +01:00
James Cole
afe28b5581 New translations 2016-11-02 22:30:33 +01:00
James Cole
4106b2e4c0 Remove some help entries in favour of help pages in the top right corner. 2016-11-02 22:23:40 +01:00
James Cole
e1be4909b9 Redirect when 0 accounts.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-11-02 21:24:16 +01:00
James Cole
7a0347c0c2 Translated 2016-11-02 21:00:38 +01:00
James Cole
a7e0e3fc15 Small additions and bug fixes.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-11-02 20:52:40 +01:00
James Cole
5e480eca36 Clean up some report code.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-11-02 20:45:11 +01:00
James Cole
6c8d594df7 Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop
* 'develop' of https://github.com/JC5/firefly-iii:
  New translations
  New translations
  New translations
  New translations
  Approved. Step name: Proofread
  New translations
  New translations

Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-11-02 20:08:38 +01:00
James Cole
e24f5ec9f3 Multi year report move to AJAX.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-11-02 20:08:11 +01:00
James Cole
1379c0652e Merge pull request #373 from JC5/l10n_develop
New Crowdin translations
2016-11-02 19:50:10 +01:00
James Cole
1f87b0bd2d New translations 2016-11-02 14:41:56 +01:00
James Cole
787a437ca4 New translations 2016-11-02 14:41:44 +01:00
James Cole
c0bdb35cb3 New translations 2016-11-02 14:41:34 +01:00
James Cole
4b9cf67413 New translations 2016-11-02 14:41:26 +01:00
James Cole
86ff3be741 Approved. Step name: Proofread 2016-11-02 14:41:09 +01:00
James Cole
8bc8e8d9fe New translations 2016-11-02 14:40:59 +01:00
James Cole
227a12d75d New translations 2016-11-02 14:40:54 +01:00
James Cole
2ddd4314f1 Extend help pages. 2016-11-02 14:33:57 +01:00
James Cole
b980b5baea Small optimisations.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-11-02 07:23:11 +01:00
James Cole
4ba34ab511 Show sum [skip ci]
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-11-02 07:16:46 +01:00
James Cole
5be317d73c sprintf ALL THE THINGS
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-11-02 07:04:14 +01:00
James Cole
af16205965 Merge branch 'master' into develop
* master:
  New budget table for multi year report.
  Removed everything pointless from multi year report.

Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-11-02 07:03:17 +01:00
James Cole
39917b77c1 New GitHub move repository instructions
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-11-02 07:02:22 +01:00
James Cole
124ecb1372 New budget table for multi year report.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-11-02 04:55:44 +01:00
James Cole
33c0c1bea6 Removed everything pointless from multi year report.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-11-01 19:06:35 +01:00
James Cole
a66990459e Merge branch 'release/4.1.5' 2016-11-01 18:45:25 +01:00
James Cole
fecbdc7fbf New version.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-11-01 18:44:26 +01:00
James Cole
0369ace5f7 Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop
* 'develop' of https://github.com/JC5/firefly-iii: (28 commits)
  Approved. Step name: Proofread
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  ...
2016-11-01 18:41:15 +01:00
James Cole
1657048181 Fixed bug #370 2016-11-01 18:40:35 +01:00
James Cole
b9bdaa7a56 Merge pull request #369 from JC5/l10n_develop
New Crowdin translations
2016-11-01 11:43:00 +01:00
James Cole
f28d07e17b Approved. Step name: Proofread 2016-11-01 11:40:36 +01:00
James Cole
8b8bf1debc New translations 2016-10-31 18:41:44 +01:00
James Cole
aff1c1e3ef New translations 2016-10-31 18:41:40 +01:00
James Cole
169bb2c9bb New translations 2016-10-31 18:41:29 +01:00
James Cole
fb1eafef43 New translations 2016-10-31 18:41:26 +01:00
James Cole
bfe26ceb39 New translations 2016-10-31 18:41:25 +01:00
James Cole
050f305e80 New translations 2016-10-31 18:41:24 +01:00
James Cole
63a6a4f823 New translations 2016-10-31 18:41:23 +01:00
James Cole
a3b167cab5 New translations 2016-10-31 18:41:23 +01:00
James Cole
48327948e2 New translations 2016-10-31 18:41:22 +01:00
James Cole
93856d4577 New translations 2016-10-31 18:41:21 +01:00
James Cole
7ff068aa95 New translations 2016-10-31 18:41:20 +01:00
James Cole
b2f00c869e New translations 2016-10-31 18:41:18 +01:00
James Cole
b717cab8f6 New translations 2016-10-31 18:41:17 +01:00
James Cole
adaff52707 New translations 2016-10-31 18:41:16 +01:00
James Cole
54050edcc6 New translations 2016-10-31 18:41:16 +01:00
James Cole
9acbb69a6a New translations 2016-10-31 18:41:15 +01:00
James Cole
a5e6de047a New translations 2016-10-31 18:41:14 +01:00
James Cole
3d8d35207b New translations 2016-10-31 18:41:13 +01:00
James Cole
0a95f59813 New translations 2016-10-31 18:41:10 +01:00
James Cole
43a3d28dbd New translations 2016-10-31 18:41:09 +01:00
James Cole
685cb7a505 Translated 2016-10-31 18:41:06 +01:00
James Cole
dd82466d07 Translated 2016-10-31 18:41:05 +01:00
James Cole
2cbe4a013e Translated 2016-10-31 18:41:04 +01:00
James Cole
fb85341844 Translated 2016-10-31 18:41:03 +01:00
James Cole
116b3ecdad Approved. Step name: Proofread 2016-10-31 18:40:58 +01:00
James Cole
af85fbf0a3 New translations 2016-10-31 18:40:50 +01:00
James Cole
1d250593c0 New translations 2016-10-31 18:40:45 +01:00
James Cole
ed33a054ad This update will make the help method fall back to the English content, if it is available. 2016-10-31 18:31:52 +01:00
James Cole
4e3e015912 Fix multi year account report [skip ci] 2016-10-30 20:13:49 +01:00
James Cole
7821c52842 Ajax some report parts. 2016-10-30 18:29:26 +01:00
James Cole
0a6f299ae6 Merge branch 'release/4.1.4' 2016-10-30 08:56:35 +01:00
James Cole
73f87e30c2 Changelog.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-10-30 08:52:09 +01:00
James Cole
838ece2c89 Merge pull request #368 from JC5/l10n_develop
New Crowdin translations
2016-10-30 07:32:23 +01:00
James Cole
d8b88ea2c0 New translations 2016-10-30 07:20:17 +01:00
James Cole
5908951b75 New translations 2016-10-30 07:20:17 +01:00
James Cole
0b41f4c4d2 New translations 2016-10-30 07:20:16 +01:00
James Cole
35439d4fbc New translations 2016-10-30 07:20:16 +01:00
James Cole
fdce40310f New translations 2016-10-30 07:20:15 +01:00
James Cole
6b4785ae32 New translations 2016-10-30 07:20:15 +01:00
James Cole
f74e8e9cb7 New translations 2016-10-30 07:20:13 +01:00
James Cole
5a4eb7e09e New translations 2016-10-30 07:20:12 +01:00
James Cole
3bc4df03cc New translations 2016-10-30 07:20:11 +01:00
James Cole
5d585132fb New translations 2016-10-30 07:20:11 +01:00
James Cole
eff4905883 New translations 2016-10-30 07:20:10 +01:00
James Cole
8923ac4fe3 New translations 2016-10-30 07:20:09 +01:00
James Cole
073535e5ed New translations 2016-10-30 07:20:09 +01:00
James Cole
d304b90ca6 New translations 2016-10-30 07:20:08 +01:00
James Cole
816c26e14e New translations 2016-10-30 07:20:07 +01:00
James Cole
b1244ffa01 New translations 2016-10-30 07:20:07 +01:00
James Cole
fc1342bff9 New translations 2016-10-30 07:20:06 +01:00
James Cole
d7b95194b5 New translations 2016-10-30 07:20:04 +01:00
James Cole
b58bdeccd2 New translations 2016-10-30 07:20:04 +01:00
James Cole
f260b9bdee New translations 2016-10-30 07:20:02 +01:00
James Cole
fb1bdc9ec5 New translations 2016-10-30 07:20:01 +01:00
James Cole
697eff48fc New translations 2016-10-30 07:20:00 +01:00
James Cole
c05019339a Approved. Step name: Proofread 2016-10-30 07:20:00 +01:00
James Cole
8438efaf41 Approved. Step name: Proofread 2016-10-30 07:19:59 +01:00
James Cole
81c019cc99 Translated 2016-10-30 07:19:59 +01:00
James Cole
c773fdc435 Approved. Step name: Proofread 2016-10-30 07:19:58 +01:00
James Cole
c1406f51f1 Approved. Step name: Proofread 2016-10-30 07:19:58 +01:00
James Cole
92affd3440 Approved. Step name: Proofread 2016-10-30 07:19:57 +01:00
James Cole
d3da0652ef Approved. Step name: Proofread 2016-10-30 07:19:57 +01:00
James Cole
e3fbbd6cf1 Translated 2016-10-30 07:19:56 +01:00
James Cole
fcff13470c Approved. Step name: Proofread 2016-10-30 07:19:56 +01:00
James Cole
e3061ee7e7 Approved. Step name: Proofread 2016-10-30 07:19:55 +01:00
James Cole
0ee305fc4a Approved. Step name: Proofread 2016-10-30 07:19:55 +01:00
James Cole
58b93fd0c4 Approved. Step name: Proofread 2016-10-30 07:19:53 +01:00
James Cole
b30217fa2d Approved. Step name: Proofread 2016-10-30 07:19:52 +01:00
James Cole
ae48eec3a2 Translated 2016-10-30 07:19:52 +01:00
James Cole
948233ba27 Translated 2016-10-30 07:19:52 +01:00
James Cole
c2db9b183a New translations 2016-10-30 07:19:51 +01:00
James Cole
6d2b88fa0b New translations 2016-10-30 07:19:51 +01:00
James Cole
1d5da825c5 New translations 2016-10-30 07:19:50 +01:00
James Cole
330c9b53d6 New translations 2016-10-30 07:19:50 +01:00
James Cole
751fe7d4fb New translations 2016-10-30 07:19:49 +01:00
James Cole
9df1fc6e5d New translations 2016-10-30 07:19:48 +01:00
James Cole
8d660f1701 New translations 2016-10-30 07:19:46 +01:00
James Cole
4d61d3c4aa New translations 2016-10-30 07:19:46 +01:00
James Cole
0457088c99 New translations 2016-10-30 07:19:45 +01:00
James Cole
8e575da74e New translations 2016-10-30 07:19:45 +01:00
James Cole
48ed28888e Translated 2016-10-30 07:19:43 +01:00
James Cole
4084b1124e Translated 2016-10-30 07:19:42 +01:00
James Cole
60ba607027 Translated 2016-10-30 07:19:42 +01:00
James Cole
3df2c11b4a Translated 2016-10-30 07:19:41 +01:00
James Cole
c93221923a Translated 2016-10-30 07:19:41 +01:00
James Cole
375317e932 New translations 2016-10-30 07:19:40 +01:00
James Cole
7ce527957a New translations 2016-10-30 07:19:40 +01:00
James Cole
6946521199 New translations 2016-10-30 07:19:39 +01:00
James Cole
18ee20e680 Update crowdin file [skip ci]
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-10-30 06:37:00 +01:00
James Cole
c53da15219 Update composer.lock in anticipation of new release.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-10-30 06:20:18 +01:00
James Cole
d4995e342f Fixed #330 2016-10-30 06:14:07 +01:00
James Cole
c9f14da294 Translations. 2016-10-29 17:30:55 +02:00
James Cole
e9c2446cba Debug log for #366 2016-10-29 16:16:10 +02:00
James Cole
35f179625c New queries for #366 2016-10-29 16:11:54 +02:00
James Cole
39749aa113 First code set for #330 2016-10-29 15:14:33 +02:00
James Cole
ba65e982fd Forgot to include model [skip ci] 2016-10-29 11:42:04 +02:00
James Cole
b50e5d7e59 Can also change destination in new rule. 2016-10-29 09:22:51 +02:00
James Cole
a3148dc172 Code for #321 2016-10-29 09:03:14 +02:00
James Cole
73f1491d2d Updates for translations. 2016-10-29 07:44:46 +02:00
James Cole
28eb54dc96 Initial split for report options. 2016-10-28 19:01:52 +02:00
James Cole
21fb426524 Make sure date is localised. 2016-10-28 18:16:30 +02:00
James Cole
d5710ca809 Update Crowdin configuration file 2016-10-28 14:06:41 +02:00
James Cole
0ba6cdda17 Merge pull request #364 from schoentoon/develop
Added dockerfile
2016-10-27 19:40:27 +02:00
James Cole
afdcfa8525 Tweak reports. 2016-10-26 19:45:10 +02:00
James Cole
5db4f8512b Tweak reports. 2016-10-26 19:37:19 +02:00
James Cole
dc0c1b73bc Better view for expenses. 2016-10-26 19:32:19 +02:00
James Cole
f999257095 New verify database routine. 2016-10-26 19:32:07 +02:00
James Cole
7182909e28 Keep the box [skip ci] 2016-10-26 16:54:52 +02:00
James Cole
fe3f015171 Add more stuff to ajax controllers, making report controller simpler. 2016-10-26 16:46:43 +02:00
Toon Schoenmakers
5bb668be63 Added dockerfile 2016-10-26 15:07:36 +02:00
James Cole
01de147900 Display message about common error. 2016-10-26 06:41:50 +02:00
James Cole
a7e5fcc806 Move some stuff over to AJAX thing. 2016-10-25 18:53:54 +02:00
James Cole
e2d187d74b Various small bug fixes. 2016-10-24 18:01:15 +02:00
James Cole
48b0620629 New help thing. 2016-10-23 17:33:53 +02:00
James Cole
19e9f382e4 Add some rounding to make forms more neat. 2016-10-23 16:56:18 +02:00
James Cole
446eaf6588 Some code cleanup [skip ci] 2016-10-23 14:58:39 +02:00
James Cole
78deb1420d Some fixes for bills. 2016-10-23 14:56:05 +02:00
James Cole
e092515dff Better export. 2016-10-23 12:55:07 +02:00
James Cole
81f6fef978 Add new line to files [skip ci] 2016-10-23 12:42:44 +02:00
James Cole
6a2f8fa9ee No use models directly. 2016-10-23 12:41:54 +02:00
James Cole
a79a8c8874 Various small upgrades. 2016-10-23 12:37:12 +02:00
James Cole
c39659b064 Remove a lot of references to user id. 2016-10-23 12:19:32 +02:00
James Cole
9a30fbd05a Move stuff to request classes for #339 2016-10-23 12:10:22 +02:00
James Cole
83f48418f6 Small updates [skip ci] 2016-10-23 09:57:04 +02:00
James Cole
bcd7b41c91 Simplified export. 2016-10-23 09:44:14 +02:00
James Cole
cefb7d12bc Merge branch 'release/4.1.3' 2016-10-22 22:45:27 +02:00
James Cole
3c0c15103e This fixes #361 2016-10-22 22:44:57 +02:00
James Cole
a8a8afc2be More for #339 2016-10-22 22:03:00 +02:00
James Cole
49e32abd3f Move some code for #339 2016-10-22 21:40:31 +02:00
James Cole
7977eefaca Merge branch 'release/4.1.2' 2016-10-22 20:52:54 +02:00
James Cole
f1fa6c3108 Fixed a bug in the store transaction routine. 2016-10-22 20:50:20 +02:00
James Cole
2fa0d55f39 Merge branch 'release/4.1.1' 2016-10-22 12:03:34 +02:00
James Cole
5bff509346 New translations.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-10-22 12:03:11 +02:00
James Cole
a147e9b74a Fix edit screen.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-10-22 11:53:34 +02:00
James Cole
0d87f7c4ca Better implementation of markdown.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-10-22 11:50:33 +02:00
James Cole
8c675615df Support markdown in notes.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-10-22 11:47:47 +02:00
James Cole
7edd1bff40 Merge branch 'release/4.1.0' 2016-10-22 10:21:15 +02:00
James Cole
3bfcb1f3ab New change log. [skip ci]
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-10-22 10:20:25 +02:00
James Cole
7b6c63e6a8 New version number [skip ci]
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-10-22 10:15:50 +02:00
James Cole
5500e5b0aa Remove debug classes 2016-10-22 10:13:56 +02:00
James Cole
e4d249e73c Piggy bank supports notes (#350) 2016-10-22 10:13:49 +02:00
James Cole
091f6e918b Fix some reported issues. 2016-10-22 09:44:47 +02:00
James Cole
5d9b68c3e7 Various code cleanup [skip ci] 2016-10-22 09:39:31 +02:00
James Cole
12a6a61100 Various code cleanup [skip ci] 2016-10-22 09:33:03 +02:00
James Cole
7ce3b8d4ef Updated events, fixes #345 2016-10-22 09:31:27 +02:00
James Cole
3d9b855849 Force larval 5.3.18 2016-10-22 07:52:17 +02:00
James Cole
2346d2ec05 Fine tuning split edit screens. 2016-10-22 07:28:31 +02:00
James Cole
a4c081c8a5 Fix unset variable. [skip ci] 2016-10-21 22:01:42 +02:00
James Cole
316980efbd Fix unset variable. [skip ci] 2016-10-21 22:00:45 +02:00
James Cole
a05bc0eed0 Fix route [skip ci] 2016-10-21 21:57:10 +02:00
James Cole
4d1c271da6 Renamed a route [skip ci] 2016-10-21 21:54:57 +02:00
James Cole
0dd7ecbfbe Remove code no longer used. 2016-10-21 21:43:12 +02:00
James Cole
0dc188b083 Removed old code 2016-10-21 21:41:50 +02:00
James Cole
6a553f77f3 Large update to fix split journals. 2016-10-21 21:41:31 +02:00
James Cole
a74cef439b For simplicity, split controller. 2016-10-21 19:20:03 +02:00
James Cole
9a3cd27700 Many updates to get split transactions and normal transactions working side by side. 2016-10-21 19:06:22 +02:00
James Cole
801c7c0ab6 Remove unused function. 2016-10-21 13:22:45 +02:00
James Cole
a95a4e783a Fix and simplify bill repos 2016-10-21 13:20:51 +02:00
James Cole
af1ee9db93 This fixes bills unpaid. 2016-10-21 07:29:25 +02:00
James Cole
fcdb6fd2a7 Do loop instead of while loop [skip ci] 2016-10-21 06:41:33 +02:00
James Cole
97c0fb389d More logs [skip ci] 2016-10-21 06:38:00 +02:00
James Cole
a9c3992331 Back to old method [skip ci] 2016-10-21 06:33:56 +02:00
James Cole
a38e057fa7 Rewrote some methods to fix #341 2016-10-21 06:26:12 +02:00
James Cole
f83aaf77f1 Improve bill things for issue #341 2016-10-20 21:40:45 +02:00
James Cole
d92768ecbf This code fixes #349 2016-10-20 19:10:43 +02:00
James Cole
b9308cd74a Test flash messages. 2016-10-20 16:51:05 +02:00
James Cole
78b577bc9d Better ip info [skip ci] 2016-10-18 06:50:35 +02:00
James Cole
7d247897ed Should correctly show user info. [skip ci] 2016-10-18 06:47:48 +02:00
James Cole
5dcbdec491 Update composer file and update routine. [skip ci] 2016-10-15 18:52:21 +02:00
James Cole
9bf980431e Remove unused methods. 2016-10-15 14:07:51 +02:00
James Cole
da60bfbcff Better text [skip ci] 2016-10-15 14:05:56 +02:00
James Cole
92553cbc7e Add icon, missing translation [skip ci] 2016-10-15 12:41:45 +02:00
James Cole
8e48e53f17 Restucturing some code. 2016-10-15 12:39:34 +02:00
James Cole
2f9a4bb79a Better text 2016-10-15 12:39:11 +02:00
James Cole
ac968dd6cd Extended the user admin. 2016-10-15 07:11:53 +02:00
James Cole
6e4f2c0c8a Small script to upgrade transactions. 2016-10-15 06:19:21 +02:00
James Cole
d662c18ed7 Fix sorting in chart. [skip ci] 2016-10-14 20:07:15 +02:00
James Cole
e4ea234707 New revenue accounts chart. 2016-10-14 20:01:17 +02:00
James Cole
0b526c0168 New revenue chart 2016-10-14 19:59:10 +02:00
James Cole
2acde5c72a Option to show deposit accounts on the front page. 2016-10-14 19:52:30 +02:00
James Cole
ec8cf2c459 New preferences screen. 2016-10-14 19:48:19 +02:00
James Cole
3598780d54 This should at least catch #357 2016-10-14 19:18:00 +02:00
James Cole
35dd8ac6e6 Revert "This should at least catch #357"
This reverts commit 5ff7c7ffab.
2016-10-14 19:16:39 +02:00
James Cole
5ff7c7ffab This should at least catch #357 2016-10-14 19:16:28 +02:00
James Cole
399db47826 Merge branch 'release/4.0.2' 2016-10-14 17:15:47 +02:00
James Cole
148956a60d Some code reformatting. 2016-10-14 17:14:54 +02:00
James Cole
3670053a58 Some code reformatting [skip ci] 2016-10-14 17:14:28 +02:00
James Cole
e8e2b9704f New translations. 2016-10-14 17:14:04 +02:00
James Cole
fcdeebcc06 Some last minute updated texts. 2016-10-14 16:51:38 +02:00
James Cole
586ed82e88 New changelog. 2016-10-14 16:26:05 +02:00
James Cole
cc400d1e2e Merge pull request #356 from telyn/require-intl
Require PHP intl extension
2016-10-12 10:32:28 +02:00
Telyn
6edbfb27aa Add ext-intl to dependencies 2016-10-12 09:22:21 +01:00
James Cole
8fc9251b93 Fix name of language. [skip ci] 2016-10-10 19:08:09 +02:00
James Cole
10af888a97 Expand view [skip ci] 2016-10-10 13:27:35 +02:00
James Cole
89f2328846 Forgot include [skip ci] 2016-10-10 13:25:27 +02:00
James Cole
48e8cd20b4 Removed unused Twig methods. 2016-10-10 13:08:02 +02:00
James Cole
394ef23eda New local names [skip ci] 2016-10-10 08:27:08 +02:00
James Cole
62aa1eb487 Updated translations [skip ci] 2016-10-10 08:19:00 +02:00
James Cole
1500018ccc A new language arrives! [skip ci] 2016-10-10 08:13:27 +02:00
James Cole
23fad62d46 Completely removed account crud class. 2016-10-10 08:03:03 +02:00
James Cole
3cbf00734f Remove storeMeta 2016-10-10 07:53:25 +02:00
James Cole
1dc17dd59d Move getActiveAccountsByType 2016-10-10 07:53:12 +02:00
James Cole
f8935c92ea Unrelated code cleanup. 2016-10-10 07:49:55 +02:00
James Cole
de6f838413 Moved getAccountsByType 2016-10-10 07:49:39 +02:00
James Cole
e8a095e543 Moved getAccountsById 2016-10-10 07:25:27 +02:00
James Cole
717c1d080e Copied (not yet removed) findByName 2016-10-10 07:20:49 +02:00
James Cole
0ae9afd325 Move findByIban 2016-10-10 07:16:05 +02:00
James Cole
d1b56c2afa Moved findByAccountNumber 2016-10-10 07:14:01 +02:00
James Cole
8ef7c5ac33 Moved find() method to new class. 2016-10-10 07:12:39 +02:00
James Cole
7180a40cd8 Refactored some methods surrounding the opening balance of an account. 2016-10-10 07:01:14 +02:00
James Cole
71804af624 Updated some model code. 2016-10-10 06:50:24 +02:00
James Cole
85dc7f3643 Moved another method. 2016-10-10 06:49:50 +02:00
James Cole
a866d13b75 Forgot to add argument 2016-10-10 06:49:39 +02:00
James Cole
fcb5e4eabc Moved leftOnAccount() 2016-10-10 06:47:42 +02:00
James Cole
ade1cf9c19 Fixed wrong listing. 2016-10-10 06:40:50 +02:00
James Cole
0f1ec7d003 Removed double method. 2016-10-09 21:49:31 +02:00
James Cole
7e038afece Must be unsigned 2016-10-09 21:36:22 +02:00
James Cole
9bb8e182fa Forgot a translation 2016-10-09 21:36:15 +02:00
James Cole
e94ae126fd Refactored accountRepository::getJournals > accountTasker > getJournals 2016-10-09 21:36:03 +02:00
James Cole
5bb8c6a366 This should fix #355 2016-10-09 20:18:46 +02:00
James Cole
30844df5d4 Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop
* 'develop' of https://github.com/JC5/firefly-iii:
  Fixed issue causing all imported transactions to have unknown opposing account with ABN AMRO specific
2016-10-09 20:18:14 +02:00
James Cole
63e4a410a7 Merge pull request #354 from roberthorlings/bugfix/abn-amro-specific
Bugfix for issue with ABN AMRO specific
2016-10-09 20:00:48 +02:00
Robert Horlings
ee9a5d91e2 Merge branch 'develop' into bugfix/abn-amro-specific 2016-10-09 19:53:11 +02:00
Robert Horlings
171ab8a4c3 Fixed issue causing all imported transactions to have unknown opposing account with ABN AMRO specific 2016-10-09 17:19:00 +02:00
James Cole
96740aaac4 Extend transaction model for #351 2016-10-09 17:06:52 +02:00
James Cole
2017720096 Experimental new getJournals method. 2016-10-09 16:22:08 +02:00
James Cole
b77ea6d316 Add some phpdoc 2016-10-09 11:21:41 +02:00
James Cole
f5adb4047f Remove methods no longer used. 2016-10-09 10:59:28 +02:00
James Cole
b082858866 Removed unused blocks from the front page. Savings and piggy banks. 2016-10-09 10:58:54 +02:00
James Cole
a8a014189d Removed method that was already there under another name. 2016-10-09 10:57:06 +02:00
James Cole
39ea9e85a7 Various code cleanup and refactoring. Restored cache. 2016-10-09 10:53:37 +02:00
James Cole
a4d2ed74fc Make sure all journals are included. 2016-10-09 09:41:03 +02:00
James Cole
90f2e27f1f Refactoring income and expense reports. 2016-10-09 09:32:12 +02:00
James Cole
a3359ba47a Moved destroy() method from CRUD to Account repos. 2016-10-09 08:20:29 +02:00
James Cole
1d2d3523d6 Move CRUD method count() to account repository 2016-10-09 08:18:47 +02:00
James Cole
3f40751a1a Forgot to exclude a method. 2016-10-09 08:06:49 +02:00
James Cole
b5b55e862c Clean up code. 2016-10-09 07:59:14 +02:00
James Cole
c64771b76b Move some methods around, refactoring. 2016-10-09 07:58:27 +02:00
James Cole
ea7ee7ee9a Moved a report out of the controller. 2016-10-08 16:24:07 +02:00
James Cole
a1f797c4d1 Moved a method around. 2016-10-08 16:04:05 +02:00
James Cole
d0c92a2244 Clean up account report helper. 2016-10-08 15:59:58 +02:00
James Cole
6e90c033b1 Start of some remodelling. 2016-10-08 14:54:32 +02:00
James Cole
24f62b8fce Some minor refactoring. 2016-10-08 10:02:33 +02:00
James Cole
d43936155c Removed some unused code. 2016-10-07 16:33:17 +02:00
James Cole
39dab4fdd9 Remove unused class. 2016-10-07 12:28:14 +02:00
James Cole
c0fdf44ad2 Small cleaning up. 2016-10-07 11:40:03 +02:00
James Cole
4d91f7d23a This fixes #344 2016-10-07 09:40:50 +02:00
James Cole
49af6522a8 Some code cleanup. 2016-10-07 05:44:21 +02:00
James Cole
3c5f9487a8 Prep change log for next version [skip ci] 2016-10-07 05:43:47 +02:00
James Cole
f5cb87f5c3 Merge pull request #348 from SanderKleykens/feature/postgres-compatibility
PostgreSQL compatibility
2016-10-07 05:32:10 +02:00
Sander Kleykens
cf543613c9 Fix the CSV importer failing when using PostgreSQL
Add ordered column to the list of columns that are selected so PostgreSQL doesn't throw an error
2016-10-06 23:49:33 +02:00
Sander Kleykens
5c239c91db Convert raw XORs to a construct compatible with Laravel's query builder 2016-10-06 22:27:10 +02:00
James Cole
9920504232 Fixes #346 2016-10-06 05:26:38 +02:00
James Cole
5540697dbd Removed a method no longer necessary. 2016-10-05 16:09:37 +02:00
James Cole
b355c18e0c Some code cleanup and copyright cleanup. [skip ci] 2016-10-05 06:52:15 +02:00
James Cole
1e90485c5f Merge branch 'master' into develop
* master:
  added some comments
  removed some debug commands
  Better descriptions for ING accounts
2016-10-05 06:31:47 +02:00
James Cole
dc784c53b5 Fix for #343 2016-10-04 21:51:46 +02:00
James Cole
5a47391a64 Merge branch 'release/4.0.1' 2016-10-04 20:13:50 +02:00
James Cole
8a106bd16a Merge branch 'release/4.0.1' into develop 2016-10-04 20:13:50 +02:00
James Cole
a31ac79173 New version. 2016-10-04 20:13:40 +02:00
James Cole
0d0a604254 Changelog for 4.0.1 [skip ci] 2016-10-04 20:13:09 +02:00
James Cole
724d25f2c2 Merge branch 'develop'
* develop:
  Fixed some rare bugs.
  Extra clear button to reapply rules #307
  Fix trim when null [skip ci]
  Fixed a bug where incoming transactions would not be properly filtered in several reports.
  Removed for #334
  Fix #337 [skip ci]
  Fix #335
  Remove account extra text #336 [skip ci]
  Fixes bug #338
  Refer to correct page [skip ci]
  Catch unset row.
2016-10-04 20:08:35 +02:00
James Cole
8ed22d452d Merge pull request #342 from tomwerf/master
ING Import
2016-10-04 20:02:34 +02:00
Tom van der Werf
d7fef45a56 added some comments 2016-10-04 17:50:01 +00:00
Tom van der Werf
dc22802dec removed some debug commands 2016-10-04 17:30:49 +00:00
Tom van der Werf
ce5af7b1d9 Better descriptions for ING accounts 2016-10-03 17:08:24 +00:00
James Cole
0a147e5c9c Fixed some rare bugs. 2016-10-02 15:09:43 +02:00
James Cole
7d21255f7f Extra clear button to reapply rules #307 2016-10-02 08:14:11 +02:00
James Cole
13f952f182 Fix trim when null [skip ci] 2016-10-01 09:41:16 +02:00
James Cole
b494be228b Fixed a bug where incoming transactions would not be properly filtered in several reports. 2016-10-01 09:37:18 +02:00
James Cole
0fdaac53d0 Removed for #334 2016-10-01 08:49:33 +02:00
James Cole
e1b3a08878 Fix #337 [skip ci] 2016-10-01 08:49:02 +02:00
James Cole
dc893588b0 Fix #335 2016-10-01 08:48:13 +02:00
James Cole
b9fcc443ec Remove account extra text #336 [skip ci] 2016-10-01 08:45:14 +02:00
James Cole
d8586c8043 Fixes bug #338 2016-09-29 19:17:24 +02:00
James Cole
4252a3e53b Refer to correct page [skip ci] 2016-09-29 07:04:58 +02:00
James Cole
dbb5cdb9cf Catch unset row. 2016-09-29 07:02:47 +02:00
James Cole
9bdfecbfdc Merge branch 'release/4.0.0' 2016-09-26 18:37:33 +02:00
James Cole
3ec8a8c375 Merge branch 'release/4.0.0' into develop 2016-09-26 18:37:33 +02:00
James Cole
f85e4a24e5 New license information. 2016-09-26 18:37:20 +02:00
James Cole
0dda87c78e New license. 2016-09-26 18:34:31 +02:00
James Cole
2fc09ff9d7 Fix empty pop-ups in report. 2016-09-25 14:47:55 +02:00
James Cole
e4e0e21293 Smaller method. 2016-09-25 08:59:27 +02:00
James Cole
15089f0d7e Some issues fixed for scrutiniser. 2016-09-25 08:50:12 +02:00
James Cole
7232c1d7bb partial fix for #307 2016-09-25 08:46:57 +02:00
James Cole
9a53d8c21c Some array_keys fixes. 2016-09-25 08:46:42 +02:00
James Cole
0d198193db Some issues fixed for scrutiniser. 2016-09-25 08:36:35 +02:00
James Cole
45bc23b8af Some issues fixed for scrutiniser. 2016-09-25 08:32:53 +02:00
James Cole
3323c31765 Some issues fixed for scrutiniser. 2016-09-25 08:24:03 +02:00
James Cole
bb7c26b77c Some issues fixed for scrutiniser. 2016-09-25 08:20:17 +02:00
James Cole
9101d6a2c0 Add lines to configuration on wiki. [skip ci] 2016-09-24 19:32:00 +02:00
James Cole
ad2b254be0 Fix for issue #328. Turns out the import routine converts accounts back and forth instead of creating new entries. 2016-09-24 18:59:31 +02:00
James Cole
abc4f856ce Fix nullable fields. 2016-09-24 17:22:42 +02:00
James Cole
b3b66a8f92 Merge pull request #329 from niekvanderkooy/develop
Fix assignment of array variables
2016-09-24 17:04:32 +02:00
Niek van der Kooy
2f7cf9b916 Fix assignment of array variables 2016-09-24 17:01:41 +02:00
James Cole
b822e0c6e7 Upgrade stuff for 4.0.0 2016-09-24 15:30:08 +02:00
James Cole
6fef9ee72b #315 2016-09-24 10:58:48 +02:00
James Cole
ab6dd0a1ec #314 2016-09-24 10:55:13 +02:00
James Cole
9deef5ac92 #325 2016-09-24 10:53:39 +02:00
James Cole
577187babe Fix #324 [skip ci] 2016-09-24 10:52:13 +02:00
James Cole
577290e813 add strtolower [skip ci] 2016-09-24 09:14:47 +02:00
James Cole
f3b9798216 Fix some rule things. 2016-09-24 09:12:17 +02:00
James Cole
4dcaa96d16 Fix group error. I hope. 2016-09-24 08:59:29 +02:00
James Cole
0dcbf451d6 Add verify command to composer.json 2016-09-24 08:59:14 +02:00
James Cole
e87f6ca40e Fix some possible NULL values. 2016-09-24 08:55:01 +02:00
James Cole
1f34e33d8c Update composer, improve verify routine. 2016-09-23 22:31:01 +02:00
James Cole
258e87e127 Merge pull request #323 from Mortalife/master
Adding GBP to Seed
2016-09-22 07:58:21 +02:00
Matthew Peck
3ec8efcfc1 Adding GBP to Seed 2016-09-21 20:45:36 +01:00
James Cole
70ea227bd0 Add logging to processor #322 2016-09-21 21:01:10 +02:00
James Cole
27c832ed58 Logging for rule triggers #322 2016-09-21 20:58:12 +02:00
James Cole
a31b4ccf01 Basic logging for willMatchEverything #322 2016-09-21 20:30:09 +02:00
James Cole
d221ea68d0 Gave all rule actions some logging. #322 2016-09-21 20:12:04 +02:00
James Cole
dc9fe58536 Fix tags input width. 2016-09-21 19:23:50 +02:00
James Cole
f871e29bdb Quick fix for broken attachments. 2016-09-21 19:16:47 +02:00
James Cole
1357352276 Merge pull request #320 from Mortalife/master
Decimal place fix on import
2016-09-20 20:21:02 +02:00
James Cole
e169754693 Fix display bug for attachments 2016-09-20 17:23:12 +02:00
James Cole
1cfe4f40ba Fix display bug for attachments 2016-09-20 17:22:07 +02:00
James Cole
5545d1c1ba Fix display bug for attachments 2016-09-20 17:21:26 +02:00
James Cole
e5f7228fa9 Fix future query problems (current users not affected either way) [skip ci] 2016-09-20 09:32:58 +02:00
James Cole
11385494eb Fix for income entry. 2016-09-20 08:57:08 +02:00
James Cole
ae328de469 Fix bug in year report. 2016-09-20 08:26:42 +02:00
James Cole
0574a706c8 Error in decrypt error (yes) 2016-09-20 07:57:04 +02:00
Matthew Peck
70bb85a75b Cleanup 2016-09-20 00:00:11 +01:00
Matthew Peck
8cd901b57b Added support for multiple decimal places 2016-09-19 23:53:51 +01:00
James Cole
8b9818c48e This will fix #316 2016-09-18 20:00:13 +02:00
James Cole
a95099fa46 Update FF configuration. 2016-09-18 19:57:21 +02:00
James Cole
221e4b7fc0 Fix some migrations [skip ci] 2016-09-18 18:14:07 +02:00
James Cole
6cff3eb61e Fix some migrations [skip ci] 2016-09-18 17:52:31 +02:00
James Cole
e4fd97ae77 Some code fixes. [skip ci] 2016-09-17 09:52:28 +02:00
James Cole
5ca9099654 Some code fixes. 2016-09-17 09:50:40 +02:00
James Cole
6e33e26ddf Update copyright notices, update German language. 2016-09-17 07:57:32 +02:00
James Cole
04461a4ab8 Updated composer.lock [skip ci] 2016-09-17 07:22:39 +02:00
James Cole
a4b9bbff54 Update AdminLTE template. 2016-09-17 07:19:09 +02:00
James Cole
4ad4252a77 Extend exclude path. Trigger a new inspection. 2016-09-17 07:10:29 +02:00
James Cole
aac0c9ab98 Various layout updates and tiny upgrade fixes [skip ci] 2016-09-16 13:29:56 +02:00
James Cole
c123e1044a Expand config so people won't get errors here [skip ci] 2016-09-16 12:19:29 +02:00
James Cole
d25d0454fc Code clean up 2016-09-16 12:15:58 +02:00
James Cole
f38984398d Code clean up [skip ci] 2016-09-16 12:07:45 +02:00
James Cole
a07799cfa4 MySQL 5.7 compatible query fixing. [skip ci] 2016-09-16 11:16:31 +02:00
James Cole
7c52f297ee MySQL 5.7 compatible query fixing. [skip ci] 2016-09-16 11:06:21 +02:00
James Cole
50a3279b30 MySQL 5.7 compatible query fixing. [skip ci] 2016-09-16 11:04:24 +02:00
James Cole
0ea14eb987 MySQL 5.7 compatible grouping. [skip ci] 2016-09-16 11:01:35 +02:00
James Cole
cf1b98e569 MySQL 5.7 compatible grouping. 2016-09-16 10:55:26 +02:00
James Cole
63fb435002 Expand code. 2016-09-16 10:50:19 +02:00
James Cole
2f8263f53a Possible fix for reports [skip ci] 2016-09-16 09:36:08 +02:00
James Cole
fb649779d6 Do not need to sort. Fix MySQL 5.7 compatibility. 2016-09-16 09:31:40 +02:00
James Cole
bb58f605f7 Some new login / logout routes 2016-09-16 09:21:36 +02:00
James Cole
fccdf56c5d Fixed some query things. 2016-09-16 09:09:54 +02:00
James Cole
bd53410c71 Some changes in login routes for 5.3 2016-09-16 09:02:35 +02:00
James Cole
7d63f124c4 Fixing some login routes 2016-09-16 07:22:57 +02:00
James Cole
9ffc5d857c Fixed some db bugs. These will only pop up when developing. 2016-09-16 07:16:09 +02:00
James Cole
2f93784acd More code for 5.3 2016-09-16 07:05:34 +02:00
James Cole
d00fbe4eb3 More code for 5.3 2016-09-16 06:48:38 +02:00
James Cole
51d9f041ae Changes for login routes. 2016-09-16 06:43:13 +02:00
James Cole
b872ab8b86 New code and new routes for 5.3 2016-09-16 06:40:45 +02:00
James Cole
3d25fd79ca First set of upgrade to 5.3 stuff. 2016-09-16 06:19:40 +02:00
James Cole
3aad78e6ef Lots of updated libraries.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-09-15 19:14:55 +02:00
James Cole
7d5bb72b0c Fix for #312
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-09-15 19:14:22 +02:00
James Cole
46e5aae8bb Fix changelog. [skip ci]
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-09-15 19:00:22 +02:00
James Cole
b9e2ee7af3 Merge branch 'release/3.10.4' 2016-09-14 20:40:52 +02:00
James Cole
c1a2892788 New changelog.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-09-14 20:40:12 +02:00
James Cole
2078183e0d Update version and composer file. 2016-09-14 20:37:12 +02:00
James Cole
fab1d53714 Simplified upgrade instructions. 2016-09-14 20:35:45 +02:00
James Cole
3fe831c7d8 Bit of code cleanup courtesy of PHPStorm. 2016-09-13 19:20:09 +02:00
James Cole
6958f71cfd @fuf discovered a bug where FF3 will fall back to the hard-coded system default currency and not the set default currency. See #307 2016-09-13 19:19:58 +02:00
James Cole
a7351f348d Fixed a bug mentioned by @vissert and added some logging for @sandermulders
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-09-12 18:43:10 +02:00
James Cole
5379e03447 Merge pull request #311 from sandermulders/fix/nullable-values
add migration that correctly sets nullable for description fields on rules and rule_groups
2016-09-12 16:52:14 +02:00
Sander Mulders
539058e32d Fix for #310: add migration that correctly sets nullable for description fields on rules and rule_groups 2016-09-12 14:24:01 +02:00
James Cole
11b6b5a63c Merge branch 'release/3.10.3' into develop 2016-09-11 08:17:42 +02:00
James Cole
1155096226 Merge branch 'release/3.10.3' 2016-09-11 08:17:41 +02:00
James Cole
2920dd356e Updated translations.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-09-11 08:17:35 +02:00
James Cole
9c3dac8170 Config for new version.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-09-11 08:13:22 +02:00
James Cole
49f9909b15 New changelog.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-09-11 08:13:14 +02:00
James Cole
e4fef6dfc3 Fixed an import bug where a new transaction validation rule would break storing of the transaction, while the import would not notice this error happening. The importer will now also correctly set a date on the "import tag" and will not tag an incomplete journal as already imported.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-09-11 08:08:01 +02:00
James Cole
2da087401e Extend audit report
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-09-10 18:37:16 +02:00
James Cole
629baf9de5 Added invoice date
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-09-10 18:36:52 +02:00
James Cole
29a930dae5 Updated translations.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-09-09 11:36:19 +02:00
James Cole
d920537dd2 Updated translations.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-09-09 11:29:19 +02:00
James Cole
106b04a5da Update composer.lock [skip ci]
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-09-09 11:19:50 +02:00
James Cole
176752e219 Code for optional fields #301
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-09-09 11:19:40 +02:00
James Cole
8d19f60091 Various translation updates.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-09-09 11:19:19 +02:00
James Cole
e937aa2f74 Fix a bug in piggy bank display [skip ci]
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-09-09 06:17:50 +02:00
James Cole
c3ccc4ccdf This should fix #308
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-09-08 21:10:24 +02:00
James Cole
6c5cd705c0 Some code for new optional fields, see #301
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-09-04 16:21:51 +02:00
James Cole
ce003f217b Removed unused "budget maximum" preference 2016-09-03 21:13:08 +02:00
James Cole
8c7ef49eb6 New code by @vissert that allows category edit (see #282)
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-09-03 05:01:48 +02:00
James Cole
29af4bd1b9 This fixes #303 2016-09-03 04:54:57 +02:00
James Cole
2ce5142b06 Small fix for #303
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-09-01 19:01:08 +02:00
James Cole
f3a8a25872 Fixed #303
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-09-01 18:31:39 +02:00
James Cole
598e97d028 Forgot to escape things, which causes havoc in the Dutch translation.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-08-31 18:50:46 +02:00
James Cole
fa110279de Merge branch 'release/3.10.2' 2016-08-29 19:32:49 +02:00
James Cole
8fdeaf73cc Update composer.lock [skip ci]
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-08-29 19:32:03 +02:00
James Cole
a7ffdf062a Update changelog. [skip ci]
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-08-29 19:26:31 +02:00
James Cole
3bad92dd6d Upgrade instructions and new version.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-08-29 19:25:21 +02:00
James Cole
2e88024bca Close #290
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-08-29 19:21:40 +02:00
James Cole
ca2301959c Merge pull request #298 from Bonno/develop
Fixed wrong conversion to revenue account
2016-08-29 14:49:46 +02:00
Bonno Nachtegaal-Karels
3285fae7f0 Fixed wrong conversion to revenue account 2016-08-29 14:39:43 +02:00
James Cole
312079657b Include files from new import routine in export routine. 2016-08-28 07:05:42 +02:00
James Cole
18c183afd6 Remove form tags in favour of raw html.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-08-27 09:38:58 +02:00
James Cole
f424d9cf20 Update change log
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-08-27 04:37:04 +02:00
James Cole
5c3da9fd9e New language files.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-08-27 04:34:59 +02:00
James Cole
1f321fadd4 Removed some form-tags in favour of plain HTML
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-08-27 04:18:02 +02:00
James Cole
65f5d27b12 New pages for administration. More settings will be web-based.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-08-27 04:00:48 +02:00
James Cole
cdb591de7f Remove unnecessary setting.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-08-27 04:00:19 +02:00
James Cole
a0ea3882e1 Various code cleanup.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-08-27 03:50:35 +02:00
James Cole
a9444ac702 Code cleanup.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-08-26 09:30:52 +02:00
James Cole
d0c6afc3a9 Various code clean up. [skip ci] 2016-08-26 08:21:31 +02:00
James Cole
e7a0a5937c Extend git ignore. [skip ci]
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-08-26 07:41:13 +02:00
James Cole
08992b5298 Extend test-import data set to contain some rules.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-08-26 07:38:00 +02:00
James Cole
6490a4240d Remove references to ImportResult. Add the application of user rules.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-08-26 07:37:47 +02:00
James Cole
43a7544dd7 Catch empty (null) descriptions. Which never happens.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-08-26 07:37:27 +02:00
James Cole
0fe70dae17 Referring to Auth::user will not work from the command line.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-08-26 07:37:09 +02:00
James Cole
7079e76886 Remove some commented code.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-08-26 07:36:33 +02:00
James Cole
0ec021c375 No need to grab journals we don't need.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-08-26 07:36:26 +02:00
James Cole
ff3396e286 Removed the ImportResult class because it was lame.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-08-26 07:36:13 +02:00
James Cole
78912903ce Change signature of importstorage. 2016-08-26 06:47:12 +02:00
James Cole
4c015e2d12 Re-arrange code. No changes. 2016-08-26 06:44:24 +02:00
James Cole
172634a55a Add some comments. 2016-08-26 06:43:38 +02:00
James Cole
58ca7d551a Rename import procedure method name 2016-08-26 06:43:23 +02:00
James Cole
fd8ed4c9aa Fixed a bug in strict typing.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-08-25 19:19:12 +02:00
James Cole
c03f5f5ff0 Merge branch 'release/3.10.1' 2016-08-25 11:20:39 +02:00
James Cole
6775fc58c8 Change log and updated config.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-08-25 11:20:13 +02:00
James Cole
9f250fc61b Renamed migration. 2016-08-25 11:16:17 +02:00
James Cole
94609f1419 Clean up some code. 2016-08-25 06:44:48 +02:00
James Cole
53402aa5e2 Update composer file. 2016-08-25 06:44:41 +02:00
James Cole
5aadb29905 Add some forgotten code to the mobile piggy bank controller things.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-08-24 20:06:45 +02:00
James Cole
d4f8c41d80 This should fix a bug in the verification routine.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-08-24 19:36:09 +02:00
James Cole
a2e14f8b8d Various code clean up.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-08-24 19:33:58 +02:00
James Cole
98c4ac955a Finetune user feedback during import and add a tag to collect transactions. 2016-08-14 11:31:09 +02:00
James Cole
70b63e1736 Better report for finished import. 2016-08-14 10:11:49 +02:00
James Cole
106665a468 Better reporting for double imported rows. See also #164 2016-08-14 09:49:04 +02:00
James Cole
da5e48d769 More language lines. Add a check for double lines. 2016-08-14 09:10:47 +02:00
James Cole
85f484e73c Divide by zero. 2016-08-14 09:10:08 +02:00
James Cole
d287ae97f8 Prep for translations in JS. 2016-08-14 08:34:59 +02:00
James Cole
117bb602dc Extend ImportObject with row hash. 2016-08-14 08:34:51 +02:00
James Cole
e440d55034 Finetune import status page. 2016-08-14 08:10:42 +02:00
James Cole
7f5b94fe43 Fixed a bug in the verify routine. 2016-08-13 23:31:42 +02:00
James Cole
c58eea6654 Fine-tuning the import routine. 2016-08-13 23:28:01 +02:00
James Cole
bbed5d0701 First version of a web-based import status thing. 2016-08-13 21:51:01 +02:00
James Cole
2775690fc8 Extend model to allow for more data during the import. 2016-08-13 18:53:16 +02:00
James Cole
1fd9f6e724 First user interface elements and routes for web import. 2016-08-13 16:38:58 +02:00
James Cole
3d63903128 Make sure import errors end up where the user can read them. 2016-08-13 16:29:24 +02:00
James Cole
ef876a165a Some better feedback in the import process. 2016-08-13 14:22:40 +02:00
James Cole
c4d6aaeef3 Extend scrutinizer config. 2016-08-12 16:06:27 +02:00
James Cole
37b735c2e3 Remove code climate config 2016-08-12 16:06:17 +02:00
James Cole
62d30c7b0e Fix migration (call to empty table name) 2016-08-12 16:06:11 +02:00
James Cole
9cac7d46c0 Merge branch 'release/3.10' 2016-08-12 16:03:30 +02:00
James Cole
99b3e24836 Code optimalization 2016-08-12 15:50:52 +02:00
James Cole
ffb699cb06 Clean up code. 2016-08-12 15:34:15 +02:00
James Cole
2947ec0002 Small optimisations. 2016-08-12 15:27:44 +02:00
James Cole
5c4d010bde Code cleanup. 2016-08-12 15:10:03 +02:00
James Cole
955306d877 Remove travis file and fix NULL error in sqlite. 2016-08-12 14:50:25 +02:00
James Cole
015935ed55 Implemented ABN Amro specific import code. 2016-08-12 12:55:52 +02:00
James Cole
48f4cceb19 Mention new version. 2016-08-12 10:47:09 +02:00
James Cole
9850220aac Add new languages. 2016-08-12 10:46:22 +02:00
James Cole
c4ac1460f0 Expanded translations 2016-08-12 10:44:27 +02:00
James Cole
b9e1e01337 New translations. 2016-08-12 10:34:45 +02:00
James Cole
76649cb7de Extended views and language. 2016-08-12 10:07:53 +02:00
James Cole
5e310776b4 New change log 2016-08-12 09:50:54 +02:00
James Cole
4d7fa11172 Upgrade instructions for 3.10 2016-08-12 09:35:09 +02:00
James Cole
28962007c1 More code for new importer 2016-08-12 09:27:09 +02:00
James Cole
2111873bcf Fixed a bug in tag creation. 2016-08-11 19:01:23 +02:00
James Cole
0aaf9a6fda Extend rule set for import. 2016-08-11 18:44:11 +02:00
James Cole
186b704509 Lots of new code to test the import routine.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-08-11 10:21:32 +02:00
James Cole
efe9933721 Import storage routine is creating the first transaction journals.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-08-11 08:00:02 +02:00
James Cole
200366f5be Extended the validator and created more code to handle exceptions.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-08-10 18:49:16 +02:00
James Cole
c9bd72337d Some notes on the import process. 2016-08-06 09:31:32 +02:00
James Cole
d4510440b8 Split the importer and the setup routine. 2016-08-06 06:28:21 +02:00
James Cole
5a9cf698f7 Configuration for import routine. 2016-08-06 06:21:46 +02:00
James Cole
5826fec519 Some new import stuff. 2016-08-06 06:21:25 +02:00
James Cole
7035600984 Add some logging for #283 2016-08-05 21:50:49 +02:00
James Cole
b1dfb5811f Merge pull request #286 from niekvanderkooy/develop
Generalise Steam::phpBytes
2016-08-05 21:42:40 +02:00
Niek van der Kooy
51570a5d08 Allow phpBytes to work with configs where gigabyte file sizes are allowed 2016-08-05 20:54:59 +02:00
Niek van der Kooy
f065f3a0b8 Make phpBytes case insensitive, since php.ini can contain both capitals and small letters 2016-08-05 20:53:09 +02:00
James Cole
47376f1f35 Fix a problem mentioned in issue #283
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-08-05 19:29:44 +02:00
James Cole
bcfe2c6410 Fixes #284
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-08-05 18:52:16 +02:00
James Cole
09d63b584d Save old data; bread crumbs 2016-08-04 06:14:08 +02:00
James Cole
5f5469a7d4 Moved some files around. 2016-08-04 06:10:30 +02:00
James Cole
38800d61b0 New user related code. 2016-08-04 06:07:53 +02:00
James Cole
1186e95c51 Admin view will show some IP addresses.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-08-03 20:57:01 +02:00
James Cole
d870e0f42e Fix split query. 2016-08-02 19:42:41 +02:00
James Cole
0db9852769 This should fix a bug in split expenses. 2016-08-02 19:12:18 +02:00
James Cole
7e3f9048fe Fixed some fields in split thing. 2016-08-01 20:14:23 +02:00
James Cole
1ba88f182b Various CSV bugs and a config bug fixed. 2016-07-31 17:17:45 +02:00
James Cole
c8f5a6b7ad Ignore deleted columns. 2016-07-30 20:04:24 +02:00
James Cole
d26bbf3cdc Handling import values. This is a dead end but it seemed a good idea. 2016-07-30 19:09:58 +02:00
James Cole
0de72b6914 Ignore result.html 2016-07-30 16:29:49 +02:00
James Cole
e41c89bd59 Does not belong. 2016-07-30 16:29:17 +02:00
James Cole
541d9ebdd9 Optimised some code. 2016-07-30 16:29:04 +02:00
James Cole
1e724712e0 Bug fix in converter 2016-07-29 21:42:12 +02:00
James Cole
3682467ae3 Each CSV converter can set the certainty of their conversion. 2016-07-29 21:40:58 +02:00
James Cole
7707c81b2d Each CSV converter can set the certainty of their conversion. 2016-07-29 21:29:46 +02:00
James Cole
e434de72a3 Expand fields. 2016-07-26 20:40:46 +02:00
James Cole
ce191fa6d3 Fix split deposit. 2016-07-26 20:26:46 +02:00
James Cole
90865a5284 Fix recursive. 2016-07-24 19:24:02 +02:00
James Cole
684f6e0b5c Don't need these. 2016-07-24 19:07:47 +02:00
James Cole
c287bc139c Check new list. 2016-07-24 18:51:39 +02:00
James Cole
1392275b81 Lots of new code for importer and some preferences. 2016-07-24 18:47:55 +02:00
James Cole
87c0f1d86e More CSV related updates. 2016-07-23 21:37:06 +02:00
James Cole
a4a723cfc6 Fixed import error. 2016-07-20 15:57:42 +02:00
James Cole
921e2c06f4 Beta warning for import thing. 2016-07-20 15:47:30 +02:00
James Cole
cb9433f4b9 This should fix #280 2016-07-17 08:50:22 +02:00
James Cole
1be6af820e No map for tags. 2016-07-17 08:35:04 +02:00
James Cole
3b686b6d1c New but empty converters. 2016-07-16 08:25:39 +02:00
James Cole
697566fe42 New importers. 2016-07-16 07:58:25 +02:00
James Cole
5130ba7ea4 Working IBAN account import thing. 2016-07-15 22:37:47 +02:00
James Cole
c9e46a4dd1 Lots of import related code. 2016-07-15 22:26:08 +02:00
James Cole
f5b3dc36e3 Fix view. 2016-07-05 09:02:01 +02:00
James Cole
f1e8d1cf1e Show bill average. 2016-07-05 08:57:45 +02:00
James Cole
e8e7ab01d2 Merge branch 'develop' of github.com:JC5/firefly-iii into develop 2016-07-04 12:38:22 +02:00
James Cole
9244994233 Fix bug that would report wrong file size to browser. 2016-07-04 12:37:33 +02:00
James Cole
ae768a8525 Works up until actual import. 2016-07-02 23:08:47 +02:00
James Cole
162c762973 First set of data mappers. 2016-07-02 20:40:23 +02:00
James Cole
57b5981904 Fix #266 for period-chart. 2016-07-02 17:42:27 +02:00
James Cole
275d19e71d Fix #266 for all-chart. 2016-07-02 17:39:58 +02:00
James Cole
189b11befa Extra page number check for issue #276 2016-07-02 17:36:46 +02:00
James Cole
a56a5fc228 New code for import routine. 2016-07-02 17:33:57 +02:00
James Cole
cbe3fb73a8 Catch decrypt exceptions. 2016-06-27 16:36:28 +02:00
James Cole
3d58fbebec Should not have committed this. 2016-06-27 16:25:17 +02:00
James Cole
b947ff50ed Fix chart thing. 2016-06-27 16:11:49 +02:00
James Cole
18d2741814 More code for the new CSV import 2016-06-27 15:15:46 +02:00
James Cole
93a54780ab Fixes a bug in the 2FA activation thing. 2016-06-24 21:58:57 +02:00
James Cole
3d201db6fc More code for import. 2016-06-24 14:24:34 +02:00
James Cole
9ffc0936ee Merge branch 'feature/new-csv-import' into develop
# Conflicts:
#	app/Helpers/Csv/Importer.php
2016-06-23 12:15:19 +02:00
James Cole
fbf9e00208 Change preferences info. 2016-06-23 12:08:14 +02:00
James Cole
2c826451d1 Fix delete routine and some NULLs 2016-06-23 12:07:31 +02:00
James Cole
617a5c0606 Fix date range. 2016-06-23 08:01:15 +02:00
James Cole
8331a7e34a Rename stuff. 2016-06-18 07:37:12 +02:00
James Cole
8ee1676f0a New migrations. 2016-06-18 07:36:15 +02:00
James Cole
5dc8620c43 More new migrations. 2016-06-17 14:06:38 +02:00
James Cole
d2733a4df0 First attempt at rewriting all migrations. 2016-06-17 06:03:42 +02:00
James Cole
ae649223d8 Mobile add money to piggy routine 2016-06-16 20:52:59 +02:00
James Cole
6267930938 Work on new chart for year report. 2016-06-16 20:52:30 +02:00
James Cole
bdee8cde77 This fixes #273 2016-06-16 08:04:22 +02:00
James Cole
e63f216905 Fix small bug in reorder routine. 2016-06-15 09:58:33 +02:00
James Cole
ec18165698 Fixed #267 2016-06-11 07:38:30 +02:00
James Cole
307e6a2337 Renamed fields #267 2016-06-11 06:36:46 +02:00
James Cole
b80d8cf774 Move date picker stuff to new method. 2016-06-11 06:33:51 +02:00
James Cole
7a5ef6013a Fix #271 2016-06-11 06:31:56 +02:00
James Cole
13b92c47d9 Translations and fixes. 2016-06-11 06:31:40 +02:00
James Cole
5a79bc0a99 Initial code base for new CSV import. 2016-06-10 21:00:00 +02:00
James Cole
beda6ec3a9 Removed old CSV stuff. 2016-06-10 15:25:24 +02:00
James Cole
c619b8730b Implemented #264 2016-06-07 12:22:46 +02:00
James Cole
c14ec8b006 New change log. 2016-06-07 12:22:30 +02:00
James Cole
10c7786248 Merge branch 'release/3.9.1' 2016-06-06 20:25:55 +02:00
James Cole
08ff08685c Small updates for 3.9.1 2016-06-06 20:25:01 +02:00
James Cole
8091dbfdfa Restore views (#262) 2016-06-06 09:28:35 +02:00
James Cole
8dc106b79a Restore config (#262) 2016-06-06 09:28:25 +02:00
James Cole
7527433738 Restore provider (#262) 2016-06-06 09:25:29 +02:00
James Cole
1502e08a7a Restore routes (#262) 2016-06-06 09:24:51 +02:00
James Cole
c9679f1d4f Restore bread crumbs (#262) 2016-06-06 09:23:55 +02:00
James Cole
6b976dd6b9 Restore controller (#262) 2016-06-06 09:22:28 +02:00
James Cole
8da4abf655 Restore helpers (#262) 2016-06-06 09:22:20 +02:00
James Cole
2e26193333 This should fix #266 2016-05-24 16:08:43 +02:00
James Cole
ada43bc0dd Fix #265 2016-05-24 11:28:24 +02:00
James Cole
a447c886c4 Basic for for #262
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-05-22 21:11:30 +02:00
James Cole
288e713f94 Remove all code related to the CSV importer in preparation of #262
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-05-22 20:18:16 +02:00
James Cole
f8eb1fa44a Merge branch 'release/3.9.0'
Signed-off-by: James Cole <thegrumpydictator@gmail.com>

# Conflicts:
#	app/Helpers/Csv/Converter/BillName.php
2016-05-22 16:46:11 +02:00
James Cole
afc794513f last minute composer update [skip ci]
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-05-22 16:43:47 +02:00
James Cole
7e6d3c9d6b Various last minute bug fixes.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-05-22 16:38:32 +02:00
James Cole
44960e8e42 Various last minute bug fixes. 2016-05-22 15:48:34 +02:00
James Cole
41430c3bb2 Same bug, another line. 2016-05-22 09:08:37 +02:00
James Cole
2f435019e0 Fix bug. 2016-05-22 09:04:16 +02:00
James Cole
480e70dfac Sharper spent in period. [skip ci] 2016-05-20 18:30:48 +02:00
James Cole
c4818334e7 Sharper spent in period. [skip ci] 2016-05-20 18:29:51 +02:00
James Cole
a5d5f86aed Some code cleanup and a better chart [skip ci] 2016-05-20 18:26:43 +02:00
James Cole
78afb771b1 Code cleanup [skip ci] 2016-05-20 17:58:10 +02:00
James Cole
a74a646777 Code cleanup. Moving closer to new release. 2016-05-20 17:53:03 +02:00
James Cole
87f9ca3bb2 Removed some old configuration values. 2016-05-20 17:28:07 +02:00
James Cole
d54e264a91 Cannot create empty tags.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-05-20 15:09:25 +02:00
James Cole
99aea5ce7a Fix bug in verification.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-05-20 15:08:24 +02:00
James Cole
e10d5e89e5 Last minute bug fixes.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-05-20 15:02:52 +02:00
James Cole
0105456828 Copyright notices. [skip ci]
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-05-20 12:42:21 +02:00
James Cole
5c7df5c04d Copyright notices. [skip ci]
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-05-20 12:41:23 +02:00
James Cole
563ede822f Copyright notices. [skip ci]
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-05-20 12:27:31 +02:00
James Cole
786cfc21c7 Make strval for bcadd [skip ci] 2016-05-20 12:08:48 +02:00
James Cole
8f0856e31a Make strval for bcadd [skip ci] 2016-05-20 12:07:55 +02:00
James Cole
bea075c74d Make strval for bcadd [skip ci] 2016-05-20 12:06:54 +02:00
James Cole
5f82accb61 Point to other library. [skip ci] 2016-05-20 12:03:28 +02:00
James Cole
95f50ca2fd Point to other library. [skip ci] 2016-05-20 12:02:19 +02:00
James Cole
d8b76bdfd2 Code cleanup [skip ci] 2016-05-20 11:59:54 +02:00
James Cole
74a9edaaf7 Bug fixes in strict types. 2016-05-20 11:53:34 +02:00
James Cole
7dd858be39 Fix bugs. 2016-05-20 11:27:41 +02:00
James Cole
7d7ff71384 New routes. 2016-05-20 11:09:09 +02:00
James Cole
003177fa49 Move stuff around. 2016-05-20 11:09:02 +02:00
James Cole
3c3a83330d More moving stuff around. 2016-05-20 11:02:07 +02:00
James Cole
724f423692 Move some stuff around. 2016-05-20 09:45:24 +02:00
James Cole
65b8882ed4 Clean up repository. 2016-05-20 09:25:17 +02:00
James Cole
66d7fd7d4c Declare strict types. 2016-05-20 08:57:45 +02:00
James Cole
782a6f289c Remove deprecated methods. 2016-05-20 08:11:54 +02:00
James Cole
70d936bb8f Fix filters and other methods that used deprecated methods. 2016-05-20 08:09:53 +02:00
James Cole
dda3082c7e Some code cleanup. 2016-05-20 08:00:35 +02:00
James Cole
ed948cc965 Allow user to split unsplit journal 2016-05-20 07:51:26 +02:00
James Cole
0347649f42 Fix some views. 2016-05-20 06:58:13 +02:00
James Cole
c66fe2b541 Fix some views [skip ci] 2016-05-20 06:27:48 +02:00
James Cole
8c1ae76c7a More tight report thing [skip ci] 2016-05-19 13:39:36 +02:00
James Cole
04dee404c0 More narrow result for popup. [skip ci] 2016-05-19 13:38:12 +02:00
James Cole
b22dd29835 Fix charts. [skip ci] 2016-05-19 08:57:25 +02:00
James Cole
536a5cd1c8 New translations. [skip ci] 2016-05-18 18:13:38 +02:00
James Cole
b7f1bcf7c9 Slightly larger screenshots. [skip ci] 2016-05-18 14:24:59 +02:00
James Cole
5e590072dd Slightly larger screenshots. [skip ci] 2016-05-18 14:24:31 +02:00
James Cole
d204b9b752 Slightly larger screenshots. [skip ci] 2016-05-18 14:23:54 +02:00
James Cole
22d1121193 New read me. [skip ci] 2016-05-18 14:22:48 +02:00
James Cole
e23c6521b9 Add expenses. [skip ci] 2016-05-18 14:19:33 +02:00
James Cole
b0cb9663a6 Updated read me [skip ci] 2016-05-18 07:23:11 +02:00
James Cole
95b7da89f0 Some code cleanup. 2016-05-18 07:01:27 +02:00
James Cole
b0a5b53abb Better number formatting. 2016-05-17 19:23:23 +02:00
James Cole
ce78c8993f Optimise query. [skip ci] 2016-05-17 16:47:43 +02:00
James Cole
2538b4a885 Small changes to audit report. 2016-05-17 16:11:19 +02:00
James Cole
109d96ad16 Small but expensive changes to audit report. 2016-05-17 16:10:32 +02:00
James Cole
4cbb0d9716 Fixed split journals views. 2016-05-17 16:00:27 +02:00
James Cole
65ecea3b1c Small fix to split data. 2016-05-17 15:25:03 +02:00
James Cole
495b80f5ef More code for the split journal support. 2016-05-17 15:19:07 +02:00
James Cole
e113736887 Should fix issue #263 2016-05-17 12:45:31 +02:00
James Cole
042b7a4966 Fix multi-year chart. [skip ci] 2016-05-16 12:51:52 +02:00
James Cole
5ab8cb38d3 Small change in report [skip ci] 2016-05-16 12:47:43 +02:00
James Cole
fc4ab29244 Fixed chart. [skip ci] 2016-05-16 09:05:06 +02:00
James Cole
5a43e6cb9f Better query for no budget. [skip ci] 2016-05-16 07:13:54 +02:00
James Cole
4effc95c5f Fixed some report bugs. 2016-05-15 19:23:19 +02:00
James Cole
962965b5b7 Code cleanup. 2016-05-15 18:36:40 +02:00
James Cole
260b611293 Various fixes in report pages. 2016-05-15 18:16:31 +02:00
James Cole
d2131c371b Fixed more report details. 2016-05-15 17:53:00 +02:00
James Cole
eedf6a07f0 Fixed the income report. 2016-05-15 17:46:53 +02:00
James Cole
5cd1e7c100 Fix charts. [skip ci] 2016-05-15 16:15:17 +02:00
James Cole
6a750a998f Remove category chart from report controller. 2016-05-15 16:13:05 +02:00
James Cole
bd818b2dea Code clean up. 2016-05-15 15:39:22 +02:00
James Cole
4164ebcc69 Added a lot of todo things. 2016-05-15 15:24:23 +02:00
James Cole
60d732067b Made some things less complex. 2016-05-15 15:08:59 +02:00
James Cole
b7b52707fb Fix Travis. 2016-05-15 15:02:07 +02:00
James Cole
f373c72679 Remove tests. 2016-05-15 15:01:29 +02:00
James Cole
ec2027b8db Update git ignore. [skip ci] 2016-05-15 14:48:52 +02:00
James Cole
a84de5db77 Enable caching. Remove stuff for development. 2016-05-15 14:48:21 +02:00
James Cole
5065b1ee03 Enable cache [skip ci] 2016-05-15 12:39:39 +02:00
James Cole
a0aa114ee6 Update balance view. [skip ci] 2016-05-15 12:32:18 +02:00
James Cole
823839fbf6 Better routes and titles. 2016-05-15 12:26:40 +02:00
James Cole
1c93d8bf79 More test data and better views. 2016-05-15 12:08:41 +02:00
James Cole
626404407e More support for #142 2016-05-15 09:00:49 +02:00
James Cole
446ab62d38 View updates. [skip ci] 2016-05-14 23:14:49 +02:00
James Cole
0d39161ec3 Fix iban in test data. 2016-05-14 22:23:55 +02:00
James Cole
29be16dcba Fix complex query. [skip ci] 2016-05-14 22:21:08 +02:00
James Cole
b0bb790386 Experimental query. [skip ci] 2016-05-14 22:12:16 +02:00
James Cole
e64b40d58b Experimental query. [skip ci] 2016-05-14 22:11:49 +02:00
James Cole
4870945af2 Remove references to unused library. 2016-05-14 21:55:43 +02:00
James Cole
a547a5f3f9 New Chart library. [skip ci] 2016-05-14 21:50:02 +02:00
James Cole
e5eabdf7e7 Clean up test data. 2016-05-14 21:49:16 +02:00
James Cole
f78d56b149 Will implement changes to test database. 2016-05-14 17:08:28 +02:00
James Cole
771926c779 No longer needed. 2016-05-14 14:02:37 +02:00
James Cole
6090efe2df Refactoring. 2016-05-14 14:02:12 +02:00
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
James Cole
ac8ff4e565 Clean up repository. 2016-05-01 07:09:58 +02:00
James Cole
bfa7ee90f4 Reverse stuff 2016-05-01 06:59:08 +02:00
James Cole
77c9e37584 Move some stuff around. 2016-05-01 06:37:47 +02:00
James Cole
80350f8423 Fix for transactions. 2016-04-30 22:30:11 +02:00
James Cole
3c1ff4d21f Fix query. 2016-04-30 22:05:58 +02:00
James Cole
55b8f03590 Some new data thing. 2016-04-30 21:20:39 +02:00
James Cole
1fd7852309 Fix query thing. 2016-04-30 20:24:47 +02:00
James Cole
9c5292962f More stuff for splits. 2016-04-30 19:50:42 +02:00
James Cole
c05c6e72c0 Display budget and category if relevant. 2016-04-30 16:36:58 +02:00
James Cole
bdcd033952 Fix edit routine 2016-04-30 12:46:21 +02:00
James Cole
4ec6bcc8c7 More code for split and small bug fix in attachment helper. 2016-04-30 09:48:39 +02:00
James Cole
11ea4b6d47 Fix migrations. 2016-04-30 07:15:28 +02:00
James Cole
e4f45b5370 List of categories will check transactions as well. #142 2016-04-29 22:00:24 +02:00
James Cole
9baadd3793 Use other method of collecting query fields. #142 2016-04-29 21:52:15 +02:00
James Cole
94a79876ce View for split transactions. #142 2016-04-29 21:49:18 +02:00
James Cole
42c3d1fa68 Expanding support for split transactions #142 2016-04-29 21:36:59 +02:00
James Cole
0e3ccebd0b First attempt at #142. Needs a lot of work still. 2016-04-29 20:59:28 +02:00
James Cole
4af8272faa Updates to transactions. 2016-04-29 17:29:13 +02:00
James Cole
0ef3d0cf03 Better message for issue #247 2016-04-29 17:26:59 +02:00
James Cole
f266b92ef1 This catches issue #247 2016-04-29 17:26:38 +02:00
James Cole
462c9fb3aa Merge pull request #259 from tonicospinelli/pt_BR
add brazilian currency and translation
2016-04-29 15:11:23 +02:00
Antonio Spinelli
568186828c add brazilian currency and translation
fix #257
2016-04-29 07:30:22 -03:00
James Cole
8bcc319b7d Better demo warning and budget indication. 2016-04-29 11:34:48 +02:00
James Cole
baff9780de Smaller report. [skip ci] 2016-04-29 11:05:52 +02:00
James Cole
d8b8f98738 Translations. [skip ci] 2016-04-29 09:56:50 +02:00
James Cole
b714eaac06 Boxes will try to remember their state and auto-collapse. 2016-04-29 09:47:47 +02:00
James Cole
14b94a5bd2 Simplified some code. 2016-04-29 08:56:56 +02:00
James Cole
ea014a6504 Some code simplifications. 2016-04-28 16:30:21 +02:00
James Cole
e28e66e8f1 Fix ABN AMRO importer 2016-04-28 16:23:21 +02:00
James Cole
b47a140c2f Updates to budgets. 2016-04-28 10:59:36 +02:00
James Cole
19d7e27fa9 Code cleanup. 2016-04-28 05:50:29 +02:00
James Cole
2d368f226e Remove parameters. [skip ci] 2016-04-27 19:23:24 +02:00
James Cole
75d81f8f18 Parameter change [skip ci] 2016-04-27 19:22:15 +02:00
James Cole
e3437ba697 Various code cleanup. 2016-04-27 19:21:47 +02:00
James Cole
84f299c33b Forgot a return statement. 2016-04-27 10:39:27 +02:00
James Cole
3d4489efe6 Code cleanup. 2016-04-27 10:38:51 +02:00
James Cole
6aa50e3c00 @roberthorlings I have no idea if this is a correct fix. 2016-04-27 09:20:51 +02:00
James Cole
b70498c337 Some cleaning up. 2016-04-27 06:46:02 +02:00
James Cole
f34aa77d1d Cleaned up some code. 2016-04-27 06:43:17 +02:00
James Cole
3833a41acb Fix sorting. 2016-04-27 06:19:13 +02:00
James Cole
b5a5a216cd Fine tune chart. [skip ci] 2016-04-26 22:32:55 +02:00
James Cole
d9da2a57b6 Fix query error [skip ci] 2016-04-26 22:31:49 +02:00
James Cole
1591b61b77 Expand new charts. 2016-04-26 22:30:53 +02:00
James Cole
66f2df9677 Some code cleanup and I sneaked in a chart optimisation. 2016-04-26 22:21:34 +02:00
James Cole
5199377113 Fixes tests.. for now. 2016-04-26 21:47:16 +02:00
James Cole
da202317c0 Code cleanup. 2016-04-26 21:40:15 +02:00
James Cole
1d2a4e707e Code cleanup in export routine 2016-04-26 20:49:22 +02:00
James Cole
edf9dbc6e8 Some cleaning up [skip ci] 2016-04-26 14:56:42 +02:00
James Cole
dfbe6e5b6e Code clean up. [skip ci] 2016-04-26 12:39:29 +02:00
James Cole
d551333fa2 Some cleaning up and more charts. 2016-04-26 09:21:57 +02:00
James Cole
01cab599bb And now to make sure it works. 2016-04-26 08:11:26 +02:00
James Cole
1c8834fffb Some code cleaning up and refactoring. 2016-04-26 08:09:10 +02:00
James Cole
22e6ea700f Some extensions to budgets. 2016-04-25 21:37:08 +02:00
James Cole
7f7d6cf893 Expand query [skip ci] 2016-04-25 21:07:17 +02:00
James Cole
a94d476b75 Small additions to budget handling [skip ci] 2016-04-25 20:05:09 +02:00
James Cole
eb5e55a272 Some code cleanup. Fixes the tests. 2016-04-25 18:43:09 +02:00
James Cole
53c80aaef8 Small optimizations to reports. 2016-04-25 14:53:41 +02:00
James Cole
607d0115f0 Code improvements for budgets. 2016-04-25 13:20:42 +02:00
James Cole
b4f18dbe77 Database stuff. 2016-04-25 11:44:41 +02:00
James Cole
51d97cdca5 Reinstated a chart. 2016-04-25 09:57:39 +02:00
James Cole
2cd593157f Comment some stuff. 2016-04-25 09:50:46 +02:00
James Cole
ec70fde557 Start of some changes in budget overview related to #256 and #246 2016-04-25 09:49:34 +02:00
James Cole
950576d38b Better date format [skip ci] 2016-04-25 09:12:52 +02:00
James Cole
ce5304277d Translation for popup [skip ci] 2016-04-25 09:11:09 +02:00
James Cole
53760766a0 Fixed budget charts. 2016-04-24 20:41:12 +02:00
James Cole
ed863986a7 Fine tuning. [skip ci] 2016-04-24 20:28:08 +02:00
James Cole
89ff5a83b5 Expand cache. [skip ci] 2016-04-24 20:25:35 +02:00
James Cole
fe0b62b9b4 Cache charts. [skip ci] 2016-04-24 20:23:42 +02:00
James Cole
32c8ddbe1b First render of new budget charts. 2016-04-24 20:23:17 +02:00
James Cole
2cfbfd8649 Start of better budget charts. 2016-04-24 20:00:20 +02:00
James Cole
3f6c19dec4 Merge branch 'release/3.8.4'
# Conflicts:
#	app/Helpers/Csv/PostProcessing/Bill.php
2016-04-24 18:48:16 +02:00
James Cole
93421b50f9 New translations. 2016-04-24 18:47:03 +02:00
James Cole
54e829173a Prep for next release. 2016-04-24 18:44:29 +02:00
James Cole
4fe38bd31b New release 2016-04-24 18:38:58 +02:00
James Cole
fb0638e824 Say what each thing is. 2016-04-24 18:36:44 +02:00
James Cole
108794a6b6 Improved verify command. 2016-04-24 18:35:45 +02:00
James Cole
9c16fc1380 Some small updates. 2016-04-24 18:25:52 +02:00
James Cole
99c219ed97 Three fixes courtesy of user @Bonno 2016-04-24 12:24:59 +02:00
James Cole
ec12238ea1 Some code cleanup. 2016-04-24 09:14:40 +02:00
James Cole
bdbd22f98b Some language and code updates. 2016-04-24 09:02:21 +02:00
James Cole
b8e1944d20 Mass edit #241 2016-04-24 07:18:39 +02:00
James Cole
8883d185fe Fix tests. 2016-04-23 20:00:48 +02:00
James Cole
19e40e9976 Expand transaction lists for mass delete / edit functionality. 2016-04-23 18:55:57 +02:00
James Cole
fa85b2b5b2 Some layout fixes. [skip ci] 2016-04-23 18:53:16 +02:00
James Cole
5cf0131d75 New translations. 2016-04-23 12:14:24 +02:00
James Cole
3948cb8e6c New mass delete form and options. #241 2016-04-23 09:33:54 +02:00
James Cole
f43938726a Simple mass edit JS complete. Fallback for when the list.js is not included. #241 2016-04-23 06:11:31 +02:00
James Cole
8c8bb7a930 Start of mass delete code. #241 2016-04-21 14:57:58 +02:00
James Cole
3972882a33 Fix #251 2016-04-21 11:03:04 +02:00
James Cole
0ef5eeeb55 Take page size into account. [skip ci] 2016-04-21 10:34:16 +02:00
James Cole
ef48a79d0c Take page size into account. [skip ci] 2016-04-21 10:23:19 +02:00
James Cole
2bb883219c Take page size into account. 2016-04-21 09:10:37 +02:00
James Cole
23c0bb49c4 Take page size into account. [skip ci] 2016-04-21 09:04:19 +02:00
James Cole
13e59105ec Set correct path. [skip ci] 2016-04-21 09:01:34 +02:00
James Cole
98c057c516 Take page size into account. 2016-04-21 09:00:32 +02:00
James Cole
e293d69798 Take page size into account. 2016-04-21 08:59:31 +02:00
James Cole
b097e29104 New preference for page size. 2016-04-21 08:59:15 +02:00
James Cole
29fbd46e33 Fixes for translations. [skip ci] 2016-04-20 17:13:25 +02:00
James Cole
6a15afc723 New translations [skip ci] 2016-04-20 17:10:35 +02:00
James Cole
c56a39a726 Update chart js. [skip ci] 2016-04-20 13:54:13 +02:00
James Cole
4b80e46d26 Fix old bug. 2016-04-18 19:55:48 +02:00
James Cole
a6f3e61520 Fix #248 2016-04-18 19:41:16 +02:00
James Cole
cce4ef19e5 Fix #244 2016-04-18 19:34:15 +02:00
James Cole
1951491c04 Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop
* 'develop' of https://github.com/JC5/firefly-iii:
  Fix #243
2016-04-18 19:33:27 +02:00
James Cole
87b72e4bcd Fix #245 2016-04-18 19:33:02 +02:00
James Cole
2c6643d691 Fix #243 2016-04-18 14:15:10 +02:00
James Cole
d02df46517 Fix bug in bill name import routine 2016-04-17 20:40:26 +02:00
James Cole
0c0cc417ee Order chart thing again [skip ci] 2016-04-17 19:59:15 +02:00
James Cole
f0c03e8a3b Update chart order. 2016-04-17 19:58:09 +02:00
James Cole
345766f387 Merge branch 'release/3.8.3' 2016-04-17 12:13:00 +02:00
James Cole
3fa659632c Updated composer.lock [skip ci] 2016-04-17 12:12:35 +02:00
James Cole
95b92b7d1e Should fix test. 2016-04-17 11:43:07 +02:00
James Cole
466e988627 Correct date [skip ci] 2016-04-17 11:32:36 +02:00
James Cole
dc3c967c9f Update stuff in anticipation of new release. 2016-04-17 11:32:18 +02:00
James Cole
1fc31b4d8f Fixed a bug courtesy of Johan. 2016-04-17 11:28:44 +02:00
James Cole
e4a4b0a4eb Config update [skip ci] 2016-04-16 08:41:55 +02:00
James Cole
a9c026884d Fix null pointer. 2016-04-10 21:31:00 +02:00
James Cole
e893000ce9 Fix pie chart. 2016-04-10 20:28:32 +02:00
James Cole
32eeb3424d Code cleanup. 2016-04-10 17:51:51 +02:00
James Cole
ab523b6102 Make chart pretty 2016-04-10 17:03:36 +02:00
James Cole
b062222c45 Update chart options. 2016-04-10 11:28:55 +02:00
James Cole
2dddc843ce Fix chart heights. 2016-04-10 10:20:15 +02:00
James Cole
b74c1c8cf9 Upgrade chart library. 2016-04-10 10:05:50 +02:00
James Cole
d5d4bb2c4b Some javascript upgrades. 2016-04-10 08:23:31 +02:00
James Cole
89ac27ad10 Some code cleanup [skip ci] 2016-04-10 08:18:14 +02:00
James Cole
48b169c026 Fix comma thing [skip ci] 2016-04-09 21:07:43 +02:00
James Cole
0715b7406e Add language in cache as well. 2016-04-09 09:27:04 +02:00
James Cole
6e4991a34b Make help more reliable. 2016-04-09 09:24:17 +02:00
James Cole
8730af59bc Fix help text and debug. 2016-04-09 09:20:16 +02:00
James Cole
bdcc2c6c9f Prep for new report. 2016-04-09 09:16:51 +02:00
James Cole
6f0f6e86a1 Small bug fixes. 2016-04-09 09:10:11 +02:00
James Cole
3962d9da92 Text for error. 2016-04-09 06:02:30 +02:00
James Cole
5ed53d5f04 Some new code for CSV. 2016-04-08 20:36:11 +02:00
James Cole
ddb28b78c3 Some new translations and stuff. 2016-04-08 17:54:25 +02:00
James Cole
7699b6b4ea Update composer lock file. [skip ci] 2016-04-08 15:16:13 +02:00
James Cole
d783d05462 Some query optimisations for the audit report 2016-04-08 15:10:07 +02:00
James Cole
33bf373151 First attempt at audit report (uses lots of queries). 2016-04-08 14:50:18 +02:00
James Cole
8116644526 Some log fine tuning. 2016-04-08 14:44:53 +02:00
James Cole
dc4665e82a Add debug messages. 2016-04-08 11:59:44 +02:00
James Cole
732a85e51d Fix null call 2016-04-06 21:07:03 +02:00
James Cole
32190db8bb Fixed tests. 2016-04-06 21:05:43 +02:00
James Cole
25d3a115e0 Amounts better divided. 2016-04-06 20:59:09 +02:00
James Cole
30e3ed6410 Fix more tests. 2016-04-06 20:52:22 +02:00
James Cole
8b5a775dc5 Nonsense commit to test signing.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-04-06 20:16:28 +02:00
James Cole
2942c3a4be Nonsense commit to test signing.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-04-06 19:45:58 +02:00
James Cole
768d3bb3e8 Fix some tests. Won't fix all. 2016-04-06 19:44:42 +02:00
James Cole
250b2c2f53 PHP7 compatible function definitions. 2016-04-06 16:37:28 +02:00
James Cole
c8440af9a5 PHP7 compatible function definitions. 2016-04-06 09:27:45 +02:00
James Cole
37fe2d22b0 PHP7 compatible function definitions. 2016-04-05 22:00:03 +02:00
James Cole
b0b5d90976 Fixes the travis run. 2016-04-05 21:12:50 +02:00
James Cole
27b0c7f425 Moved a lot of files outside of the root. 2016-04-05 21:08:36 +02:00
James Cole
7c23571806 Missing translation. 2016-04-04 19:54:15 +02:00
James Cole
ea378c8d82 Fix search. [skip-ci] 2016-04-04 19:49:11 +02:00
James Cole
0fb45974ef Fix title. 2016-04-04 19:48:07 +02:00
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
James Cole
ed8b41e8ec Add source account to scan, see issue #226 2016-03-29 15:24:40 +02:00
James Cole
aada3371b7 Better translations for dates and so on. 2016-03-29 15:09:37 +02:00
James Cole
38a9782bdf Debug. 2016-03-29 13:55:57 +02:00
James Cole
c6ac81dcf6 Some more confirmation things. 2016-03-29 13:52:51 +02:00
James Cole
2d3f3f0fde Updated the routes. 2016-03-29 13:45:18 +02:00
James Cole
993a2c7823 New middleware. 2016-03-29 12:23:10 +02:00
James Cole
87b36cf7e3 Update 2FA and account activation 2016-03-29 12:14:01 +02:00
James Cole
742f2c8d9f New middle ware for user activation. 2016-03-29 11:55:49 +02:00
James Cole
0d7ac5f1d8 Move some routes around. 2016-03-29 11:55:38 +02:00
James Cole
3adccff611 New events and their handlers for user activation and other things. 2016-03-29 11:55:25 +02:00
James Cole
08b8bd27f9 Expand Preferences to handle not logged in users. 2016-03-29 11:55:02 +02:00
James Cole
1059c7e2be Updated config for user activation. 2016-03-29 11:54:50 +02:00
James Cole
3ebcd5f738 New translations for user activation. 2016-03-29 11:54:36 +02:00
James Cole
4627ea1dec Updated views for user activation. 2016-03-29 11:54:26 +02:00
James Cole
7ed24e78d5 New emails for the activation. 2016-03-29 11:48:29 +02:00
James Cole
ae02e3fd8d New example configuration that includes user account activation (disabled by default). 2016-03-29 11:46:21 +02:00
James Cole
cc88d5962e Move code to event handlers instead of registration routine. 2016-03-28 19:50:24 +02:00
James Cole
70c8a524cd Should fix the tests 2016-03-22 17:22:48 +01:00
James Cole
9a8efc8a58 Info in tags for #159 2016-03-22 16:59:29 +01:00
James Cole
f0f67b87c4 Code for #159 2016-03-22 16:57:26 +01:00
James Cole
1a3ec98896 Give all icons some context, no value yet. 2016-03-22 16:55:04 +01:00
James Cole
efff44cba9 Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop
* 'develop' of https://github.com/JC5/firefly-iii:
  Fix link to non-existing budget
2016-03-22 16:54:31 +01:00
James Cole
7227418c4c More fine-grained cookie control. 2016-03-22 15:04:51 +01:00
James Cole
29f93a9b73 Fix link to non-existing budget 2016-03-22 09:04:32 +01:00
James Cole
532aa2acd0 Fix amount [skip ci] 2016-03-21 19:29:24 +01:00
James Cole
6aca410f37 Fix amount [skip ci] 2016-03-21 19:28:22 +01:00
James Cole
f20656b516 Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop
* 'develop' of https://github.com/JC5/firefly-iii:
  Fix for #227
2016-03-21 19:27:13 +01:00
James Cole
bcd7866e10 For debug, add float. [skip ci] 2016-03-21 19:24:15 +01:00
James Cole
c1b8d44209 Small various fixes. 2016-03-21 19:22:37 +01:00
James Cole
50e947fbbe Fix for #227 2016-03-21 08:48:36 +01:00
James Cole
189d969ee6 Include "no budget" thing for issue #152 2016-03-20 20:06:05 +01:00
James Cole
201790ff8d Cleanup transaction journal edit. #215 2016-03-20 17:12:34 +01:00
James Cole
cc26ce4143 Some scrutiniser related code cleanup. 2016-03-20 16:49:49 +01:00
James Cole
745e0aa525 Move to object held user object. 2016-03-20 16:47:53 +01:00
James Cole
6602b1587a Some scrutiniser related code cleanup. 2016-03-20 16:46:26 +01:00
James Cole
6698b57f52 Fixed a bug that would leave all amounts at zero. #224 2016-03-20 16:41:48 +01:00
James Cole
628268d47c Code to fix #223 2016-03-20 11:47:10 +01:00
James Cole
56a635212a Code for #155 2016-03-20 11:46:27 +01:00
James Cole
7e67eb17e0 All new translations for #218 2016-03-20 11:38:01 +01:00
James Cole
935d72d672 New English text for issue #218 2016-03-20 11:36:50 +01:00
James Cole
fccb510186 Merge pull request #222 from eddyh/patch-1
Fixed small typo.
2016-03-20 11:34:58 +01:00
Edwin
e7ea0dc842 Fixed small typo. 2016-03-19 18:45:12 +01:00
James Cole
a40d6b0649 Merge branch 'master' into develop
* master:
  Code cleanup [skip ci]
  Quick bug fix.
2016-03-19 17:40:24 +01:00
James Cole
b7429a358f Code cleanup [skip ci] 2016-03-19 17:34:37 +01:00
James Cole
cf8b4e2f76 Quick bug fix. 2016-03-19 17:34:02 +01:00
James Cole
48c865e57a Merge branch 'hotfix/account-repos' into develop 2016-03-19 17:28:16 +01:00
James Cole
059764cd23 Merge branch 'hotfix/account-repos' 2016-03-19 17:28:15 +01:00
James Cole
c205eee6fd Something went wrong. 2016-03-19 17:28:04 +01:00
James Cole
7b22099608 Merge branch 'release/3.8.0'
Conflicts:
	app/Repositories/Account/AccountRepository.php
2016-03-19 17:17:06 +01:00
James Cole
b56b42d6fb Final change log. 2016-03-19 17:15:19 +01:00
James Cole
ef6ef57e67 Various code cleanup things. 2016-03-19 16:51:52 +01:00
James Cole
47d3cf1d45 Updated composer. 2016-03-19 16:50:01 +01:00
James Cole
9cfac9a884 New translations. #219 2016-03-19 16:47:29 +01:00
James Cole
dc172476e1 Make sure the two factor auth pages are not accessible when already authenticated using two factor. 2016-03-19 16:29:01 +01:00
James Cole
6fc7763380 New routes for #219 2016-03-19 16:25:24 +01:00
James Cole
ce45f21dba Translated stuff. #219 2016-03-19 16:25:16 +01:00
James Cole
2de713c946 New language stuff. #219 2016-03-19 16:25:05 +01:00
James Cole
3d1dfe20b3 Listen to the logout event. #219 2016-03-19 16:24:47 +01:00
James Cole
0404735ccb This is the cleaned up version of the controller #219 2016-03-19 16:24:35 +01:00
James Cole
83f200f5a2 This is the two factor middleware. #219 2016-03-19 16:23:09 +01:00
James Cole
a29eb9b993 This is the controller for two factor authentication. #219 2016-03-19 16:22:57 +01:00
James Cole
c939be97fb These are some new middleware groups required to call the two factor auth routines at the right moments. 2016-03-19 16:22:20 +01:00
James Cole
f31e62a532 This is a routine that will remove all two-factor related information from the session, when the user logs out. See issue #219 2016-03-19 16:21:50 +01:00
James Cole
34c195159e Clean mail message for blocked users. 2016-03-19 11:32:23 +01:00
James Cole
322fef2db1 Removed most logging. 2016-03-19 11:25:11 +01:00
James Cole
7aa2565e89 Fixed a bug where profiled account names would not get strtolower() and thus match nothing. Thanks to Tweakers.net user "doeners" 2016-03-19 11:23:23 +01:00
James Cole
8f3572f2d3 Correctly save 2fa secret. 2016-03-19 07:59:55 +01:00
James Cole
fb165ef28b Do not give the user the secret. 2016-03-19 07:56:57 +01:00
James Cole
a26acf4a25 Clean up mail thing. 2016-03-18 20:30:07 +01:00
James Cole
645400e17f Clean up mail thing. 2016-03-18 20:29:51 +01:00
James Cole
ccad52b80f Fix opening balance bug #214 2016-03-18 16:29:08 +01:00
James Cole
f6303deaa4 Error when blocked user logs in 2016-03-18 11:22:58 +01:00
James Cole
d3a3083b85 Error when blocked user logs in 2016-03-18 11:20:54 +01:00
James Cole
99452056ec Error when blocked user logs in 2016-03-18 11:19:22 +01:00
James Cole
fca21bab4d Error when blocked user logs in 2016-03-18 11:16:05 +01:00
James Cole
9c58b77f01 Error when blocked user logs in 2016-03-18 11:10:51 +01:00
James Cole
b5c5f67fcc Catch possible NULL 2016-03-18 10:53:59 +01:00
James Cole
0f17423465 Fix chart money format 2016-03-18 09:57:18 +01:00
James Cole
f093e29bd1 Removed the last floatvals. 2016-03-16 17:48:07 +01:00
James Cole
fe9b8e834d Change the precision. Should not influence anything. 2016-03-16 17:47:07 +01:00
James Cole
64f273120e Make sure that charts work when Firefly III is in a subdirectory. Thx to @xnyhps. 2016-03-16 17:28:04 +01:00
James Cole
31c1dd466b Merge pull request #217 from JC5/revert-216-fix-absolute-urls-report
Revert "Fix use of absolute URLs for linecharts for the report pages."
2016-03-16 17:26:06 +01:00
James Cole
99b369bf45 Revert "Fix use of absolute URLs for linecharts for the report pages." 2016-03-16 17:25:57 +01:00
James Cole
e2a1535c44 Merge pull request #216 from xnyhps/fix-absolute-urls-report
Fix use of absolute URLs for linecharts for the report pages.
2016-03-16 17:25:53 +01:00
Thijs Alkemade
3dfa88020e Fix use of absolute URLs for linecharts for the report pages. 2016-03-16 11:46:12 +01:00
James Cole
a220094941 Remove param doc. [skip ci]
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-03-14 21:03:35 +01:00
James Cole
ababdacf89 Some code cleanup
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-03-14 20:53:56 +01:00
James Cole
114dd5fc2a Rename method.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-03-14 20:52:08 +01:00
James Cole
c058629172 Small bug fixes.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-03-14 20:51:34 +01:00
James Cole
79d7f577e4 Small bug fixes.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-03-14 20:50:19 +01:00
James Cole
631bafc6ab Small bug fixes. 2016-03-14 20:47:13 +01:00
James Cole
be58da539e Fix various small issues. 2016-03-14 20:38:23 +01:00
James Cole
a508ac9dda Update composer.lock 2016-03-14 20:20:12 +01:00
James Cole
538fd2cef0 Add upgrade warning. 2016-03-14 20:15:29 +01:00
James Cole
42557446a1 New change log file 2016-03-14 20:13:27 +01:00
James Cole
b9586481fc Translate some help text. 2016-03-14 19:46:42 +01:00
James Cole
a0434e3271 Disable audit reports for now. [skip ci] 2016-03-14 19:42:05 +01:00
James Cole
15a5bcc21a Clean up some views 2016-03-14 17:18:28 +01:00
James Cole
edb838045b Update composer [skip ci] 2016-03-13 19:36:49 +01:00
James Cole
41a2e657b1 Cleaned up translation files. 2016-03-13 17:19:09 +01:00
James Cole
18b80a69c2 PHP 7 badge [skip ci] 2016-03-12 14:30:21 +01:00
James Cole
ce80fb39e8 Fix for #185 2016-03-12 14:20:45 +01:00
James Cole
2f19ff314b Fix for #185 2016-03-12 14:18:28 +01:00
James Cole
a0fd4b505a Fix for #185 2016-03-12 11:07:54 +01:00
James Cole
919aa70251 Account controller #185 2016-03-12 11:05:26 +01:00
James Cole
1aea4045a3 Fixes #151 2016-03-12 07:44:20 +01:00
James Cole
4cded0bf57 New translations for #122 2016-03-12 07:39:11 +01:00
James Cole
cd0585c7c4 Views will show new dates #122 2016-03-12 07:37:36 +01:00
James Cole
8281279452 Repository will store edits/ new journals #122 2016-03-12 07:37:26 +01:00
James Cole
8f1bf846fe Journal allows date edits and sets fields as dates #122 2016-03-12 07:37:13 +01:00
James Cole
c26bf557d0 Controller can let you edit new dates #122 2016-03-12 07:37:00 +01:00
James Cole
499b92cdd1 Journal request can handle new dates #122 2016-03-12 07:36:49 +01:00
James Cole
3dce5e162f New field for #122 2016-03-12 07:36:35 +01:00
James Cole
f9de65c035 Expand phpdoc. 2016-03-12 07:36:23 +01:00
James Cole
6f95e9a3cb Fix some decrypt bugs. 2016-03-12 07:17:00 +01:00
James Cole
ce09da084c Add account number to export #107 2016-03-12 07:16:42 +01:00
James Cole
5d50f92dd3 Issue #208 2016-03-12 07:04:47 +01:00
James Cole
d054e085d6 This will make triggers check existing fields first. 2016-03-12 07:02:39 +01:00
James Cole
59cdfa6fe6 Fix #211 2016-03-12 06:58:39 +01:00
James Cole
ee0e9011b2 Fixes bug #213 2016-03-11 19:20:31 +01:00
James Cole
654ebe0c48 Whoops, forgot the brackets. 2016-03-07 21:39:50 +01:00
James Cole
a40859c0bb Make opening balance not click-able. 2016-03-07 21:39:08 +01:00
James Cole
74e3f6dee5 Updated composer.lock
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-03-07 21:06:18 +01:00
James Cole
e553bfb204 Add new lines.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-03-07 20:46:05 +01:00
James Cole
96caace068 Update language fields.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-03-07 20:45:59 +01:00
James Cole
5310ccebbe New ability to disable 2fa.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-03-07 20:28:26 +01:00
James Cole
ccd55257cd Add php doc.
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-03-07 20:19:05 +01:00
James Cole
583687f3a7 Better FF name for multiple accounts. 2016-03-07 20:17:43 +01:00
James Cole
e06dc86bf7 Fix some logic in the preferences controller. 2016-03-07 20:14:24 +01:00
James Cole
8828aa0621 Merge pull request #204 from zjean/2fa
Validate the 2fa secret
2016-03-07 20:01:19 +01:00
James Cole
e472e105f2 ING specific amount modifier. See issue #210 2016-03-07 20:00:16 +01:00
James Cole
6ad10f1772 Fix bug that occurs when the transaction journal does not have the field "transaction_currency_code" 2016-03-07 19:52:59 +01:00
zjean
fcf7d98834 Update translations. 2016-03-04 19:36:42 +01:00
zjean
90ad06c65c Fixed composer.json 2016-03-04 19:35:11 +01:00
zjean
888e9beb4c Add breadcrumbs 2016-03-03 22:02:08 +01:00
zjean
69b338ca85 Added translations for 2fa. 2016-03-03 22:00:56 +01:00
zjean
0c009445d4 Added 2fa code validation 2016-03-03 21:14:53 +01:00
James Cole
c5fb734e42 Fix query. [skip ci] 2016-03-03 13:24:02 +01:00
James Cole
d2c8475504 #202 [skip ci] 2016-03-03 13:20:06 +01:00
James Cole
f38d99653f #202 make positive. 2016-03-03 13:19:47 +01:00
James Cole
cdce43d226 Closed #202 2016-03-03 13:19:06 +01:00
James Cole
89ab0a7e97 Clean up files. 2016-03-03 12:15:18 +01:00
James Cole
c7250bfcba Fix null error [skip ci] 2016-03-03 10:46:23 +01:00
James Cole
4a9b693da8 Fix sum [skip ci] 2016-03-03 10:39:11 +01:00
James Cole
fff35aa820 Reinstated sum of tag. 2016-03-03 10:37:06 +01:00
James Cole
a9a542d68f Update language stuff. 2016-03-03 10:27:53 +01:00
James Cole
35ff3f0cbf Some code cleanup. 2016-03-03 10:24:59 +01:00
James Cole
abf92b6df3 Add some new lines. 2016-03-03 09:38:16 +01:00
James Cole
8517fc9f24 Exclude test data. 2016-03-03 09:37:40 +01:00
James Cole
21b473108f Updated test script [skip ci] 2016-03-03 09:35:45 +01:00
James Cole
d4367f73a2 Updated composer.lock file. 2016-03-03 09:15:11 +01:00
James Cole
7ff46c3cd6 New providers in config. 2016-03-03 09:09:14 +01:00
James Cole
4a88e241b5 Code cleanup. 2016-03-03 09:05:09 +01:00
James Cole
8da0317b19 Fixed tag repository and provider. 2016-03-03 09:03:55 +01:00
James Cole
297c2e244d Created / updated rule repository and provider. 2016-03-03 09:02:04 +01:00
James Cole
a51d752a35 Update rule group repository and provider. 2016-03-03 09:00:15 +01:00
James Cole
7800b0a7f5 Update piggy bank repository / provider. 2016-03-03 08:58:15 +01:00
James Cole
5ce4104644 Update transaction journal repository / provider 2016-03-03 08:55:43 +01:00
James Cole
b4f1bbf793 Updated export job repository 2016-03-03 08:53:05 +01:00
James Cole
ca33bea6b7 Update category repository. 2016-03-03 08:50:17 +01:00
James Cole
42d20ff693 Updated budget provider and budget repository. 2016-03-03 08:44:20 +01:00
James Cole
22a14416ad Forgot to include classes for bill service provider. 2016-03-03 08:41:29 +01:00
James Cole
98bd9bdaa0 New bill repository provider. 2016-03-03 08:40:25 +01:00
James Cole
13bac92a24 Adapted attachment repository. 2016-03-03 08:38:24 +01:00
James Cole
d9eb14d6e5 New attachment service provider. 2016-03-03 08:36:36 +01:00
James Cole
6ec0471e8b Code cleanup. 2016-03-03 08:31:31 +01:00
James Cole
8008311d9c Added a new argument to the constructor of the account repository which should correctly inject the user. 2016-03-03 08:31:18 +01:00
James Cole
fcf16051a2 Some general code cleanup. 2016-03-03 08:29:56 +01:00
James Cole
3a236456cd Fix tag report thing. [skip ci] 2016-03-02 20:44:55 +01:00
James Cole
2606d77c62 Fix show tag [skip ci] 2016-03-02 20:40:43 +01:00
James Cole
3d2f33c120 Clean up some views. 2016-03-02 20:38:17 +01:00
James Cole
4f14969464 Add cache to journal support. 2016-03-02 20:19:39 +01:00
James Cole
7234f011ec Clean up method relying on old transaction journal code. 2016-03-02 20:11:28 +01:00
James Cole
5b949d6e00 Move some stuff around. 2016-03-02 19:41:22 +01:00
James Cole
2fd476ada8 Fixed search as well. 2016-03-02 13:56:56 +01:00
James Cole
2e7703bc97 Fixed two crashes. 2016-03-02 13:55:48 +01:00
James Cole
9b69a6addd Lots of todo's [skip ci] 2016-03-02 13:51:56 +01:00
James Cole
500243b0b3 This fixes most of the tests. 2016-03-02 13:37:28 +01:00
James Cole
3ef84dc1fc Cleanup and fix tests. 2016-03-02 13:13:33 +01:00
James Cole
b04d68d087 Stop on failure for easy log debug thing. 2016-03-02 12:57:35 +01:00
James Cole
715c381eb2 No longer need this left join. 2016-03-02 12:53:20 +01:00
James Cole
ca32ae4561 Fix is / is not already joined. 2016-03-02 12:52:36 +01:00
James Cole
6b277c5e67 Fix bill overview. 2016-03-02 12:47:15 +01:00
James Cole
1ac64fd0b3 Last updates, fixes the main list. 2016-03-02 12:33:07 +01:00
James Cole
f2c1dd41d0 Expanded Amount and expanded TransactionJournal to include source and destination information. 2016-03-02 12:25:00 +01:00
James Cole
869360f26c Some unrelated phpdoc. 2016-03-02 12:24:38 +01:00
James Cole
dbdc334931 Clean up frontpage query call (first of many...) 2016-03-02 12:09:45 +01:00
James Cole
b317d1a171 First attempt at scopeExpanded(), included some new fields in QUERYFIELDS. 2016-03-02 12:09:34 +01:00
James Cole
b00c7b0ce3 New constant that defines which fields a journal query is expected to load. 2016-03-02 12:03:53 +01:00
James Cole
a61eafeac2 Will now look for new field "transaction_type_type" 2016-03-02 12:03:04 +01:00
James Cole
5978b1c421 Removed cache from typeIcon 2016-03-02 12:02:01 +01:00
James Cole
9f16799453 Re-added phpdoc. 2016-03-02 11:59:39 +01:00
James Cole
74fe0ee4e4 Add some todo things, removed "withrelevantdata". This breaks FF 2016-03-02 11:58:31 +01:00
James Cole
e8880232b3 Removed "transaction_type" 2016-03-02 11:57:02 +01:00
James Cole
556e9f1df7 Removed "source_account" attribute. 2016-03-02 11:56:47 +01:00
James Cole
beb301e781 Removed "destination_account" 2016-03-02 11:54:03 +01:00
James Cole
056c809754 Removed amount_positive. This breaks the other half. 2016-03-02 11:53:23 +01:00
James Cole
fa47eac9ff Removed "amount" attribute. This breaks half of Firefly III. 2016-03-02 11:52:52 +01:00
James Cole
bf4a7846dd Removed boolean for left join that was never called more than twice anyway. 2016-03-02 11:52:17 +01:00
James Cole
b0cc6dd714 - Removed php doc.
- Added book_date and rent_date as fillable fields.
2016-03-02 11:50:37 +01:00
James Cole
d6e2d8e4a2 Add some extra filters [skip ci] 2016-03-02 11:48:53 +01:00
James Cole
bbfc962727 Include tags in multi year report [skip ci] 2016-03-02 07:08:08 +01:00
James Cole
8ddb357e5a Refer to correct var [skip ci] 2016-03-02 07:06:19 +01:00
James Cole
560c10898f Extra spaces for clarity [skip ci] 2016-03-02 07:05:43 +01:00
James Cole
04f5214bb7 Fix multiplier for single tag. 2016-03-02 07:04:48 +01:00
James Cole
4c35d52234 Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop
# By Robert Horlings
# Via James Cole (2) and Robert Horlings (1)
* 'develop' of https://github.com/JC5/firefly-iii:
  Small bugfix
  Small bugfix in AbnAmroImport specific
2016-03-01 21:31:42 +01:00
James Cole
01be5e3e23 Tag report. 2016-03-01 21:31:25 +01:00
James Cole
46dc4102e0 Merge pull request #200 from roberthorlings/develop
Small improvement in AbnAmroImport specific
2016-02-25 16:24:57 +01:00
James Cole
cf31049c51 Merge pull request #199 from roberthorlings/bugfix/import-amount-comma
Small bugfix
2016-02-25 16:20:28 +01:00
Robert Horlings
c624c4342f Small bugfix 2016-02-25 16:19:27 +01:00
James Cole
701d7baca8 #193 2016-02-25 15:17:24 +01:00
James Cole
8e45959483 #193 forgot to change file size thing. 2016-02-25 15:06:01 +01:00
James Cole
6858d67897 #193 2016-02-25 15:04:17 +01:00
James Cole
9b23cbd2c2 #193 2016-02-25 15:02:05 +01:00
Robert Horlings
ec1bb300e2 Small bugfix in AbnAmroImport specific 2016-02-25 14:54:06 +01:00
James Cole
69a8cad47b Attachment download (issue #193) 2016-02-25 14:53:26 +01:00
James Cole
bcaca0eca3 Queue name, default queue name. 2016-02-24 20:51:50 +01:00
James Cole
a1f79e58db Include time in job. 2016-02-24 20:44:39 +01:00
James Cole
2cc5fdcf62 Include time and date for errors. 2016-02-24 20:42:05 +01:00
James Cole
dd1b4e21f5 New table for #196 2016-02-24 20:14:09 +01:00
James Cole
91eb052c22 Use a job to send the error email instead of inline. #196 2016-02-24 20:13:55 +01:00
James Cole
ecefcfabc0 This is a partial fix for issue #151. It does not filter on account selection. 2016-02-24 17:37:08 +01:00
James Cole
8e42e71528 End of month... 2016-02-24 16:01:08 +01:00
James Cole
a2275ae111 Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop
# By Robert Horlings
# Via James Cole (2) and Robert Horlings (1)
* 'develop' of https://github.com/JC5/firefly-iii:
  Bugfix for a bug when adding a tag in a rule
  Bugfix in redirect after creating a new rule
2016-02-24 14:49:42 +01:00
James Cole
3976803d8f Same method of determining the applicable range as the "no category" view. Thanks to @roberthorlings in issue #151 2016-02-24 14:49:36 +01:00
James Cole
7921fc74fd Merge pull request #198 from roberthorlings/bugfix/rule-action-addtag
Bugfix for a bug when adding a tag in a rule
2016-02-24 14:09:00 +01:00
Robert Horlings
1732acfee2 Bugfix for a bug when adding a tag in a rule 2016-02-24 14:06:11 +01:00
James Cole
3a4fc65712 Merge pull request #197 from roberthorlings/bugfix/redirect-after-creating-rule
Bugfix in redirect after creating a new rule
2016-02-24 13:16:21 +01:00
Robert Horlings
9ce9caba02 Bugfix in redirect after creating a new rule 2016-02-24 10:21:04 +01:00
James Cole
07f4995c8f First start of new report. 2016-02-23 20:23:10 +01:00
James Cole
8200c7248a Helper for help text. 2016-02-23 20:22:53 +01:00
James Cole
bd9f1d5398 Rename export date range in other forms. Makes the rule group runner by @roberthorlings more consistent. 2016-02-23 19:59:41 +01:00
James Cole
ce0ca23d79 Rename field export start and end date. 2016-02-23 19:57:35 +01:00
James Cole
35863c8d3a This should fix the tests. 2016-02-23 17:55:56 +01:00
James Cole
dad73ce9df Added a translation. 2016-02-23 16:16:03 +01:00
James Cole
f716692591 New route and method. Work in progress. 2016-02-23 16:15:53 +01:00
James Cole
6387114a18 New method to access files. 2016-02-23 16:15:37 +01:00
James Cole
55ab39ca55 Old cover script. 2016-02-23 16:15:26 +01:00
James Cole
28a4f724d5 Use Requests library to get help from Github. 2016-02-23 16:12:59 +01:00
James Cole
f2d06bcea1 Fix bread crumb 2016-02-23 16:03:05 +01:00
James Cole
4d1771614a Code reformat 2016-02-23 16:02:44 +01:00
James Cole
61efabb3b5 Added sub title 2016-02-23 16:02:37 +01:00
James Cole
b00458c2b9 Small code format thing. 2016-02-23 15:55:09 +01:00
James Cole
594f9822c7 Fix parameters, re-order. 2016-02-23 15:54:13 +01:00
James Cole
9b3131b95e Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop
# By Robert Horlings
# Via Robert Horlings (2) and James Cole (1)
* 'develop' of https://github.com/JC5/firefly-iii:
  Added button to specify parameters and execute the job
  Added missing imports for job
  Implemented job to execute rulegroup on existing transactions
  Moved JournalCollector to other package to encourage reuse
2016-02-23 15:47:39 +01:00
James Cole
d7ad32a8cc Merge pull request #194 from roberthorlings/feature/rules-on-existing-transactions
Implemented support to execute rulegroup on existing set of transactions
2016-02-23 15:10:39 +01:00
Robert Horlings
59127e4029 Added button to specify parameters and execute the job 2016-02-23 14:18:09 +01:00
Robert Horlings
7edf70a77b Added missing imports for job 2016-02-23 14:17:41 +01:00
Robert Horlings
3fd90a37fb Merge branch 'develop' into feature/rules-on-existing-transactions 2016-02-23 13:17:07 +01:00
James Cole
356ec276bc Updated composer stuff. 2016-02-23 12:04:00 +01:00
James Cole
ad8d945c1d Make sure all the users accounts are included so internal transfers are ignored. [skip ci] 2016-02-23 09:22:18 +01:00
James Cole
a3bf30a77b Remove file_get / file_put combi for #193 2016-02-23 09:12:21 +01:00
James Cole
3f829a3114 Restore original functionality. 2016-02-23 07:31:01 +01:00
James Cole
537b4ae003 Fix translation. 2016-02-23 07:27:52 +01:00
James Cole
08b4c9ea5c Use export disk for zip file. 2016-02-23 07:27:29 +01:00
James Cole
6b00f5a97d Updated config file maker. 2016-02-23 07:07:14 +01:00
James Cole
d259df9a47 Fixed a small documentation bug. 2016-02-23 07:05:18 +01:00
James Cole
aeaebd082f Cleaned up upload collector. 2016-02-23 07:05:08 +01:00
James Cole
0c9c0f2032 Simplified the attachment collector. 2016-02-23 06:54:51 +01:00
James Cole
155801ab2b Some extra logging. 2016-02-23 06:54:16 +01:00
James Cole
deeeb06488 Added debug info to the export routine. 2016-02-23 06:39:01 +01:00
James Cole
28fd719ce3 New file systems. 2016-02-23 06:17:04 +01:00
James Cole
317075aa6d Oops. 2016-02-20 18:48:06 +01:00
James Cole
eaf2efc510 Updated favicons. 2016-02-20 18:47:06 +01:00
James Cole
88555bbea2 Some translations. 2016-02-20 14:18:55 +01:00
Robert Horlings
a4d7bf4ebe Implemented job to execute rulegroup on existing transactions 2016-02-18 20:15:50 +01:00
Robert Horlings
50e5c21735 Moved JournalCollector to other package to encourage reuse 2016-02-18 20:01:53 +01:00
James Cole
2ddacf48d4 Removed unused parameter and added caching. [skip ci] 2016-02-18 10:12:07 +01:00
James Cole
cd66d2c7b0 Return 0 amount. [skip ci] 2016-02-18 10:06:34 +01:00
James Cole
2e7c26c539 New chart called "net worth". 2016-02-18 10:04:53 +01:00
James Cole
f0f47530bf PHP7 type declarations. 2016-02-18 10:04:26 +01:00
James Cole
e7be4e3e49 PHP7 compatible type hinting [skip ci] 2016-02-18 07:21:48 +01:00
James Cole
7a7ce7fcea Some new translations [skip ci] 2016-02-18 06:57:25 +01:00
James Cole
bd104a7ea8 Massively reduced number of checked transactions. Even if the user six transactions a day, every day, the test will go back a month to find matches. 2016-02-18 06:56:24 +01:00
James Cole
31d6789ff0 Type hinting. 2016-02-18 06:54:50 +01:00
James Cole
bdcb7372a5 More phpdoc. 2016-02-18 06:45:10 +01:00
James Cole
b8df2226ae New phpdoc. 2016-02-18 06:38:37 +01:00
James Cole
106bae5c97 Move factories to separate folder. 2016-02-18 06:34:16 +01:00
James Cole
651297fa0b Method can be private. 2016-02-18 06:29:04 +01:00
James Cole
1b2873fc5f Some phpdoc. 2016-02-18 06:28:46 +01:00
James Cole
f82a2b3bc5 Some phpdoc. 2016-02-18 06:24:47 +01:00
James Cole
4cb616ebeb Some PHP7 compatible type definitions 2016-02-18 06:24:39 +01:00
James Cole
1bcc975d7b Some new phpDoc and refactoring. 2016-02-18 06:15:01 +01:00
James Cole
98fd5b8858 Invert stuff so chart works again. 2016-02-17 22:35:57 +01:00
James Cole
6f08482aaf Some simplification. 2016-02-17 22:02:32 +01:00
James Cole
f7d06b9759 Some more code cleanup. 2016-02-17 21:59:47 +01:00
James Cole
a178fed0c6 Code cleanup courtesy of Scrutiniser CI. 2016-02-17 21:55:00 +01:00
James Cole
ff342f6789 New translations. 2016-02-17 21:22:49 +01:00
James Cole
b1c2f8faa1 Various code cleaning things. 2016-02-17 21:14:32 +01:00
James Cole
6f59e79b28 Massively reduce number of searched transactions. 2016-02-17 21:05:32 +01:00
James Cole
6c22bad77a Revamped a part of the rule test code.
- clean way of constructing triggers
- processor can be constructed in a number of ways.
- cleaner transaction matcher using collections instead of arrays
2016-02-17 21:03:59 +01:00
James Cole
1cf0125d1b New method for transaction matcher. 2016-02-17 20:31:18 +01:00
James Cole
49211482b0 New getters and setters. 2016-02-17 20:25:54 +01:00
James Cole
b3aecec11d Remove parameter and make fields private. 2016-02-17 20:25:20 +01:00
James Cole
7cb86d0254 Add field. Also limit range. 2016-02-17 20:24:59 +01:00
James Cole
0ba9389ca2 Rename field. 2016-02-17 20:24:27 +01:00
James Cole
1902787104 Removed constructor. 2016-02-17 20:23:53 +01:00
James Cole
b3e32db073 Rename variables. 2016-02-17 20:23:14 +01:00
James Cole
01d53bdb85 Use request instead of complex method. 2016-02-17 20:22:25 +01:00
James Cole
51acc34a80 Fix factory and triggers. 2016-02-17 20:19:44 +01:00
James Cole
694447e66c Removed all constructors from all triggers. 2016-02-17 20:09:03 +01:00
James Cole
05b7a610ef Prep for private constructor. 2016-02-17 19:58:49 +01:00
James Cole
1e799402ee Rule actions no longer need to know the journal at construction time. This is easier. 2016-02-17 19:56:05 +01:00
James Cole
5f9c61c4b4 Update Processor with new situation. 2016-02-17 19:08:27 +01:00
James Cole
12b6791e8b Changed trigger constructor. No longer needs model AND journal, now only model. Wait for it... 2016-02-17 19:07:20 +01:00
James Cole
8024ad123e Cleaned up the Processor. This completely breaks everything @ roberthorlings has built but stay with me. 2016-02-17 18:47:05 +01:00
James Cole
2bd2f5a5aa Renamed config thing. [skip ci] 2016-02-17 18:36:08 +01:00
James Cole
37d79b2a1c Remove unused import. 2016-02-17 18:35:29 +01:00
James Cole
cd057045e6 Code clean up. 2016-02-17 18:23:20 +01:00
James Cole
ddfbd69e8b Minimum of one trigger. 2016-02-17 18:23:12 +01:00
James Cole
28fa1264b7 Remove matchesAnything 2016-02-17 18:06:49 +01:00
James Cole
a6c3189833 Add willMatchEveryThing as a static replacement for matchesAnything 2016-02-17 18:00:13 +01:00
James Cole
0d2fe08dc9 New request object for when the user wants to test triggers. 2016-02-17 17:47:29 +01:00
James Cole
8cfe25bfac Small code clean up [skip ci] 2016-02-17 17:32:02 +01:00
James Cole
f9e2a677d9 Offload stuff to repositories for rules and rule groups, see issue #185 2016-02-17 17:27:41 +01:00
James Cole
2ef1c54417 Code cleanup. [skip ci] 2016-02-17 17:19:57 +01:00
James Cole
f9c3c0c8ae Merge pull request #191 from roberthorlings/feature/test-triggers
New feature for testing triggers
2016-02-17 17:19:21 +01:00
James Cole
44a15551ba Merge pull request #192 from roberthorlings/bugfix/abnamro-description-specifix
Bugfix in parsing specific descriptions
2016-02-17 17:15:53 +01:00
Robert Horlings
732e181312 Bugfix in parsing specific descriptions 2016-02-17 16:59:56 +01:00
Robert Horlings
919187f7fd Made performance settings for testing triggers configurable 2016-02-17 16:39:26 +01:00
Robert Horlings
7840a5ea49 Added missing import 2016-02-17 16:30:54 +01:00
Robert Horlings
3a33ac1455 Removed code left over from merge 2016-02-17 16:29:32 +01:00
Robert Horlings
2eb7d8ba91 Merge branch 'feature/test-triggers' of github.com:roberthorlings/firefly-iii into feature/test-triggers 2016-02-17 16:26:29 +01:00
Robert Horlings
7ec5cce2c8 Implemented filter not to return all transactions when testing filters 2016-02-17 16:23:43 +01:00
Robert Horlings
8fdc6c11e1 Merge branch 'develop' into feature/test-triggers 2016-02-17 16:14:07 +01:00
James Cole
1a110de597 Throw errors instead of abort() 2016-02-17 15:52:46 +01:00
James Cole
317aa591c3 Need to "use" the TriggerFactory! 2016-02-17 15:46:58 +01:00
James Cole
0d44f82c86 Code cleanup. [skip ci] 2016-02-17 15:38:21 +01:00
James Cole
9cac61dc33 Better description for matchesAnything 2016-02-17 15:37:05 +01:00
James Cole
52481a6e8b Code formatting. 2016-02-17 15:29:26 +01:00
James Cole
b3e18f4e56 Merge pull request #189 from roberthorlings/feature/trigger-matches-anything
Check for triggers that match anything
2016-02-17 15:28:39 +01:00
James Cole
aa25ac774e Merge pull request #190 from roberthorlings/feature/trigger-action-factories
Introduction of factories to create rule actions and rule triggers
2016-02-17 15:27:38 +01:00
Robert Horlings
af7da586aa Cleanup of processor after introduction of factories 2016-02-17 13:26:38 +01:00
Robert Horlings
b671da900a Implemented action factory analogue to trigger factory 2016-02-17 13:24:56 +01:00
Robert Horlings
d8bb83e8c4 Moved creation of Trigger objects to factory for reuse 2016-02-17 13:20:51 +01:00
Robert Horlings
bc3d64a2ff Moved creation of Trigger objects to factory for reuse 2016-02-17 13:16:46 +01:00
Robert Horlings
70e72c246d Added method to RuleTrigger object as well 2016-02-17 13:03:02 +01:00
Robert Horlings
7c8c82edd7 Added method for triggers to check whether they match all transactions 2016-02-17 13:02:27 +01:00
Robert Horlings
5dc556f0af Updated frontend to access the 'test-rules' functionality 2016-02-17 12:11:00 +01:00
Robert Horlings
c8c69f1a66 Implemented controller method and helper object to find matching transactions 2016-02-17 12:10:38 +01:00
James Cole
985019e117 Merge pull request #188 from roberthorlings/bugfix/fixed-missing-tags
Added closing li tags
2016-02-17 10:31:51 +01:00
Robert Horlings
b9620b3a21 Refactored method to check whether a transaction is triggered by a list of triggers 2016-02-17 10:24:40 +01:00
Robert Horlings
e7bb4a8ec6 Implemented option to specify pagesize when retrieving journals 2016-02-17 10:17:16 +01:00
Robert Horlings
bb5f935d7a Added closing li tags 2016-02-17 10:13:21 +01:00
James Cole
17dad27610 Catch type error. 2016-02-16 18:39:03 +01:00
James Cole
ee960d76c7 Possible fix for attachment helper 2016-02-16 13:30:50 +01:00
James Cole
dfb595193a Possible fix for attachment helper 2016-02-16 13:28:55 +01:00
James Cole
0a91a40c1b Merge branch 'develop' of github.com:JC5/firefly-iii into develop 2016-02-16 13:25:48 +01:00
James Cole
12f4305691 Possible fix for attachment helper 2016-02-16 13:25:03 +01:00
James Cole
dd865b0dfb Remove IDE specific files from .gitignore. [skip ci] 2016-02-15 19:49:33 +01:00
James Cole
7cbfa9fcd4 Merge pull request #182 from roberthorlings/develop
Small fix for importing amounts with comma as decimal separator
2016-02-15 19:48:27 +01:00
Robert Horlings
28d880a7c4 Ignoring eclipse specific files 2016-02-15 14:50:10 +01:00
James Cole
e83d45fce5 Expand manifest.json [skip ci] 2016-02-14 16:17:01 +01:00
James Cole
693ff3cc66 Various fixes. 2016-02-13 13:13:22 +01:00
James Cole
706b095f95 Forgot to actually return the created array. 2016-02-12 17:50:12 +01:00
James Cole
8e2e96d513 Config for code climate. 2016-02-12 17:45:33 +01:00
James Cole
28bce44f69 More code cleanup. 2016-02-12 17:41:12 +01:00
James Cole
53d88dfd50 Clean up code. 2016-02-12 17:37:11 +01:00
James Cole
42daf7ed32 Clean up some code. 2016-02-12 17:34:42 +01:00
James Cole
e5402ea7c1 Fixed a sum. 2016-02-12 15:01:32 +01:00
James Cole
05e8d6b578 Removed superfluous sentence in registration mail. 2016-02-12 14:16:51 +01:00
James Cole
505f340917 Some clean up in the error handler. 2016-02-12 14:15:49 +01:00
James Cole
46856c9394 Remove entrust package. 2016-02-12 05:49:53 +01:00
James Cole
c63a2ad39d Updated test data. 2016-02-12 05:32:16 +01:00
James Cole
68a7078614 Clean up TestData 2016-02-12 05:29:41 +01:00
James Cole
2e15f1e2a3 Removed todo comments. 2016-02-12 04:59:14 +01:00
James Cole
a790838222 Remove total downloads. [skip ci] 2016-02-12 04:51:40 +01:00
James Cole
cd14360d62 Merge pull request #178 from zjean/develop
Respect the base href in ajax calls.
2016-02-11 21:24:53 +01:00
zjean
74c94a60a6 Respect the base href in ajax calls. 2016-02-11 19:57:26 +01:00
James Cole
56cbc7683e Try changes to the handler 2016-02-11 14:20:18 +01:00
James Cole
bf778d2fca Try changes to the handler 2016-02-11 14:17:58 +01:00
James Cole
6e5bca8306 Try changes to the handler 2016-02-11 14:17:11 +01:00
James Cole
7e8fea6ed3 Forgot a bracket 2016-02-11 14:14:47 +01:00
James Cole
43ff3e11ed Some changes to the error handler 2016-02-11 14:13:23 +01:00
James Cole
f1750e3c35 Will inform about the logged in user 2016-02-11 12:54:16 +01:00
James Cole
8b1fe26c84 A route that displays an error. Seems quite useless, I know 2016-02-11 12:49:04 +01:00
James Cole
6ab09a3603 Undo PHP7 thing in master. 2016-02-11 11:22:27 +01:00
James Cole
df45298c1f Fixed bug in sumOfEverything() function 2016-02-11 11:21:50 +01:00
James Cole
4a64dce737 Fixed bug in sumOfEverything() function 2016-02-11 11:21:05 +01:00
James Cole
27ad428b5e Weird letter. 2016-02-11 08:13:57 +01:00
James Cole
2da33bae43 Some code used for #164 2016-02-11 08:13:04 +01:00
James Cole
3dab683a45 New asset account number handler. For issue #107 2016-02-11 08:12:10 +01:00
James Cole
d08fa37ccf Expanded error handling. 2016-02-11 08:11:26 +01:00
James Cole
4cd7976f63 Changes to the CSV importer because I ran into small bugs. 2016-02-11 08:11:12 +01:00
James Cole
569e8b6180 Better sort for CSV import column roles. 2016-02-11 07:03:12 +01:00
James Cole
9a443bd08e New translations. 2016-02-11 07:02:57 +01:00
James Cole
efb37ae709 Field 'name' is not used. Also added some other new stuff. 2016-02-11 07:02:48 +01:00
James Cole
4658ef9918 Fix PHP7 related strict type check. 2016-02-11 07:02:27 +01:00
James Cole
2b6a1c9cb1 Fixes a bug in the CSV importer. 2016-02-11 06:49:39 +01:00
James Cole
c4606b1854 New error message translations (also for #107) 2016-02-11 06:41:31 +01:00
James Cole
d47b946d00 New validator for account number #107 2016-02-11 06:40:16 +01:00
James Cole
a886e8087d New rule for account number. #107 2016-02-11 06:40:06 +01:00
James Cole
d473455680 Valid misspelled #107 2016-02-11 06:30:37 +01:00
James Cole
40245ef43b Some cosmetic changes for #107. 2016-02-11 06:30:09 +01:00
James Cole
aa057d6a57 Merge pull request #177 from zjean/develop
Tried to start with #107
2016-02-11 06:27:01 +01:00
zjean
5c03e64f46 Tried to start with #107
- Always show the IBAN in the create account view, because it is always editable the edit view.
- Added 'accountNumber' account_meta field, and showing it in create/edit account view.
2016-02-10 22:09:24 +01:00
James Cole
1d4d156749 Merge pull request #176 from zjean/2fa
Some small fixes to respect the base url
2016-02-10 20:12:28 +01:00
zjean
4fc6da1fa1 Add favicons to default.twig 2016-02-10 19:47:40 +01:00
zjean
9fac48fcea Fix base url in empty.twig 2016-02-10 19:45:23 +01:00
zjean
ff4fdd3740 Respect the base url in the guest area. 2016-02-10 19:42:04 +01:00
zjean
da1cce035a Focus the first visible form field in the guest area. 2016-02-10 19:39:10 +01:00
James Cole
49292bbb2d New model for future implementation of #164 2016-02-10 16:26:42 +01:00
James Cole
3e502db772 Various code fixes. 2016-02-10 16:23:37 +01:00
James Cole
426351bb54 Added new lines. 2016-02-10 16:01:18 +01:00
James Cole
4d6e244100 Better error handling for issue #168 2016-02-10 15:18:13 +01:00
James Cole
71253b23d5 Allow tests to run very long. 2016-02-10 15:04:18 +01:00
James Cole
076ff7c7ba Fixes #173 2016-02-10 15:04:06 +01:00
James Cole
94b6c7975a Fixes #174. 2016-02-10 14:36:21 +01:00
James Cole
0b08010221 Slightly updated travis file. 2016-02-10 12:04:24 +01:00
James Cole
bc67113d77 This fixes the broken tests. 2016-02-10 12:01:45 +01:00
James Cole
5974bdcc2a This fixes what turns out to be an incredibly inaccurate chart. 2016-02-10 07:34:04 +01:00
James Cole
f9696287a4 Removed opening balance as possible expense for the balance thing. [skip ci] 2016-02-10 06:58:41 +01:00
James Cole
807dede90a Because nextExpectedMatch() must return a date (and cannot return null) the list of bills will show "unknown" when the bill is next expected in 1900. 2016-02-10 06:55:08 +01:00
James Cole
1f2b37b70e Updated translations via CrowdIn: new lines added to Dutch (still untranslated in other languages). Changed @zjean's 2-step verification lines a bit. 2016-02-10 06:39:09 +01:00
James Cole
7288ba0fd7 Bit of code cleanup + the true/false in SHOW_INCOMPLETE_TRANSLATIONS is not a text but a boolean. Changed as such. 2016-02-10 06:25:21 +01:00
James Cole
f48c17cf88 Update packages. [skip ci] 2016-02-10 06:24:10 +01:00
James Cole
fba9cc3739 Merge pull request #175 from zjean/2fa
Started over with 2fa
2016-02-10 06:13:44 +01:00
zjean
e04388a230 Added two factor auth setting to Preferences page. 2016-02-08 22:28:24 +01:00
James Cole
fbe3be169d Add some fancy Schema markers. [skip ci]
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-02-08 21:25:12 +01:00
James Cole
4e4ae0fca0 New URL for "full description" [skip ci]
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-02-08 21:13:44 +01:00
James Cole
2f278c8618 Just a test commit [skip ci]
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
2016-02-08 21:10:33 +01:00
James Cole
905ae3437b float > string. 2016-02-08 21:09:00 +01:00
James Cole
7679721007 float > string. 2016-02-08 21:07:11 +01:00
James Cole
9f29a2e04f Fixed something in the reports. 2016-02-08 20:59:09 +01:00
James Cole
ff5bf0c6e5 Opening balance does not count as an income or as an expense. It's just there. 2016-02-08 20:42:31 +01:00
James Cole
0eb8c2b7ba Make sure account has a start and end balance. 2016-02-08 20:40:47 +01:00
James Cole
deb140e3bc Fixes to export [skip ci] 2016-02-07 09:19:51 +01:00
James Cole
9a1710eb27 Some enhancements to export. 2016-02-07 09:11:46 +01:00
James Cole
e478238d77 New translations [skip ci] 2016-02-07 08:49:02 +01:00
James Cole
c9c9410908 Use translations instead of hard config. [skip ci] 2016-02-07 08:40:59 +01:00
James Cole
42372cabd5 Wasn't used. [skip ci] 2016-02-07 08:35:37 +01:00
James Cole
ab9c991530 Better flashes (also translated) [skip ci] 2016-02-07 08:31:21 +01:00
James Cole
9429d84cf8 Some code cleanup [skip ci] 2016-02-07 07:56:58 +01:00
James Cole
b22774a599 Logout blocked accounts. 2016-02-07 07:36:31 +01:00
James Cole
ca3b0a2ab1 It's called a route [skip ci] 2016-02-06 22:16:59 +01:00
James Cole
62f76d08ad It's called a route [skip ci] 2016-02-06 22:16:30 +01:00
James Cole
92bff24d43 It's called a route [skip ci] 2016-02-06 22:15:16 +01:00
James Cole
eddd3e508f Force blocked users to logout. 2016-02-06 22:14:51 +01:00
James Cole
649eb65bb1 Fixed scrutiniser issue. [skip ci] [skip Scrutinizer] 2016-02-06 20:19:28 +01:00
James Cole
8fb3348a7c Added some (yet without function) information icons. [skip ci] [skip Scrutinizer] 2016-02-06 20:17:55 +01:00
James Cole
6c2df1a783 Give maintenance page a title as well [skip ci] 2016-02-06 19:10:24 +01:00
James Cole
55afc98108 Better maintenance page. 2016-02-06 19:06:10 +01:00
James Cole
b875eb31d2 Small cosmetic changes. 2016-02-06 19:00:01 +01:00
James Cole
060b031272 Added PHP7 return type statements. 2016-02-06 18:59:48 +01:00
James Cole
95c4c4a238 Fixed a small bug after changing the return type statements. 2016-02-06 16:23:54 +01:00
James Cole
4424e48926 Added PHP7 return type statements. 2016-02-06 16:22:12 +01:00
James Cole
b8c7876454 Simplified export controller. 2016-02-06 15:01:26 +01:00
James Cole
8256f60340 Fixed form elements. 2016-02-06 15:00:57 +01:00
James Cole
1d0cb45e4c List in translation. 2016-02-06 15:00:48 +01:00
James Cole
d1a184e3f2 Added PHP7 return type statements. 2016-02-06 10:17:41 +01:00
James Cole
aa38b31015 Added PHP7 return type statements. 2016-02-06 10:15:07 +01:00
James Cole
466067bd95 Added PHP7 return type statements. 2016-02-06 10:11:06 +01:00
James Cole
c9b56efaaa Mock stuff in tests. 2016-02-06 09:52:31 +01:00
James Cole
e56920edee Speed up some tests. [skip ci] 2016-02-06 05:15:17 +01:00
James Cole
0e0c475c83 Forgot a thing. 2016-02-06 05:04:41 +01:00
James Cole
241190c4da More consistent error handling. 2016-02-06 05:01:34 +01:00
James Cole
69d0c31ae5 Translation. 2016-02-06 04:55:41 +01:00
James Cole
c3993fd943 Merge branch 'hotfix/3.7.2.3' into develop 2016-02-06 04:37:33 +01:00
James Cole
8a3b7d7c1a Merge branch 'hotfix/3.7.2.3' 2016-02-06 04:37:29 +01:00
James Cole
87f14617cc Code fix for #172. 2016-02-06 04:37:18 +01:00
James Cole
9f24f765ea Fix in Javascript for #172. 2016-02-06 04:35:51 +01:00
James Cole
48c802e5cc New version. 2016-02-06 04:34:06 +01:00
James Cole
388d141d82 Fix for #172 2016-02-06 04:32:30 +01:00
James Cole
7fa93e97db Fix language [skip-ci] 2016-02-05 21:30:56 +01:00
James Cole
030d241130 Should fix a bug in Travis. 2016-02-05 21:29:03 +01:00
James Cole
bac392d331 Some new translations 2016-02-05 21:23:10 +01:00
James Cole
1542d5e386 Include IBAN 2016-02-05 21:12:19 +01:00
James Cole
f1b6b3386a Expanded entry for export. 2016-02-05 21:10:55 +01:00
James Cole
7d05999ced Fixed view. [skip-ci] 2016-02-05 19:59:38 +01:00
James Cole
d477feb930 Some fix [skip-ci] 2016-02-05 19:59:07 +01:00
James Cole
9465a6d2b5 This PHP7 thing is strict! 2016-02-05 19:57:17 +01:00
James Cole
c3f78b698d This PHP7 thing is strict! 2016-02-05 19:56:25 +01:00
James Cole
a4e699f781 Fix another php7 bug. 2016-02-05 19:54:25 +01:00
James Cole
cd871e5aad Let's see what happens. 2016-02-05 19:27:52 +01:00
James Cole
c9b215684c Also fixed tests. 2016-02-05 19:25:17 +01:00
James Cole
82a4c706b0 Update something in travis. 2016-02-05 19:16:42 +01:00
James Cole
082e6f5e99 Removed the composer.lock, see what happens. 2016-02-05 19:14:06 +01:00
James Cole
b90c7c09b6 Smaller travis file. Try to fix the search. 2016-02-05 19:12:54 +01:00
James Cole
1ee72a6ce5 Travis file update. 2016-02-05 18:53:31 +01:00
James Cole
f72a8c5c06 Fixed some errors. Debug tests. 2016-02-05 17:38:58 +01:00
James Cole
ba5db2c15f Fixed test data. 2016-02-05 17:29:51 +01:00
James Cole
f5b89ca783 Some code cleanup. 2016-02-05 15:41:40 +01:00
James Cole
4ef840e210 More test data tweaks. 2016-02-05 15:20:44 +01:00
James Cole
e2d0ee125f Cleaning up test data. 2016-02-05 15:01:33 +01:00
James Cole
8e1dbc03d9 Merge branch 'hotfix/3.7.2.2' into develop
Conflicts:
	app/Http/Controllers/RuleGroupController.php
2016-02-05 13:23:00 +01:00
James Cole
9c0893fa8c Merge branch 'hotfix/3.7.2.2' 2016-02-05 13:22:02 +01:00
James Cole
0dfb97c5f7 Fix #171 2016-02-05 13:21:56 +01:00
James Cole
cb52af28e7 Also fixes #171 2016-02-05 13:20:10 +01:00
James Cole
4b4384b1a8 Merge branch 'hotfix/3.7.2.1' 2016-02-05 13:16:21 +01:00
James Cole
62483e748b Merge branch 'hotfix/3.7.2.1' into develop 2016-02-05 13:16:21 +01:00
James Cole
9b10984d81 Fix for bug #171 2016-02-05 13:16:12 +01:00
James Cole
c5e283a13e This is a fix for #171 2016-02-05 13:13:47 +01:00
James Cole
df918e8529 Fixed all problems related to strict types. 2016-02-05 13:09:18 +01:00
James Cole
aa1193a9eb Fixed all problems related to strict types. 2016-02-05 12:28:05 +01:00
James Cole
8f7f263a48 Declare strict type. 2016-02-05 12:08:25 +01:00
James Cole
0bad227548 No more PHP 5.6 tests. 2016-02-05 09:30:06 +01:00
James Cole
78bcd3e1bb Changed a lot of parameters. 2016-02-05 09:25:15 +01:00
James Cole
554640c345 These are the first commits that make FF require php 7. 2016-02-05 08:03:26 +01:00
James Cole
baecc256f6 Secretly updated some migrations. 2016-02-05 07:55:36 +01:00
James Cole
10a2a4cf5b Merge branch 'hotfix/3.7.2' 2016-02-05 07:40:38 +01:00
James Cole
c5dc073d49 Merge branch 'hotfix/3.7.2' into develop 2016-02-05 07:40:38 +01:00
James Cole
d48e4c66b2 I have no idea what I'm doing 2016-02-05 07:40:15 +01:00
James Cole
d357142075 Merge branch 'release/3.7.1' 2016-02-05 07:34:34 +01:00
James Cole
af17381e04 Merge branch 'release/3.7.1' into develop 2016-02-05 07:34:34 +01:00
James Cole
2e7d339d7e Fix for bug #170, caught thanks to @boerbiet 2016-02-05 07:34:25 +01:00
James Cole
c6cddad13c Let's see if this works as well. 2016-02-05 07:31:22 +01:00
James Cole
54bd54b521 First install with no-dev, then update? 2016-02-05 07:27:07 +01:00
James Cole
8cbbb970e1 Attempt to fix the tests. 2016-02-05 07:26:20 +01:00
James Cole
fbbf7f75c3 Fix for test. 2016-02-05 07:24:33 +01:00
James Cole
5a23b95352 Final fix for #170. Now to make a new release! 2016-02-05 07:21:51 +01:00
James Cole
6f9675b6d6 Catch the latest exceptions for #170. 2016-02-05 07:16:55 +01:00
James Cole
bb8ce30552 Added missing ranges to Navigation, see issue #170 2016-02-05 06:56:10 +01:00
James Cole
581e2ad431 Updated all tests to include the range. 2016-02-05 06:45:54 +01:00
James Cole
45deb493ba Added the provider annotation to all tests. 2016-02-05 06:41:28 +01:00
James Cole
4531d0ee32 Expand test to set a "custom" range. 2016-02-05 06:37:08 +01:00
James Cole
a26e8a5f83 Added the $range argument to every test that might need it. See #170 2016-02-05 06:36:56 +01:00
James Cole
be74fbd677 The tests now reflect that not all category-related views support all date ranges, see issue #170 2016-02-05 06:31:27 +01:00
James Cole
ee8c83bbd8 Some small fixes. 2016-02-04 17:57:36 +01:00
James Cole
dbd32abdd1 Also delete old files. 2016-02-04 17:50:35 +01:00
James Cole
f300287814 Better cleanup routine. 2016-02-04 17:22:09 +01:00
James Cole
dd361bb9ad Delete files used. 2016-02-04 17:22:01 +01:00
James Cole
744205cb6e New composer. 2016-02-04 17:21:46 +01:00
James Cole
86c22c9fdd New export functionality. 2016-02-04 17:16:16 +01:00
James Cole
d7a66f6782 New model for export. 2016-02-04 17:14:59 +01:00
James Cole
902f310eb0 New export directory. 2016-02-04 17:14:32 +01:00
James Cole
3bb107e192 New migrations (also for export). 2016-02-04 17:13:58 +01:00
James Cole
78f8b1454d New export controller. 2016-02-04 17:13:42 +01:00
James Cole
70ba9a4db5 Some phpunit updates. 2016-02-04 17:13:34 +01:00
James Cole
93d9c44585 This should fix the tests. 2016-02-04 11:07:34 +01:00
James Cole
f0bb462f1c New test data. 2016-02-04 11:00:26 +01:00
James Cole
151e8e8f17 Experimenting with a negation for #159 2016-02-04 08:56:33 +01:00
James Cole
23f474b003 Don't add inactive unhit bills, see #159 2016-02-04 08:55:06 +01:00
James Cole
15104de84c This should clean up the monthly report a bit. See issue #159 2016-02-04 08:53:56 +01:00
James Cole
55e4875662 New method to collect a users accounts by the given ids. 2016-02-04 08:53:15 +01:00
James Cole
5c3165efa2 Site is gone. 2016-02-04 08:52:54 +01:00
James Cole
3690a53dc9 expand tests 2016-02-04 07:30:48 +01:00
James Cole
fb119cc208 Replaced success() with done () 2016-02-04 07:30:12 +01:00
James Cole
7343304284 Code cleanup. 2016-02-04 07:28:39 +01:00
James Cole
c1ecc62ac1 Replaced Session::get() with session() 2016-02-04 07:27:03 +01:00
James Cole
bd40615f8e Code cleanup. 2016-02-04 07:23:14 +01:00
James Cole
0df8d096f0 Removed unused use statements. 2016-02-04 07:23:02 +01:00
James Cole
749dd1e8e3 Text alignment. 2016-02-04 07:22:38 +01:00
James Cole
ade6558769 Mea culpa. Removed ide specific files from git ignore. 2016-02-04 07:22:26 +01:00
James Cole
6303b172b1 Merge branch 'release/3.7.0' into develop 2016-02-04 07:21:29 +01:00
James Cole
636ae193a7 Merge branch 'release/3.7.0' 2016-02-04 07:21:28 +01:00
James Cole
aff8493204 Fixed bug where download would not be pushed as download. 2016-02-03 11:46:28 +01:00
James Cole
8f2d4494d5 Fixed a bug in the beforeDraw() routine. 2016-01-31 14:02:52 +01:00
James Cole
7a2bb4eb96 Removed some old CSS. Might just fix #114 2016-01-30 10:00:52 +01:00
James Cole
4916c06797 Added new dates to transaction journal, see #122 2016-01-30 09:52:05 +01:00
James Cole
a818ab0942 Fixes #110 2016-01-30 09:41:48 +01:00
James Cole
9aa89393c0 Forgot some translations. 2016-01-30 08:57:25 +01:00
James Cole
216b304fe1 Updated composer.lock. 2016-01-30 08:47:37 +01:00
James Cole
cf8a687b4d Added some new lines to files. 2016-01-30 08:42:04 +01:00
James Cole
d1d6ba4114 Updated read me file. 2016-01-30 08:38:40 +01:00
James Cole
a5ac713310 Importer will now fire custom rules. 2016-01-30 07:36:22 +01:00
James Cole
6fa8c33672 Fixed some bugs in test data. 2016-01-30 07:36:11 +01:00
James Cole
dd2b019d3c Moved test data around. 2016-01-30 07:36:02 +01:00
James Cole
3a12ad192f Move more javascript around. 2016-01-29 18:39:50 +01:00
James Cole
d669b75352 This view does not use JS. 2016-01-29 18:33:01 +01:00
James Cole
746d50d459 Some javascript related cleaning up. 2016-01-29 17:53:49 +01:00
James Cole
f741552d91 Some javascript code cleanup. Should make some pages lighter. 2016-01-29 17:49:02 +01:00
James Cole
c38e4b86b4 I noticed a weird page jump in the piggy bank section so it seemed a good moment to clean up some javascript. 2016-01-29 17:31:07 +01:00
James Cole
b044d85e90 Expand report index to include both "normal" year and fiscal year. 2016-01-29 17:14:23 +01:00
James Cole
24d111f026 New text. 2016-01-29 17:14:02 +01:00
James Cole
f50058e3c2 Renamed fiscal year start and end variable. 2016-01-29 17:13:54 +01:00
James Cole
ce9445168c Move the start and end date for the fiscal date ranges to fiscal-start and fiscal-end respectively. 2016-01-29 17:09:23 +01:00
James Cole
27b8b4b35a Use the fiscal helper's interface instead of the fiscal helper itself. 2016-01-29 17:08:06 +01:00
James Cole
9ccb67db8a Charts "columnChart" and "stackedColumnChart" now support beforeDraw() which will check the data to see if the chart should be drawn. This cleans up the front page for new users and empty months. 2016-01-29 13:35:08 +01:00
James Cole
3d82afd4e6 Because the "options" parameter is used nowhere I've removed it to be used for something else. 2016-01-29 13:25:04 +01:00
James Cole
5f9cb61160 Some stuff moving around in test data generation. 2016-01-29 13:24:33 +01:00
James Cole
7f54b70c24 Make fiscal year quick link optional. 2016-01-29 07:47:18 +01:00
James Cole
a156dce281 Some minor code cleanup. 2016-01-29 07:35:14 +01:00
James Cole
c0b0e58720 Removed duplicated code. 2016-01-29 07:33:49 +01:00
James Cole
170ffbae04 Removed duplicate code. 2016-01-29 07:29:21 +01:00
James Cole
6755ec7eb0 Some code cleanup. 2016-01-29 07:17:50 +01:00
James Cole
c8bc9a096a Some other clean up. 2016-01-29 07:08:17 +01:00
James Cole
dc7f5a562b Clean up some migrations. 2016-01-29 07:08:04 +01:00
James Cole
3b5b51578d Merge pull request #153 from webenhanced/feature/current-fiscal-year-quicklink-report
Quicklink fiscal year report feature. As per github issue #131.
2016-01-29 06:45:36 +01:00
Graham Miller
41188a1bd6 Quicklink fiscal year report feature. As per github issue #131.
The reason for instantiating the helper at the beginning of the static function routeBinder
is I am hoping that the object will only be created once.
2016-01-29 09:11:36 +10:00
James Cole
d9bafe34eb Renamed some stuff, courtesy of sensiolabs. 2016-01-28 22:06:16 +01:00
James Cole
43dbba5378 Implemented wrong interface. 2016-01-28 21:59:40 +01:00
James Cole
168ed5ac56 Renamed some stuff, courtesy of sensiolabs. 2016-01-28 21:50:20 +01:00
James Cole
e5b4a55d8e Some code cleanup things courtesy of SensioLabs. 2016-01-28 21:33:45 +01:00
James Cole
167c057e8a Removed executable rights. 2016-01-28 21:22:26 +01:00
James Cole
71bf054ab1 Removed TODO items in favour of issues, or actual fixes. 2016-01-28 21:05:26 +01:00
James Cole
111fcd77c4 Code style stuff for @webenhanced 2016-01-28 16:05:39 +01:00
James Cole
287c1c4ffa Some code cleanup. 2016-01-28 16:03:49 +01:00
James Cole
3d69dc786d Some minor code cleanup. 2016-01-27 21:52:21 +01:00
James Cole
57a3f20c13 Moved more code around. 2016-01-27 21:35:59 +01:00
James Cole
eab2c57594 Moved another method. 2016-01-27 21:18:51 +01:00
James Cole
b019962f34 Moved a method. 2016-01-27 20:54:14 +01:00
James Cole
5c59c819b6 Moved method to new helper. 2016-01-27 20:48:35 +01:00
James Cole
93b97b8d72 Refer to new account helper. 2016-01-27 20:46:38 +01:00
James Cole
f1f922031a Refer to new account helper 2016-01-27 20:45:49 +01:00
James Cole
390cace775 New account report helper to make the report helper a lot lighter. 2016-01-27 20:45:05 +01:00
James Cole
28fdad9426 A set of small fixes, courtesy of scrutinizer-ci 2016-01-27 19:35:00 +01:00
James Cole
9155c13e08 A set of small fixes, courtesy of scrutinizer-ci 2016-01-27 18:31:44 +01:00
James Cole
e8776d44c5 Merge pull request #149 from webenhanced/feature/custom-fiscal-years
Feature - custom fiscal years
2016-01-27 17:57:13 +01:00
Graham Miller
5ee8d04800 Added modifications to reports enabling the custom fiscal year changes. 2016-01-27 13:38:34 +10:00
Graham Miller
eb31934fb7 Add a new helper to handle fiscal issues.
Used initially to provide fiscal year support to the reports.
2016-01-27 11:54:04 +10:00
Graham Miller
000f86d318 Added fiscal year start date stored in 'm-d' format to preferences.
Displays YYYY-MM-DD for current year to get input.
2016-01-27 11:31:33 +10:00
Graham Miller
d9b3ebc82f Add preferences option to enable or disable the custom fiscal year handling.
Stored in DB as 0 or 1 and converted:-
- twig expression in view (expandedform needs true boolean)
- checkbox true/false converted to integer in set function in controller

Oh and I worked out how to localize the label ... took me a while but ended up so simple.

This is stage 1 of the overall custom fiscal year extension for Firefly.
2016-01-27 11:28:14 +10:00
Graham Miller
91b3ca047a Merge branch 'develop' of https://github.com/JC5/firefly-iii.git 2016-01-27 10:35:33 +10:00
James Cole
08131e42af Implemented some new tests. 2016-01-24 20:38:58 +01:00
James Cole
a013553a6c More cleanup. 2016-01-24 18:11:57 +01:00
James Cole
7b2fe8eb4a Test code cleanup. 2016-01-24 18:05:04 +01:00
James Cole
610f782054 Translations. 2016-01-24 16:51:01 +01:00
James Cole
94700f4064 Fixed some things in the rule controllers. 2016-01-24 16:50:55 +01:00
James Cole
0f12ebb31c Expanded tests. 2016-01-24 16:25:03 +01:00
James Cole
00a8a9ac0e Removed parameter rule trigger / rule action since they weren't being used. 2016-01-24 16:12:59 +01:00
James Cole
92616c6ae3 New test data with required role. 2016-01-24 16:05:14 +01:00
James Cole
97db618cd8 Some code cleanup and reordering 2016-01-24 15:58:16 +01:00
James Cole
2832d308f1 Optimize scripts. 2016-01-24 15:55:48 +01:00
James Cole
a7ecdf715f New translations. 2016-01-24 15:54:54 +01:00
James Cole
935dc3ff9f Some new tests 2016-01-23 16:48:34 +01:00
James Cole
99d14e8cbe This prevents constraint errors when the specified category has already been set. 2016-01-23 16:48:15 +01:00
James Cole
664fde2344 Some forgotten translations. 2016-01-23 09:10:22 +01:00
James Cole
27c45eface Updated test env. 2016-01-23 08:51:34 +01:00
James Cole
f83bc3c8b3 Updated tests. 2016-01-23 08:48:36 +01:00
James Cole
0d5efb8d27 Better mocking of objects. 2016-01-23 06:59:22 +01:00
James Cole
bf9c1c1875 Fixed some tests so they will not be skipped. 2016-01-23 06:54:29 +01:00
James Cole
049d866f62 Unskipped some tests. 2016-01-22 23:00:32 +01:00
James Cole
d672f0c2ad Better scripts (accept arguments) 2016-01-22 22:39:51 +01:00
James Cole
7b040e8583 Some changes to test coverage. 2016-01-22 21:08:04 +01:00
James Cole
e1cf285272 Various updates in test data and test configuration. 2016-01-22 20:47:48 +01:00
James Cole
53f7f13362 New env file. 2016-01-22 20:44:25 +01:00
James Cole
f710677cdc Also check for CSV delimiter presence. 2016-01-22 20:43:44 +01:00
James Cole
b5fbc8b632 test data 2016-01-22 20:13:55 +01:00
James Cole
1fdc0a196c Test data. 2016-01-22 20:13:27 +01:00
James Cole
559f429f5e Merge pull request #148 from roberthorlings/bugfix/rulegrouprepository
Added binding for RuleGroupRepositoryInterface
2016-01-22 19:30:37 +01:00
James Cole
ae4b198d3d Merge pull request #147 from roberthorlings/develop
Fixed a bug in storing date changes for the opening balance
2016-01-22 19:30:02 +01:00
Robert Horlings
e088ecbbad Added binding for RuleGroupRepositoryInterface to enable storing a rulegroup 2016-01-22 16:01:33 +01:00
Robert Horlings
f6b7bd5b44 Fixed a bug in storing date changes for the opening balance of an account 2016-01-22 15:44:23 +01:00
James Cole
f5a21f64c0 More magic words. 2016-01-22 10:10:51 +01:00
James Cole
f5cbed7c0c Added magic words "currentMonthEnd" and "currentMonthStart". 2016-01-22 07:54:15 +01:00
James Cole
59fff8928b Simplified some methods. 2016-01-22 07:35:28 +01:00
James Cole
8743b49a17 Some fixes for code climate. 2016-01-22 07:27:49 +01:00
James Cole
19dc91937e Remove double badge. 2016-01-22 07:22:34 +01:00
James Cole
4846cb7b14 Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop 2016-01-21 13:56:30 +01:00
James Cole
54e0ac816b Updated readme. [skip ci] 2016-01-21 13:56:08 +01:00
James Cole
9ce960b3d7 There are no converters that need the role of the current field. 2016-01-21 09:52:45 +01:00
James Cole
cc9d1c4bfd Some unrelated code cleanup. 2016-01-20 21:24:48 +01:00
James Cole
d211555beb Only fire post-processing specifix in the import routine. See issue #145 2016-01-20 21:24:27 +01:00
James Cole
9350557d10 Properly extend the current specifix to indicate they're all post-processors. See issue #145 2016-01-20 21:24:08 +01:00
James Cole
ea6c54cad0 Expand specifix to have a property that determines whether they fire before anything happens, or after. Could be expanded to allow for even more fine-grained control. See issue #145 2016-01-20 21:23:39 +01:00
James Cole
81287602d7 Updated tests. 2016-01-20 16:15:23 +01:00
James Cole
441ba79ec7 Some tests 2016-01-20 15:27:53 +01:00
James Cole
c9e4a09da6 Sort by alphabet. 2016-01-20 15:23:36 +01:00
James Cole
c84f4e2bc0 Sort by alphabet. 2016-01-20 15:21:27 +01:00
James Cole
6938f8ab89 I just realised this still said "watch movie". 2016-01-20 15:14:31 +01:00
James Cole
4fdd2c851f Fix registration. 2016-01-20 14:23:50 +01:00
James Cole
78b56712fc More new tests. 2016-01-20 10:47:29 +01:00
James Cole
6dcdb0f9a0 Committed wrong .gitignore file. 2016-01-20 10:14:27 +01:00
James Cole
cfab837b96 Create upload directory. 2016-01-20 10:14:05 +01:00
James Cole
b8461cdeb6 Touch empty attachment. 2016-01-20 10:13:44 +01:00
James Cole
e07d65ef6b Create default upload directory. 2016-01-20 10:13:33 +01:00
James Cole
80cbc35c89 More test data, more tests. 2016-01-20 09:31:24 +01:00
James Cole
2faf84780f Implemented some tests. 2016-01-20 09:15:33 +01:00
James Cole
ebdb1a8836 No more session flash. 2016-01-20 08:25:49 +01:00
James Cole
2dfa51652a Basic set of tests (incomplete). 2016-01-20 06:20:09 +01:00
James Cole
1cf1ea230f Updated read me. 2016-01-19 19:59:32 +01:00
James Cole
86e127ebff Fixed password reset routine. 2016-01-19 18:32:09 +01:00
James Cole
a313265785 Different URL for password reset. 2016-01-19 18:14:15 +01:00
James Cole
37693ad08d Fixed mail config. 2016-01-19 18:14:03 +01:00
James Cole
e8180d252b Wrong URL for login form. 2016-01-19 18:10:30 +01:00
James Cole
9957c95c68 Re-order auth controller. 2016-01-19 18:10:07 +01:00
James Cole
3354d53a48 Reset phpunit xml. 2016-01-19 18:09:53 +01:00
James Cole
ddaa53b940 Updated test code. 2016-01-19 16:55:53 +01:00
James Cole
c2e04a11bf Updated run scripts for tests. 2016-01-19 16:55:02 +01:00
James Cole
00d059b8df More tests. 2016-01-19 14:37:44 +01:00
James Cole
f3fff6f1c5 Code rearrangement. 2016-01-19 13:59:54 +01:00
James Cole
9360eb6a70 First account controller test. 2016-01-19 13:53:55 +01:00
James Cole
26fb03e6c8 Reformatted code according to scrutinizer-ci. 2016-01-19 09:11:15 +01:00
James Cole
eed3d021d9 Small cleanup. 2016-01-19 08:48:38 +01:00
James Cole
48728e8418 Merge pull request #146 from roberthorlings/feature/abn-amro-import-specifix
ABN AMRO Specifix
2016-01-19 08:36:06 +01:00
Robert Horlings
f39f25760a Added messages for new specifix 2016-01-18 15:43:30 +01:00
Robert Horlings
10ea60daaf Improved SEPA description parsing 2016-01-18 15:42:56 +01:00
Robert Horlings
f2fa5e140b Merge remote-tracking branch 'origin/develop' into feature/abn-amro-import-specifix 2016-01-18 15:35:08 +01:00
James Cole
be5ff35b13 Reversed the removal of the validating trait since @roberthorlings discovered it's actually still being used. 2016-01-18 13:15:11 +01:00
Robert Horlings
bd5d73d1e6 Removed transaction type from the description 2016-01-18 12:37:06 +01:00
Robert Horlings
cc712b0c75 Updated message identifier for unknown opposing account 2016-01-18 12:31:45 +01:00
Robert Horlings
a5ac84e1b9 Merge remote-tracking branch 'origin/develop' into feature/abn-amro-import-specifix 2016-01-18 09:09:35 +01:00
Robert Horlings
cbe1f762ca Fixing a bug with expense account being set to unknown 2016-01-18 09:09:30 +01:00
James Cole
e6db49c20c Some tests. 2016-01-17 15:48:18 +01:00
Robert Horlings
4909fcc8b4 Moved parsing of amount with decimal separator to Converter object 2016-01-17 15:37:49 +01:00
James Cole
68cdfd00b0 Update test things. 2016-01-17 15:28:01 +01:00
Robert Horlings
323c16ebe1 Implemented additional ABNAMRO description formats 2016-01-17 15:25:47 +01:00
James Cole
c20a38b7b0 Ignore file for coverage logs. 2016-01-17 08:38:19 +01:00
James Cole
20993342a2 Better wording. 2016-01-17 07:55:23 +01:00
James Cole
1b3198c143 New: upgrade instructions when installing or upgrading composer packages. 2016-01-17 07:50:09 +01:00
James Cole
173d0290ea New composer stuff. 2016-01-17 07:49:49 +01:00
James Cole
ae4cd8da12 This should fix the travis builds. 2016-01-17 07:30:14 +01:00
James Cole
a494398332 Actually correct database name for once. 2016-01-17 07:24:06 +01:00
James Cole
c82bdd1f5a New gitignore. 2016-01-17 07:22:36 +01:00
James Cole
e6ac3ccfad Fix travis configuration. 2016-01-17 07:19:44 +01:00
James Cole
b13b58a2b2 More test data and an actual test. 2016-01-17 07:18:35 +01:00
James Cole
2b6790f83f Fixed data seeder. 2016-01-17 07:07:22 +01:00
James Cole
fe30850568 Fixed some database migration stuff. 2016-01-16 21:32:36 +01:00
James Cole
493c71b89e Fix test data seeder. 2016-01-16 09:16:26 +01:00
James Cole
deaebc373c Some new code for testing. 2016-01-16 09:15:24 +01:00
James Cole
e834489206 Some cleaning up courtesy of PHPStorm. 2016-01-16 07:14:36 +01:00
James Cole
1b316e462e Also fire rules when updating. 2016-01-16 06:34:50 +01:00
James Cole
7bf75128a8 Some cleaning up courtesy of PHPStorm. 2016-01-15 23:12:52 +01:00
James Cole
3857e8d49f Remove old code. 2016-01-15 22:44:25 +01:00
James Cole
b16149b842 Wrong array name. 2016-01-15 22:44:17 +01:00
James Cole
32ed8a4d8d Removed some unnecessary methods. 2016-01-15 22:41:26 +01:00
James Cole
f949d2476b Move from getDates to array dates. 2016-01-15 22:32:21 +01:00
James Cole
0620830b10 Move from getDates to array dates. 2016-01-15 22:23:01 +01:00
James Cole
7ee25693aa Removed stuff no longer used. 2016-01-15 22:20:38 +01:00
James Cole
7cb86add64 New phpdoc. 2016-01-15 22:13:38 +01:00
James Cole
fbc9720f7a Clean up some report methods. 2016-01-15 21:50:57 +01:00
James Cole
ffdd37ddd5 More code cleanup. 2016-01-15 20:57:26 +01:00
James Cole
51062bc80b Some cleaning up and suppressing. 2016-01-15 20:48:06 +01:00
James Cole
31533b5ef8 No need to check for opening balance. 2016-01-15 19:48:35 +01:00
James Cole
3649b595df Will no longer recognise transactions of type "opening balance". 2016-01-15 19:48:09 +01:00
James Cole
83b7c9aa32 Fixed a bug in editing an opening balance 2016-01-15 19:45:34 +01:00
James Cole
4e3c59a2da Some cleaning up courtesy of PHPStorm. 2016-01-15 19:37:09 +01:00
James Cole
dcbfe90cf7 Some code cleanup courtesy of PHPStorm. 2016-01-15 18:21:59 +01:00
James Cole
f69be86c74 Some code cleanup courtesy of PHPStorm. 2016-01-15 17:53:54 +01:00
James Cole
820722f44e Some code cleanup courtesy of PHPStorm. 2016-01-15 17:38:09 +01:00
Robert Horlings
2ff806dedc Initial version of ABN AMRO import specifix with amount correction and SEPA description parser 2016-01-15 16:48:09 +01:00
James Cole
a755badd5f Use correct parameter. 2016-01-15 16:33:54 +01:00
James Cole
4df1e5393b Also updated all translations. 2016-01-15 16:33:03 +01:00
James Cole
8c55bd179f Moved the option right under the file selection. 2016-01-15 16:27:17 +01:00
James Cole
ccfc5ece66 Put the form options in the translation files. 2016-01-15 16:27:01 +01:00
James Cole
6c12f1bc86 Some refactoring, courtesy of PHPStorm. 2016-01-15 16:26:49 +01:00
James Cole
88839e9610 For more clarity in the code, moved the array of options to the controller itself. 2016-01-15 16:26:24 +01:00
James Cole
4f6a733238 For more clarity in the code, moved the array of options to the controller itself. 2016-01-15 16:26:19 +01:00
James Cole
dc9083a764 Also forget delimiter. 2016-01-15 16:26:02 +01:00
James Cole
6f231b840b Merge pull request #144 from roberthorlings/feature/import-csv-delimiter
Option to choose CSV delimiter when importing data
2016-01-15 16:19:53 +01:00
Robert Horlings
61a703e605 Implemented option to choose field delimiter in CSV import 2016-01-15 15:24:07 +01:00
Robert Horlings
8e0e9734a5 Updated gitignore with eclipse files and storage directory 2016-01-15 15:07:42 +01:00
James Cole
2afb455bac New translations. 2016-01-15 13:40:39 +01:00
James Cole
01792f91e2 Code cleanup 2016-01-15 13:13:33 +01:00
James Cole
651dff0750 Shorter method names. 2016-01-15 13:13:21 +01:00
James Cole
9cbfbd41dc Shorter method names. 2016-01-15 13:10:34 +01:00
James Cole
168d6f403c Shorter method names. 2016-01-15 13:09:27 +01:00
James Cole
41f200e630 Some code cleanup. 2016-01-15 13:08:25 +01:00
James Cole
0809cfdc6d Move methods around 2016-01-15 13:06:17 +01:00
James Cole
466d739da8 Start with new controller for rule groups. 2016-01-15 11:28:27 +01:00
James Cole
daf65cb387 Split rule and rule group repositories. 2016-01-15 11:27:27 +01:00
James Cole
2605f60983 Refactor. Split rules and rule groups. 2016-01-15 11:16:41 +01:00
James Cole
fcf6cdb134 Better order and display. 2016-01-15 10:52:35 +01:00
James Cole
209258b507 Fixed various bugs. 2016-01-15 09:25:32 +01:00
James Cole
f80bc214f9 Edit rules. 2016-01-15 08:45:39 +01:00
James Cole
f76990bb9b Twig methods. 2016-01-15 08:13:19 +01:00
James Cole
eef68c9b31 New extension for rules. 2016-01-15 08:10:22 +01:00
James Cole
006c2ae186 Refer to dedicated methods instead of variables. 2016-01-15 08:06:33 +01:00
James Cole
8b66ff6afe First edit-rule code. 2016-01-15 08:04:57 +01:00
James Cole
4cc6d57e6e Stop processing other rules if asked. 2016-01-15 06:43:00 +01:00
James Cole
af1c6b22bb Translation. 2016-01-15 06:35:53 +01:00
James Cole
5958990ed5 Stop processing. 2016-01-15 06:35:31 +01:00
James Cole
cd4cbdc197 Accidentally used a php 7 thing. 2016-01-15 06:25:09 +01:00
James Cole
1f538be16e More code for rules. 2016-01-14 21:34:17 +01:00
James Cole
9703439a4c Some more rule things before I merge a change to the CSV importer. 2016-01-14 19:20:02 +01:00
James Cole
42203ba872 Attempt at validating. 2016-01-14 18:57:52 +01:00
James Cole
cd60b852a1 This isn't really working. 2016-01-14 18:09:20 +01:00
James Cole
5b1d9e1a0d Start work on adding a rule. 2016-01-14 16:41:15 +01:00
James Cole
e02657a7c7 New font awesome 2016-01-14 13:12:20 +01:00
James Cole
c352eb0c74 First attempt at create rule form. 2016-01-14 12:37:49 +01:00
James Cole
81b9d5da09 User can now re-order triggers and actions. 2016-01-14 11:27:15 +01:00
James Cole
b9b0413510 More resources for rules. 2016-01-14 10:33:24 +01:00
James Cole
97770da619 Re-order rule groups. 2016-01-14 09:53:59 +01:00
James Cole
521623797e Move rule groups. 2016-01-14 09:49:12 +01:00
James Cole
15d3414443 Can order rules. 2016-01-14 09:38:48 +01:00
James Cole
245f06c93a Fix test, expand index. 2016-01-14 09:17:23 +01:00
James Cole
33899f0e2f New test data, new translations. 2016-01-14 09:08:44 +01:00
James Cole
4697fbdeef Routine to delete rules. Should include routine to move rules to other group. 2016-01-13 21:44:26 +01:00
James Cole
06174d6afb Edit rule group. 2016-01-13 18:50:15 +01:00
James Cole
b2bb16c1e0 Updated composer file. 2016-01-13 18:35:09 +01:00
James Cole
27aae279e6 More code for rules. 2016-01-13 18:34:56 +01:00
James Cole
e9ee93beb7 Expand view and translations. 2016-01-13 16:51:55 +01:00
James Cole
20941dedd3 Also fix rule group. 2016-01-13 16:08:05 +01:00
James Cole
5ac88623ed Prep stuff for routes and actions. 2016-01-13 16:05:39 +01:00
James Cole
768508dd4b First attempt at interface. 2016-01-13 15:59:45 +01:00
James Cole
668633e764 All actions and triggers. 2016-01-13 15:10:49 +01:00
James Cole
3dbb1f034d Fix the last triggers. 2016-01-13 14:51:49 +01:00
James Cole
1270e5d15c More valid triggers. 2016-01-13 14:37:19 +01:00
James Cole
afec8480fb More working triggers. 2016-01-13 14:12:46 +01:00
James Cole
8720511046 From account contains trigger. 2016-01-13 14:05:26 +01:00
James Cole
a7a00ecf40 More rule possibilities 2016-01-13 14:02:22 +01:00
James Cole
88bbafd3e8 If you get the destination account attribute before the model is saved, the cache breaks. 2016-01-13 14:01:40 +01:00
James Cole
ae3258b449 If you get the source account attribute before the model is saved, the cache breaks. 2016-01-13 14:01:09 +01:00
James Cole
cf4d7cfeef Grab rules properly. 2016-01-13 09:08:13 +01:00
James Cole
46ee2a0568 Can now automatically handle some rules. No user interface, yet. 2016-01-13 08:14:14 +01:00
James Cole
ce250c85fc Rename class. 2016-01-13 07:48:43 +01:00
James Cole
1087b9f5df Can now trigger. 2016-01-13 07:47:26 +01:00
James Cole
0dc74d9d14 Rules will now fire for a store-action. And fail. 2016-01-13 07:30:11 +01:00
James Cole
98b272383f Clean up triggers, add some new ones. 2016-01-13 07:16:29 +01:00
James Cole
e722daafd0 Removed old codeception file. 2016-01-13 05:54:42 +01:00
James Cole
670ab059d1 Simply log presence. 2016-01-13 05:37:25 +01:00
James Cole
09f826ceba First attempt at executing groups and rules. 2016-01-12 21:41:45 +01:00
James Cole
df5e3c9be9 Include handlers. 2016-01-12 21:41:19 +01:00
James Cole
31c336b3b1 New test data. 2016-01-12 21:40:31 +01:00
James Cole
b3a419b2f3 New events. 2016-01-12 21:38:12 +01:00
James Cole
11f63fa6ce Rename models for clarity 2016-01-12 21:38:05 +01:00
James Cole
4b35059140 Add connection to user. 2016-01-12 21:37:48 +01:00
James Cole
7836feba63 New trigger. 2016-01-12 21:10:16 +01:00
James Cole
1e54366f1f Update test data. 2016-01-12 21:09:51 +01:00
James Cole
d039bb0e03 Update database. 2016-01-12 21:09:38 +01:00
James Cole
166d32f073 Add actions 2016-01-12 21:09:28 +01:00
James Cole
321890992e Cleanup php doc. 2016-01-12 21:09:19 +01:00
James Cole
d644403d8a Add php doc to rule controller. 2016-01-12 20:56:53 +01:00
James Cole
44e76f9518 Cleanup rule migration. 2016-01-12 20:56:43 +01:00
James Cole
f9703eca4c Removed double configuration. 2016-01-12 20:56:36 +01:00
James Cole
48551e8bf5 Merge branch 'feature/rules' into develop 2016-01-12 20:39:49 +01:00
James Cole
74b538805b Expand config. 2016-01-12 20:38:19 +01:00
James Cole
35f493beff Move domain stuff to configuration. 2016-01-12 20:37:47 +01:00
James Cole
06d11c9133 New stuff for the rule thing. 2016-01-12 20:36:47 +01:00
James Cole
da7eb615db Added php doc. 2016-01-11 21:42:51 +01:00
James Cole
5da5024ad3 New models. 2016-01-11 21:28:29 +01:00
James Cole
c1346d4c86 Migration for rules. 2016-01-11 21:10:11 +01:00
James Cole
c38a4a15ff View 2016-01-11 20:42:24 +01:00
James Cole
bdec94ead6 Sidebar entry 2016-01-11 20:42:20 +01:00
James Cole
69bebf202f New translation 2016-01-11 20:42:15 +01:00
James Cole
38895afea6 New migration (empty) 2016-01-11 20:42:08 +01:00
James Cole
70ed4188b6 New controller for rules. 2016-01-11 20:41:57 +01:00
James Cole
d889094863 New route for rules index. 2016-01-11 20:41:50 +01:00
James Cole
c96eb8753e New bread crumb for rules controller. 2016-01-11 20:41:43 +01:00
James Cole
5a7607f6c6 More consistent monetary formatting. 2016-01-10 18:02:24 +01:00
James Cole
71bb88529a Also run php 7 tests. 2016-01-10 14:42:51 +01:00
James Cole
b26164a168 More test data. 2016-01-10 12:16:34 +01:00
James Cole
19444551e4 Get withdrawals only. 2016-01-10 12:16:25 +01:00
James Cole
e0b2a6e627 Translations. 2016-01-09 19:39:38 +01:00
James Cole
2973765866 New translations. 2016-01-09 19:37:21 +01:00
James Cole
2a08a25064 Fixed a translation. 2016-01-09 19:29:52 +01:00
James Cole
a55e291908 Removed money_format. 2016-01-09 18:02:36 +01:00
James Cole
2003d37a9a Fix for php 5.6 thing. 2016-01-09 16:10:12 +01:00
James Cole
29145bf6cf More bindings. 2016-01-09 16:09:26 +01:00
James Cole
caa1ff120a Built more binders. 2016-01-09 15:53:11 +01:00
James Cole
ef4e964c94 Fixed budget list binder. 2016-01-09 15:47:03 +01:00
James Cole
1f263f60a7 New binder for category lists. 2016-01-09 15:45:21 +01:00
James Cole
5fc7cafcbe All new binders. 2016-01-09 15:44:07 +01:00
James Cole
397c4926eb Update cookie policy 2016-01-09 15:39:41 +01:00
James Cole
a14544398b New middleware 2016-01-09 15:39:34 +01:00
James Cole
d439dceac1 New middleware. 2016-01-09 15:39:02 +01:00
James Cole
af29b31ea8 Remove "created by" message. 2016-01-09 15:38:48 +01:00
James Cole
b311ef70bc Point to website. 2016-01-09 14:34:28 +01:00
James Cole
9f9d744406 Cleared read me. [skip-ci] 2016-01-09 14:33:21 +01:00
James Cole
e094871bc9 Merge branch 'release/3.6.1' into develop
Conflicts:
	composer.lock
2016-01-09 14:31:52 +01:00
James Cole
dfc95cee45 Merge branch 'release/3.6.1' 2016-01-09 14:31:25 +01:00
James Cole
fdca234721 New composer lock file. 2016-01-09 14:31:17 +01:00
James Cole
cf5cc626d7 Important bug fix. 2016-01-09 14:27:35 +01:00
James Cole
358d9aac7d New version. 2016-01-09 14:27:17 +01:00
James Cole
681bc580c4 Removed GA beacon. 2016-01-09 12:54:43 +01:00
James Cole
4a2768f8d1 Reinstated test files. 2016-01-09 09:56:41 +01:00
James Cole
05f8773fa0 Fix user model. 2016-01-09 08:51:49 +01:00
James Cole
5e5fdfdd51 Move database reference. 2016-01-09 08:47:54 +01:00
James Cole
5e744390c0 Remove PHP requirement. 2016-01-09 08:45:27 +01:00
James Cole
cb5fa401cb Try to get travis working again. 2016-01-09 08:36:50 +01:00
James Cole
2980860377 Did some code cleanup. Comments and headers mostly. 2016-01-09 08:20:55 +01:00
James Cole
9ff0b282f3 With the growing popularity and frankly, quality of this software, I've decided to connect my actual name to it in the form of a license. Soon, every file will have a short reference to this license. 2016-01-09 07:57:42 +01:00
James Cole
4bc1c032bd Removed middle ware. 2016-01-09 07:48:45 +01:00
James Cole
9fcb00f10b Fixed some date range problems. 2016-01-09 07:46:11 +01:00
James Cole
723e461559 Fix logout. 2016-01-09 07:38:18 +01:00
James Cole
9b24e6d448 Remove explanation text. 2016-01-09 07:32:23 +01:00
James Cole
e622774775 Move to better spot 2016-01-08 20:48:34 +01:00
James Cole
84ce9bc94b Move locale code. 2016-01-08 20:47:35 +01:00
James Cole
a3a1bc30b1 Convert to number. 2016-01-08 20:43:46 +01:00
James Cole
b4c9a7698e Also call parent constructor. 2016-01-08 20:40:48 +01:00
James Cole
8b2d7fc32f Need to call parent constructor. 2016-01-08 19:13:51 +01:00
James Cole
90e66cbd94 Remove session guard. 2016-01-08 18:51:10 +01:00
James Cole
fd9a7080ea Move authentication around. 2016-01-08 18:29:47 +01:00
James Cole
c0fad106f0 Temp fix for redirect loop. 2016-01-08 16:38:20 +01:00
James Cole
78c8243184 Not the problem. 2016-01-08 16:36:41 +01:00
James Cole
780abecd53 Worked the last time.. 2016-01-08 16:35:44 +01:00
James Cole
ea6896816d Fix domain check. 2016-01-08 16:34:52 +01:00
James Cole
95a456860a Fix another URL. 2016-01-08 16:33:27 +01:00
James Cole
b1b2fda155 No 5.5 test. 2016-01-08 16:32:51 +01:00
James Cole
5847f534c3 Fix register route. 2016-01-08 16:32:31 +01:00
James Cole
e8e8163fa7 Allow registering by default. 2016-01-08 16:31:27 +01:00
James Cole
6a21d82dcf Debug class does not belong in production. 2016-01-08 16:29:14 +01:00
James Cole
d6b47656bc Updated various files after upgrade to laravel 5.2 2016-01-08 16:09:51 +01:00
James Cole
8c37ef3a95 Updated various files after upgrade to laravel 5.2 2016-01-08 16:02:15 +01:00
James Cole
35deed1d10 Update http related classes after upgrade to Laravel 5.2 2016-01-08 16:01:21 +01:00
James Cole
ba32a665f1 Update middleware after upgrade to Laravel 5.2 2016-01-08 16:00:57 +01:00
James Cole
bbd19be554 Update requests after upgrade to Laravel 5.2 2016-01-08 16:00:28 +01:00
James Cole
c360cc6db6 Update jobs after upgrade to Laravel 5.2 2016-01-08 16:00:16 +01:00
James Cole
7e4b9af315 Updated providers after upgrade to Laravel 5.2 2016-01-08 16:00:07 +01:00
James Cole
9b03e6b124 Updated config after upgrade to Laravel 5.2 2016-01-08 15:59:30 +01:00
James Cole
013e16e15f Updated config after upgrade to Laravel 5.2 2016-01-08 15:59:21 +01:00
James Cole
180ec52798 Various new files after upgrade to Laravel 5.2 2016-01-08 15:56:35 +01:00
James Cole
c7b47b4453 Fix view after upgrade to Laravel 5.2 2016-01-08 15:55:22 +01:00
James Cole
4b00db7662 Removed test code after upgrading to laravel 5.2 (will have to reinstate). 2016-01-08 14:30:19 +01:00
James Cole
78a7b995d2 Updated artisan after upgrading to laravel 5.2 2016-01-08 14:29:12 +01:00
James Cole
f7c50a123a Updated config file after upgrading to laravel 5.2 2016-01-08 14:28:59 +01:00
James Cole
9617d17aca Updated app file after upgrading to laravel 5.2 2016-01-08 14:28:15 +01:00
James Cole
d9884ddf73 Removed test code after upgrading to laravel 5.2 2016-01-08 14:28:04 +01:00
James Cole
8157f0a958 Updated htaccess file after upgrading to laraval 5.2 2016-01-08 14:27:35 +01:00
James Cole
b7580a5f83 Updated example env files after upgrading to laraval 5.2 2016-01-08 14:27:27 +01:00
James Cole
66703b30b3 Updated git files after laravel 5.2 upgrade 2016-01-08 14:27:05 +01:00
James Cole
53677e3c64 Moved views. 2016-01-08 13:35:27 +01:00
James Cole
feef6a1756 Merge branch 'release/3.6.0' into develop 2016-01-07 10:22:18 +01:00
James Cole
5f299b895b Merge branch 'release/3.6.0' 2016-01-07 10:22:17 +01:00
James Cole
4e1bb5fbac Update read me, composer 2016-01-07 10:21:57 +01:00
James Cole
47ccc513ad New version. 2016-01-07 10:11:37 +01:00
James Cole
cce1a01936 Update composer.lock 2016-01-07 10:10:52 +01:00
James Cole
6f2b1a6a76 The Sendgrid cron does not belong in Firefly. 2016-01-06 15:20:21 +01:00
James Cole
8526907f50 Expand multi-year report. 2016-01-05 21:23:58 +01:00
James Cole
bc192a8e54 Merge pull request #138 from leander091/develop
String is a reserved class name in php 7.
2016-01-03 20:25:34 +01:00
leander091
9ff6f8fc52 String is a reserved class name in php7 changed to Str according to the upstream project 2016-01-03 15:52:12 +01:00
James Cole
6573bd6b4b Code cleanup according to PHPStorm. 2016-01-02 19:33:44 +01:00
James Cole
9dc3f614af Localised date 2016-01-02 16:59:36 +01:00
James Cole
3888b8cceb Code cleanup according to PHPStorm. 2016-01-02 16:57:31 +01:00
James Cole
294df4a2b3 Simplified some code. 2016-01-02 16:32:08 +01:00
James Cole
265dd37212 Cleanup and add various warnings. 2016-01-02 16:31:14 +01:00
James Cole
eb7c79ad27 Can be written to. 2016-01-02 09:47:01 +01:00
James Cole
de111c7100 Fix broken route. 2016-01-01 21:59:19 +01:00
James Cole
e892c9a824 Followed up on some inspections. 2016-01-01 21:49:27 +01:00
James Cole
5eb0e18cae Cleaning up 2016-01-01 21:15:03 +01:00
James Cole
27cabb398e More queries filtered. 2016-01-01 21:07:15 +01:00
James Cole
64dbb14241 Method no longer used. 2016-01-01 20:05:14 +01:00
James Cole
bb4e2be9eb Method no longer used. 2016-01-01 20:04:44 +01:00
James Cole
7d1de0da17 Method no longer used. 2016-01-01 20:02:01 +01:00
James Cole
bf16c9a42b Method no longer used. 2016-01-01 20:01:07 +01:00
James Cole
1a7b1ce499 Method no longer used. 2016-01-01 20:00:20 +01:00
James Cole
efc9bc71a7 Method no longer used. 2016-01-01 19:58:31 +01:00
James Cole
fc5b315af0 Method no longer used. 2016-01-01 19:58:05 +01:00
James Cole
7a4a78628d Method no longer used. 2016-01-01 19:57:23 +01:00
James Cole
d16fb30a62 Method no longer used. 2016-01-01 19:56:23 +01:00
James Cole
2d177e660e Method no longer used. 2016-01-01 19:55:47 +01:00
James Cole
2f131dc170 Method no longer used. 2016-01-01 19:55:00 +01:00
James Cole
94810e371a Enable bill report. 2016-01-01 19:52:55 +01:00
James Cole
59731878f6 Month report optimised. 2016-01-01 19:46:12 +01:00
James Cole
54ede8aa18 Code cleanup. 2016-01-01 13:54:23 +01:00
James Cole
b415b6b043 Some code cleanup. 2016-01-01 12:41:00 +01:00
James Cole
70c922cdc5 Code cleanup. 2016-01-01 11:32:08 +01:00
James Cole
068fc32cb2 Some query cleaning up. 2015-12-31 20:12:49 +01:00
James Cole
3dcdacc3b8 Cleared lots of queries. In some cases, from 1400 back to 300. And those 300 have a different cause which is next. 2015-12-31 17:46:34 +01:00
James Cole
a6594358d8 Use a lot less queries 2015-12-31 17:20:54 +01:00
James Cole
f98921da46 Optimised summary chart. 2015-12-31 08:36:01 +01:00
James Cole
25747fbcf2 And optimised another chart. Amounts are slightly different. Will investigate 2015-12-31 08:31:28 +01:00
James Cole
aac5c2b13c Optimised another chart. 2015-12-31 08:26:04 +01:00
James Cole
cc810a5b6f Renamed a chart to be more consistent with the others. 2015-12-31 07:54:11 +01:00
James Cole
1b3592d959 Optimise chart. 2015-12-31 07:49:19 +01:00
James Cole
d75614e9a7 Optimised two charts, cleaned up some code. 2015-12-30 16:42:09 +01:00
James Cole
08703e282f Fix array. 2015-12-30 09:30:06 +01:00
James Cole
2904baf44e From 1100+ queries to a steady 6. 2015-12-30 09:17:29 +01:00
James Cole
f99e46bf75 Removed for-loop in favour of "pluck()" aka: RTFM. 2015-12-30 09:17:14 +01:00
James Cole
9f87890ead Removed for-loop in favour of "pluck()" aka: RTFM. 2015-12-30 09:17:05 +01:00
James Cole
638184cf66 Removed for-loop in favour of "pluck()" aka: RTFM. 2015-12-30 09:16:58 +01:00
James Cole
03babfe75c Removed for-loop in favour of "pluck()" aka: RTFM. 2015-12-30 09:16:53 +01:00
James Cole
238ed3c788 Rename a method. 2015-12-30 08:25:38 +01:00
James Cole
6a9d931ba3 More code cleanup. 2015-12-30 08:21:11 +01:00
James Cole
a3d2a9e00b Some cleaning up, and I hope simplification. 2015-12-30 08:15:04 +01:00
James Cole
39b88e8207 Added an alias to make methods more readable. 2015-12-30 08:00:52 +01:00
James Cole
449c6dfde5 Bind new class. 2015-12-29 22:51:31 +01:00
James Cole
7cc47ca0b1 Some cleaning up. 2015-12-29 22:48:55 +01:00
James Cole
95f4a83f41 Split category repository into two repositories. One for database calls for single categories, the other pertaining all categories. 2015-12-29 22:44:13 +01:00
James Cole
35154dc7a3 Another chart optimised 2015-12-29 18:55:30 +01:00
James Cole
0fd0d7d080 Less queries for category frontpage chart. 2015-12-29 10:08:40 +01:00
James Cole
658265c938 Optimised whole budget chart to use less queries. 2015-12-29 08:45:43 +01:00
James Cole
38fe9e7e1c Optimised chart. 2015-12-29 08:27:13 +01:00
James Cole
77056dcf8d Cleanup. 2015-12-29 08:27:05 +01:00
James Cole
026683a8e1 Made reportType camelCase. 2015-12-28 20:04:54 +01:00
James Cole
6ab6dd6ac3 First attempt at optimised query for multi-year budget chart. 2015-12-28 19:56:28 +01:00
James Cole
83de3482ce Optimised budget year chart. 2015-12-28 17:57:03 +01:00
James Cole
919a35aed3 Merge branch 'release/3.5.6.1' 2015-12-28 16:53:45 +01:00
James Cole
ad3defb071 Merge branch 'release/3.5.6.1' into develop 2015-12-28 16:53:45 +01:00
James Cole
9c929ecd1b New release. 2015-12-28 16:53:30 +01:00
James Cole
f79c9f7cf1 Cleanup. 2015-12-28 16:52:28 +01:00
James Cole
8e75c345d9 Found a bug that requires a new release of FF3 to fix. 2015-12-28 16:52:21 +01:00
James Cole
44886d9aad Merge branch 'release/3.5.6' into develop 2015-12-28 08:07:44 +01:00
James Cole
c2d444347d Merge branch 'release/3.5.6' 2015-12-28 08:07:43 +01:00
James Cole
5cb497596d New release. 2015-12-28 08:07:26 +01:00
James Cole
1857469d2f Removed unused parameters 2015-12-28 08:00:42 +01:00
James Cole
ea71b4843d Formatting fix in chart. 2015-12-28 07:58:40 +01:00
James Cole
97727e2e3d Some code cleanup courtesy of phpstorm. 2015-12-28 07:55:09 +01:00
James Cole
f81e7da8bb Code cleanup. 2015-12-28 07:49:27 +01:00
James Cole
8e827bf83b Removed parameter. 2015-12-28 07:43:57 +01:00
James Cole
9e1fa284ca Update php doc. 2015-12-28 07:43:05 +01:00
James Cole
3bf800be6e null check. 2015-12-28 07:41:44 +01:00
James Cole
635b9f9dba instance check. 2015-12-28 07:39:48 +01:00
James Cole
52a0d7cf7b Clean up code. 2015-12-28 07:38:02 +01:00
James Cole
a34516932b Rename include advised by scrutinizer. 2015-12-28 07:35:09 +01:00
James Cole
929a2a30a2 Fix TODO. 2015-12-28 07:31:48 +01:00
James Cole
ffa88eeb08 Made deleted piggy banks for piggy bank events visible. 2015-12-28 07:27:16 +01:00
James Cole
51b45b4ed4 Code cleanup. 2015-12-28 07:12:47 +01:00
James Cole
f263844793 Fix a bug where you cannot edit transactions. Will warrant a new release of FF. 2015-12-28 07:12:12 +01:00
James Cole
18c46df9aa Fix negative amounts and chart names. 2015-12-27 21:26:44 +01:00
James Cole
15846e157b From 200+ queries back to ~17. 2015-12-27 21:17:04 +01:00
James Cole
bc59f2db0d Optimised queries. 2015-12-27 20:07:49 +01:00
James Cole
cd2be8c1a4 Activate caching. 2015-12-27 19:51:20 +01:00
James Cole
f958115c50 Update composer file. 2015-12-27 17:57:32 +01:00
James Cole
e7d677bfb6 Add rounding, so the number will be a float. 2015-12-27 17:34:31 +01:00
James Cole
3e80ffc52b Huge change to bills and paid/unpaid/cc boxes. 2015-12-27 17:29:41 +01:00
James Cole
d0c7a5c076 Optimised query. 2015-12-27 09:44:12 +01:00
James Cole
f3f4e6b354 Stops date from skipping ahead slowly. 2015-12-27 09:40:28 +01:00
James Cole
5a45b25614 Merge branch 'hotfix/chart-fix' 2015-12-27 09:35:41 +01:00
James Cole
0b5ee1edfc Merge branch 'hotfix/chart-fix' into develop 2015-12-27 09:35:41 +01:00
James Cole
da3dc599f9 Fix chart call. 2015-12-27 09:35:24 +01:00
James Cole
f013b435ab Merge branch 'release/3.5.5' 2015-12-27 08:58:36 +01:00
James Cole
5f6975a113 Merge branch 'release/3.5.5' into develop 2015-12-27 08:58:36 +01:00
James Cole
c5dee29e4b New version. 2015-12-27 08:58:25 +01:00
James Cole
633ee02f13 Remove old Google references 2015-12-27 08:57:51 +01:00
James Cole
6b750c909a Fix forgotten call in bill repository. 2015-12-27 08:39:41 +01:00
James Cole
5f8b6640a9 A lot less queries thanks to efficient query. 2015-12-27 08:39:29 +01:00
James Cole
dd42d8437c Removed code for unused chart. 2015-12-27 08:12:46 +01:00
James Cole
67a178591d Some query optimisations. 2015-12-27 07:59:00 +01:00
James Cole
f5e5659c1f Code cleanup. 2015-12-26 09:40:24 +01:00
James Cole
8b0f0fb615 Optimise queries. 2015-12-26 09:39:35 +01:00
James Cole
209116e766 Query optimisations. 2015-12-26 09:21:45 +01:00
James Cole
79392ab656 Add caching to various queries and lists. 2015-12-26 08:44:34 +01:00
James Cole
3ca1207231 #135 2015-12-26 08:24:41 +01:00
James Cole
cec1b147f2 #135 2015-12-26 08:23:52 +01:00
James Cole
46cfcfa3e7 Update admin template. 2015-12-26 08:22:48 +01:00
James Cole
b833e8dfa2 #135 2015-12-26 08:16:30 +01:00
James Cole
77b843efd8 #135 2015-12-26 08:15:22 +01:00
James Cole
db72ad7c60 Issue #135 2015-12-26 08:12:51 +01:00
James Cole
eadc630fcb #135 2015-12-26 08:12:44 +01:00
James Cole
170c1793cc #135 2015-12-26 08:06:34 +01:00
James Cole
9f7c6c2d0c Extra cache. 2015-12-25 17:11:55 +01:00
James Cole
72d054c55c Add support for virtual balance currency, even though it cannot be stored yet. 2015-12-25 17:10:04 +01:00
James Cole
524edfe7c2 Better formatting (will take currency into account). 2015-12-25 16:40:27 +01:00
James Cole
c25c5623d2 Fixed the currency dropdown when multiple fields present on single page. 2015-12-25 16:38:53 +01:00
James Cole
4f38b77ef6 Better caching. 2015-12-25 09:34:37 +01:00
James Cole
5862803434 This saves some queries. 2015-12-25 09:34:23 +01:00
James Cole
5b3beded39 I can't believe I left this here all this time. 2015-12-25 07:58:19 +01:00
James Cole
c61fb7a598 Marked some unused stuff as deprecated. 2015-12-25 07:52:56 +01:00
James Cole
33d9148029 Make sure charts are cached. 2015-12-25 07:43:34 +01:00
James Cole
63969f5a33 Same routine but for money spent on accounts. 2015-12-25 07:42:00 +01:00
James Cole
edde18aeef Remove old chart. 2015-12-25 07:32:56 +01:00
James Cole
657116d361 Display new chart. 2015-12-25 07:32:03 +01:00
James Cole
e16269daa8 Collect data for new chart. 2015-12-25 07:31:54 +01:00
James Cole
c07591ff5c New method, earnedForAccounts 2015-12-25 07:31:43 +01:00
James Cole
75a478ad54 New chart, earned in period. 2015-12-25 07:31:29 +01:00
James Cole
8dae8b1a7f More code. Forgot to push. 2015-12-24 16:59:38 +01:00
James Cole
15fd8cf486 Completed the renaming of some methods. 2015-12-24 10:27:45 +01:00
James Cole
55333156ac Better cache control for some charts. 2015-12-24 10:14:01 +01:00
James Cole
8cdcba3231 Original fix in place. #133 2015-12-24 09:50:28 +01:00
James Cole
8bab9e84e2 Should not have edited that code. #133 2015-12-24 09:50:16 +01:00
James Cole
2faae83912 Include empty budgets. #133 2015-12-24 09:47:44 +01:00
James Cole
5a61a11a61 Attempt to fix bug #133 2015-12-24 09:45:21 +01:00
James Cole
a6d71988f2 Replaced some language calls. 2015-12-24 08:35:08 +01:00
James Cole
7069e242ae Removed useless entry. 2015-12-24 08:20:59 +01:00
James Cole
56ee830558 Moved locale information from the language to the translation files. 2015-12-24 08:20:47 +01:00
James Cole
6dd12729e6 Small disclaimer in readme. 2015-12-24 08:20:19 +01:00
James Cole
14a48303cb Cleanup. 2015-12-23 11:32:50 +01:00
James Cole
72cf6c9c0f Removed old route. 2015-12-23 11:32:41 +01:00
James Cole
144ee6b8ca Updated read me. 2015-12-23 10:38:42 +01:00
James Cole
8967d86da6 Updated language files. 2015-12-23 09:34:23 +01:00
James Cole
18c6edbb5d Update language files. 2015-12-23 09:09:51 +01:00
James Cole
53de3c4717 Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop
* 'develop' of https://github.com/JC5/firefly-iii:
  Fix a bug where the frontpage would not honor transaction order.
  Fix a bug where the report page would mess up the session dates.
2015-12-22 20:46:52 +01:00
James Cole
ad577e4e81 Expand language files. 2015-12-22 20:46:16 +01:00
James Cole
44811a3e7c Fix a bug where the frontpage would not honor transaction order. 2015-12-21 11:30:58 +01:00
James Cole
1ab3f05b3a Fix a bug where the report page would mess up the session dates. 2015-12-21 10:25:57 +01:00
James Cole
5e76488ae7 Better localisation in charts. 2015-12-20 08:40:58 +01:00
James Cole
32771fe7e1 Add Português do Brasil 2015-12-20 08:20:50 +01:00
James Cole
9b40cc6881 Fix locale setting for Carbon. 2015-12-20 08:19:26 +01:00
James Cole
2e35260bbb Add some translations. 2015-12-20 07:34:10 +01:00
James Cole
a067704277 Move stuff around. 2015-12-20 07:34:01 +01:00
James Cole
de281818ac Add language 2015-12-19 21:16:09 +01:00
James Cole
c49bfad38d Move languages. 2015-12-19 20:54:59 +01:00
James Cole
c1ba591b26 Rename languages. 2015-12-19 20:54:27 +01:00
James Cole
719af38a61 Cleanup. 2015-12-18 18:42:56 +01:00
James Cole
ac61dfae6b File reformatting. 2015-12-18 16:38:50 +01:00
James Cole
813fb679a7 File reformatting. 2015-12-18 16:37:45 +01:00
James Cole
e7562781f7 File reformatting. 2015-12-18 16:37:27 +01:00
James Cole
56d36b7f53 Remove Google references. 2015-12-18 16:37:02 +01:00
James Cole
53b3f7f821 Merge branch 'release/3.5.4' 2015-12-18 08:13:28 +01:00
James Cole
08a53156bd Merge branch 'release/3.5.4' into develop 2015-12-18 08:13:28 +01:00
James Cole
8985cd6309 New composer for 3.5.4. 2015-12-18 08:13:19 +01:00
James Cole
3833da7410 Add something about security. 2015-12-18 08:11:05 +01:00
James Cole
4210cd10db Cleanup. 2015-12-18 08:10:41 +01:00
James Cole
a7bd1c6892 Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop
* 'develop' of https://github.com/JC5/firefly-iii:
  First attempt cleaning up chart money formatting.
2015-12-18 07:32:03 +01:00
James Cole
52b0111afa Expanded text in register dialog. 2015-12-18 07:31:49 +01:00
James Cole
7921d128e4 Cleanup routine that checks for blocked domains. 2015-12-18 07:31:36 +01:00
James Cole
d7e838701a Blocked domains now in .env file. 2015-12-18 07:31:14 +01:00
James Cole
289bcb22aa First attempt cleaning up chart money formatting. 2015-12-17 15:03:47 +01:00
James Cole
3fe57b7983 Report remembers budgets and categories. 2015-12-16 16:19:15 +01:00
James Cole
32e92c2a16 Committed some dev stuff. 2015-12-16 13:10:49 +01:00
James Cole
1b3d208540 First attempt at functional category chart. 2015-12-16 13:08:26 +01:00
James Cole
6a8bf0aa62 Fixed the "undefined" error. 2015-12-16 12:13:01 +01:00
James Cole
56715556ed Second attempt. 2015-12-16 10:54:56 +01:00
James Cole
838330b909 First attempt at multi-year budget chart. 2015-12-16 10:17:15 +01:00
James Cole
69553b138b First calculations for multi-year budget chart. 2015-12-15 12:52:42 +01:00
James Cole
36d7a02994 Some refactoring. 2015-12-15 12:46:40 +01:00
James Cole
301528e2d2 Quick links. 2015-12-15 12:38:18 +01:00
James Cole
0303b45707 First code for multi year budget chart. 2015-12-15 12:37:55 +01:00
James Cole
ba722e8ed5 Expanded error message. 2015-12-15 08:19:16 +01:00
James Cole
289e5a5442 Add new blocked domain. 2015-12-15 08:19:07 +01:00
James Cole
fdad96e2bc Replaced route. 2015-12-14 21:14:34 +01:00
James Cole
af994e4dae Included first multi-year chart. 2015-12-14 21:12:10 +01:00
James Cole
006d68e279 Expand chart generation. 2015-12-14 21:11:57 +01:00
James Cole
29dc122ad3 New charts (slight variations of previous charts) 2015-12-14 21:11:26 +01:00
James Cole
cf4a8c6204 New translations. 2015-12-14 21:11:12 +01:00
James Cole
3c73fe92bf Lower threshold. 2015-12-14 20:58:23 +01:00
James Cole
6637590797 Empty placeholder for multi-year report. 2015-12-14 20:54:19 +01:00
James Cole
b8bab11acd Fix bread crumbs, clean up routes. 2015-12-14 20:45:12 +01:00
James Cole
a2f600feac Nice clean code. 2015-12-14 20:37:38 +01:00
James Cole
80dd62ef0a Refer to correct translations. 2015-12-14 20:34:08 +01:00
James Cole
827b1c9cd8 Fix some translations. 2015-12-14 20:33:57 +01:00
James Cole
2e4fcf803d Fix JS references. 2015-12-14 20:33:50 +01:00
James Cole
d00d95fc6f Cleanup JS 2015-12-14 20:33:10 +01:00
James Cole
3e3ab9bd25 Move some JS around. 2015-12-14 20:25:48 +01:00
James Cole
6eecc7722d Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop
* 'develop' of https://github.com/JC5/firefly-iii:
  Fix for left unbalanced field in report.
2015-12-14 20:22:47 +01:00
James Cole
ada4aaf69a This will generate buttloads of test data. 2015-12-14 20:21:24 +01:00
James Cole
93244c1f78 Fix for left unbalanced field in report. 2015-12-14 12:35:52 +01:00
James Cole
be056cea6b Update some queries. 2015-12-13 20:41:35 +01:00
James Cole
659ca8be14 Update some queries. 2015-12-13 20:40:41 +01:00
James Cole
ea9af8366d Update some queries. 2015-12-13 20:39:26 +01:00
James Cole
80edd47d36 First attempts at building a multi-year report. 2015-12-13 17:31:25 +01:00
James Cole
d7746b3649 Support multi-year, not implemented yet. 2015-12-13 10:18:25 +01:00
James Cole
c4c4fbc34c Refactor 2015-12-13 10:05:13 +01:00
James Cole
59f57c96e9 Refactor names. 2015-12-13 09:41:22 +01:00
James Cole
a2f852fecf Clean up code. 2015-12-13 09:35:58 +01:00
James Cole
ad114ed329 Remove unused methods. 2015-12-13 09:30:02 +01:00
James Cole
c4c3d0f07f Some refactoring. 2015-12-13 09:01:17 +01:00
James Cole
6cf8102de5 Update version for coming release. 2015-12-12 22:32:19 +01:00
James Cole
e7e4aa2218 Update composer.lock. 2015-12-12 22:32:04 +01:00
James Cole
6d84f4b6c1 Update screenshots. 2015-12-12 22:31:34 +01:00
James Cole
ce3e9ffd11 Better cache control. 2015-12-12 21:20:20 +01:00
James Cole
3ada260e0e This will keep history. 2015-12-12 20:59:29 +01:00
James Cole
8fdd0cb795 Fixed some yearly charts. 2015-12-12 20:56:07 +01:00
James Cole
913e05a2e6 Really, reversed. 2015-12-12 20:20:18 +01:00
James Cole
fa1f703ef6 Some negative sums were failing regarding transfers. 2015-12-12 20:19:40 +01:00
James Cole
4004c53e1b Fix negative amount thing. 2015-12-12 20:16:30 +01:00
James Cole
4838670649 Transfer fix. 2015-12-12 20:13:07 +01:00
James Cole
a985e09282 Fix query. 2015-12-12 20:10:52 +01:00
James Cole
9bd1503cb4 Expand query to catch all expenses. 2015-12-12 20:07:33 +01:00
James Cole
a2ccbf7844 Jump to year report if the period is too long. 2015-12-12 19:04:30 +01:00
James Cole
61bbe8a905 Don't need this file. 2015-12-12 17:51:40 +01:00
James Cole
59bc5d22d1 Clean up some urls 2015-12-12 17:51:07 +01:00
James Cole
1423d5b314 Expand query, let's see what happens. 2015-12-12 12:36:36 +01:00
James Cole
152d0eb1d0 Cleanup and translations. 2015-12-12 12:29:54 +01:00
James Cole
6426d1df06 Fix the report chart. 2015-12-12 10:41:51 +01:00
James Cole
9284eb3fe9 First attempt at account specific bill report. 2015-12-12 10:33:19 +01:00
James Cole
afdae8bc1e Fix a sum for #129 2015-12-12 08:26:12 +01:00
James Cole
2a7085e593 Experimental budget lines. #129 2015-12-12 08:25:08 +01:00
James Cole
2408fb3ed4 Experimental budget lines. #129 2015-12-12 08:24:17 +01:00
James Cole
8316afb176 Experimental budget lines. #129 2015-12-12 08:21:46 +01:00
James Cole
e59fd098a3 Spent amount / withdrawals are negative, #129. 2015-12-12 08:15:14 +01:00
James Cole
e044199693 Spent amount / withdrawals are negative, #129. 2015-12-12 08:14:17 +01:00
James Cole
8f8e29fc22 Fix a sum. 2015-12-12 08:12:27 +01:00
James Cole
8de5384158 Spent amount / withdrawals are negative, #129. 2015-12-12 08:11:30 +01:00
James Cole
216c659335 Spent amount / withdrawals are negative, #129. 2015-12-12 08:07:25 +01:00
James Cole
041ca8a5d3 Amount reversal for #129 2015-12-12 08:05:10 +01:00
James Cole
fe4f1b306d Fix a sum for #129 2015-12-11 18:52:21 +01:00
James Cole
a0972d99fb Made a negative amount a positive as per #129 2015-12-11 18:49:07 +01:00
James Cole
e332bfef7c First attempt at budgets (split by account). 2015-12-11 18:45:39 +01:00
James Cole
cba5e226d8 Fix display of amount. 2015-12-11 18:36:19 +01:00
James Cole
5aff0c4943 Some fixes for #129 2015-12-11 18:35:49 +01:00
James Cole
cb49c00f4d Fix another JS error 2015-12-11 18:33:47 +01:00
James Cole
e26d797d57 Fix JS error. 2015-12-11 18:32:57 +01:00
James Cole
938581527e Fix sorting. 2015-12-11 18:31:15 +01:00
James Cole
c38ae09735 Negative expenses, as per #129 2015-12-11 18:30:28 +01:00
James Cole
28c3cfe084 Fix display of amount. See issue #129 2015-12-11 18:15:37 +01:00
James Cole
4a2823bcba Reverse sort. 2015-12-11 18:05:07 +01:00
James Cole
18eba02026 Expanded report for categories. 2015-12-11 18:03:13 +01:00
James Cole
d4690ce580 Fix date in budget report 2015-12-11 17:54:52 +01:00
James Cole
a785c450b1 First attempt at including a budget report. 2015-12-11 17:53:17 +01:00
James Cole
7480dc4a19 Fix a query. 2015-12-11 16:39:33 +01:00
James Cole
ad01891a67 First attempt at including expense report. 2015-12-11 16:36:40 +01:00
James Cole
67fe35d564 Small query fix. 2015-12-11 11:32:22 +01:00
James Cole
7f19b6957a Expanded new report a bit. Mainly copy/paste work. Will have to see how it pans out. 2015-12-11 09:39:17 +01:00
James Cole
0a54caf202 Tweak more translations. 2015-12-11 08:48:07 +01:00
James Cole
4b4c1c7f8f Moved some translations to see if they will still be picked up by Laravel. 2015-12-11 08:40:45 +01:00
James Cole
d071f3947e Merge pull request #127 from tonicospinelli/demeter-law
applying Demeter law for Transaction Type. Looking good!
2015-12-11 08:36:03 +01:00
Antonio Spinelli
b3d99cd210 apply demeter law for transaction type calls
- adds contants for transaction type names
- demeter law = never speaks with strangers
2015-12-10 16:53:48 -02:00
James Cole
90e696f82c Period is a month 2015-12-07 14:42:28 +01:00
James Cole
958fcd1cfa Report IP address 2015-12-07 14:41:04 +01:00
James Cole
8f57c7dcb3 Some fixes to amounts. 2015-12-06 13:17:00 +01:00
James Cole
77262f52a4 First functional view of default report. 2015-12-06 13:11:43 +01:00
James Cole
16bfbc8a12 Some JS to process the report form beforehand. 2015-12-06 08:42:04 +01:00
James Cole
1fd375b875 Better redirect after logout. 2015-12-05 17:45:33 +01:00
James Cole
46131ad39d Updated view for new reports. 2015-12-04 06:57:08 +01:00
James Cole
0b5c5b2ae9 Some mediocre Javascript for report thing. 2015-12-04 06:56:59 +01:00
James Cole
55be174037 Method to find an account. 2015-12-04 06:56:45 +01:00
James Cole
a17b7025f1 New function to build URL report. 2015-12-04 06:56:35 +01:00
James Cole
170cf7fd77 New routes for new reports. 2015-12-04 06:56:03 +01:00
James Cole
23cdb4d326 Expand month list for new reports. 2015-12-04 06:55:54 +01:00
James Cole
cbbe529572 Show bill if one is connected. 2015-12-04 06:16:19 +01:00
James Cole
0b382426e9 First experimental report generator / choice thing. 2015-12-03 14:52:10 +01:00
James Cole
1cbbf9baa4 Added a missing translation. 2015-12-03 11:46:05 +01:00
James Cole
8d41ff7b79 Prev should be next. Duh. 2015-12-03 11:41:06 +01:00
James Cole
e3b6057bf8 Catch Swift exceptions and do a log only (instead of crashing) because the email message isn't actually critical. 2015-12-03 11:30:43 +01:00
James Cole
66a4042cad Updated composer file. 2015-12-03 11:25:12 +01:00
James Cole
56c08d8302 Can block certain domains from registering, such as ten-minute-mail services. Two example domains provided in configuration. 2015-12-03 11:17:48 +01:00
James Cole
d4e759754d Make password reset impossible for blocked users. 2015-12-02 13:28:11 +01:00
James Cole
a96e171cbf Update composer. 2015-12-02 13:26:58 +01:00
James Cole
bd4a8c8397 Fixed "under" column 2015-12-02 09:03:34 +01:00
James Cole
04f71b3b43 Removed old code. 2015-12-02 09:01:40 +01:00
James Cole
d124de51db Shouldn't be like this? 2015-12-02 09:00:28 +01:00
James Cole
d87d12a0f5 Better query. See if works. 2015-12-02 08:58:40 +01:00
James Cole
f2b08346d0 Log. 2015-12-02 08:50:28 +01:00
James Cole
d3682a6727 Another fix in reports. 2015-12-02 08:46:03 +01:00
James Cole
371bbd9508 Some cosmetic fixes to reports 2015-12-02 08:44:23 +01:00
James Cole
a8a28f442f Also show "zero" amounts. 2015-12-02 08:38:57 +01:00
James Cole
65ddd8a736 One 'equals' sign too many! 2015-12-02 08:37:35 +01:00
James Cole
8bb27de233 More report subtleties. 2015-12-02 08:37:08 +01:00
James Cole
37e2f097ba To make budget report more clear, add spent amount to "spent" column. 2015-12-02 08:35:15 +01:00
James Cole
1966d87ce6 Small formatting fixes in reports. 2015-12-02 08:33:22 +01:00
James Cole
7b8c86e1e3 Only get active piggy banks. 2015-12-02 08:25:38 +01:00
unknown
de634da513 Only get active savings accounts. 2015-12-02 08:22:25 +01:00
James Cole
96836e2d6c Update read me. 2015-11-28 16:04:30 +01:00
James Cole
8a9d576f61 Allow change to default currency. issue #121 2015-11-22 11:30:06 +01:00
James Cole
791d12fbb4 Fix for issue #123 2015-11-22 11:25:15 +01:00
James Cole
d1329be2fa Bill scan routine should not grab transfers and income. 2015-11-20 20:13:10 +01:00
James Cole
3ed6561702 Updated all packages. 2015-11-13 07:16:23 +01:00
James Cole
7a0587f433 Merge branch 'release/3.5.3' 2015-11-13 07:01:29 +01:00
James Cole
0fe682bfe6 Merge branch 'release/3.5.3' into develop 2015-11-13 07:01:29 +01:00
James Cole
0f685e8789 New version. 2015-11-13 07:01:14 +01:00
James Cole
420771c233 New translations. See issue #117 2015-11-13 07:00:30 +01:00
James Cole
5e3e9271ca Added encryption to new password. See issue #118 2015-11-13 06:59:08 +01:00
James Cole
1e603c0833 Merge pull request #113 from RonaldvanMeer/develop
Removed duplicated controlbar item
2015-11-01 08:22:33 +01:00
James Cole
03e1673e92 Fix login message. 2015-11-01 08:06:51 +01:00
James Cole
9f992f003d Fix redirect loop. 2015-11-01 08:03:41 +01:00
James Cole
f50244a41f Merge branch 'release/3.5.2' into develop 2015-10-30 07:23:43 +01:00
James Cole
8b9607f9b5 Merge branch 'release/3.5.2' 2015-10-30 07:23:42 +01:00
James Cole
af107ad5e8 New release. 2015-10-30 07:23:33 +01:00
James Cole
8926d62165 Remake of: Merge pull request #111 from colinodell/patch-1
Loosen league/commonmark version
2015-10-30 07:22:39 +01:00
James Cole
45344ee347 Fixed a bug where budget chart would come up negative on overspent amounts. 2015-10-30 07:16:15 +01:00
RonaldvanMeer
baf9ebab15 Update control-bar.twig 2015-10-27 12:31:21 +01:00
James Cole
b7dab817f2 Merge pull request #111 from colinodell/patch-1
Loosen league/commonmark version
2015-10-27 12:17:25 +01:00
RonaldvanMeer
fb2fa54480 Merge pull request #1 from RonaldvanMeer/master
Duplicate controlbar item
2015-10-26 22:45:38 +01:00
James Cole
2c966a1234 Fixed ambiguous column. 2015-10-19 15:21:17 +02:00
James Cole
143ea69c0d Fixed the fix (fixeption). 2015-10-19 15:20:18 +02:00
James Cole
8a02ead013 Blind validator update. 2015-10-19 15:16:30 +02:00
James Cole
930d5ab941 Better fix. 2015-10-17 21:15:16 +02:00
James Cole
e54a56d3a8 Experimental chart fix. 2015-10-17 21:14:25 +02:00
James Cole
f5216c0d85 Fixed absolute uri 2015-10-05 20:30:57 +02:00
James Cole
ebc77540b9 Fix some reports. 2015-10-03 22:49:12 +02:00
James Cole
28d2583c10 Remove multiplication. 2015-10-03 22:34:25 +02:00
James Cole
b0988a7b00 Fix zero division. 2015-10-03 22:32:36 +02:00
James Cole
2c4920db2d Fix amount thing. 2015-10-03 22:31:55 +02:00
James Cole
8321663815 Some amount fixes. 2015-10-03 22:29:34 +02:00
James Cole
ac0280d460 Fixed some amounts. 2015-10-03 22:23:42 +02:00
James Cole
ba6f4268f0 Get correct fields. 2015-10-03 17:55:08 +02:00
James Cole
0bd18f94ac Fix ambiguous id. 2015-10-03 17:54:15 +02:00
James Cole
66fb63661f Less journals. 2015-10-03 17:53:13 +02:00
James Cole
d9b16beb0a Added some debug. 2015-10-03 17:51:13 +02:00
James Cole
6a01a9bdfd Fix bill scan. 2015-10-01 07:48:50 +02:00
James Cole
b81b34a706 Fixed amount in bill chart. 2015-10-01 07:46:47 +02:00
James Cole
3750a00b5f Fix amount, make it positive. 2015-09-30 19:43:02 +02:00
James Cole
05ddcc169d Fix amount thing. 2015-09-30 19:41:21 +02:00
James Cole
f571a5f1bd Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop
* 'develop' of https://github.com/JC5/firefly-iii:
  Fixed the other chart too.
  Trying to fix chart.
  New code. Debug.
2015-09-30 19:32:58 +02:00
James Cole
48b786adea Some fixes for amounts. 2015-09-30 19:31:21 +02:00
James Cole
d691fa9b4d Fixed the other chart too. 2015-09-29 09:29:28 +02:00
James Cole
da50f9e419 Trying to fix chart. 2015-09-29 09:28:16 +02:00
James Cole
103de5e18a New code. Debug. 2015-09-29 09:20:50 +02:00
James Cole
dac6efd98b Fix amount in box. 2015-09-28 21:45:11 +02:00
James Cole
46aa7f81b2 Fixed a method call. 2015-09-28 20:41:53 +02:00
James Cole
0683c7cd67 Fixed chart 2015-09-28 14:43:08 +02:00
James Cole
50d7aa7b6a Fix so chart will not display negatives. 2015-09-28 14:32:12 +02:00
James Cole
b781215d0a Date range fixes. 2015-09-27 17:45:01 +02:00
James Cole
866bc2f3bd Cleanup in budgets. 2015-09-27 17:44:49 +02:00
James Cole
49d4705014 Chart was negative. 2015-09-27 09:52:02 +02:00
James Cole
9163fcfccb Quicker amount thing. 2015-09-27 09:47:13 +02:00
James Cole
7e10641461 Organized some category charts. Still needs some translating 2015-09-26 07:18:12 +02:00
James Cole
cdc0e3cfd8 Some cleaning up. 2015-09-25 20:40:24 +02:00
James Cole
466e81d56a Fixed some sorting. 2015-09-25 20:25:22 +02:00
James Cole
5953f691d1 More should fit. 2015-09-25 20:15:38 +02:00
James Cole
e2790ca6c1 Try to limit the collection returned to the user. 2015-09-25 20:13:43 +02:00
James Cole
66dbd48b76 Fix something with the dates. 2015-09-25 19:36:03 +02:00
James Cole
73cfbbd2ba Fix some things so the date range has a better display. 2015-09-25 19:28:39 +02:00
James Cole
38bc38bf26 Add some period things. 2015-09-25 17:28:42 +02:00
James Cole
e12d13c838 Fixed a negative chart. 2015-09-25 16:43:34 +02:00
James Cole
fcc3af6136 Fixed something. 2015-09-25 16:38:36 +02:00
James Cole
491298e1cb Some fixes in titles and bread crumbs. 2015-09-25 16:33:45 +02:00
James Cole
72b5895217 Added a subtitle to the category view. 2015-09-25 16:25:17 +02:00
James Cole
0a8f4017bd Fix some chart things. Again. 2015-09-25 16:18:50 +02:00
James Cole
cb985f5897 Make sure the month chart can show the spent / earned. 2015-09-25 16:08:10 +02:00
James Cole
968ec0853f Fixed the chart. Forgot an argument. 2015-09-25 16:06:06 +02:00
James Cole
0bde72d3df Spent should not be negative for the chart. 2015-09-25 16:04:22 +02:00
James Cole
45293fbd42 Fixes for #109. 2015-09-25 16:00:14 +02:00
Colin O'Dell
72997065f0 Loosen league/commonmark version
See https://github.com/thephpleague/commonmark#versioning
2015-09-19 10:49:55 -04:00
James Cole
a838dc163d I need unit tests again. #109 2015-09-14 17:22:31 +02:00
James Cole
3d15a4ca6d I need unit tests again. #109 2015-09-14 17:20:20 +02:00
James Cole
51c7d4fb1b Properly show spent and earned. #109 2015-09-13 07:40:37 +02:00
James Cole
fa586dba7e Also include all types. 2015-09-13 07:35:53 +02:00
James Cole
8ad40389f2 Corrected the field used for bug #109 2015-09-13 07:34:58 +02:00
James Cole
b3333cc2d3 Experimental fix for issue #109. 2015-09-13 07:32:39 +02:00
James Cole
3699a7ba9a Some cleaning up. 2015-09-08 19:38:04 +02:00
James Cole
204e521ba4 Fixed sorting for contracts. 2015-09-08 19:36:54 +02:00
James Cole
c9bab3e5c3 Tag list show sum. 2015-08-29 08:43:18 +02:00
James Cole
3d00e20238 Fixed a translation. 2015-08-29 08:35:11 +02:00
James Cole
c3958ed3c4 Fixed some bugs that caused inconsistencies in the monthly reports. 2015-08-29 07:20:53 +02:00
James Cole
e5b88be5fa Fix a bug where an transfer to and from a shared asset would count as an expense/income. 2015-08-29 06:48:12 +02:00
James Cole
425552988a Fix month report so transfers from a shared account to another shared account do not count as income. 2015-08-28 06:19:50 +02:00
James Cole
a81dd8abe5 Send search engine spiders away, as suggested in issue #105 2015-08-24 20:11:04 +02:00
James Cole
bac8154a5b Merge branch 'release/3.5.1' 2015-08-23 07:43:02 +02:00
James Cole
737d15fa0e Merge branch 'release/3.5.1' into develop 2015-08-23 07:43:02 +02:00
James Cole
5f2317af7f New version 2015-08-23 07:42:32 +02:00
James Cole
2bd1f783e5 Cleaned up some translations. 2015-08-23 07:41:12 +02:00
James Cole
d6c0c9f963 Cleanup composer. 2015-08-23 07:10:02 +02:00
James Cole
21b6ad7a41 More checks in the bounce cron job. 2015-08-19 19:21:39 +02:00
James Cole
a65d609fdc Fixed bug #104 2015-08-16 21:18:12 +02:00
James Cole
04e676b936 Fix bug #103 2015-08-16 20:27:25 +02:00
James Cole
be8eaaffdf Some code cleanup. 2015-08-16 20:26:11 +02:00
James Cole
28c753523f Caught a nasty bug thanks to an alert Tweakers.net user. This fix will make the account-edit screen inconsistent for a select number of users. This will be detailed on the wiki. 2015-08-15 21:45:29 +02:00
James Cole
7fbd0b2ffc Fixed some inconsistencies in the delete-form. 2015-08-15 21:44:29 +02:00
James Cole
7ffb48a87a New translations 2015-08-15 21:42:45 +02:00
James Cole
d485270e1f Merge branch 'release/3.5.0' 2015-08-13 17:37:55 +02:00
James Cole
5fd688b266 Merge branch 'release/3.5.0' into develop 2015-08-13 17:37:55 +02:00
James Cole
3716668e0c Updated read me. 2015-08-13 17:37:45 +02:00
James Cole
ae7fd18c34 New composer file. 2015-08-13 17:35:48 +02:00
James Cole
4f59b1d32f No Google thing when no Analytics ID present. 2015-08-13 17:35:41 +02:00
James Cole
90cb3279df Better example env file. 2015-08-13 17:34:08 +02:00
James Cole
cf0c7ef6b2 New version. 2015-08-13 17:32:22 +02:00
James Cole
47c23781d9 Fixed password reset. 2015-08-13 17:32:15 +02:00
James Cole
e258c050f7 Merge branch 'release/3.4.11' 2015-08-10 20:13:38 +02:00
James Cole
57801b2f34 Merge branch 'release/3.4.11' into develop 2015-08-10 20:13:38 +02:00
James Cole
710e9c9423 new version. 2015-08-10 20:13:33 +02:00
James Cole
deefef83bd Added sum for the current period, see issue #99 2015-08-09 17:01:12 +02:00
James Cole
51e30aed66 Added a sum of the current page and the sum of the entire category, in reference to issue #99. 2015-08-09 16:56:38 +02:00
James Cole
8d109a3cfe Fixed a null pointer exception. 2015-08-09 13:54:58 +02:00
James Cole
3424e019b5 Removed animation, again [skip ci] 2015-08-06 16:39:53 +02:00
James Cole
c6b4bceb67 Animation test [skip ci] 2015-08-06 16:39:06 +02:00
James Cole
afb4155015 Remove animation thing. [skip ci] 2015-08-06 16:37:53 +02:00
James Cole
8d99baf38a Update charts.js 2015-08-05 09:02:33 +02:00
James Cole
b91cb60328 Fix translations [skip ci] 2015-08-02 09:01:13 +02:00
James Cole
c0d62237fc Made the date thing throw a FF error. 2015-08-02 08:53:34 +02:00
James Cole
223ea80860 Fixed some embarrassing spelling errors in the CSV importer. [skip ci] 2015-08-02 08:53:19 +02:00
James Cole
5a77bef494 Sort chart and code cleanup [skip ci] 2015-08-02 07:41:47 +02:00
James Cole
80c0efe821 Small rearrangement of front page boxes. [skip ci] 2015-08-02 07:35:09 +02:00
James Cole
8044d89557 Display correct amount [skip ci] 2015-08-02 07:08:47 +02:00
James Cole
4f0ed97410 Fixed a bug where the category list in a monthly report would be empty. 2015-08-02 07:04:43 +02:00
James Cole
af7952f204 Removed old references to Google [skip ci] 2015-08-01 07:22:48 +02:00
James Cole
d8dcae856b Remove log. 2015-08-01 07:12:34 +02:00
James Cole
7296796ed9 Fix chart. 2015-08-01 07:12:03 +02:00
James Cole
a2c2bb4948 Forgot a dot [skip ci] 2015-08-01 07:09:51 +02:00
James Cole
72ebfdc20e Debug log. 2015-08-01 07:09:12 +02:00
James Cole
16b95ea78a New chart. 2015-08-01 07:04:41 +02:00
James Cole
c04f08dfd8 Filter empty budgets. 2015-07-31 18:18:54 +02:00
James Cole
a30793e818 Fix chart. Related to #99 2015-07-31 18:14:24 +02:00
James Cole
e39e1eaf21 Included opening balance. 2015-07-31 18:10:55 +02:00
James Cole
ab22d2cbaa Fixed the overview chart for categories, so it will properly reflect income and expenses. See bug #99 2015-07-31 14:26:22 +02:00
James Cole
96ddbe7227 Reorganized the category charts in the year report to properly reflect income and expenses. Necessary to facilitate the changes needed for bug #99 2015-07-31 14:20:18 +02:00
James Cole
4d09235aef Update composer.lock 2015-07-31 14:17:49 +02:00
James Cole
136b8975e3 Sort piggy bank list. 2015-07-31 13:44:56 +02:00
James Cole
e21b1eca17 Remove script. 2015-07-31 07:31:05 +02:00
James Cole
244b90b1d4 Fix bug #98 2015-07-30 21:32:58 +02:00
James Cole
b318f3f940 Merge branch 'release/3.4.10' 2015-07-27 21:23:20 +02:00
James Cole
e211c9812e Fixed some math things. 2015-07-26 19:42:28 +02:00
James Cole
eef28d96f4 Code cleanup [skip ci] 2015-07-26 19:13:06 +02:00
James Cole
c8227e09ee id was ambiguous. 2015-07-26 19:10:31 +02:00
James Cole
3e05fd91d9 Lots of cleaning up. 2015-07-26 19:07:02 +02:00
James Cole
450baba56a Removed some dead code and fixed some other. 2015-07-26 17:03:05 +02:00
James Cole
17a8c4918c Code cleanup. 2015-07-26 15:51:07 +02:00
James Cole
0e2419d61a New translations [skip ci] 2015-07-26 09:44:31 +02:00
James Cole
79b1a2ca6d Gave cron controller a new line. [skip ci] 2015-07-26 07:42:34 +02:00
James Cole
2213c68155 Added a missing breadcrumb. 2015-07-26 07:41:10 +02:00
James Cole
2492b1fa96 Expanded the message a user may get when his credentials do not work. 2015-07-26 07:39:21 +02:00
James Cole
6c6598dac5 Lots of new translations. 2015-07-26 07:39:04 +02:00
James Cole
a137112e66 New read me. 2015-07-25 19:28:19 +02:00
James Cole
8642ae8180 New version. 2015-07-25 19:27:14 +02:00
James Cole
894c4dc5a7 New composer.lock. 2015-07-25 19:24:07 +02:00
James Cole
d96063ea6e Also expand interface. 2015-07-25 19:23:00 +02:00
James Cole
c3dc193f3e First attempt at new last activity thing. 2015-07-25 19:22:41 +02:00
James Cole
3c2952009e Some new stuff. 2015-07-25 19:04:39 +02:00
James Cole
f4ade470df Remove if statements. 2015-07-25 18:48:48 +02:00
James Cole
2e33b43389 CSS and invalid account warning. 2015-07-25 18:40:45 +02:00
James Cole
92799699bc Better attachment handling. 2015-07-25 18:33:19 +02:00
James Cole
7ab0508167 Some new translations. 2015-07-25 18:31:05 +02:00
James Cole
3c65c28936 Some translations. 2015-07-25 16:48:32 +02:00
James Cole
43892da07e may edit fields [skip ci] 2015-07-25 07:05:27 +02:00
James Cole
7c436920a4 Some formatting and translations. [skip ci] 2015-07-25 07:04:09 +02:00
James Cole
89d565e63b Check for block code. [skip ci] 2015-07-25 07:03:50 +02:00
James Cole
150b6fe5b6 Add block code [skip ci] 2015-07-25 07:03:42 +02:00
James Cole
0e77574c26 Also give block code. [skip ci] 2015-07-25 07:03:35 +02:00
James Cole
df23863443 Remove bounce error thing. 2015-07-24 22:08:38 +02:00
James Cole
581bf11b21 Fixed a translation [skip ci] 2015-07-24 13:34:22 +02:00
James Cole
d602d4b429 Add some debug logging. 2015-07-24 13:26:42 +02:00
James Cole
d1d4a52934 Catch empty send grid credentials. 2015-07-24 13:23:02 +02:00
James Cole
375d113769 Find users not already blocked only. 2015-07-24 13:20:09 +02:00
James Cole
9b83974bff Improve the cron controller. Force blocked users to logout. 2015-07-24 13:17:47 +02:00
James Cole
3c68c99bd5 Fixed some translations. 2015-07-24 09:03:40 +02:00
James Cole
ec4b37c596 Updated chart. 2015-07-24 08:36:49 +02:00
James Cole
ba9601d21c Better display for piggy bank events. 2015-07-24 08:34:30 +02:00
James Cole
50c13fd469 Clear cache. 2015-07-22 22:13:40 +02:00
James Cole
7af072b8fc Show message. 2015-07-22 19:35:39 +02:00
James Cole
faa128d41e Made a cron controller. 2015-07-22 19:09:17 +02:00
James Cole
868fe46932 Some more debug stuff. 2015-07-22 18:44:51 +02:00
James Cole
e9e4307ce5 Better debug. 2015-07-22 18:09:14 +02:00
James Cole
774d4844a9 Another try to fix csrf 2015-07-22 17:58:06 +02:00
James Cole
586c53e670 Remove CSRF check. 2015-07-22 17:52:55 +02:00
James Cole
68e073fbff A new controller that can be used in combination with SendGrid. 2015-07-22 17:50:02 +02:00
James Cole
8101dc37b1 New route for attachment preview. 2015-07-19 22:19:36 +02:00
James Cole
63f16c458d Small fixes for piggy banks data seed. 2015-07-19 22:19:26 +02:00
James Cole
821e007e95 If zero, other thing. 2015-07-19 18:39:06 +02:00
James Cole
1656a2f11a Experimenting with a preview for attachments. 2015-07-19 18:37:29 +02:00
James Cole
4dbc135dce Added max file size for uploads. 2015-07-19 14:30:20 +02:00
James Cole
fc886f6bc1 Seed some tags. 2015-07-19 13:46:41 +02:00
James Cole
f93e480466 Better notifications. 2015-07-19 13:46:34 +02:00
James Cole
fe807e23f8 Fixed sorting in tags. 2015-07-19 13:46:20 +02:00
James Cole
ecf61c31f1 Add new line to file. 2015-07-19 12:23:27 +02:00
James Cole
4feff18af5 Fix test data. 2015-07-19 12:21:51 +02:00
James Cole
a07c52e0d8 Fix some route names. 2015-07-19 12:21:38 +02:00
James Cole
7bb07d7f55 Add non-breaking space to fix issue #95. 2015-07-19 12:20:35 +02:00
James Cole
f12dfc8a14 Icons for attachments. 2015-07-19 11:47:56 +02:00
James Cole
be030f15c4 New composer.lock. 2015-07-19 09:57:26 +02:00
James Cole
f5fb6c063b Also delete attachments. 2015-07-19 09:53:58 +02:00
James Cole
fb722f06b9 Some added newlines. 2015-07-19 09:38:44 +02:00
James Cole
c0ea19e15e Test data no longer runs into the future. 2015-07-19 09:37:52 +02:00
James Cole
cdeb1ad87c Some model updates. 2015-07-19 09:37:37 +02:00
James Cole
0dbe4e94fa Allow to edit an attachment. 2015-07-19 09:37:28 +02:00
James Cole
b5e2e8aa1d Edit attachment page. 2015-07-18 23:51:51 +02:00
James Cole
9502010248 Some new routes. 2015-07-18 23:06:51 +02:00
James Cole
fea0557b47 Going to allow edit of attachment. 2015-07-18 22:49:27 +02:00
James Cole
ed4fcc9011 Some optimisation. 2015-07-18 22:17:31 +02:00
James Cole
ed12ea7cfb Check for double files and some code clean up. 2015-07-18 21:46:16 +02:00
James Cole
73e526645e Uncomment providers. 2015-07-18 21:33:52 +02:00
James Cole
72aeafb2b5 Some model code block updates 2015-07-18 21:33:10 +02:00
James Cole
cc1af60cb4 Basic attachment download function. 2015-07-18 21:32:31 +02:00
James Cole
359fab315f A fix in the model and a simple view for attachments. 2015-07-18 21:12:34 +02:00
James Cole
6a9574bab9 Allow jpeg and PDF. 2015-07-18 19:49:35 +02:00
James Cole
83d6158483 Basic upload working. 2015-07-18 09:49:59 +02:00
James Cole
63ef89b6cc Basic interface for upload. 2015-07-18 09:49:29 +02:00
James Cole
b0beab4cd3 Attachment model and database changes. 2015-07-18 09:49:19 +02:00
James Cole
a34782575f Fix form and upload thing. 2015-07-18 08:59:33 +02:00
James Cole
142bdc9430 Add attachment thing to upload form. 2015-07-17 21:45:58 +02:00
James Cole
14b79cb0a4 Fixed a bug where deposits and/or transfers would be assigned budgets if you had selected a budget at the withdrawal screen earlier. 2015-07-17 21:03:13 +02:00
James Cole
ce5beeaf2c Better compare for amounts because floatval can be inaccurate. 2015-07-17 17:35:04 +02:00
James Cole
31114a2ca5 Fixed a bug where tags would be recreated instead of "found". 2015-07-17 17:34:49 +02:00
James Cole
32528094ad Updated composer file. 2015-07-16 20:39:20 +02:00
James Cole
0a2a01c44c Code reformat. 2015-07-15 21:06:26 +02:00
James Cole
c1888dc3ac Merge branch 'release/3.4.9' 2015-07-15 21:02:36 +02:00
James Cole
4d76afbe01 Merge branch 'release/3.4.9' into develop 2015-07-15 21:02:36 +02:00
James Cole
76d7a97f93 New release with all changes so far. Change log coming soon. 2015-07-15 21:02:27 +02:00
James Cole
8b1366b20a Merge pull request #93 from RonaldvanMeer/master
fix issue #91
2015-07-15 21:00:29 +02:00
RonaldvanMeer
e0f9685578 Spacing fixes 2015-07-15 12:29:11 +02:00
RonaldvanMeer
5235657954 Fixing missing IBAN field on Create New User request 2015-07-15 12:25:09 +02:00
James Cole
a15fbc8094 Now committing to correct branch. 2015-07-14 22:48:34 +02:00
James Cole
546f1d9c50 Revert "Some login and session updates."
This reverts commit 74231f552a.
2015-07-14 22:45:14 +02:00
James Cole
74231f552a Some login and session updates. 2015-07-14 22:45:00 +02:00
James Cole
b250a10e3c Merge branch 'release/3.4.8'
Conflicts:
	resources/twig/auth/login.twig
	resources/twig/auth/password.twig
	resources/twig/auth/register.twig
2015-07-12 22:45:37 +02:00
James Cole
a9f1b31dd6 New version. 2015-07-12 22:43:43 +02:00
James Cole
7fe393acaf Updated composer.lock. 2015-07-12 22:43:01 +02:00
James Cole
04faba4db5 Fix URL things. 2015-07-12 22:37:05 +02:00
James Cole
91bba40c20 Cleanup code. 2015-07-12 17:59:13 +02:00
James Cole
79e39f7de8 Code cleanup. 2015-07-12 17:36:38 +02:00
James Cole
9c09353559 Some improvements in tour 2015-07-12 12:45:41 +02:00
James Cole
50752a5bfe Implemented a short tour. 2015-07-11 10:01:13 +02:00
James Cole
d59879db7d Add bootstrap tour references. 2015-07-11 08:37:21 +02:00
James Cole
aab125da27 Add bootstrap tour files. 2015-07-11 08:36:46 +02:00
James Cole
74fc731f96 Full Bootstrap. 2015-07-11 08:35:51 +02:00
James Cole
bd0050fec2 Fix balance display. 2015-07-10 20:59:20 +02:00
James Cole
aa5e313b92 Save transactions by moving them. 2015-07-10 20:48:45 +02:00
James Cole
e89d613b7e Removed confidential data from logging routine. [skip ci] 2015-07-10 20:25:17 +02:00
James Cole
8757929ead Make log [skip ci] 2015-07-10 20:19:31 +02:00
James Cole
e0a9b19802 Some new translations and what-not. 2015-07-10 20:17:17 +02:00
James Cole
308da6dc6e Clean up some lists [skip ci] 2015-07-10 07:39:59 +02:00
James Cole
b6960fb0e5 Small layout and translation fixes [skip ci] 2015-07-10 05:39:35 +02:00
James Cole
137208c3fd Typical. 2015-07-09 21:59:02 +02:00
James Cole
d7a9a62a1d Should fix some scrutinyizer problems. 2015-07-09 21:48:05 +02:00
James Cole
075315bdaa Added some model thingies so scrutinizer will stop whining. 2015-07-09 21:29:30 +02:00
James Cole
3948fcd614 Added newlines to files. 2015-07-09 21:26:40 +02:00
James Cole
8e61e129ab More debug, some bug fixes. 2015-07-09 19:36:14 +02:00
James Cole
20cffd0502 Fixed Rabo importer. 2015-07-09 19:23:49 +02:00
James Cole
5df09dab09 Put specifix in json. 2015-07-09 19:05:59 +02:00
James Cole
7446b911e5 Logging in Rabo specifix. 2015-07-09 19:03:39 +02:00
James Cole
f15267c1ab Better import feedback. 2015-07-09 18:38:15 +02:00
James Cole
9c9fc2b5dc Some fixes in csv importer. 2015-07-09 18:33:09 +02:00
James Cole
28f601b54b Import fix asset account. 2015-07-09 16:37:42 +02:00
James Cole
18b8a05014 Extra logging. 2015-07-09 16:07:05 +02:00
James Cole
910c995ed8 Log account id. [skip ci] 2015-07-09 16:03:47 +02:00
James Cole
498468aa2c Display error. [skip ci] 2015-07-09 15:39:41 +02:00
James Cole
637aebcb34 Bug fix for importer. [skip ci] 2015-07-09 15:36:56 +02:00
James Cole
9afd5cb277 Fix specific [skip ci] 2015-07-09 15:27:40 +02:00
James Cole
bc525e7272 Date format in config downloader. [skip ci] 2015-07-09 15:25:24 +02:00
James Cole
a80180780d Use log [skip ci] 2015-07-09 15:21:34 +02:00
James Cole
0d73086c37 More logging [skip ci] 2015-07-09 15:20:55 +02:00
James Cole
02ae39238d Forgot one iban key. 2015-07-09 14:04:01 +02:00
James Cole
43d6b51d42 Some cleaning up [skip ci] 2015-07-09 11:13:38 +02:00
James Cole
84566310de Cleaned up model comments. 2015-07-09 09:42:09 +02:00
James Cole
6a6ec9fbe4 Cleaned up some bill related code. 2015-07-09 09:41:54 +02:00
James Cole
84a7f825d7 Some small code optimisations. 2015-07-09 06:13:39 +02:00
James Cole
0372c1aaf1 Small fix to make account journal list sortable. [skip ci] 2015-07-08 20:18:51 +02:00
James Cole
c9fff197f7 Some improved sorting. 2015-07-08 13:11:51 +02:00
James Cole
6900392e43 Fixed some sorting. 2015-07-08 13:05:33 +02:00
James Cole
c00bcd78cc Some dependency clean up. 2015-07-07 19:09:45 +02:00
James Cole
b2b82124e6 Merge branch 'release/3.4.7' 2015-07-07 11:12:30 +02:00
James Cole
3de57c668f Merge branch 'release/3.4.7' into develop 2015-07-07 11:12:30 +02:00
James Cole
43669648ce New test data. 2015-07-07 11:10:13 +02:00
James Cole
3b73b416d5 New read me. 2015-07-07 11:10:07 +02:00
James Cole
5153591c8f New version. 2015-07-07 10:38:53 +02:00
James Cole
3172bc90da Some small fixes. 2015-07-07 10:05:11 +02:00
James Cole
76a1b2cd51 Improve some search methods. 2015-07-07 09:46:19 +02:00
James Cole
bdf7eee72f Clean up some code routines. 2015-07-07 01:07:19 +02:00
James Cole
2d4b148b2c Various optimisations. 2015-07-06 22:23:34 +02:00
James Cole
d67db74ca2 Optimized some code. 2015-07-06 22:12:35 +02:00
James Cole
516725456f Scrutiniser will now include duplicate code. 2015-07-06 21:57:43 +02:00
James Cole
001d72a484 Code cleanup. 2015-07-06 20:56:20 +02:00
James Cole
c555e28988 Add new bank specific fixes. 2015-07-06 20:21:55 +02:00
James Cole
af13d1943f Should fix the last issues. 2015-07-06 18:57:15 +02:00
James Cole
52df2edc8f Fixed the last issues. Now onto code complexity. 2015-07-06 18:48:17 +02:00
James Cole
cd08484a13 Code cleanup. 2015-07-06 18:13:57 +02:00
James Cole
f38d38f139 Math fixes. Not bugs. 2015-07-06 18:06:31 +02:00
James Cole
93b6c68938 Some math fixes. Not bugs. 2015-07-06 18:04:13 +02:00
James Cole
a4cc25175a Fixed some duplication. 2015-07-06 17:45:59 +02:00
James Cole
3fb14b4708 Code cleanup. 2015-07-06 16:52:18 +02:00
James Cole
6bdb6db330 Fixed some problems. 2015-07-06 16:42:19 +02:00
James Cole
d05c165ace These might be the final issues on scrutiniser, apart from code complexity. 2015-07-06 16:33:54 +02:00
James Cole
ab53cdb896 Cleanup redirect code. 2015-07-06 16:27:21 +02:00
James Cole
c1f142af78 Fix some redirect things. 2015-07-06 16:12:22 +02:00
James Cole
6e261abb73 Some code improvements. 2015-07-06 16:08:36 +02:00
James Cole
39af9e4414 More translations. 2015-07-06 10:39:44 +02:00
James Cole
5b50abb2c7 Bread crumbs and fine tuning. 2015-07-06 08:33:39 +02:00
James Cole
13bda0a264 Mainly layout improvements. 2015-07-06 08:14:19 +02:00
James Cole
1658c666ab Some changes. 2015-07-05 21:47:59 +02:00
James Cole
170aebfe54 Some code improvements. 2015-07-05 19:57:44 +02:00
James Cole
c4ef379d0e Cleanup post processing. 2015-07-05 19:31:58 +02:00
James Cole
18b038d8ff Fixed most importers. 2015-07-05 18:18:44 +02:00
James Cole
12ee5da872 Massively complex but working never the less. 2015-07-05 16:39:25 +02:00
James Cole
601f9f86bb Some more importers. 2015-07-05 15:16:44 +02:00
James Cole
d7329a5915 Expanded CSV configuration. 2015-07-05 14:37:36 +02:00
James Cole
9e7b730002 Somehow CSV reader got lost in translation. 2015-07-05 09:34:57 +02:00
James Cole
2d59d845bc Account iban thing fix [skip ci] 2015-07-05 09:19:51 +02:00
James Cole
c2645894e0 Allow update iban [skip ci] 2015-07-05 09:07:05 +02:00
James Cole
3751106317 Fix name in option list. 2015-07-05 09:05:51 +02:00
James Cole
60bb639351 Add IBAN to account list. 2015-07-05 08:52:35 +02:00
James Cole
74c50930bd Merge branch 'feature/csv-import' into develop
Conflicts:
	composer.json
	composer.lock
	resources/lang/en/form.php
	resources/lang/nl/form.php
2015-07-05 08:50:54 +02:00
James Cole
9105104303 Make CSV import a feature that can be turned on / off. 2015-07-05 08:47:16 +02:00
James Cole
540dde135e CSV importer now indicates the problems it has. 2015-07-05 08:45:05 +02:00
James Cole
f8936210cf Small fixes. 2015-07-05 07:18:48 +02:00
James Cole
1dc6d8de40 First working version, very beta. 2015-07-05 06:59:05 +02:00
James Cole
1069db3c13 Some new converters. 2015-07-05 06:26:34 +02:00
James Cole
65122f0144 Greatly expanded the CSV routine. 2015-07-05 06:18:02 +02:00
James Cole
d2c018f7da First (almost) functional CSV importer. 2015-07-04 07:53:37 +02:00
James Cole
46493c2af6 Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop
* 'develop' of https://github.com/JC5/firefly-iii:
  Update model info.
  Accounts can now have IBAN.
  Add IBAN field.
  New read me.
2015-07-03 12:54:45 +02:00
James Cole
c303e03f76 Update model info. 2015-07-03 12:54:35 +02:00
James Cole
d8b65f62e7 Accounts can now have IBAN. 2015-07-03 12:54:35 +02:00
James Cole
854368a8f3 Add IBAN field. 2015-07-03 12:54:35 +02:00
James Cole
7653a34aea New read me. 2015-07-03 12:54:35 +02:00
James Cole
ee50b58e00 Update model info. 2015-07-03 12:52:03 +02:00
James Cole
1eb60ab100 Accounts can now have IBAN. 2015-07-03 12:51:14 +02:00
James Cole
4a20eef351 Add IBAN field. 2015-07-03 12:27:49 +02:00
James Cole
26c9b2c353 Initial process form. 2015-07-03 12:22:20 +02:00
James Cole
16374bce9b Fixed upload form, made a new form element, added some processing. 2015-07-03 11:52:51 +02:00
James Cole
86011d4ea2 Initial commit for CSV import. 2015-07-03 10:45:00 +02:00
James Cole
fcb8b02da9 Merge branch 'release/3.4.6.1' 2015-07-03 10:32:31 +02:00
James Cole
571165c2bb Merge branch 'release/3.4.6.1' into develop 2015-07-03 10:32:31 +02:00
James Cole
c842113610 New read me. 2015-07-03 10:32:16 +02:00
James Cole
974a8b3b70 Merge branch 'master' of https://github.com/JC5/firefly-iii
# By Richard Ebbers
# Via James Cole (2) and Richard Ebbers (1)
* 'master' of https://github.com/JC5/firefly-iii:
  updated authentication pages to use dynamic urls
  use relative path in login screen
2015-07-03 10:30:57 +02:00
Richard Ebbers
2e20c99ada updated authentication pages to use dynamic urls 2015-07-03 10:30:32 +02:00
Richard Ebbers
aa88ff6f2c use relative path in login screen 2015-07-03 10:30:32 +02:00
James Cole
5e6aa63d03 Merge pull request #86 from ebbz/master
use relative path in login screen improved
2015-07-03 10:29:35 +02:00
James Cole
ad6700c114 An example test. Will continue later. 2015-07-03 10:28:40 +02:00
Richard Ebbers
f08c6efb00 updated authentication pages to use dynamic urls 2015-07-03 09:37:59 +02:00
James Cole
cc807ec132 Remove database setup from single test. 2015-07-03 08:16:14 +02:00
James Cole
24e7c68243 Initial codeception installation. 2015-07-03 08:15:30 +02:00
James Cole
ab25edd37a Updated to include codeception. 2015-07-03 08:13:50 +02:00
James Cole
be47fde6c2 Removed all tests. 2015-07-03 07:38:55 +02:00
James Cole
1ffa8c5e72 Removed code coverage logic. 2015-07-03 07:33:43 +02:00
James Cole
d855ccb8a7 Removed help button for small layouts [skip ci] 2015-07-03 07:28:20 +02:00
James Cole
d88919474b Reversed codeception. 2015-07-03 07:27:01 +02:00
James Cole
e139664301 Revert "Some updates to unit tests."
This reverts commit 5adf5f6e3f.
2015-07-03 07:25:07 +02:00
James Cole
5adf5f6e3f Some updates to unit tests. 2015-07-03 07:24:34 +02:00
James Cole
aef2075c8e Cleanup test case. 2015-07-02 09:49:45 +02:00
James Cole
922b2962a3 Bootstrap codeception. 2015-07-02 09:45:21 +02:00
James Cole
b4a401700e Installed codeception. 2015-07-02 09:44:56 +02:00
James Cole
e9601bb9c1 Add codeception. 2015-07-02 09:36:43 +02:00
James Cole
58af3dc6ea Removed everything related to unit tests. Can restore later. 2015-07-02 08:51:53 +02:00
Richard Ebbers
074295df61 use relative path in login screen 2015-07-01 20:03:43 +02:00
James Cole
ec349b31c7 Fixed tests. 2015-07-01 16:41:59 +02:00
James Cole
5ae236e016 With tooltips. 2015-07-01 15:08:09 +02:00
James Cole
d7c5897aba Optimise bootstrap. [skip ci] 2015-07-01 15:04:56 +02:00
James Cole
5252e7efe7 Cleanup css [skip ci] 2015-07-01 15:02:27 +02:00
James Cole
fc7d65629a Reorder bill chart [skip ci] 2015-07-01 13:18:50 +02:00
James Cole
f28fdf8252 Fixed chart tooltip [skip ci] 2015-07-01 11:08:14 +02:00
James Cole
5d07c4a949 Add date format to category charts [skip ci] 2015-07-01 11:07:10 +02:00
James Cole
fdd9eaab4b Added a better date for some budget charts [skip ci] 2015-07-01 11:04:08 +02:00
James Cole
e0d863a46f Create bills in test data, sort them [skip ci] 2015-07-01 10:52:42 +02:00
James Cole
3aacb6f5f3 New packages, updated read me, new composer.lock 2015-06-29 16:42:38 +02:00
James Cole
428e331b3e Reinstated the help button. 2015-06-29 15:23:50 +02:00
James Cole
847e05e9a7 Small experimental fix [skip ci] 2015-06-29 12:34:31 +02:00
James Cole
087eb5dbe6 Merge branch 'release/3.4.6' into develop 2015-06-29 09:53:26 +02:00
James Cole
f15932b2ac Merge branch 'release/3.4.6' 2015-06-29 09:53:25 +02:00
James Cole
d3a4c3795d New version. 2015-06-29 09:53:10 +02:00
James Cole
b15d55e1d9 Ignore untestable stuff. 2015-06-29 09:23:39 +02:00
James Cole
4f5889cc5b New tests for navigation. 2015-06-29 09:14:39 +02:00
James Cole
bf2a104a4e Fixed some tests. 2015-06-29 07:59:06 +02:00
James Cole
0c6dd5cd16 Removed some dead code. 2015-06-29 07:22:51 +02:00
James Cole
5efb06a7aa Removed unused code. 2015-06-29 07:17:39 +02:00
James Cole
b13acef272 Removed some dead code. 2015-06-29 07:16:43 +02:00
James Cole
cfa67d6c0f Implemented google chart tests. 2015-06-28 21:33:39 +02:00
James Cole
e70444f19a Fixed the bug that would unintentionally not let you edit accounts without changing their name. Closed #83 2015-06-28 21:13:08 +02:00
James Cole
0258982e60 Implemented two google chart tests. 2015-06-28 20:56:04 +02:00
James Cole
70eed5cb5e New tests. 2015-06-28 18:00:11 +02:00
James Cole
a650fa51f7 Implemented bill chart JS test. 2015-06-28 16:41:12 +02:00
James Cole
cb205580d8 First test for chartJS. 2015-06-28 16:20:14 +02:00
James Cole
f9329aac00 Removed unnecessary html tags. [skip ci] 2015-06-28 13:09:20 +02:00
James Cole
745f4a7523 Small chart and layout fixes [skip ci] 2015-06-28 13:07:23 +02:00
James Cole
60254dafd7 Implemented a forgotten chart. 2015-06-28 12:41:58 +02:00
James Cole
a8d60388ba New (empty) tests. 2015-06-28 10:38:51 +02:00
James Cole
83ec60254c New tests. 2015-06-28 10:03:34 +02:00
James Cole
c15c45f765 Some small fixes. 2015-06-28 08:42:06 +02:00
James Cole
cbe52b5089 Optimised chart generation. 2015-06-28 08:33:23 +02:00
James Cole
e4e2921f3e Fixed some tests. 2015-06-28 08:24:12 +02:00
James Cole
4673170531 Restored some cache [skip ci] 2015-06-27 22:22:27 +02:00
James Cole
2c2ed26c38 Optimise some charts [skip ci] 2015-06-27 22:11:03 +02:00
James Cole
94be5244fe Final chart. First version. 2015-06-27 20:52:06 +02:00
James Cole
f137a08493 Implemented some more charts. 2015-06-27 20:39:50 +02:00
James Cole
48624d0a34 A new chart, single count. 2015-06-27 17:38:16 +02:00
James Cole
4cceb3ddaa Completed the index. 2015-06-27 17:32:52 +02:00
James Cole
f728395603 Added some more charts 2015-06-27 17:05:39 +02:00
James Cole
3e82d43807 Expand some code to generate chartJS charts. 2015-06-27 16:01:06 +02:00
James Cole
2194c4e0a9 Expand some layouts to accept chartJS charts. 2015-06-27 16:00:50 +02:00
James Cole
c581080f3f Added option for other charts (chartJS currently). 2015-06-27 12:21:04 +02:00
James Cole
f6b1ec27e5 Renamed google chart methods and data. 2015-06-27 12:04:53 +02:00
James Cole
368b183230 Fixed category chart [skip ci] 2015-06-27 11:46:14 +02:00
James Cole
9028ad36ad Moved charts to separate generators. 2015-06-27 11:44:18 +02:00
James Cole
6cc041cd39 Fixed the chart generator. 2015-06-27 08:38:27 +02:00
James Cole
63ff01e78d Outsourced a chart to a specialised Google chart thing. 2015-06-27 08:18:47 +02:00
James Cole
9e5484937e Code cleanup [skip ci] 2015-06-27 08:06:24 +02:00
James Cole
b8ed489b14 Updated the read me [skip ci] 2015-06-27 07:55:59 +02:00
James Cole
765152d04b Reimplemented GA code. [skip ci] 2015-06-26 05:19:11 +02:00
James Cole
14934367d8 Simplified account name for cash accounts. 2015-06-26 04:57:30 +02:00
James Cole
04164500c8 Optimised some layout things. 2015-06-25 17:06:20 +02:00
James Cole
5160f2c298 Some new tests and a bug fix for piggy banks. 2015-06-24 21:02:34 +02:00
James Cole
124c9303b9 This should fix the tests. 2015-06-23 22:13:13 +02:00
James Cole
cd27f0ad69 Some database and css fixes. [skip ci] 2015-06-23 21:14:21 +02:00
James Cole
a7555bcce3 Some layout and file updates. 2015-06-23 19:07:37 +02:00
James Cole
6b5c4fd3f4 Merge branch 'master' of https://github.com/JC5/firefly-iii into develop
* 'master' of https://github.com/JC5/firefly-iii:
  New images [skip ci]
2015-06-23 07:40:50 +02:00
James Cole
cc55e2acee Lets see if this fixes the database. 2015-06-23 07:38:48 +02:00
James Cole
1511f75a80 Fixed tests. Broke database. 2015-06-22 22:04:46 +02:00
James Cole
f01bbefc1f Fixed tests. 2015-06-22 21:45:32 +02:00
James Cole
1d1eb5ffa8 Fix migration thing. 2015-06-22 21:37:02 +02:00
James Cole
a465cb2191 Remove all references to reminders. 2015-06-22 21:31:12 +02:00
James Cole
42d13e02ef New images [skip ci] 2015-06-22 21:04:31 +02:00
James Cole
d00786c43f Merge branch 'release/3.4.5' into develop 2015-06-22 19:12:05 +02:00
James Cole
4b47f99829 Merge branch 'release/3.4.5' 2015-06-22 19:12:04 +02:00
James Cole
35aaf40003 Updated composer file. 2015-06-22 19:11:17 +02:00
James Cole
cc5b4a1e02 Actually fix version [skip ci] 2015-06-22 19:03:03 +02:00
James Cole
7079521e8c Fix version in develop. 2015-06-22 19:02:28 +02:00
James Cole
b5025560a5 Merge branch 'feature/admin-lte' into develop 2015-06-22 18:59:36 +02:00
James Cole
3f4bdd7f0e Remove unnecessary code. 2015-06-22 18:58:19 +02:00
James Cole
e94bb9b549 Fixed some html errors [skip ci] 2015-06-22 18:50:54 +02:00
James Cole
1ddaacbef5 Some updated templates [skip ci] 2015-06-22 17:55:37 +02:00
James Cole
e8b40518e0 Hide boxes [skip ci] 2015-06-22 17:23:02 +02:00
James Cole
0f88cbb41b Fixed some layouts [skip ci] 2015-06-22 07:24:44 +02:00
James Cole
780d137b76 Fixed tests. 2015-06-21 16:10:32 +02:00
James Cole
ad8a9717d1 Fixed some views. [skip ci] 2015-06-21 15:09:10 +02:00
James Cole
9d6ea6b2f6 Some view updates [skip ci] 2015-06-21 11:59:35 +02:00
James Cole
7559383089 Cleaned up lots of views. 2015-06-21 10:50:45 +02:00
James Cole
f84381c927 Fixed search [skip ci] 2015-06-21 05:58:05 +02:00
James Cole
cb0122a43f Different colour scheme. [skip ci] 2015-06-21 05:48:47 +02:00
James Cole
6776b20989 Cleaned up tag views [skip ci] 2015-06-21 05:48:07 +02:00
James Cole
e98d556022 Some new templates and a bug fix [skip ci] 2015-06-20 22:18:54 +02:00
James Cole
5bf18b69d7 Smaller css footprint [skip ci] 2015-06-20 21:57:54 +02:00
James Cole
ea17f045a7 Added language stuff [skip ci] 2015-06-20 21:57:03 +02:00
James Cole
526f565ea7 Updated stuff from the control list. 2015-06-20 21:55:55 +02:00
James Cole
4aff9d6e73 Some more stuff done. Layout mostly. 2015-06-20 18:22:33 +02:00
James Cole
bf516d4d21 Fix some things. 2015-06-20 09:54:01 +02:00
James Cole
ae92e409d9 First functional run of new layout. 2015-06-20 07:48:44 +02:00
James Cole
4d017dc8a9 Updated boxes and what-not. 2015-06-20 07:29:25 +02:00
James Cole
707f4e2965 First implementation of new template. 2015-06-19 20:59:14 +02:00
James Cole
1c3bffdc50 Trigger a build. 2015-06-19 08:38:21 +02:00
James Cole
e54ddcb8b0 Small fix in edit form. [skip ci] 2015-06-18 18:12:57 +02:00
James Cole
ddefb0debc Improved tag view [skip ci] 2015-06-18 18:05:06 +02:00
James Cole
92d8dde90d Fixed sort commands [skip ci] 2015-06-17 06:11:35 +02:00
James Cole
1bb0508ddf Fix balance report [skip ci] 2015-06-16 18:34:19 +02:00
James Cole
a280a326b9 Fix report [skip ci] 2015-06-16 18:32:34 +02:00
James Cole
683e9b7c2c Small bugs in transaction controller [skip ci] 2015-06-16 18:26:17 +02:00
James Cole
a44e5da421 Add save routine to each transaction. [skip ci] 2015-06-16 06:52:30 +02:00
James Cole
8cd2c90ad7 Fixed menu in mobile [skip ci] 2015-06-15 20:24:58 +02:00
James Cole
5e57a390a2 Fixed tests. 2015-06-15 19:25:54 +02:00
James Cole
620848272e Implement tag count and fix a count thing. 2015-06-14 21:27:04 +02:00
James Cole
1e86794416 Add tag count to journal for easier amount calculations [skip ci] 2015-06-14 11:52:07 +02:00
James Cole
e36717259b Put tags in test data [skip ci] 2015-06-14 11:51:47 +02:00
James Cole
75b9238b90 Code cleanup [skip ci] 2015-06-14 11:51:33 +02:00
James Cole
ce5b20027e Newlines [skip ci] 2015-06-14 11:22:41 +02:00
James Cole
0de1242c83 Some cleaning up [skip ci] 2015-06-14 08:22:02 +02:00
James Cole
8bd445ab19 Some code cleanup [skip ci] 2015-06-13 10:02:36 +02:00
James Cole
fdef0de163 Increased test coverage. 2015-06-13 08:17:38 +02:00
James Cole
b1b03a4325 Upgrade to laravel 5.1 2015-06-11 21:19:40 +02:00
James Cole
0587d96474 Fixed tests [skip ci] 2015-06-11 20:14:15 +02:00
James Cole
c2241567e4 New translations. [skip ci] 2015-06-11 18:32:31 +02:00
James Cole
7ac24ba418 Some new translations [skip ci] 2015-06-09 17:56:08 +02:00
James Cole
c933ffec66 Quick fix in budget edit. [skip ci] 2015-06-09 16:20:37 +02:00
James Cole
e587d934b1 Switch menu around [skip ci] 2015-06-09 15:47:10 +02:00
James Cole
f354e90656 Some small menu optimisations. [skip ci] 2015-06-09 15:46:13 +02:00
James Cole
1b0bc7ec6e Clean up language. [skip ci] 2015-06-08 21:36:54 +02:00
James Cole
ee1acb9c00 Merge branch 'hotfix/3.4.4.2' 2015-06-08 18:52:30 +02:00
James Cole
06862a2812 Merge branch 'hotfix/3.4.4.2' into develop 2015-06-08 18:52:30 +02:00
James Cole
5fa87e18db Fix tag bug. (again) 2015-06-08 18:51:45 +02:00
James Cole
77989e2720 Fix read me. 2015-06-08 18:50:48 +02:00
James Cole
3a1102fa4e New code for auth controller [skip ci] 2015-06-08 18:42:19 +02:00
James Cole
8a9974ce53 New menu and new boxes [skip ci] 2015-06-08 18:41:47 +02:00
James Cole
4be8f1ca03 New email messages [skip ci] 2015-06-08 18:41:36 +02:00
James Cole
1ec2970ee3 Merge branch 'hotfix/3.4.4.1' 2015-06-08 18:41:02 +02:00
James Cole
81b3a22606 Merge branch 'hotfix/3.4.4.1' into develop 2015-06-08 18:41:02 +02:00
James Cole
f81a475cc9 Fixed a bug where the source and destination account could be the same one. 2015-06-08 18:40:52 +02:00
Sander Dorigo
d7ee03d4f9 New HTML view. 2015-06-08 09:48:53 +02:00
Sander Dorigo
c1c06410c2 Add HTML view. 2015-06-08 09:47:02 +02:00
James Cole
657d16bb60 Merge branch 'release/3.4.4' 2015-06-07 18:24:40 +02:00
James Cole
e65a4c1010 Merge branch 'release/3.4.4' into develop 2015-06-07 18:24:40 +02:00
James Cole
e23d3f5661 Mark a new release. 2015-06-07 18:24:23 +02:00
James Cole
e13611f7af Stupid faker messes up again. 2015-06-07 16:58:49 +02:00
James Cole
596cd09489 With a little luck this will cover a lot. 2015-06-07 15:32:01 +02:00
James Cole
0be5b27d34 Fixed some test coverage. 2015-06-07 10:28:26 +02:00
James Cole
a27471ae55 Fixed test. [skip ci] 2015-06-07 09:30:24 +02:00
James Cole
e27e3622a8 Fixed translation [skip ci] 2015-06-07 09:10:44 +02:00
James Cole
e95273b72b Simplified (or tried to) some code. [skip ci] 2015-06-07 09:09:27 +02:00
James Cole
583d4f3249 Cleanup scan method. [skip ci] 2015-06-07 08:13:19 +02:00
James Cole
d6967c4516 Cleaning up the relevantTags thing [skip ci] 2015-06-07 07:48:53 +02:00
James Cole
40b3097374 Lots of cleanup and stuff. 2015-06-06 23:09:12 +02:00
James Cole
1a1f127993 Cleanup code. 2015-06-06 17:40:41 +02:00
James Cole
a0f34a7ce1 Fix tests. 2015-06-06 16:26:26 +02:00
James Cole
db020db34b Fix tests and fix coverage. 2015-06-06 15:36:12 +02:00
James Cole
681167bc1b Some code cleanup. 2015-06-05 19:02:23 +02:00
James Cole
40e49ffc37 Some bug fixes and cleanup. 2015-06-05 16:49:16 +02:00
James Cole
834b1afb38 Updated some code [skip ci] 2015-06-05 13:39:24 +02:00
James Cole
62d5a1da87 Cleaning up [skip ci] 2015-06-05 12:48:58 +02:00
James Cole
8d8308e557 Cleanup another validator [skip ci] 2015-06-05 12:34:45 +02:00
James Cole
e1aa63487a Optimized a validator. [skip ci] 2015-06-05 12:18:20 +02:00
Sander Dorigo
b7fbe110d4 Merge pull request #82 from JC5/scrutinizer-patch-5
Scrutinizer Auto-Fixes
2015-06-05 11:39:08 +02:00
Scrutinizer Auto-Fixer
58859eb35a Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-06-05 08:40:26 +00:00
James Cole
4b7e1ae1c6 Removed duplicate code. 2015-06-05 10:02:40 +02:00
James Cole
3a06a6ac07 Removed unnecessary code. 2015-06-05 09:51:52 +02:00
James Cole
db0f269dc8 Fix class reference. 2015-06-05 09:50:59 +02:00
James Cole
3cabe6ca5a Improved test coverage. 2015-06-05 08:39:23 +02:00
James Cole
d483005219 Expanded some tests. 2015-06-05 07:49:07 +02:00
James Cole
fea9bc4e7e Increased coverage and fixed a nasty bug. 2015-06-05 07:10:51 +02:00
James Cole
d579992c98 Slightly improved test coverage. 2015-06-04 23:08:44 +02:00
James Cole
ad1c61d959 Improved test coverage. 2015-06-04 21:35:36 +02:00
James Cole
bb1da31830 Increase test coverage. 2015-06-04 17:43:50 +02:00
James Cole
a50949e554 Cache preferences. 2015-06-03 22:11:50 +02:00
James Cole
14dce8a10b Optimized preferences. 2015-06-03 21:58:06 +02:00
James Cole
1240c8f685 Update models [skip ci] 2015-06-03 21:27:36 +02:00
James Cole
cc7c2e952c Code cleanup [skip ci] 2015-06-03 21:25:11 +02:00
James Cole
409ec2e086 Should fix tests. 2015-06-03 21:15:52 +02:00
James Cole
a7f6848e53 Lots of stuff gets cached now. 2015-06-03 18:22:47 +02:00
James Cole
4b0b79199d Some cleanup. 2015-06-03 17:32:50 +02:00
Sander Dorigo
d1d6c48d9b Update GA code 2015-06-03 11:27:47 +02:00
James Cole
21631780bb Fix some tests 2015-06-02 22:22:47 +02:00
James Cole
b935e32340 Fix amount in tag list [skip ci] 2015-06-02 22:07:38 +02:00
James Cole
72dd064932 Fix count in transaction search [skip ci] 2015-06-02 21:58:30 +02:00
James Cole
2e75446665 Fixed some JS bugs [skip ci] 2015-06-02 18:13:23 +02:00
James Cole
be17e4481e Cache boxes. 2015-06-02 18:05:42 +02:00
James Cole
616c849b1f Fixed tests. 2015-06-02 17:58:30 +02:00
James Cole
71947c097f Some experiments with a cache control thing. [skip ci] 2015-06-02 17:44:50 +02:00
James Cole
546787802d Some code cleanup [skip ci] 2015-06-02 17:14:03 +02:00
James Cole
294d0e388a Add cache to main chart. 2015-06-01 18:41:18 +02:00
James Cole
193a1b0325 Basic tutorial for new users. 2015-06-01 18:13:54 +02:00
James Cole
12743217a2 Merge branch 'release/3.4.3' into develop 2015-06-01 17:37:03 +02:00
James Cole
b252b9da66 Merge branch 'release/3.4.3' 2015-06-01 17:37:02 +02:00
James Cole
cdef9c3c7e New version. 2015-06-01 17:36:53 +02:00
James Cole
71dcebb744 New read me [skip ci] 2015-06-01 17:36:13 +02:00
James Cole
25f248c60a New read me [skip ci] 2015-06-01 17:35:48 +02:00
James Cole
d5cbc17831 Update read me. 2015-06-01 17:35:03 +02:00
James Cole
7a10217511 New read me and scrutiniser instructions. 2015-05-31 20:53:31 +02:00
James Cole
7559efab77 Update build thing. 2015-05-31 20:52:20 +02:00
James Cole
8254efbd03 Fix modal. 2015-05-31 20:24:06 +02:00
James Cole
4ae24225a5 Cleanup some modals. 2015-05-31 20:23:49 +02:00
James Cole
67d9154563 Added some new code to implement a permission scheme. 2015-05-28 06:43:07 +02:00
James Cole
ad0319c188 Some new translations [skip ci] 2015-05-28 06:11:39 +02:00
James Cole
eb650ea3ec Some code cleanup 2015-05-27 08:36:26 +02:00
James Cole
7eba33e805 Fixed some issues for scrutiniser [skip ci] 2015-05-27 07:58:54 +02:00
James Cole
e1cb9d387e Fixed chart and redirect 2015-05-27 07:51:33 +02:00
James Cole
2ace7c3ca0 Some code cleanup [skip ci] 2015-05-27 07:27:05 +02:00
James Cole
58014f0592 Extra translation [skip ci] 2015-05-27 06:57:02 +02:00
James Cole
1d4938bb09 Small fix in error handler. 2015-05-26 22:12:34 +02:00
James Cole
bbf4007c3e Fixed return type [skip ci] 2015-05-26 20:59:16 +02:00
Sander Dorigo
4d5124fb4c Merge pull request #81 from JC5/scrutinizer-patch-4
Scrutinizer Auto-Fixes
2015-05-26 20:58:11 +02:00
Scrutinizer Auto-Fixer
14a7cd05b1 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-05-26 18:57:31 +00:00
James Cole
946be80eef Fix route urls. 2015-05-26 20:37:01 +02:00
James Cole
9ad8b1a980 Some optimisations. 2015-05-26 20:28:18 +02:00
James Cole
f733216fcb Trigger a build. 2015-05-26 20:18:21 +02:00
Sander Dorigo
ffc6139e21 Merge pull request #80 from JC5/scrutinizer-patch-3
Scrutinizer Auto-Fixes
2015-05-26 20:16:39 +02:00
Scrutinizer Auto-Fixer
571cac6644 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-05-26 17:50:09 +00:00
James Cole
2738ac5a5c Did some cleanup [skip ci] 2015-05-26 19:48:49 +02:00
James Cole
7dfde51b84 Fixed tests. 2015-05-26 19:38:52 +02:00
James Cole
2d2f18e538 Code cleanup. 2015-05-26 12:19:11 +02:00
James Cole
3af0dd2e3b Some code cleanup [skip ci] 2015-05-26 12:08:46 +02:00
James Cole
349e077802 Added model data to models to aid scrutiniser. 2015-05-26 11:15:45 +02:00
James Cole
812aae358f Some code cleanup. 2015-05-26 08:17:58 +02:00
James Cole
c3c59d0627 Fixed some JS things [skip ci] 2015-05-26 07:50:38 +02:00
James Cole
89518b412d Merge branch 'release/3.4.2' into develop 2015-05-25 23:18:33 +02:00
James Cole
f43b026162 Merge branch 'release/3.4.2' 2015-05-25 23:18:32 +02:00
James Cole
b806c70f52 New read me. 2015-05-25 22:58:49 +02:00
James Cole
10bff3c0b8 Fix tests. 2015-05-25 22:56:00 +02:00
James Cole
65c12fd0b2 Merge branch 'release/3.4.1' 2015-05-25 22:24:28 +02:00
James Cole
50f71c4130 Merge branch 'release/3.4.1' into develop 2015-05-25 22:24:28 +02:00
James Cole
8e401a53dc New version. 2015-05-25 22:24:21 +02:00
James Cole
64a289a47c Cleanup some code [skip ci] 2015-05-25 22:17:41 +02:00
James Cole
8f2c37061b Update translations [skip ci] 2015-05-25 22:16:00 +02:00
James Cole
39f2de6b90 Cleanup code [skip ci] 2015-05-25 22:04:24 +02:00
James Cole
855ba8d4f3 Cleanup [skip ci] 2015-05-25 22:01:48 +02:00
James Cole
74f098e718 Some new translations [skip ci] 2015-05-25 21:39:05 +02:00
James Cole
56c8a84691 Update translations [skip ci] 2015-05-25 21:26:34 +02:00
James Cole
8bbf319032 Some translations and a new test. 2015-05-25 21:17:36 +02:00
James Cole
afbca4ae65 Newline in travis.ml [skip ci] 2015-05-25 20:08:31 +02:00
James Cole
0ef6d2f91a Code cleanup. 2015-05-25 19:58:13 +02:00
James Cole
fbe4435599 Fix translation [skip ci] 2015-05-25 19:19:27 +02:00
James Cole
34be565dd1 New translations [skip ci] 2015-05-25 19:18:16 +02:00
James Cole
af838e4ed1 New translations. 2015-05-25 09:23:45 +02:00
James Cole
60fe8ce011 New GA events [skip ci] 2015-05-25 08:12:31 +02:00
James Cole
8ece341467 Add GA events [skip ci] 2015-05-25 08:01:06 +02:00
James Cole
dfa6bdbcb8 Fixed menu for mobile screens [skip ci] 2015-05-25 07:53:13 +02:00
James Cole
fb2481ebaa Add some GA events. 2015-05-25 07:26:19 +02:00
James Cole
4874c116cf Add GA to 503 page. [skip ci] 2015-05-25 07:23:35 +02:00
James Cole
e19c44efbd Some code cleanup. 2015-05-25 07:14:04 +02:00
James Cole
4b687b9bdc Clean up config 2015-05-25 07:03:26 +02:00
James Cole
6af79ef601 Fixed tests 2015-05-24 23:08:55 +02:00
James Cole
352b996ad2 Cleanup some code. 2015-05-24 22:59:48 +02:00
James Cole
4a93bb35f8 Cleanup budget view. 2015-05-24 22:54:59 +02:00
James Cole
8e1f493daf Another build routine. 2015-05-24 21:45:10 +02:00
James Cole
59ee153375 Fixed test. 2015-05-24 21:11:37 +02:00
James Cole
60f7f1fc16 New build routine. 2015-05-24 21:07:22 +02:00
James Cole
b7433683d8 Cleanup cleanup [skip ci] 2015-05-24 20:57:27 +02:00
James Cole
42799b9273 Some JS cleanup. 2015-05-24 20:48:31 +02:00
James Cole
860a0f790e Update js [skip ci] 2015-05-24 20:41:14 +02:00
James Cole
8daccbfbb4 Add JSHint stuff. [skip ci] 2015-05-24 18:22:41 +02:00
James Cole
285b77dcb7 Merge branch 'release/3.4.0.10' into develop 2015-05-24 15:56:05 +02:00
James Cole
6e48827d3f Merge branch 'release/3.4.0.10' 2015-05-24 15:56:04 +02:00
James Cole
f0c20cc706 New release. 2015-05-24 15:55:59 +02:00
James Cole
8916c0a3de Clean code [skip ci] 2015-05-24 15:18:19 +02:00
James Cole
7193a77840 Some translations and cleanup [skip ci] 2015-05-24 15:13:07 +02:00
James Cole
61930b5b51 Code cleanup [skip ci] 2015-05-24 15:03:45 +02:00
James Cole
11a494cacf Remove some middleware, fix cleanup [skip ci] 2015-05-24 12:53:47 +02:00
James Cole
17f9bf0339 Merge branch 'release/3.4.0.9' into develop 2015-05-24 11:53:44 +02:00
James Cole
3d9755ca8c Merge branch 'release/3.4.0.9' 2015-05-24 11:53:43 +02:00
James Cole
b5cf2d03e6 New version. 2015-05-24 11:53:34 +02:00
James Cole
e3b35b8f35 Add code climate file [skip ci] 2015-05-24 11:46:41 +02:00
James Cole
1c1fe672bd Some code cleanup [skip ci] 2015-05-24 11:41:52 +02:00
James Cole
6c71f68ed8 Should cover models. 2015-05-24 11:13:46 +02:00
James Cole
8f2f912cdf New (empty) tests for models. 2015-05-24 10:01:00 +02:00
James Cole
bf6ea16acb Fixed test. 2015-05-24 09:29:44 +02:00
James Cole
288546c2b9 Fixed some math. 2015-05-24 08:00:40 +02:00
James Cole
724db6c34c Built some new tests 2015-05-24 07:43:48 +02:00
James Cole
067c451c1d Fixed tests 2015-05-23 21:41:04 +02:00
James Cole
11e3696191 Cleanup tests. 2015-05-23 21:23:51 +02:00
James Cole
41e20664de Fixed coverage. 2015-05-23 21:18:20 +02:00
James Cole
d8de90d6f3 Ignore constructors. 2015-05-23 20:49:57 +02:00
James Cole
b01e8299d3 Fixed tests 2015-05-23 20:47:31 +02:00
James Cole
1ec11e3e2e Compartmentalised all tests. 2015-05-23 19:41:54 +02:00
James Cole
422f429725 Experimental count thing. 2015-05-23 17:38:16 +02:00
James Cole
5c55fa5fbb Remove encrypted amounts because it stinks. 2015-05-23 17:33:04 +02:00
James Cole
80d845fdf2 Save but don't use. 2015-05-23 17:18:23 +02:00
James Cole
601fe68346 Don't multiply transactions. 2015-05-23 17:14:36 +02:00
James Cole
9e050fb059 Updated some tests. 2015-05-23 17:11:16 +02:00
James Cole
99d4adf5e6 Translations [skip ci] 2015-05-23 15:57:38 +02:00
James Cole
85f8d1e8e9 Math is hard [skip ci] 2015-05-23 15:45:01 +02:00
James Cole
8334d3d99f Translation error [skip ci] 2015-05-23 15:43:48 +02:00
James Cole
cff08d19eb Slowly move away from using the raw 'transactions.amount' field. 2015-05-23 15:42:19 +02:00
James Cole
2d86390bc1 Experimental query.Code cleanup [skip ci] 2015-05-23 09:11:59 +02:00
James Cole
7a20835571 Code cleanup [skip ci] 2015-05-23 09:09:25 +02:00
James Cole
ff3c9676b5 Encrypt more stuff in the cleanup routine [skip ci] 2015-05-23 09:05:08 +02:00
James Cole
055f97dab1 Encrypt more stuff in the cleanup routine [skip ci] 2015-05-23 09:03:52 +02:00
James Cole
8a867e71a1 Encrypt more stuff in the cleanup routine [skip ci] 2015-05-23 09:02:27 +02:00
James Cole
b8275b4734 Encrypt more stuff in the cleanup routine [skip ci] 2015-05-23 09:01:38 +02:00
James Cole
36b951b146 Encrypt more stuff in the cleanup routine [skip ci] 2015-05-23 09:01:07 +02:00
James Cole
c5a5f17643 Encrypt more stuff in the cleanup routine [skip ci] 2015-05-23 09:00:11 +02:00
James Cole
16b909c4df Encrypt more stuff in the cleanup routine [skip ci] 2015-05-23 08:59:23 +02:00
James Cole
92b7648e03 Encrypt more stuff in the cleanup routine [skip ci] 2015-05-23 08:58:21 +02:00
James Cole
ca46ebe3b2 Encrypt bill amounts [skip ci] 2015-05-23 08:57:02 +02:00
James Cole
676e48254a Whoops [skip ci] 2015-05-23 08:55:16 +02:00
James Cole
b15b55227d Add another cleanup routine. [skip ci] 2015-05-23 08:54:25 +02:00
James Cole
3c3b723913 Some code cleanup [skip ci] 2015-05-23 08:51:24 +02:00
James Cole
f05002c729 Updated models for encryption. 2015-05-23 08:46:46 +02:00
James Cole
1c2cbd5b40 New stuff for encrypted amounts. 2015-05-23 07:47:36 +02:00
James Cole
54c6ca9f45 Expanded some tests. 2015-05-22 20:25:12 +02:00
James Cole
c10efbb170 Also encrypt meta data for reminders. 2015-05-22 19:19:18 +02:00
James Cole
a496ad5814 Simple routine to encrypt entries which were not encrypted yet. 2015-05-22 19:18:00 +02:00
James Cole
50cf7f6a3b Merge branch 'release/3.4.0.8' 2015-05-22 18:55:13 +02:00
James Cole
f946f10afd Merge branch 'release/3.4.0.8' into develop 2015-05-22 18:55:13 +02:00
James Cole
eecb4db34c Built chart tests. 2015-05-22 18:31:57 +02:00
James Cole
1f865d3ea4 Improved coverage. 2015-05-22 15:05:32 +02:00
James Cole
623bb4b350 New tests. 2015-05-22 10:17:20 +02:00
James Cole
dc8ad673a6 New test to cover some reminder stuff. 2015-05-22 08:52:30 +02:00
James Cole
4914ad821e Fixed coverage for transaction controller. 2015-05-22 08:03:34 +02:00
James Cole
f099cbadc3 Version increment. 2015-05-22 07:16:36 +02:00
James Cole
42cda384c8 Fix help routes 2015-05-22 07:15:40 +02:00
James Cole
23c91b9990 Some translations, playing around with popups. [skip ci] 2015-05-21 23:05:31 +02:00
James Cole
ff0379182e Sort chart [skip ci] 2015-05-21 18:57:14 +02:00
James Cole
e08a23948f Fixed chart. [skip ci] 2015-05-21 18:50:23 +02:00
James Cole
bd56de6d36 Fix other translations [skip ci] 2015-05-21 17:47:10 +02:00
James Cole
42970aea80 Fix some translations. 2015-05-21 17:45:01 +02:00
James Cole
003a05ee8d Fixed the category chart. 2015-05-21 17:27:48 +02:00
James Cole
ffb11b01a6 Some new translations. 2015-05-21 07:44:44 +02:00
James Cole
e426f5d5da Some new translations. 2015-05-21 07:30:38 +02:00
James Cole
6989f61e1b Extra translations [skip ci] 2015-05-20 20:10:01 +02:00
James Cole
0e6677ccb3 Remove cash accounts from list [skip ci] 2015-05-20 20:04:27 +02:00
James Cole
8f104d555a Added newlines to files. 2015-05-20 19:56:14 +02:00
James Cole
b1d3158db1 Code cleanup. 2015-05-20 19:55:53 +02:00
James Cole
7645005d5a Return of account id. 2015-05-20 18:18:05 +02:00
James Cole
411f77fd29 Fixed some other displays of money 2015-05-20 18:09:44 +02:00
James Cole
568ab26db1 Spell check [skip ci] 2015-05-20 17:06:47 +02:00
James Cole
29652108f0 Fixed tests. 2015-05-20 17:04:53 +02:00
James Cole
f07e4dc711 Fix sort. [skip ci] 2015-05-20 07:21:40 +02:00
James Cole
8a2ac457c2 Name fix [skip ci] 2015-05-20 07:21:01 +02:00
James Cole
9e54eecfaa Fixed some views. 2015-05-20 07:20:02 +02:00
James Cole
95ef691077 Fixed some more reports and charts. [skip ci] 2015-05-20 07:07:46 +02:00
James Cole
7a0ad5a587 Fixed a chart [skip ci] 2015-05-20 06:50:24 +02:00
James Cole
42b49d0e4b Added some correcting methods. [skip ci] 2015-05-20 06:50:15 +02:00
James Cole
9217c2f003 Corrected some charts [skip ci] 2015-05-20 06:49:51 +02:00
James Cole
fbdf66998d Added a forgotten chart, corrected some others. [skip ci] 2015-05-20 06:49:22 +02:00
James Cole
deda9d3c54 Add corrected expense routes [skip ci] 2015-05-20 06:49:03 +02:00
James Cole
a5d78f20ae Add corrected income and expense methods [skip ci] 2015-05-20 06:48:52 +02:00
James Cole
5ed09e3f38 Call the corrected spent function [skip ci] 2015-05-20 06:47:53 +02:00
James Cole
3e9774cd66 Merge branch 'release/3.4.0.7' 2015-05-18 18:23:07 +02:00
James Cole
54387c8fdf Merge branch 'release/3.4.0.7' into develop 2015-05-18 18:23:07 +02:00
James Cole
7eec949a13 Push new release. 2015-05-18 18:23:01 +02:00
James Cole
4113c4ff40 Fixed the tests. 2015-05-18 17:57:44 +02:00
James Cole
1bf0968bfe Show correct icon. [skip ci] 2015-05-18 17:05:22 +02:00
James Cole
374b90fb00 Show correct amount [skip ci] 2015-05-18 17:04:10 +02:00
James Cole
064e60e9d5 Show tag amount better [skip ci] 2015-05-18 17:02:18 +02:00
James Cole
b637455970 New translations [skip ci] 2015-05-18 16:59:01 +02:00
James Cole
68158937d1 Fixed translation [skip ci] 2015-05-18 06:56:59 +02:00
James Cole
adb1356b7a Small bug fix in display of income vs. expenses [skip ci] 2015-05-18 06:55:36 +02:00
James Cole
d880ccb8e0 Small bug fix in display of income vs. expenses [skip ci] 2015-05-18 06:54:46 +02:00
James Cole
050fb1d1ef Some translations [skip ci] 2015-05-17 18:06:00 +02:00
James Cole
6580752bde Now includes chart! [skip ci] 2015-05-17 18:03:16 +02:00
James Cole
c9df265c9b Included bills in month report. [skip ci] 2015-05-17 17:54:13 +02:00
James Cole
098e5bc162 Small translation fix [skip ci] 2015-05-17 17:27:56 +02:00
James Cole
4b2dcc74d4 Expanded the amount thing. 2015-05-17 16:12:00 +02:00
James Cole
a9254c5c9a Some new translations, better tag view [skip ci] 2015-05-17 15:55:24 +02:00
James Cole
7ce57e6ccb Fix a view, fix tag format. 2015-05-17 15:24:30 +02:00
James Cole
0fcb32a66f Fix update error. 2015-05-17 15:17:06 +02:00
James Cole
9946535f01 Some new bread crumbs [skip ci] 2015-05-17 15:12:45 +02:00
James Cole
2b17396d6b Fix some translations. 2015-05-17 13:44:58 +02:00
James Cole
b01d5bc237 Translation fixes [skip ci] 2015-05-17 12:53:32 +02:00
James Cole
b123860304 More stuff. 2015-05-17 12:49:09 +02:00
James Cole
033f5b67db Code cleanup 2015-05-17 11:28:58 +02:00
James Cole
6280448dfb Fixed more tests. 2015-05-17 10:47:12 +02:00
James Cole
01cd3333e4 Fixing tests. 2015-05-17 10:36:11 +02:00
James Cole
63050907b9 Code cleanup. 2015-05-17 10:30:18 +02:00
James Cole
beedf7d780 Cleaning up 2015-05-17 10:10:58 +02:00
James Cole
6b8194261f Clean up and simplify code. 2015-05-17 10:01:47 +02:00
James Cole
dbb1c4d534 Fixed some reports. 2015-05-17 09:35:49 +02:00
James Cole
e6263f9ff5 Some cleaning up 2015-05-17 09:18:44 +02:00
James Cole
6ca119c4db Minor changes [skip ci] 2015-05-17 09:04:55 +02:00
James Cole
c483a1ab3a Ignore simple classes. 2015-05-16 19:08:54 +02:00
James Cole
2e7edd033c Some expanded things. 2015-05-16 16:47:52 +02:00
James Cole
c576902501 Fixed tests. 2015-05-16 16:04:51 +02:00
James Cole
66c2951594 Cleanup 2015-05-16 15:52:09 +02:00
James Cole
b812881cdb More hip report stuff. 2015-05-16 15:43:58 +02:00
James Cole
cdeac2c6db Should simplify reports. 2015-05-16 14:51:23 +02:00
James Cole
bca2ddd529 Budget report thing. 2015-05-16 14:14:22 +02:00
James Cole
e7285c6499 Some overhauls. 2015-05-16 13:53:08 +02:00
James Cole
bdff275672 Simplified report code. 2015-05-16 13:06:38 +02:00
James Cole
bec58a1ee6 Experimental test coverage. 2015-05-16 10:34:38 +02:00
James Cole
f64616748c Expenses only [skip ci] 2015-05-16 10:18:32 +02:00
James Cole
512ce15973 Small tweaks in charts. 2015-05-16 10:13:41 +02:00
James Cole
ed8b301574 Routes and JS cleanup. 2015-05-16 10:05:22 +02:00
James Cole
d22a6c019c Fixed lots of chart references. 2015-05-16 09:57:31 +02:00
James Cole
a0cb1b9d9e Clean up and split chart controllers 2015-05-16 09:41:14 +02:00
James Cole
a5294c62ea Renamed a method. 2015-05-16 09:26:54 +02:00
James Cole
e155d3311c Fixed tests 2015-05-16 09:25:14 +02:00
James Cole
0a372b0daf Cleanup tests 2015-05-16 09:16:32 +02:00
James Cole
69143399d1 Moved some stuff around. 2015-05-16 09:09:52 +02:00
James Cole
3270d3bf96 Cleanup. 2015-05-16 08:14:26 +02:00
James Cole
3896a66122 Fixed tests. 2015-05-16 08:09:15 +02:00
James Cole
b94781aef1 Some optimisations. 2015-05-16 08:05:04 +02:00
James Cole
bed1adc367 Fixed budget. 2015-05-16 07:56:15 +02:00
James Cole
ae54497efa Differ between shared and normal transactions (not build yet). 2015-05-16 07:49:02 +02:00
James Cole
06b747c221 Some cleanup and translations. 2015-05-16 07:28:58 +02:00
James Cole
f159beee0d Fixed preferences tests. 2015-05-15 23:24:55 +02:00
James Cole
49d7dea086 Fixed some coverage. 2015-05-15 23:02:42 +02:00
James Cole
3e65733dc5 Small fix in report view [skip ci] 2015-05-15 22:12:31 +02:00
James Cole
cc375d58bb Fixed tests. 2015-05-15 22:06:52 +02:00
James Cole
911c7c662a Expanded reports. 2015-05-15 22:00:00 +02:00
James Cole
aae003be33 Some more cleaning up and fixing 2015-05-15 21:01:24 +02:00
James Cole
aede03d8b2 Some more layout changes. 2015-05-15 20:43:50 +02:00
James Cole
f0f5ada7de More changes to reports. 2015-05-15 20:38:39 +02:00
James Cole
58365121a3 Fixed tests. 2015-05-15 20:15:58 +02:00
James Cole
d5a154d2e6 Cleaned up reports and associated views. 2015-05-15 20:07:51 +02:00
James Cole
b20f369aef Some new tests. 2015-05-15 18:39:59 +02:00
James Cole
abb8aa0b29 Merge branch 'feature/translations' into develop 2015-05-15 18:38:26 +02:00
James Cole
5368a0f1d7 Some new translations. 2015-05-14 19:44:20 +02:00
James Cole
d3897eece7 This should fix the tests on the translations branch. 2015-05-14 18:15:31 +02:00
James Cole
a82b829da9 More translations. 2015-05-14 18:00:56 +02:00
James Cole
9f5058e81a Some new translations. 2015-05-14 17:52:50 +02:00
James Cole
5b19263720 Some more [skip ci] 2015-05-14 16:43:12 +02:00
James Cole
9d5a0db0d9 [skip ci] 2015-05-14 16:36:08 +02:00
James Cole
4bd8a7014f Count things [skip ci] 2015-05-14 16:35:41 +02:00
James Cole
353e96d951 Better (and translated) delete forms. [skip ci] 2015-05-14 16:32:35 +02:00
James Cole
149a6f92b0 Translations [skip ci] 2015-05-14 15:56:23 +02:00
James Cole
d66426c137 Nieuw vertalingen [skip ci] 2015-05-14 15:53:56 +02:00
James Cole
4fc9966392 Chart translations [skip ci] 2015-05-14 13:43:58 +02:00
James Cole
417766f0db Various date localisation. [skip ci] 2015-05-14 13:41:21 +02:00
James Cole
de9ac97887 Also english. [skip ci] 2015-05-14 13:19:26 +02:00
James Cole
6be42f112a Charts and titles in Dutch. [skip ci] 2015-05-14 13:17:53 +02:00
James Cole
3895ae63c7 Some translations for lists [skip ci] 2015-05-14 13:00:43 +02:00
James Cole
607d416d54 Better translation for 'balance' [skip ci] 2015-05-14 12:11:56 +02:00
James Cole
038693dc86 More index translations [skip ci] 2015-05-14 12:10:42 +02:00
James Cole
cc9be13544 Added a bread crumb [skip ci] 2015-05-14 11:50:48 +02:00
James Cole
9c1474087f Forgot one [skip ci] 2015-05-14 11:50:04 +02:00
James Cole
831de2bcf4 New menu translations [skip ci] 2015-05-14 11:48:59 +02:00
James Cole
eb687333bb Small edits to buttons and others. [skip ci] 2015-05-14 11:31:54 +02:00
James Cole
5cc7966d54 Some new form things. [skip ci] 2015-05-14 11:25:43 +02:00
James Cole
d1a34e7a6f Breadcrumbs translated to English. [skip ci] 2015-05-14 11:22:20 +02:00
James Cole
d63d791717 Translated all bread crumbs to Dutch. [skip ci] 2015-05-14 11:17:56 +02:00
James Cole
015570c741 Small translations as a basic start [skip ci] 2015-05-14 10:26:15 +02:00
James Cole
8400ebc9c6 Added a language test, added Dutch basic file. [skip ci] 2015-05-14 10:03:57 +02:00
James Cole
9f99e7c0af Edit and set language [skip ci] 2015-05-14 09:59:30 +02:00
James Cole
392c1fc399 Add language selector to preferences [skip ci] 2015-05-14 09:56:41 +02:00
James Cole
d3cea7a89c Add new supported languages [skip ci] 2015-05-14 09:52:58 +02:00
James Cole
1dcf7407e6 Cleanup [skip ci] 2015-05-14 09:51:54 +02:00
James Cole
d543c033a3 Small fixes to translations. 2015-05-14 09:50:07 +02:00
James Cole
aaa186be5e Merge branch 'release/3.4.0.6' 2015-05-14 09:21:23 +02:00
James Cole
2054b5b3dd Merge branch 'release/3.4.0.6' into develop 2015-05-14 09:21:23 +02:00
James Cole
98ae5b0ca0 New read me. 2015-05-14 09:21:12 +02:00
James Cole
36c8171d0f Clean up and tests. 2015-05-14 09:01:10 +02:00
James Cole
3603eb94cc Different budget query [skip ci] 2015-05-14 08:08:25 +02:00
James Cole
0e068d4ccf Fixed some tests. 2015-05-13 21:37:11 +02:00
James Cole
199f348ff4 Smaller mobile pages. 2015-05-13 21:32:33 +02:00
James Cole
b22655fb7c Fix helper 2015-05-13 21:32:27 +02:00
James Cole
06cc9618ba Some new tests 2015-05-13 21:32:21 +02:00
James Cole
b9019c8c7f Smaller screens update [skip ci] 2015-05-13 06:34:17 +02:00
James Cole
77e133e67c Some cleaning up for mobile screens [skip ci] 2015-05-13 06:31:32 +02:00
James Cole
571e7df807 Some tiny optimisations. 2015-05-12 20:51:03 +02:00
James Cole
22f4d2979a Added some more ignores, edited some middleware. 2015-05-11 22:12:53 +02:00
James Cole
e46e366694 Added some tests to cover an event. 2015-05-11 21:45:31 +02:00
James Cole
7b4bc23815 Merge branch 'release/3.4.0.5' 2015-05-10 19:18:57 +02:00
James Cole
9ca79f767c Merge branch 'release/3.4.0.5' into develop 2015-05-10 19:18:57 +02:00
James Cole
274dba7408 Update read me. 2015-05-10 19:18:49 +02:00
James Cole
31708ca29e Ignore some code. 2015-05-10 19:18:43 +02:00
James Cole
671b025588 More ignore stuff. 2015-05-10 13:40:29 +02:00
James Cole
a7956e4856 Adding lots of ignore statements because testing the models is pointless. 2015-05-10 13:22:00 +02:00
James Cole
355862025a Auth and password controller. 2015-05-10 13:06:02 +02:00
James Cole
a2a39ee0f8 Ignore piggy bank part. 2015-05-10 09:35:42 +02:00
James Cole
ec8e39c16f Fixed currency tests. 2015-05-10 09:26:44 +02:00
James Cole
88f714999e Add test to get full coverage. 2015-05-10 08:53:49 +02:00
James Cole
c0c2aa3be0 Fixed one test. 2015-05-10 08:49:15 +02:00
James Cole
822044820e Ignored more files. 2015-05-10 08:26:42 +02:00
James Cole
6ffc182142 Ignore lots of code in test coverage. 2015-05-10 08:08:07 +02:00
James Cole
3d54a78573 Tag repository tests 2015-05-10 07:48:33 +02:00
James Cole
8ddf7d953a Ignore constructor. 2015-05-10 07:09:21 +02:00
James Cole
8b9e9ad103 Tests for reminder repository. 2015-05-10 07:07:17 +02:00
James Cole
5737224c40 Simplified translations [skip ci] 2015-05-09 22:42:45 +02:00
James Cole
ec9aacbcae More new tests. 2015-05-09 22:30:16 +02:00
James Cole
9395454997 Small optimalizations [skip ci] 2015-05-09 19:27:25 +02:00
James Cole
66198a8d98 Expanded bread crumb [skip ci] 2015-05-09 19:23:37 +02:00
James Cole
96ed9a4256 Finished journal repository. 2015-05-09 18:30:58 +02:00
James Cole
10e54b2263 Tested part of the journal repository. 2015-05-09 18:11:48 +02:00
James Cole
cf00922ad2 Merge branch 'release/3.4.0.4' 2015-05-09 15:13:20 +02:00
James Cole
84e8e007a5 Merge branch 'release/3.4.0.4' into develop 2015-05-09 15:13:20 +02:00
James Cole
d07b2e773b Update read me 2015-05-09 15:13:14 +02:00
James Cole
506ef7b0b9 Covered currency repository. 2015-05-09 15:11:12 +02:00
James Cole
2cd5dae8e2 New read me [skip ci] 2015-05-09 15:08:56 +02:00
James Cole
a1cd49c111 First attempt at translations. 2015-05-09 13:56:03 +02:00
James Cole
aca2973aef Experimental chart [skip ci] 2015-05-09 13:55:07 +02:00
James Cole
0a7a691c95 Experimental chart [skip ci] 2015-05-09 13:53:58 +02:00
James Cole
72906a7afd Experimental chart [skip ci] 2015-05-09 13:52:33 +02:00
James Cole
d1a4a83570 Covered category repository. 2015-05-09 13:14:02 +02:00
James Cole
e0396b29e8 Add GA beacon [skip ci] 2015-05-09 10:43:37 +02:00
James Cole
536833cfe0 Fixed tests. 2015-05-09 10:25:52 +02:00
James Cole
317b02d1b9 Finished budget repository tests. 2015-05-09 10:23:13 +02:00
James Cole
75e279ea0d Update read me [skip ci] 2015-05-09 09:17:09 +02:00
James Cole
dc2ad21f4c Updated read me [skip ci] 2015-05-09 09:15:39 +02:00
James Cole
484d49aae1 Fixed tests 2015-05-09 09:15:27 +02:00
James Cole
ca39438ad4 Small update to the read me. [skip ci] 2015-05-09 09:11:54 +02:00
James Cole
49a65ebff4 New budget repository tests. 2015-05-09 09:05:37 +02:00
James Cole
befdc05084 Rewrote read me. [skip ci] 2015-05-08 19:34:03 +02:00
James Cole
1fbffe761b Merge branch 'release/3.4.0.3' into develop 2015-05-08 17:35:03 +02:00
James Cole
36aad379ff Merge branch 'release/3.4.0.3' 2015-05-08 17:35:02 +02:00
James Cole
540cfa072e Update read me. 2015-05-08 17:34:54 +02:00
James Cole
3b049c15cc Updated composer.json [skip ci] 2015-05-08 17:15:16 +02:00
James Cole
3e93ed0a17 Small JS fix. [skip ci] 2015-05-08 17:13:49 +02:00
James Cole
d7d9358136 Fix sorting [skip ci] 2015-05-08 17:04:24 +02:00
James Cole
5cf0939ff9 Fixed sorting [skip ci] 2015-05-08 17:03:20 +02:00
James Cole
8dc6f91d3c Add sort options. [skip ci] 2015-05-08 17:00:39 +02:00
James Cole
a3a25db230 New tests. 2015-05-08 16:44:57 +02:00
James Cole
c06f18c815 Some new tests 2015-05-08 14:00:49 +02:00
James Cole
6802f04036 First two tests for bill repository. 2015-05-08 12:50:39 +02:00
James Cole
beeccdf345 New (incomplete) tests [skip ci] 2015-05-08 12:44:42 +02:00
James Cole
58241ed39d Covered account repository. 2015-05-08 12:42:12 +02:00
James Cole
31128020f0 Merge branch 'release/3.4.0.2' 2015-05-08 07:57:06 +02:00
James Cole
6c48afc37b Merge branch 'release/3.4.0.2' into develop 2015-05-08 07:57:06 +02:00
James Cole
7a2f169dfc Push new version. 2015-05-08 07:56:55 +02:00
James Cole
ed910b99a7 Update travis configuration [skip ci] 2015-05-08 07:48:04 +02:00
James Cole
54195c0826 Updated tests. 2015-05-08 07:39:05 +02:00
James Cole
cefbbcd1df Fixed some tests. 2015-05-08 07:27:29 +02:00
James Cole
cc01592085 Cover some more account repository. 2015-05-08 06:01:39 +02:00
James Cole
5a98a5252d Added tests. 2015-05-07 21:26:00 +02:00
James Cole
184e8b1132 Some new tests. 2015-05-07 20:56:27 +02:00
James Cole
2b6b896c2e Some more coverage. 2015-05-06 18:09:45 +02:00
James Cole
96d06b7a93 Added incomplete tests. 2015-05-05 22:46:28 +02:00
James Cole
f54f1611b5 First tests for account repository. 2015-05-05 20:46:13 +02:00
James Cole
69ad757e8b Lazily remove todo's [skip ci] 2015-05-05 13:03:39 +02:00
James Cole
e0beb796ad Some cleaning up [skip ci] 2015-05-05 13:03:04 +02:00
James Cole
f331e7d820 Removed unnecessary imports (use statements) [skip ci] 2015-05-05 12:57:27 +02:00
James Cole
cbb62d3d78 Added new line at the end of files. [skip ci] 2015-05-05 12:51:57 +02:00
James Cole
c85bc59c1d Merge branch 'release/3.4.0.1' into develop 2015-05-05 12:35:23 +02:00
James Cole
8081eeb007 Merge branch 'release/3.4.0.1' 2015-05-05 12:35:22 +02:00
James Cole
56f91bd10d Increment version. 2015-05-05 12:35:11 +02:00
James Cole
8e20b78731 Cleanup. 2015-05-05 10:30:39 +02:00
James Cole
23a09b7081 Code cleanup. 2015-05-05 10:23:01 +02:00
James Cole
67fdd27499 Various code cleanup [skip ci] 2015-05-05 07:51:02 +02:00
James Cole
e1941daedd Updated phpdoc. [skip ci] 2015-05-05 07:48:34 +02:00
James Cole
f28bc568a4 Some cleanup [skip ci] 2015-05-05 07:43:16 +02:00
James Cole
f24cfe39aa Expanded some tests. 2015-05-05 07:41:30 +02:00
James Cole
59d2bf3f79 Covered transaction controller. 2015-05-05 07:28:04 +02:00
James Cole
3176e54614 Partial coverage of the transaction controller. 2015-05-04 23:46:14 +02:00
James Cole
eb090f7265 Better factory. 2015-05-04 22:33:52 +02:00
James Cole
6d3a9bfd18 Some cleaning up 2015-05-04 22:33:03 +02:00
James Cole
76f08b7acb Full coverage for chart controller. 2015-05-04 19:28:49 +02:00
James Cole
1ff99346aa Update chart [skip ci] 2015-05-04 18:51:51 +02:00
James Cole
369695ab32 Update chart [skip ci] 2015-05-04 18:51:38 +02:00
James Cole
7e23dd1d66 Update composer.lock [skip ci] 2015-05-04 18:45:32 +02:00
James Cole
0205d3fc5c Overspent transactions have a separate colour [skip ci] 2015-05-04 18:45:20 +02:00
James Cole
4660cf2ad5 Fixed a bug in the display of the current currency code. 2015-05-03 16:16:43 +02:00
James Cole
e26d08d674 Update git ignore. [skip ci] 2015-05-03 16:14:15 +02:00
James Cole
0932bf2797 Don't need these files [skip ci] 2015-05-03 16:13:38 +02:00
James Cole
f560fc6d76 Covered search controller. 2015-05-03 15:55:19 +02:00
James Cole
aa6209af00 Covered tag controller. 2015-05-03 15:00:39 +02:00
James Cole
4a51176193 General cleanup. 2015-05-03 12:58:55 +02:00
James Cole
bb84f7a434 Fixed parameter order [skip ci] 2015-05-03 12:54:39 +02:00
James Cole
48168b1ef0 Covered report controller. 2015-05-03 11:02:34 +02:00
James Cole
8281c7c83e Don't escape currency symbol [skip ci] 2015-05-03 10:11:16 +02:00
James Cole
a07c1e3c71 See code. [skip ci] 2015-05-03 10:07:18 +02:00
James Cole
0766bb31fe Better amount formatting [skip ci] 2015-05-03 10:03:50 +02:00
James Cole
ff4472c1a5 FormatAmountPlain is HTML safe [skip ci] 2015-05-03 10:01:38 +02:00
James Cole
17424740e5 Show plain amount instead of coloured amounts. [skip ci] 2015-05-03 10:00:47 +02:00
James Cole
dad0b2fcd3 Show plain amount instead of coloured amounts. [skip ci] 2015-05-03 10:00:03 +02:00
James Cole
c48dbf030f Covered the reminder controller. 2015-05-03 09:55:22 +02:00
James Cole
617808d603 Covered profile controller with tests. 2015-05-03 09:19:14 +02:00
James Cole
845149deee Boxes are empty, so even when it's zero, place the amount. 2015-05-03 08:56:44 +02:00
James Cole
1a9e009327 Merge branch 'release/3.4' into develop 2015-05-02 23:51:45 +02:00
James Cole
ae90815708 Merge branch 'release/3.4' 2015-05-02 23:51:44 +02:00
James Cole
1c460343b7 New version! 2015-05-02 23:51:34 +02:00
James Cole
26079622f9 Fixed JSON controller tests. 2015-05-02 23:39:39 +02:00
James Cole
06c6d6096f Fixed coverage. 2015-05-02 23:28:04 +02:00
James Cole
c8183aea51 Format amount [skip ci] 2015-05-02 22:50:40 +02:00
James Cole
7531134ad2 Some tag related fine tuning. 2015-05-02 22:41:32 +02:00
James Cole
cd0c6439c2 Delete tags now possible. 2015-05-02 22:30:59 +02:00
James Cole
c918c93f51 Forget me own head next. [skip ci] 2015-05-02 22:13:37 +02:00
James Cole
97d3bd68ed Show balance act tags. 2015-05-02 22:12:26 +02:00
James Cole
75f1e034ae Fixed menu. [skip ci] 2015-05-02 22:09:21 +02:00
James Cole
8e72f218f1 Show HTML 2015-05-02 22:05:57 +02:00
James Cole
d643e05c5a Basic amount format fix. 2015-05-02 22:05:18 +02:00
James Cole
fea44834d0 Fixed test to match fixed controller. 2015-05-02 21:22:27 +02:00
James Cole
195a2d7523 Removed all the old views. 2015-05-02 21:18:04 +02:00
James Cole
b2fd346ef8 Merge branch 'feature/twig' into develop 2015-05-02 21:16:21 +02:00
James Cole
1ff8b62cb7 And now with actual coverage. 2015-05-02 19:44:31 +02:00
James Cole
c7ae15a41a This should fix all twig tests. Let's find out! 2015-05-02 19:44:12 +02:00
James Cole
efe6f59f79 Last templates. Should cover everything. [skip ci] 2015-05-02 19:19:47 +02:00
James Cole
8e31d0491d Fixed search [skip ci] 2015-05-02 18:30:59 +02:00
James Cole
73d4a10351 Fixed reports [skip ci] 2015-05-02 18:26:55 +02:00
James Cole
81d9d4dbc7 Various files updated to twig [skip ci] 2015-05-02 13:20:49 +02:00
James Cole
184ec13f99 Fixed bills [skip ci] 2015-05-02 12:51:02 +02:00
James Cole
dee0422eff Fix preferences [skip ci] 2015-05-02 12:22:19 +02:00
James Cole
81a2975f1a Show piggy banks [skip ci] 2015-05-02 11:32:45 +02:00
James Cole
5cd2ef4a5e Some generic templates and the first piggy bank ones [skip ci] 2015-05-02 10:53:54 +02:00
James Cole
466c2a68c2 Add delete form [skip ci] 2015-05-02 10:42:41 +02:00
James Cole
0fb9fba531 New currency routes 2015-05-02 10:40:20 +02:00
James Cole
356dd2c6cd Creat / edit / index [skip ci] 2015-05-02 10:37:16 +02:00
James Cole
32c4661233 Fixed no budget / no category bread crumb [skip ci] 2015-05-02 09:49:37 +02:00
James Cole
a245b504ec Fixed bread crumbs. 2015-05-02 09:31:57 +02:00
James Cole
a2f5fbdfd3 Working on two more views [skip ci] 2015-05-02 09:29:34 +02:00
James Cole
04be26adc5 Fixed title [skip ci] 2015-05-02 09:26:20 +02:00
James Cole
be0adb7cf2 Create / edit category 2015-05-02 09:25:45 +02:00
James Cole
84fd92bf5a Categories [skip ci] 2015-05-02 09:21:42 +02:00
James Cole
ee4e061739 Removed code from budget index [skip ci] 2015-05-02 09:21:32 +02:00
James Cole
4a2b01cd9a Menu fixes [skip ci] 2015-05-02 09:16:17 +02:00
James Cole
efdd6460fb Fixed injection. 2015-05-02 09:08:41 +02:00
James Cole
803827e05c Fixed more views. [skip ci] 2015-05-02 09:06:07 +02:00
James Cole
a41d5e9ab3 New budget [skip ci] 2015-05-02 08:32:20 +02:00
James Cole
e94333f877 Can view budgets [skip ci] 2015-05-02 08:28:24 +02:00
James Cole
6dbb80d687 Optimisations [skip ci] 2015-05-02 08:09:54 +02:00
James Cole
31a1031624 And delete is fixed. 2015-05-01 23:39:45 +02:00
James Cole
f8e9ce0d52 Can edit as well. 2015-05-01 23:35:35 +02:00
James Cole
11baa968cd Can create accounts. 2015-05-01 23:17:17 +02:00
James Cole
3e5e5b376f Made it almost to the accounts. 2015-05-01 22:44:35 +02:00
James Cole
bda18f296d Optimised Twig extensions. 2015-05-01 20:17:06 +02:00
James Cole
287d110c84 Small bug fix in budget chart. 2015-05-01 18:45:42 +02:00
James Cole
c98275e73a More templates converted to twig. 2015-05-01 18:44:49 +02:00
James Cole
aa573cc951 Fix redirect 2015-05-01 14:32:31 +02:00
James Cole
883d3d86e3 Update a test. 2015-05-01 14:32:26 +02:00
James Cole
fb047bd5f4 Fix migration. 2015-05-01 08:34:53 +02:00
James Cole
66a04d8365 Slightly different chart on index. 2015-05-01 08:34:44 +02:00
James Cole
a0e501f9fd First attempt at implementing Twig. 2015-05-01 08:29:41 +02:00
James Cole
8b40d3346d An attempt at showing tag info. 2015-05-01 06:47:24 +02:00
James Cole
eddf5cd250 Fix button, close #74 2015-05-01 06:38:48 +02:00
James Cole
ee5c534ca3 Took the time to fix the tests. 2015-04-30 17:32:00 +02:00
James Cole
fd4e77ae0f Catch empty tags. 2015-04-28 21:01:54 +02:00
James Cole
b747c50aa3 Fix method to return object, not key. 2015-04-28 21:00:26 +02:00
James Cole
deebdd86a6 And another small JS fix [skip ci] 2015-04-28 20:20:16 +02:00
James Cole
b2db79cc10 Fixed some small CSS / JS problems. 2015-04-28 20:17:31 +02:00
James Cole
bbab370b1e Some new code. 2015-04-28 17:10:52 +02:00
James Cole
db4adf399d Cleaning up. 2015-04-28 15:26:30 +02:00
James Cole
0683c87e52 Small check in tags. 2015-04-28 14:08:58 +02:00
James Cole
3f62b647fc Removed code related to "related transactions". 2015-04-28 13:50:53 +02:00
James Cole
2562a5b30d Don't save all tags unconditionally. 2015-04-28 13:47:13 +02:00
James Cole
e232f2e223 Delete tags 2015-04-28 11:04:46 +02:00
James Cole
21644ff4dd Routes will throw 404's 2015-04-28 11:04:38 +02:00
James Cole
be96a4fce5 Show tags in transaction. 2015-04-28 10:51:56 +02:00
James Cole
a1cabcbed3 Show tag icons. 2015-04-28 10:50:43 +02:00
James Cole
ce933b1f06 Edit and update tags. 2015-04-28 10:36:13 +02:00
James Cole
51ae130922 Fixed the build by adding new migrations for each step. 2015-04-28 09:54:22 +02:00
James Cole
da1bc18a47 Better list for piggy banks. 2015-04-28 09:15:31 +02:00
James Cole
e7165a526b First attempt at basic tag functionality. 2015-04-28 08:58:01 +02:00
James Cole
6081cc399f Small bug fixes and cleaning up. 2015-04-28 08:12:12 +02:00
James Cole
7c5c24e15d Moved edit buttons. 2015-04-26 07:42:55 +02:00
James Cole
e3e55b4347 Moved all create-buttons lower. 2015-04-26 07:39:49 +02:00
James Cole
40d8e7d1ad Fixed a bug where transfers away from a piggy bank's account would not properly reflect the piggy bank. 2015-04-24 12:06:13 +02:00
James Cole
59e23b89f2 Removed unnecessary sort. 2015-04-24 11:54:23 +02:00
James Cole
cc33af8193 Could not set order. 2015-04-24 10:00:56 +02:00
James Cole
0e1e7eb2a9 Merge branch 'release/3.3.9' 2015-04-22 08:08:14 +02:00
James Cole
52a28a7758 Merge branch 'release/3.3.9' into develop 2015-04-22 08:08:14 +02:00
James Cole
3f752d6832 New read me. 2015-04-22 08:08:05 +02:00
James Cole
fe714e9989 Built a routine that will allow you to completely delete an account. 2015-04-22 07:54:56 +02:00
James Cole
0d3213a379 Covered the preferences controller. 2015-04-21 17:19:14 +02:00
James Cole
44056629e8 Use local db instead of constant migrating. 2015-04-20 22:08:24 +02:00
James Cole
54125c05d3 New tests and prep for future runs. 2015-04-20 21:57:20 +02:00
James Cole
7d32e50f25 Mentioned wrong amount. 2015-04-20 20:56:28 +02:00
James Cole
4af9ff49a0 Fixed a bug in the report controller that grouped transactions wrong. 2015-04-20 20:54:55 +02:00
James Cole
23faef845c Merge branch 'release/3.3.8' 2015-04-20 18:07:02 +02:00
James Cole
41dad4091a Merge branch 'release/3.3.8' into develop 2015-04-20 18:07:02 +02:00
James Cole
daf859b977 Updated read me. 2015-04-20 18:06:37 +02:00
James Cole
f47ba6c977 Update example file. 2015-04-20 18:06:21 +02:00
James Cole
4b9b207d92 Removed development references. 2015-04-20 17:59:04 +02:00
James Cole
875cbf66af 1 should be 0 2015-04-19 19:10:53 +02:00
James Cole
412d6d4fd7 Small CSS fix for piggy banks [skip ci] 2015-04-19 17:43:04 +02:00
James Cole
91c6deeb1f Renamed another field. 2015-04-19 14:28:17 +02:00
James Cole
6d1978fd9a Showed the wrong value. 2015-04-19 14:27:08 +02:00
James Cole
52d23b6ef5 Referred to an id which turned out to be a index. 2015-04-19 14:19:25 +02:00
James Cole
0656ccbdd9 Fixed a bug where the query would include deleted transactions. 2015-04-19 13:57:43 +02:00
James Cole
e774ebd0a3 Possible bug in account create thing. [skip ci] 2015-04-18 16:04:21 +02:00
James Cole
edbda32a84 Fix balance. 2015-04-13 21:13:05 +02:00
James Cole
721fa04e3c Added home screen information about piggy banks. 2015-04-13 20:43:58 +02:00
James Cole
9fd8d8915d amount > queryAmount 2015-04-12 10:53:53 +02:00
James Cole
7a9f5ebdd1 Added "what" variable. 2015-04-12 10:22:15 +02:00
James Cole
a3423f0321 Add the correct path to category overview. 2015-04-12 10:19:37 +02:00
James Cole
c37e9a4467 Covered the JSON controller. 2015-04-11 19:59:41 +02:00
James Cole
6157d82a0b time format 2015-04-11 18:52:03 +02:00
James Cole
38b27fec92 Without moment.js 2015-04-11 18:49:57 +02:00
James Cole
c43439bb68 Test for date. 2015-04-11 18:47:37 +02:00
James Cole
8d9561d7a5 Removed data-value. 2015-04-11 18:45:01 +02:00
James Cole
2a72cce3b7 Included date format. 2015-04-11 15:11:45 +02:00
James Cole
d3bbb6fb1f Removed date value. 2015-04-11 15:11:19 +02:00
James Cole
7b6723e9a2 Update date format. 2015-04-11 15:10:29 +02:00
James Cole
1ee741460d Updated empty entries as well. 2015-04-11 15:09:48 +02:00
James Cole
967b0b493b Switched dates around. 2015-04-11 15:07:42 +02:00
James Cole
b53aaf7dde Fixed sort format. 2015-04-11 15:06:10 +02:00
James Cole
714c13bdbf Include moment.js 2015-04-11 15:04:16 +02:00
James Cole
651a4fd3cc Sortable accounts. 2015-04-11 15:01:42 +02:00
James Cole
505aee22bb Sortable categories. 2015-04-11 14:53:22 +02:00
James Cole
ca3d59dc33 Another fix. 2015-04-11 12:51:58 +02:00
James Cole
13890e32a1 Fixed a view and a botched include. 2015-04-11 12:50:56 +02:00
James Cole
df8976eabe Journals that no longer match a bill will be removed. 2015-04-11 12:40:47 +02:00
James Cole
3e01daa172 Query & loop optimizations. 2015-04-11 12:36:17 +02:00
James Cole
f6999f355b Some foreach loop cleaning up. 2015-04-11 12:27:56 +02:00
James Cole
5c06b45eb1 Code cleanup. 2015-04-11 07:32:11 +02:00
James Cole
1802bb967a Moved JSON money boxes to individual functions. 2015-04-11 07:24:07 +02:00
James Cole
d8d92f147f Removed logging, found bug. 2015-04-10 07:29:36 +02:00
James Cole
4a95bdd8ba Added temporary debug to google chart. 2015-04-10 07:25:24 +02:00
James Cole
db5d94d956 Added temporary debug entries. 2015-04-10 07:19:45 +02:00
James Cole
06f2e34bb5 Renamed the amount variable so it stops interfering with another variable 2015-04-10 06:57:39 +02:00
James Cole
2ef7a01945 Fixed a bug where the bill chart and boxes would inaccurately reflect the amount of bills yet to pay. 2015-04-10 06:52:36 +02:00
James Cole
d3f642551d Fixed a small bug in the bill-chart and simplified yet another Json box. 2015-04-09 21:36:58 +02:00
James Cole
490997157e Switched two queries around. 2015-04-09 21:30:35 +02:00
James Cole
2432af7883 Simplified the in and out-box. 2015-04-09 21:29:58 +02:00
James Cole
7abeece3f0 Simplified the "out"-box. 2015-04-09 21:27:35 +02:00
James Cole
3851652821 Renamed various fields from 'amount' to 'queryAmount' to prevent interfering with the getAmountAttribute property. 2015-04-09 21:18:18 +02:00
James Cole
1d67d2250a Renamed various fields from 'amount' to 'queryAmount' to prevent interfering with the getAmountAttribute property. 2015-04-09 21:16:35 +02:00
James Cole
37f40d8637 Renamed various fields from 'amount' to 'queryAmount' to prevent interfering with the getAmountAttribute property. 2015-04-09 21:14:15 +02:00
James Cole
0224d1d59b Accidentally commented out date limits in query. 2015-04-09 21:01:08 +02:00
James Cole
587b94153d Removed some foreach() routines that are no longer necessary now that getAmountAttribute() exists. 2015-04-09 20:58:57 +02:00
James Cole
5124ce0302 Fixed a bug where getAmountAttribute would interfere with queries that contained a "amount"-field. 2015-04-09 20:52:47 +02:00
James Cole
950c4045b0 Fix total savings to accurately reflect end of current period. 2015-04-09 19:10:24 +02:00
James Cole
9c8ba66873 Order categories by name. 2015-04-09 17:54:24 +02:00
James Cole
25d1d1be1b Merge pull request #72 from vbali/feature/savings-total
Add savings total for savings widget on dashboard
2015-04-09 17:47:24 +02:00
James Cole
339c352505 Fixed a bug where categories would be created even though they already existed. 2015-04-09 17:46:47 +02:00
Balazs Varkonyi
c587081fe4 Add savings total for savings widget on dashboard 2015-04-09 11:52:35 +02:00
James Cole
8f9b1b866b Included full home controller tests. 2015-04-07 20:54:43 +02:00
James Cole
ff5ecf6182 More tests. 2015-04-07 19:58:49 +02:00
James Cole
05670cf393 Optimize test code. 2015-04-07 18:52:15 +02:00
James Cole
f10f5d30bf Mock previously unmocked calls. 2015-04-07 18:48:34 +02:00
James Cole
0d336727e8 Automated code cleanup. 2015-04-07 18:26:14 +02:00
James Cole
bf354275b3 Some general cleaning up. 2015-04-07 18:25:21 +02:00
James Cole
1932bf277a More tests 2015-04-07 17:51:22 +02:00
James Cole
192db4bb6e Accidentally included JS twice. 2015-04-07 10:14:20 +02:00
James Cole
701efb943d Lots of new tests. 2015-04-07 10:14:10 +02:00
James Cole
b2674971f1 Updated composer.lock. 2015-04-06 09:20:45 +02:00
James Cole
c907cb4cf1 General cleanup and new (incomplete) tests. 2015-04-06 09:15:59 +02:00
James Cole
bb1462b4d9 Merge branch 'release/3.3.7' 2015-04-05 21:15:01 +02:00
James Cole
1035f0e139 Merge branch 'release/3.3.7' into develop 2015-04-05 21:15:01 +02:00
James Cole
8475757716 Removed iconv() commented code. See other commit. 2015-04-05 21:14:41 +02:00
James Cole
20ffd8d61b New read me. 2015-04-05 21:14:25 +02:00
James Cole
8601428c4c Fixed a bug in the form request that wouldn't accept fairly long names. 2015-04-05 21:12:54 +02:00
James Cole
59998573ee Removed iconv thing that doesn't seem to matter. See screenshot at https://imgur.com/8r26ZZu 2015-04-05 21:12:31 +02:00
James Cole
293cd72001 Add currency tests. 2015-04-05 20:47:19 +02:00
James Cole
22ab9ebb2f Included tests for the category controller. 2015-04-05 19:43:20 +02:00
James Cole
9136e592d3 Included bill controller. 2015-04-05 18:20:06 +02:00
James Cole
ed8e392616 Fixed budget controller tests. 2015-04-05 15:53:03 +02:00
James Cole
e57ce6e644 Test now works. 2015-04-05 15:25:35 +02:00
James Cole
8204e46086 Removed inspiring quotes. 2015-04-05 10:38:53 +02:00
James Cole
9e365d9f80 Mar tests. 2015-04-05 10:36:28 +02:00
James Cole
6b40a933e9 And.. completed the account controller. 2015-04-04 22:53:49 +02:00
James Cole
8520a5002f Another attempt at fixing some tests. I'm probably searching in the wrong direction with this. 2015-04-04 22:27:51 +02:00
James Cole
b38ed06f6e New tests. 2015-04-04 21:52:56 +02:00
James Cole
48427b1143 A mediocre fix for the database failures. 2015-04-04 21:33:36 +02:00
James Cole
5d505f4ed0 Fixed more tests but the factories are not perfect yet. 2015-04-04 21:23:37 +02:00
James Cole
0c02a08954 Merge pull request #65 from vbali/master
Fixes for chart and account creation
2015-04-04 06:50:30 +02:00
Balazs Varkonyi
0221bd0f80 Merge branch 'hotfix/diff–fix' 2015-04-04 01:56:25 +02:00
Balazs Varkonyi
28216cbcb5 Removed merge conflict from CategoryController 2015-04-04 01:56:19 +02:00
Balazs Varkonyi
3e08a8cd6b Merge branch 'hotfix/account-fix' 2015-04-04 01:37:05 +02:00
Balazs Varkonyi
67fafdeef7 Return the new account from firstOrCreateEncrypted 2015-04-04 01:36:55 +02:00
Balazs Varkonyi
cc82505b66 Merge branch 'hotfix/chart-fix' 2015-04-04 01:33:36 +02:00
Balazs Varkonyi
fd5f075f63 Chart fix for accounts with accented letters 2015-04-04 01:31:57 +02:00
James Cole
a115960411 Merge branch 'release/3.3.6'
Conflicts:
	app/Http/Controllers/CategoryController.php
2015-04-03 23:31:29 +02:00
James Cole
e9fa4ca816 New version in read me. 2015-04-03 23:30:54 +02:00
James Cole
75d92bc7f0 Allow FF to send events. 2015-04-03 23:22:23 +02:00
James Cole
74aa6e911e Make boxes respond to unpaid / paid credit card bills. 2015-04-03 23:10:51 +02:00
James Cole
9d000c1898 Added amount because debug. 2015-04-03 23:05:50 +02:00
James Cole
b2254875b2 Expanded to credit cards. 2015-04-03 22:54:21 +02:00
James Cole
78d04230d5 New CC help text. 2015-04-03 21:25:04 +02:00
James Cole
1c04477393 Support credit cards (in name only). 2015-04-03 21:12:54 +02:00
James Cole
2a9679c94e Textual fix in bill [skip ci] 2015-04-03 21:05:41 +02:00
James Cole
6009f8ecde Better chart for bills. 2015-04-03 21:05:01 +02:00
James Cole
35cdbec70a Clean up for budget limits. 2015-04-03 19:39:36 +02:00
James Cole
0faef542c1 Fixed a bug in the budget controller. 2015-04-03 19:11:55 +02:00
James Cole
8b085af6a1 First attempt at account controller::index. 2015-04-03 12:14:40 +02:00
James Cole
e3b11a9eb2 New test for edit form that is more inclusive. 2015-04-03 09:30:44 +02:00
James Cole
72fc88f3c6 Even more tests. 2015-04-03 08:55:24 +02:00
James Cole
a5b759f268 Updates TestCase.php 2015-04-03 08:37:53 +02:00
James Cole
6a9ffae25d New tests and factories. 2015-04-03 08:31:50 +02:00
James Cole
64c031c7fe Small updates [skip ci] 2015-04-03 07:44:44 +02:00
James Cole
720926c50d Tests now run without a database, as they should. 2015-04-03 07:33:18 +02:00
James Cole
36ec974284 Add heavy but working migrate routine. Will fix the tests but must be optimised. Also, should not be necessary. 2015-04-02 22:51:00 +02:00
James Cole
cff77c39e2 Update travis-ci and composer.lock and composer.json 2015-04-02 22:46:50 +02:00
James Cole
056a0a1736 Smaller boxes. 2015-04-02 22:43:12 +02:00
James Cole
f301da83c6 Fixed the tests. 2015-04-02 22:39:31 +02:00
James Cole
5362231efa Ignore virtual balance in select places. 2015-04-01 19:46:16 +02:00
James Cole
4bb14cad73 Allow virtual balance to be ignored. 2015-04-01 19:45:13 +02:00
James Cole
7f5188f5a4 Added something fancy called "virtual balance". 2015-04-01 19:42:14 +02:00
James Cole
a80b7aac6c Fix more redirections. 2015-04-01 18:59:34 +02:00
James Cole
83f32478fa Fixed more redirections. 2015-04-01 09:43:19 +02:00
James Cole
7578ec6801 Fix redirections in budget. 2015-04-01 09:40:19 +02:00
James Cole
e14a32f76f Also fix delete/destroy redirection routine. 2015-04-01 09:23:51 +02:00
James Cole
58faa189ac Can now actually store transactions without an expense / revenue account. 2015-04-01 09:17:07 +02:00
James Cole
9b4f87d44a Fix checkbox for edit screen. 2015-04-01 09:16:51 +02:00
James Cole
7830a64170 Fix redirect. 2015-04-01 09:16:41 +02:00
James Cole
8f0fa02107 Better redirection for new transactions. 2015-04-01 09:12:49 +02:00
James Cole
e000fb5d80 Optimized decryption. 2015-03-31 22:46:11 +02:00
James Cole
566fadad15 Add decryption routine. 2015-03-31 21:18:22 +02:00
James Cole
cf23858c10 Gokje. 2015-03-31 20:52:48 +02:00
James Cole
216a223617 Fix in year list. 2015-03-31 20:49:02 +02:00
James Cole
638f38d823 New flush method. 2015-03-31 20:46:37 +02:00
James Cole
98ee70f04e Fix range thing. 2015-03-31 20:45:06 +02:00
James Cole
b365db5a4b New hidden id field. 2015-03-31 20:39:28 +02:00
James Cole
02e55496df Remove reminders when piggy bank is reminded. 2015-03-31 20:22:51 +02:00
James Cole
e11e53913a Some new code + GA 2015-03-31 19:21:49 +02:00
James Cole
f8a5fb4225 Fixed tests. 2015-03-31 17:49:47 +02:00
James Cole
3a49450461 Made sure migrations can be rolled back. 2015-03-31 15:38:44 +02:00
James Cole
3c375fb955 Remove build stuff because sqlite does not work with change things. 2015-03-31 15:24:13 +02:00
James Cole
011fea2cc6 Fix encryption in home chart. 2015-03-31 15:10:22 +02:00
James Cole
a079eec2cb Better unicity for objects. 2015-03-31 14:16:25 +02:00
James Cole
776b37f4ea Clean up some code, optimise the 503 error. 2015-03-30 21:24:56 +02:00
James Cole
a4d8bbe3da Fixed a bug where certain types of accounts could not be validated. 2015-03-30 20:16:33 +02:00
James Cole
72166743fa Merge branches 'develop' and 'develop' of https://github.com/JC5/firefly-iii into develop 2015-03-30 20:08:40 +02:00
James Cole
c4312c0b11 Extra large code cleanup. 2015-03-30 20:08:27 +02:00
James Cole
38ba645415 Add hidden-xs class. 2015-03-30 09:23:18 +02:00
James Cole
ac12a47071 Hide inactive budgets when there are none. 2015-03-29 21:29:37 +02:00
James Cole
bea321939e Code rearrange and optimise. 2015-03-29 21:27:51 +02:00
James Cole
210f84b6ea Allow edit from budget overview, and allow changing of active setting. 2015-03-29 21:27:13 +02:00
James Cole
d4c642741f Fixed division by zero. 2015-03-29 21:09:33 +02:00
James Cole
e6b1b58379 Enable inactive budgets. 2015-03-29 19:50:29 +02:00
James Cole
8d982c1a90 Some extensions. 2015-03-29 19:44:59 +02:00
James Cole
be10e836dc Updated composer.lock 2015-03-29 19:40:22 +02:00
James Cole
9be05e7e17 Small optimisations. 2015-03-29 18:28:49 +02:00
James Cole
bd96b2819f Removed double code. 2015-03-29 12:32:00 +02:00
James Cole
f601af3da0 Cleaned up report controller. 2015-03-29 12:25:46 +02:00
James Cole
70a01c082b Removed some double code. 2015-03-29 12:12:06 +02:00
James Cole
bcf066ead7 Cleaned up some double code. 2015-03-29 11:51:26 +02:00
James Cole
24dd3578ed Merge branch 'release/3.3.5' into develop 2015-03-29 08:43:55 +02:00
James Cole
d5c39d54d8 Merge branch 'release/3.3.5' 2015-03-29 08:43:54 +02:00
James Cole
6e3f6abc67 New read me. 2015-03-29 08:43:46 +02:00
James Cole
463201df2c New gitignore. 2015-03-29 08:43:03 +02:00
James Cole
a7501c396f Renamed some methods. 2015-03-29 08:24:56 +02:00
James Cole
4c8bc49a7e Add newlines. 2015-03-29 08:22:48 +02:00
James Cole
f254674f88 Add newlines. 2015-03-29 08:21:33 +02:00
James Cole
a97c267378 Added new lines 2015-03-29 08:20:37 +02:00
James Cole
eaa947894b Updated composer.son 2015-03-29 08:20:30 +02:00
James Cole
fb3a26510b Removed some unused use statements. 2015-03-29 08:20:20 +02:00
James Cole
bfe8b14e49 Cleaned up. 2015-03-29 08:18:15 +02:00
James Cole
afb47eb742 Add newlines. 2015-03-29 08:14:32 +02:00
James Cole
ba97f96288 Removed unused use statements. 2015-03-29 08:03:53 +02:00
James Cole
ecbafb8f4b Removed commented out code. 2015-03-29 07:59:18 +02:00
James Cole
12d3800d67 Removed unused use statements. 2015-03-29 07:51:56 +02:00
James Cole
d586b82372 New composer.son file. 2015-03-29 07:45:14 +02:00
James Cole
ba9877c9b4 Add typehints to object parameters 2015-03-29 07:43:20 +02:00
James Cole
907933f3df Removed debug logic and bad operators. 2015-03-29 07:32:24 +02:00
James Cole
2e91d21a88 Add return to form routine to budgets. 2015-03-28 18:22:36 +01:00
James Cole
dca395a018 Merge branch 'release/3.3.4' 2015-03-28 17:45:56 +01:00
James Cole
625070a5b9 Merge branch 'release/3.3.4' into develop 2015-03-28 17:45:56 +01:00
James Cole
f875c7cbf5 Updated read me file. 2015-03-28 17:45:46 +01:00
James Cole
eed88fc103 Don't fail on repeated piggy banks, just log it. 2015-03-28 17:45:15 +01:00
James Cole
6fc54d1d27 Fixed the tests 2015-03-28 07:00:53 +01:00
James Cole
0ef52bf909 Remove recurring transactions [skip ci] 2015-03-28 06:59:43 +01:00
James Cole
95e34af6ef Update script [skip ci] 2015-03-28 06:51:54 +01:00
James Cole
650b99ead2 Ignore apple files. [skip ci] 2015-03-28 06:50:26 +01:00
James Cole
57941a19de Excutable. 2015-03-28 06:48:54 +01:00
James Cole
6157db0b6a Some new tests 2015-03-28 06:48:38 +01:00
James Cole
c9358acf5d Update tests and token replace routine. 2015-03-28 06:25:36 +01:00
James Cole
ed29eb8a5d New lock file. 2015-03-28 06:19:37 +01:00
James Cole
bcf7452312 Some new tests. 2015-03-28 06:19:09 +01:00
James Cole
b9000519e4 Fixed unique piggy check. 2015-03-27 20:20:52 +01:00
James Cole
2694297466 Fixed a bug where start / end would be used incorrectly. 2015-03-27 19:48:55 +01:00
James Cole
53ff5c1490 Wrong operator, 2015-03-27 19:47:31 +01:00
James Cole
32a036b076 Add certainty to chart. 2015-03-27 19:45:47 +01:00
James Cole
aae2ab2693 Unnecessary if statement. 2015-03-27 19:43:53 +01:00
James Cole
4ef23e28a3 Update year report. 2015-03-27 19:43:20 +01:00
James Cole
38beb7f8d2 Fallback. 2015-03-27 19:42:35 +01:00
James Cole
0129a66906 Debug hidden accounts in year reports. 2015-03-27 19:37:00 +01:00
James Cole
45bced7b34 Hide accounts with no activity during a year. 2015-03-27 19:34:37 +01:00
James Cole
7f5a55dffb Small updates to read me. 2015-03-27 19:21:51 +01:00
James Cole
80289df6d3 Capital letter 2015-03-27 18:58:28 +01:00
James Cole
2115c3ced8 Read me 2015-03-27 18:58:11 +01:00
James Cole
1c2d0e6618 Updated read me file 2015-03-27 18:57:49 +01:00
James Cole
ea4f7f79ce Removed more references. 2015-03-27 18:17:15 +01:00
James Cole
b17f8ac311 Removed references to repeated expenses. 2015-03-27 18:15:10 +01:00
James Cole
6870d13b72 Removed repeated expenses. 2015-03-27 18:14:17 +01:00
James Cole
81fa304fd2 Removed repeated expenses. 2015-03-27 18:13:53 +01:00
James Cole
a663ddb0d9 Hide accounts with no activity. 2015-03-27 13:39:12 +01:00
James Cole
f7969afc22 Hide accounts with no activity in budget report. 2015-03-27 13:36:33 +01:00
James Cole
52ce4cd313 Resort array. 2015-03-27 13:25:46 +01:00
James Cole
247175881f Moved some code. 2015-03-27 13:24:04 +01:00
James Cole
fcf5009338 Moved some code around. 2015-03-27 13:20:48 +01:00
James Cole
12542d8f63 Auto fill transaction descriptions. 2015-03-27 13:16:14 +01:00
James Cole
e94194e28b New favicon. 2015-03-27 13:04:53 +01:00
James Cole
115499f3b2 New favicon. 2015-03-27 11:59:07 +01:00
James Cole
12af05b94f Only display budgets when there's money in the envelope or when there's money spent. 2015-03-27 09:43:29 +01:00
James Cole
88b83d8164 Merge branch 'release/3.3.3' into develop 2015-03-27 09:36:04 +01:00
James Cole
fcc22c692a Merge branch 'release/3.3.3' 2015-03-27 09:36:03 +01:00
James Cole
a876e8005c New version. 2015-03-27 09:35:52 +01:00
James Cole
2288e3705a Fixed order view. 2015-03-27 09:29:14 +01:00
James Cole
e8b58154e0 Bug fix. 2015-03-27 09:24:26 +01:00
James Cole
4393475af3 Remove debug. 2015-03-27 09:22:08 +01:00
James Cole
3fc560597c Validation bug. 2015-03-27 09:21:09 +01:00
James Cole
9f9af0b693 Moved to account list. 2015-03-27 08:11:13 +01:00
James Cole
a83fe2caea Correct ordering (everywhere). 2015-03-27 07:32:06 +01:00
James Cole
30c5376217 Fix order. 2015-03-27 07:29:01 +01:00
James Cole
6dddd6629d Thing with order and should fix Travis. 2015-03-27 07:20:32 +01:00
James Cole
f80de12cb5 Fix sorting. 2015-03-26 22:53:34 +01:00
James Cole
544ffca3a5 Sortable transactions. 2015-03-26 22:52:49 +01:00
James Cole
e0730c7b39 Fixed double named accounts. 2015-03-26 18:05:23 +01:00
James Cole
3d59d141c4 Push! 2015-03-26 17:46:08 +01:00
James Cole
ccddc2623d Merge branch 'develop' of github.com:JC5/firefly-iii into develop 2015-03-26 17:45:58 +01:00
James Cole
fcc47b58b4 Return to edit / create screen when user indicates. 2015-03-26 17:45:03 +01:00
James Cole
f67ac2e25e Update AccountController.php 2015-03-26 14:50:49 +01:00
James Cole
26127c9ccf Update AccountController.php 2015-03-26 14:49:02 +01:00
James Cole
d624efa799 Fix registration bug. 2015-03-25 22:30:36 +01:00
James Cole
ed3d40a4e0 Whoops. 2015-03-25 22:29:32 +01:00
James Cole
6e90ce5496 Cant dismiss reminders again. 2015-03-25 19:12:33 +01:00
James Cole
ab851b1be4 Fixed transfers 2015-03-25 17:44:06 +01:00
James Cole
340de53825 Use normal logging. 2015-03-25 17:42:33 +01:00
James Cole
a867b60af0 Update CategoryController.php 2015-03-25 16:14:28 +01:00
James Cole
26eafb0bd2 Update CategoryController.php 2015-03-25 16:13:39 +01:00
James Cole
0dbe44764b Update GoogleChartController.php 2015-03-25 16:00:06 +01:00
James Cole
2159df6802 Update GoogleChartController.php
Fixed chart.
2015-03-25 15:58:37 +01:00
James Cole
23389b9f17 Update FireflyValidator.php
Update uniqueForUser.
2015-03-25 15:56:32 +01:00
James Cole
6d3e3b894a Update AccountFormRequest.php
Update rules to include belongsToUser.
2015-03-25 15:55:39 +01:00
James Cole
55340aefa3 Remove code. 2015-03-24 21:06:45 +01:00
James Cole
94bc751e41 Sum starts at 0. 2015-03-24 21:05:15 +01:00
James Cole
89259c11e2 Fix chart. 2015-03-24 21:04:53 +01:00
James Cole
6bbaf1523c Fixed a bug in relevantOnDate 2015-03-24 21:00:42 +01:00
James Cole
fa3f18b60f Expand log for event. 2015-03-24 20:56:58 +01:00
James Cole
3dc794002f This should catch the missing piggy bank events. 2015-03-24 20:54:25 +01:00
James Cole
f50b133f2e Cleaned up some icons, improved routine for repeated expenses. 2015-03-21 21:33:52 +01:00
James Cole
1d6f6d28c9 Update font in calendar. 2015-03-21 10:29:25 +01:00
James Cole
c913de3c8b Fix percentage. 2015-03-21 08:56:24 +01:00
James Cole
bbc7b54a38 Catch 0 start balance. 2015-03-21 08:55:55 +01:00
James Cole
05fa1b40d1 Support > 100% 2015-03-21 08:53:43 +01:00
James Cole
6a88c8634d Added a block with savings. 2015-03-21 08:51:34 +01:00
James Cole
8ae1efa230 Added type savings account. 2015-03-20 23:17:59 +01:00
James Cole
ab8df4c8ab Fixed css reference. 2015-03-20 22:50:50 +01:00
James Cole
c259a46ed3 Clean up sql codes. 2015-03-20 22:39:07 +01:00
James Cole
5dc0677599 Fixed search sort 2015-03-20 18:30:17 +01:00
James Cole
7ed662ecc2 Fixed search in encrypted entries. 2015-03-20 18:21:14 +01:00
James Cole
4361cc69d4 Update font options in charts. 2015-03-20 15:54:40 +01:00
James Cole
461cbcbc28 Update to use Roboto font. 2015-03-20 13:34:59 +01:00
James Cole
09ae6c488b Fixed a bug where the session date would be edited by a chart. 2015-03-20 08:16:16 +01:00
James Cole
271a0ade26 Add code coverage to phpunit. 2015-03-18 22:24:54 +01:00
James Cole
4b076d227a Touch db so it can be created. 2015-03-18 22:17:18 +01:00
James Cole
3c4e7158a1 Config for test database. 2015-03-18 22:16:00 +01:00
James Cole
0b16765f37 Add sudo: false to enable container based builds. 2015-03-18 21:51:56 +01:00
James Cole
20c2ff3443 Add debug output to phpunit. 2015-03-18 21:43:19 +01:00
James Cole
96f2e598f4 Better position for titles. 2015-03-16 19:03:52 +01:00
James Cole
7374f0f9dd Removed Material Design. 2015-03-16 18:02:52 +01:00
James Cole
ccc44a74a0 Removed debug information. 2015-03-15 19:02:33 +01:00
James Cole
66cd63a68d Fixed a bug. 2015-03-15 18:08:52 +01:00
James Cole
decf7e5485 Set order in title. 2015-03-15 18:02:40 +01:00
James Cole
063c8025aa Allow piggy banks to be ordered. 2015-03-15 18:00:33 +01:00
James Cole
2fa7d2bd56 Add some text alignments. 2015-03-15 14:24:25 +01:00
James Cole
e55e7bce74 Misspelled a class name. 2015-03-15 14:23:26 +01:00
James Cole
f572445a65 Small updates. 2015-03-15 09:34:57 +01:00
James Cole
8b4f656d90 Switched to Google Material design line charts. 2015-03-15 08:38:12 +01:00
James Cole
6c1e093ebd Merge branch 'release/3.3.2' into develop 2015-03-14 22:06:12 +01:00
James Cole
6dd1b4537a Merge branch 'release/3.3.2' 2015-03-14 22:06:11 +01:00
James Cole
39ca9bea72 Update read me. 2015-03-14 22:06:01 +01:00
James Cole
999103277e Updated composer. 2015-03-14 22:05:36 +01:00
James Cole
3cc57ab89c Remove hash routine from user model. 2015-03-14 22:00:57 +01:00
James Cole
4e830079de New icon. 2015-03-14 17:31:17 +01:00
James Cole
ea7231e9fe Update mail config. 2015-03-14 17:25:35 +01:00
James Cole
ddfaca6d0c Cleanup and added some icons. 2015-03-14 17:21:43 +01:00
James Cole
3b11bd0593 Fixed some basic tests. 2015-03-13 08:44:07 +01:00
James Cole
3f89057528 Fixed a bug where the home budget chart would not actually list transactions without a budget. 2015-03-13 07:10:26 +01:00
James Cole
2f1073712f Merge pull request #63 from niekvanderkooy/fix-migrations
Fix migrations
2015-03-13 07:00:55 +01:00
James Cole
678e504c48 Fix charts to match report. 2015-03-10 20:26:52 +01:00
James Cole
e69545fd95 Include shared accounts. 2015-03-10 20:07:02 +01:00
James Cole
a7ed025cd6 Fine tune query. 2015-03-10 20:05:27 +01:00
James Cole
3d8e1f2484 Forgot the javascript. 2015-03-10 20:03:44 +01:00
James Cole
c38c9608da Fine tune query. 2015-03-10 20:01:49 +01:00
James Cole
2396b75e3c Fine tune income. 2015-03-10 20:00:43 +01:00
James Cole
e5c19b7562 Small fixes. 2015-03-10 19:58:05 +01:00
James Cole
114788567d More code for previous. 2015-03-10 19:57:20 +01:00
James Cole
17ae4b7d2a See if we can easily generate reports with shared accounts. 2015-03-10 19:51:24 +01:00
Niek van der Kooy
12d652bd0e We cannot entirely drop the foreign key constraint, since it is originally created (and dropped) in v3.2.1. 2015-03-10 18:25:23 +01:00
Niek van der Kooy
ff1bed97b8 We need to include models we use
Probably some left over L5 migration stuff, since you wouldn't notice it until reversing a migration
2015-03-10 18:24:28 +01:00
Niek van der Kooy
56490f0e84 Fix error when reverting changed migration.
When reverting changed migration, the down would fail because the foreign key constraint has to be dropped before you are able to rename the column.
2015-03-10 18:04:31 +01:00
James Cole
0b028a8923 Correctly order account names. 2015-03-10 17:26:31 +01:00
James Cole
43ac541cb8 Add reminders to top right menu. 2015-03-08 20:27:07 +01:00
James Cole
5218443678 Can now successfully act on reminders. 2015-03-08 20:20:58 +01:00
James Cole
d9028ed9b7 Small optimizations to the reminders 2015-03-08 09:00:04 +01:00
James Cole
9b9bd11ebb Small fix to table fix. 2015-03-07 19:42:45 +01:00
James Cole
07011ec5f7 Tiny chart improvement because I said so 2015-03-07 19:41:56 +01:00
James Cole
c3990ac32f Small updates to icons and code. 2015-03-07 12:34:03 +01:00
James Cole
081ff3ff55 View single reminder. 2015-03-07 09:29:43 +01:00
James Cole
93996ada96 Expanded reminders. 2015-03-07 09:21:06 +01:00
James Cole
a60671d4c1 First stuff for acting on reminders. 2015-03-06 20:33:23 +01:00
James Cole
3f716cc369 First new display of piggy bank reminders. 2015-03-06 17:23:29 +01:00
James Cole
9f23cffd1b Clean up code. 2015-03-06 15:26:21 +01:00
James Cole
07c416cfbf Fix set reminder. 2015-03-06 15:24:36 +01:00
James Cole
389fcc1c8d Update reminder in database. 2015-03-06 15:21:44 +01:00
James Cole
fa07811375 Add logging for debug purposes. 2015-03-06 15:18:07 +01:00
James Cole
fc91a50979 Reimplemented a routine that creates reminders. Cannot act on them yet. 2015-03-06 15:12:07 +01:00
James Cole
f9c518f321 Smaller font for boxes. 2015-03-06 10:10:07 +01:00
James Cole
015b439f0d New icons. 2015-03-06 08:30:15 +01:00
James Cole
0675622508 Experiment with boxes. 2015-03-06 08:20:27 +01:00
James Cole
e9969bdd5f Update the ranges to reflect the current dates. 2015-03-05 21:13:38 +01:00
James Cole
1139f950ed Fixed some views. 2015-03-04 21:11:47 +01:00
James Cole
284732c7a6 Better list for bills. 2015-03-04 20:58:57 +01:00
James Cole
0cb0720d8b No popup when the amount is zero. 2015-03-04 20:57:40 +01:00
James Cole
8ad1ede0c5 Popups in the reports as we've always promised. 2015-03-04 20:47:00 +01:00
James Cole
a349aac8a4 Fix balance thing. 2015-03-04 19:09:57 +01:00
James Cole
83b169c6ef Search related transfers, cleanup. 2015-03-04 16:04:17 +01:00
James Cole
49c37baac5 Update to related manager. 2015-03-04 15:30:44 +01:00
James Cole
8d62088576 Order bills. 2015-03-04 09:44:48 +01:00
James Cole
f5437a17f8 Lots of changes. 2015-03-04 09:42:47 +01:00
James Cole
92af4e5c96 Layout tweaks. 2015-03-04 05:12:05 +01:00
James Cole
0619adb0cd Support any bill in any range. 2015-03-03 17:40:17 +01:00
James Cole
65a5107854 Small layout updates. 2015-03-03 09:35:06 +01:00
James Cole
0fcc1e252b Mail user registration confirmation. 2015-03-03 09:29:02 +01:00
James Cole
4b7f817475 Removed panel for table. 2015-03-03 09:19:16 +01:00
James Cole
0439599971 Layout update. 2015-03-03 09:15:28 +01:00
James Cole
fa344d5308 Do not update when no event connected. 2015-03-03 08:46:14 +01:00
James Cole
f0316f09ed Do not over / undercorrect 2015-03-02 20:29:10 +01:00
James Cole
b1af6bab28 Cleaning up and bug fixing. 2015-03-02 20:05:28 +01:00
James Cole
ad2aebb54d Sort account list. 2015-03-02 15:46:31 +01:00
James Cole
23fc652092 Table border. 2015-03-02 15:45:24 +01:00
James Cole
f0a5756f25 Add a panel-body for the layout. 2015-03-02 15:45:00 +01:00
James Cole
14c7ad201a Paginated the account list. 2015-03-02 15:44:06 +01:00
James Cole
08ca3c89d3 Expanded account view. 2015-03-02 15:27:36 +01:00
James Cole
edda470bf8 Add everything range 2015-03-02 13:19:13 +01:00
James Cole
7183d72e5c Update chart to include other budget repetitions. 2015-03-02 12:50:51 +01:00
James Cole
5e38ebfce5 Merge branch 'feature/date-range' into develop 2015-03-02 12:35:34 +01:00
James Cole
56e36847a5 New code for new date range thing. 2015-03-02 12:35:14 +01:00
James Cole
6dba916d02 New code & css for date range. 2015-03-02 12:04:40 +01:00
James Cole
fd57086ffd Better mostly report lists. 2015-03-02 11:54:20 +01:00
James Cole
d98d366eea Some small bug fixes in the account views. 2015-03-02 11:42:27 +01:00
James Cole
b261b0b447 Shared expense should of course be shared asset. 2015-03-02 11:27:46 +01:00
James Cole
c6042a9053 Try to fix modal dialog for piggy banks. 2015-03-01 19:47:42 +01:00
James Cole
ae1245abec Fixed update transactions. 2015-03-01 19:31:00 +01:00
James Cole
e26d2376fc Fixed piggy bank delete routine. 2015-03-01 19:26:30 +01:00
James Cole
bb36ad64a7 Moved the form. 2015-03-01 13:39:16 +01:00
James Cole
262d4f92d4 Fixed a bug where consecutive payments from one source would not be summed up. 2015-03-01 10:55:20 +01:00
James Cole
675530458c Account show didn't show anything. 2015-03-01 10:44:10 +01:00
James Cole
19e34b460f Update event. 2015-03-01 08:34:59 +01:00
James Cole
dddb8cdbc0 This loops. 2015-03-01 08:25:12 +01:00
James Cole
0d0df5f143 Scan bills when editing and creating journals. 2015-03-01 08:15:24 +01:00
James Cole
d1cf683f57 Some layout and content updates 2015-03-01 07:50:26 +01:00
James Cole
d099c33e5b No more code climate for now. 2015-02-27 21:40:49 +01:00
James Cole
21fb41545b Now with son_path variable. 2015-02-27 21:24:14 +01:00
James Cole
4c56814785 Do code coverage from phpunit. 2015-02-27 21:15:21 +01:00
James Cole
cffe05e22b Add coveralls to composer.json 2015-02-27 21:01:18 +01:00
James Cole
4237850299 Restoring code coverage 2015-02-27 20:52:49 +01:00
James Cole
b5fc36a8e1 Clean up test stuff. 2015-02-27 20:46:39 +01:00
James Cole
4586c1ef52 Removed all test cases. 2015-02-27 20:45:17 +01:00
James Cole
2722f0b749 Merge branch 'release/3.3.1' 2015-02-27 20:42:12 +01:00
James Cole
d6cf7c4872 Merge branch 'release/3.3.1' into develop 2015-02-27 20:42:12 +01:00
James Cole
3aedfed432 Updated version. 2015-02-27 20:42:04 +01:00
James Cole
edeaf13259 New CSS / JS code. 2015-02-27 18:05:40 +01:00
James Cole
c1290c4e9b Forgot to commit one view. 2015-02-27 16:53:06 +01:00
James Cole
b2c1527b17 Lost a lot of stuff along the way. 2015-02-27 16:48:33 +01:00
James Cole
a4a65ea56e Merge branch 'release/3.3' into develop 2015-02-27 16:15:30 +01:00
James Cole
ccf0e1875e Merge branch 'release/3.3' 2015-02-27 16:15:29 +01:00
James Cole
9c009aceaf Updated the readme. 2015-02-27 16:15:16 +01:00
James Cole
da4b1c7276 Merge branch 'laravel5' into develop
Conflicts:
	resources/views/reports/month.blade.php

Upgraded to Laravel 5.
2015-02-27 16:13:36 +01:00
James Cole
add098d5c0 Update example environment file and composer lock. 2015-02-27 16:09:00 +01:00
James Cole
aca096548c Fixed user login and authentication. 2015-02-27 16:08:46 +01:00
James Cole
75aa3abcae Update and create transactions. 2015-02-27 14:27:04 +01:00
James Cole
e685d262cc Sub/addDay routine to fix the account list. 2015-02-27 12:55:24 +01:00
James Cole
d2599d6ef9 Removed a subDay() call that ruined some reports. 2015-02-27 12:54:24 +01:00
James Cole
cd5223d98d Removed a group clause that broke the budget report. 2015-02-27 12:15:58 +01:00
James Cole
7b68d9047d Order budgets by name. 2015-02-27 12:02:14 +01:00
James Cole
9a7ea06d66 Order budgets by name 2015-02-27 11:58:49 +01:00
James Cole
c69ef34ac9 Order accounts by name. 2015-02-27 11:57:47 +01:00
James Cole
021999d05f Ignore .env file. 2015-02-27 11:46:07 +01:00
James Cole
6054430a5e Remove default .env file. 2015-02-27 11:45:47 +01:00
James Cole
8f578ed95a Search controller. 2015-02-27 11:09:23 +01:00
James Cole
fc5c339e27 Repeated expenses. 2015-02-27 11:02:08 +01:00
James Cole
defad3d820 More code. 2015-02-25 21:19:06 +01:00
James Cole
c0f96aa948 Piggy banks 2015-02-25 19:32:33 +01:00
James Cole
f2eae2fc98 Implemented the help. 2015-02-25 16:10:02 +01:00
James Cole
0e4f786978 Fixed currencies. 2015-02-25 15:57:43 +01:00
James Cole
d36b2318fd New code for bills. 2015-02-25 15:19:14 +01:00
James Cole
d83b508bbc Add and remove transactions. 2015-02-24 22:53:38 +01:00
James Cole
5b9c2cdc13 Newly converted code. 2015-02-24 21:10:25 +01:00
James Cole
49066c282a Updates 2015-02-23 21:55:52 +01:00
James Cole
3e28c0c00a Extra report and cleanup. 2015-02-23 21:19:16 +01:00
James Cole
220d689f69 Reports! 2015-02-23 20:25:48 +01:00
James Cole
5a0a28a04c Stuff for categories. 2015-02-22 16:19:32 +01:00
James Cole
b44e69e09b Fixed tests. 2015-02-22 15:45:32 +01:00
James Cole
fcbe10f5ec New code. 2015-02-22 15:40:13 +01:00
James Cole
182fe170fd Up to budgets now! 2015-02-22 09:46:21 +01:00
James Cole
184e9bdaf6 Fixed even more tests! 2015-02-22 08:38:46 +01:00
James Cole
0096f50cde Update month.blade.php
Add decryption routine.
2015-02-21 12:20:42 +01:00
James Cole
460f14deca Some new code. 2015-02-21 12:16:41 +01:00
James Cole
910ad45bee Update test [skip ci] 2015-02-14 17:35:45 +01:00
James Cole
74e319855d Updated the test to be more dynamic. 2015-02-14 17:31:51 +01:00
James Cole
9af0fb4cd5 Update tests 2015-02-14 16:22:33 +01:00
James Cole
185f5cce29 environment files. 2015-02-14 16:13:28 +01:00
James Cole
aca1174566 New git ignore. 2015-02-14 16:11:20 +01:00
James Cole
e791f7fde2 Fixed test. 2015-02-14 15:53:56 +01:00
James Cole
7bba7fcf66 Should fix the test. 2015-02-14 14:31:43 +01:00
James Cole
1d78f98ec8 This should complete the account handler. 2015-02-14 14:25:29 +01:00
James Cole
7ed2e03654 Merge pull request #62 from kilya11/master
Handle foreign keys
2015-02-11 14:29:19 +01:00
Ilya Kil
549e0f3477 Handle foreign keys
Installation fails without these changes
2015-02-11 13:19:24 +01:00
James Cole
7785ec0222 Code cleanup. 2015-02-11 07:35:10 +01:00
James Cole
ca504965f9 Should allow to store new accounts. 2015-02-09 07:56:24 +01:00
James Cole
3841259779 First attempt at storing an account. 2015-02-09 07:23:39 +01:00
James Cole
169d1065cc Removed debug 2015-02-08 09:45:00 +01:00
James Cole
e864f5507a No exit is kind of cheating. 2015-02-08 09:35:09 +01:00
James Cole
434b4ded4a Reimplemented forms, added an overdue fix. 2015-02-08 01:15:15 +01:00
James Cole
3d01669cea Reinstated soft deletes, added first steps for account controller. 2015-02-07 23:19:28 +01:00
James Cole
1499b2cd40 Login and some routes fixed. 2015-02-07 22:50:47 +01:00
James Cole
6b54ef8398 More code. 2015-02-07 13:15:40 +01:00
James Cole
07ad43f7a2 Updated models and tests to match. 2015-02-07 12:15:53 +01:00
James Cole
72e72c60c2 Laravel 4 > Laravel 5 2015-02-07 12:00:31 +01:00
James Cole
f9a242d33e Updated codeception config. 2015-02-07 11:05:56 +01:00
James Cole
b0f43eaa07 Moved C3 handler. 2015-02-07 11:01:47 +01:00
James Cole
b02046b884 Moar packages! 2015-02-07 10:52:51 +01:00
James Cole
864c931ee9 Fixed factory muffin 2015-02-07 10:46:14 +01:00
James Cole
5cd8da6d91 Added factory muffin. 2015-02-07 10:42:40 +01:00
James Cole
4a4671c2ae Add debug info to codeception 2015-02-07 10:39:36 +01:00
James Cole
8de142cd9a Add c3 code coverage. 2015-02-07 10:38:27 +01:00
James Cole
1a42bec51c Database in the right spot. 2015-02-07 10:32:15 +01:00
James Cole
577e38759e Try again. 2015-02-07 10:30:41 +01:00
James Cole
9cdf43a2c9 Commit new env files. 2015-02-07 10:24:54 +01:00
James Cole
62d43c2cb2 Lets see fit his works. 2015-02-07 10:16:14 +01:00
James Cole
2dc67d1674 Added all the old test things. 2015-02-07 08:42:20 +01:00
James Cole
fb1c78c657 Chart re-implemented and added coveralls and other instructions, which will probably not work at all. 2015-02-07 08:23:44 +01:00
James Cole
37e58ac13a Fixed more of the index. 2015-02-07 06:49:24 +01:00
James Cole
de715c14be Some new stuffs. 2015-02-06 21:23:14 +01:00
James Cole
c4d8a0da05 Fixed the range thing 2015-02-06 20:43:19 +01:00
James Cole
1b54b14671 All kinds of new stuff. 2015-02-06 19:33:31 +01:00
James Cole
a92efbc55f Exceptions. 2015-02-06 19:31:38 +01:00
James Cole
1bd02529e0 New resources mostly. 2015-02-06 07:23:26 +01:00
James Cole
bc16298b6e Some updates. 2015-02-06 05:35:00 +01:00
James Cole
804a97cad7 References 2015-02-06 05:14:27 +01:00
James Cole
ab52bdec15 Not changed much 2015-02-06 05:05:40 +01:00
James Cole
ddc3e82c14 Update references 2015-02-06 05:04:06 +01:00
James Cole
57691471bb Updated models and imports. 2015-02-06 05:01:24 +01:00
James Cole
c502dd445b New and old code. 2015-02-06 04:52:16 +01:00
James Cole
ed475b1b9c Database & seeds. 2015-02-06 04:41:00 +01:00
James Cole
df165a817c Fresh L5 installation. 2015-02-06 04:39:52 +01:00
James Cole
d16015d625 Moved all old code for Laravel 5. 2015-02-06 04:27:37 +01:00
James Cole
a4b3bf3ef4 Moved to hidden "stash" directory. 2015-02-06 04:22:46 +01:00
James Cole
6b006853e6 Stash is a directory which will hold pretty much all code before it's implemented into Laravel 5. 2015-02-06 04:21:22 +01:00
James Cole
6001180e29 Capitalisation for code coverage. 2015-02-04 06:25:19 +01:00
James Cole
662fbed1d0 Added a "valid" email address so certain tests go through. 2015-02-04 06:15:14 +01:00
James Cole
19c7e08c5d Code coverage. 2015-02-03 19:40:13 +01:00
James Cole
72f04aaedc Some cleaning up. 2015-02-01 17:20:51 +01:00
James Cole
2998382969 Check if entries have an encrypted description and act accordingly. 2015-02-01 14:56:25 +01:00
James Cole
37fe79944f Reorder bills [skip ci] 2015-02-01 14:52:40 +01:00
James Cole
536735519a Fixed related transaction tests. 2015-02-01 12:31:11 +01:00
James Cole
6b0a711395 Expanded test coverage. 2015-02-01 12:07:06 +01:00
James Cole
13d3d40376 More code cleanup [skip ci] 2015-02-01 09:30:27 +01:00
James Cole
6873336aca More cleanup [skip ci] 2015-02-01 09:08:39 +01:00
James Cole
c2d2eb53e8 Some code cleanup. 2015-02-01 08:51:27 +01:00
James Cole
210d597a48 Close issue #46 2015-01-31 21:10:00 +01:00
James Cole
e41ede0a6b Forgot the return statement 2015-01-31 17:30:41 +01:00
James Cole
4a8b17ac7c Fixed the search for related transfers. 2015-01-31 17:24:26 +01:00
James Cole
1f5f515d72 Cleanup JS. 2015-01-31 15:10:07 +01:00
James Cole
1e6242b89f Updated composer.lock 2015-01-31 15:10:00 +01:00
James Cole
dde09f9f89 Various code cleanup things inspired by Code Climate [skip ci] 2015-01-31 08:51:40 +01:00
James Cole
916d85c3fe Simplified the account opening balance code. 2015-01-31 08:32:00 +01:00
James Cole
b243ed93aa Merge branch 'release/3.2.5' 2015-01-31 06:35:37 +01:00
James Cole
70d28bbf6e Merge branch 'release/3.2.5' into develop 2015-01-31 06:35:37 +01:00
James Cole
3c76da7132 Update version in readme file. 2015-01-31 06:35:19 +01:00
James Cole
3254565c09 Seed only in test [skip ci] 2015-01-31 06:34:31 +01:00
James Cole
cd0033791f New SQL reference for 3.2.5 [skip ci] 2015-01-31 06:34:10 +01:00
James Cole
2427ee44a5 Updated travis to handle SSL errors when communicating with Code climate. 2015-01-31 06:29:45 +01:00
James Cole
ff0e617b2a This triggers CC 2015-01-31 06:21:40 +01:00
James Cole
e6cfe040b5 Clean up some javascript, small fix for the test reporter 2015-01-31 06:11:55 +01:00
James Cole
94e2f9b6dc Updated tests to understand encrypted database content. 2015-01-30 22:43:52 +01:00
James Cole
512b81ad93 Fixed some tests. 2015-01-30 22:32:12 +01:00
James Cole
fc0e76f431 Some new seeds and the ability to search encrypted transaction journals. 2015-01-30 22:24:02 +01:00
James Cole
9da69358e2 Included code for code climate. 2015-01-30 22:09:47 +01:00
James Cole
aa246b0b2b New full set of favicon. 2015-01-30 21:40:37 +01:00
James Cole
6ed649bc8a Update list of what currency support there is in Firefly. 2015-01-30 18:40:30 +01:00
James Cole
725f5b7110 Creating and editing an account now allows the opening balance to be set in a certain currency. Issue #37 2015-01-30 18:22:55 +01:00
James Cole
5a890c5c3a It is now possible to select a different currency if desired (issue #37). 2015-01-30 18:09:13 +01:00
James Cole
7752329b94 Fixed a bug where the rules where too tight in transaction journal. 2015-01-29 18:21:56 +01:00
James Cole
5f48f13890 Exceptions for stupid sqlite. 2015-01-29 17:44:13 +01:00
James Cole
a734e04561 Default value and rename for encrypted field values. 2015-01-29 17:31:18 +01:00
James Cole
5aa1db293f 3.2.5 will once again be capable of encrypting journal descriptions (and more, in the future). 2015-01-29 05:23:31 +01:00
James Cole
f89aee37f5 Fixed a bug where the referer might not be picked up correctly. 2015-01-29 05:11:00 +01:00
James Cole
538018fed1 Should fix query [skip ci] 2015-01-27 19:22:54 +01:00
James Cole
a2327c50ec Should fix query [skip ci] 2015-01-27 19:19:44 +01:00
James Cole
c2711023e2 Updated query, lets see what happens [skip ci] 2015-01-27 18:52:59 +01:00
James Cole
cac30f0b4c Updated code coverage. 2015-01-25 15:29:09 +01:00
James Cole
4bb17019a4 Test transaction views for transactions without budgets and categories. 2015-01-25 13:17:32 +01:00
James Cole
ba2a40bdf3 Removed unused methods. 2015-01-25 12:21:56 +01:00
James Cole
f3460cca49 Ignore methods in code coverage that are not implemented. 2015-01-25 11:36:34 +01:00
James Cole
64ce53ac30 Test for opening balance. 2015-01-25 10:55:15 +01:00
James Cole
a43238360c Update caps. 2015-01-25 10:50:44 +01:00
James Cole
b2cbadf5d8 New chart route. 2015-01-25 10:06:31 +01:00
James Cole
81640ba06d Revamped and simplified form code. 2015-01-25 10:06:19 +01:00
James Cole
9327430484 Small optimalizations. 2015-01-25 08:28:59 +01:00
James Cole
a24c90eae8 Other redirects [skip ci] 2015-01-24 21:27:07 +01:00
James Cole
1d3987ece6 Fixed the tests. 2015-01-24 17:58:03 +01:00
James Cole
83f5b5e293 New budget charts for year report. 2015-01-24 08:54:33 +01:00
James Cole
f231263085 Updated chart, closed magic number issue. 2015-01-24 08:43:35 +01:00
James Cole
4ad67a87f1 Fixed budget charts. 2015-01-24 07:46:57 +01:00
James Cole
b766d93d9a Fixed the account role view. 2015-01-24 07:15:03 +01:00
James Cole
0905ceb1d5 Codeception will not run in hhvm [skip ci] 2015-01-24 07:00:58 +01:00
James Cole
2fbf837354 Closed #40 [skip ci] 2015-01-24 06:56:02 +01:00
James Cole
4bd79c880c Build in hack. 2015-01-24 06:55:42 +01:00
James Cole
4af041e015 Let's see what happens when we run Hack. 2015-01-24 06:52:22 +01:00
James Cole
8dc3e3ec93 Add an actions menu to the account view. 2015-01-23 06:50:40 +01:00
James Cole
f4b68d26d6 Fixed a bug where a deposit would not get linked to a cash account. 2015-01-23 06:45:20 +01:00
James Cole
1887977b92 Small experimental cleaning up. 2015-01-19 07:21:44 +01:00
James Cole
8eb84acf4f Show the view for transactions without a category. 2015-01-19 06:33:30 +01:00
James Cole
1b685da3e3 Code cleanup and query optimisation. 2015-01-18 21:40:00 +01:00
James Cole
406b658801 Code cleanup. 2015-01-18 21:07:40 +01:00
James Cole
bba1ee1264 Last attempt. 2015-01-18 11:18:06 +01:00
James Cole
02b6191d47 Another attempt at catching the sqlite error. 2015-01-18 11:12:17 +01:00
James Cole
c5a3de09cd Catch a sqlite error. 2015-01-18 10:33:01 +01:00
James Cole
0afe2a680e Gave report a subtitle. 2015-01-18 09:50:51 +01:00
James Cole
03e0510c4f Fixed a bug where certain reports would not show incomes from shared accounts. 2015-01-18 09:49:53 +01:00
James Cole
1068dcb8a4 Cleanup and refactor 2015-01-18 09:49:32 +01:00
James Cole
10a93df653 Clean up test data seeder 2015-01-18 09:48:58 +01:00
James Cole
79ff67852f Deleted an old unique index. 2015-01-18 09:48:48 +01:00
James Cole
a36cab969f Code cleanup. 2015-01-18 09:48:36 +01:00
James Cole
45447646fa Code cleanup. 2015-01-18 09:48:29 +01:00
James Cole
8a0f76ab68 Code cleanup. 2015-01-18 09:48:24 +01:00
James Cole
037135e764 A complete gamble on my side to fix a bug where transfers FROM shared accounts were not counted as income. 2015-01-18 00:10:57 +01:00
James Cole
21e89c3b64 Remove composer.lock when running Travis. 2015-01-17 11:31:12 +01:00
James Cole
bd11ec69fa Reinstated test data seeder, fixed the tests. 2015-01-17 10:41:29 +01:00
James Cole
9e2b34bc12 Various cleanup. 2015-01-17 10:06:12 +01:00
James Cole
0faebc290f Suppress warnings. 2015-01-17 10:05:51 +01:00
James Cole
fc0ef4b79d Small optimizations. 2015-01-17 10:05:43 +01:00
James Cole
027b954b50 Cleanup various factories and libraries. 2015-01-17 08:58:49 +01:00
James Cole
33c830a432 Cleaned up seeders. 2015-01-17 08:58:30 +01:00
James Cole
a7887f1e25 Added inspections for all migrations. 2015-01-17 08:58:19 +01:00
James Cole
fa7a59572a Code cleanup for all controllers. 2015-01-17 08:57:55 +01:00
James Cole
d9c2df5b0d Removed unused methods. 2015-01-17 07:33:43 +01:00
James Cole
a854b2c17e Some code cleanup in the account code. 2015-01-17 07:25:44 +01:00
James Cole
7d4006b205 Fixed some bugs while registering users. 2015-01-17 07:14:01 +01:00
James Cole
86ecca6011 Removed weird config values. 2015-01-16 07:11:03 +01:00
James Cole
0ea5cf2caa Merge branch 'master' of github.com:JC5/firefly-iii
Conflicts:
	app/config/app.php
2015-01-16 07:09:46 +01:00
James Cole
a950e02e9b Revert "Cleanup in preparation of an overhaul."
This reverts commit 5662a02a36.
2015-01-16 07:08:56 +01:00
James Cole
9eec6641dd Cleanup in preparation of an overhaul. 2015-01-16 07:08:56 +01:00
James Cole
18f46676fd Bug fix in new accounts. 2015-01-16 07:08:56 +01:00
James Cole
9735ef6d41 Revert "Cleanup in preparation of an overhaul."
This reverts commit 5662a02a36.
2015-01-16 07:07:57 +01:00
James Cole
d3e8ceee00 Cleanup in preparation of an overhaul. 2015-01-14 12:24:08 +01:00
James Cole
144e329eca Merge branch 'release/3.2.4'
Conflicts:
	app/config/app.php
2015-01-13 20:44:40 +01:00
James Cole
21d5420b2a Bug fix in new accounts. 2015-01-13 20:43:54 +01:00
James Cole
3011b5074d Merge branch 'release/3.2.3' 2015-01-13 19:08:33 +01:00
James Cole
83190572c7 New composer.lock 2015-01-10 18:07:39 +01:00
James Cole
9cf9e5f865 Added a missing field. 2015-01-05 20:22:39 +01:00
James Cole
5bdef7f1c7 Added a missing field. 2015-01-05 20:22:19 +01:00
James Cole
ba285a2d2d Added a missing field. 2015-01-05 20:21:43 +01:00
James Cole
0dff371e62 Added a missing field. 2015-01-05 20:20:03 +01:00
James Cole
ce4a2a5851 Added a missing field. 2015-01-05 20:19:34 +01:00
James Cole
2c978dc89a Removed experimental routes. 2015-01-05 17:53:38 +01:00
James Cole
4b8b819109 Redirect update. 2015-01-04 20:50:35 +01:00
James Cole
c230b3a806 This broke the tests. 2015-01-03 18:09:44 +01:00
James Cole
df08b9c5c6 Updated composer.lock 2015-01-03 13:46:53 +01:00
James Cole
eca65376a3 Fixed a route. 2015-01-03 09:25:40 +01:00
James Cole
88e3705636 Do some redirection. 2015-01-02 22:47:34 +01:00
James Cole
5476509ef5 Disabled some seeds, updated some routes. 2015-01-02 22:44:25 +01:00
James Cole
0bd6636453 SQL reference file [skip ci] 2015-01-02 20:04:26 +01:00
James Cole
105894e00d Small bug in budget helper [skip ci] 2015-01-02 19:53:09 +01:00
James Cole
230a319510 Removed files no longer used [skip ci] 2015-01-02 18:52:55 +01:00
James Cole
ae16a2b14f Routes and views for transactions without a budget / category [skip ci] 2015-01-02 18:48:06 +01:00
James Cole
da0c0742bf Covered some more lines of code. 2015-01-02 13:57:40 +01:00
James Cole
61d60a9048 Updated read me [skip ci] 2015-01-02 12:56:07 +01:00
2186 changed files with 286850 additions and 36277 deletions

12
.codeclimate.yml Normal file
View File

@@ -0,0 +1,12 @@
---
exclude_patterns:
- public/lib/
- public/js/lib/
- public/fonts/
- public/css/jquery-ui/
- public/css/bootstrap-multiselect.css
- public/css/bootstrap-sortable.css
- public/css/bootstrap-tagsinput.css
- public/css/daterangepicker.css
- public/css/google-fonts.css
- .sandstorm/

View File

@@ -1,3 +0,0 @@
src_dir: .
coverage_clover: tests/_output/coverage.xml
json_path: tests/_output/coveralls-upload.json

View File

@@ -0,0 +1,21 @@
<VirtualHost *:80>
ServerAdmin webmaster@localhost
DocumentRoot /var/www/firefly-iii/public
# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
# error, crit, alert, emerg.
# It is also possible to configure the loglevel for particular
# modules, e.g.
#LogLevel info ssl:warn
ErrorLog ${APACHE_LOG_DIR}/error.log
CustomLog ${APACHE_LOG_DIR}/access.log combined
<Directory /var/www/firefly-iii/public>
Options -Indexes +FollowSymLinks
AllowOverride All
Order allow,deny
allow from all
</Directory>
</VirtualHost>

221
.deploy/docker/apache2.conf Normal file
View File

@@ -0,0 +1,221 @@
# This is the main Apache server configuration file. It contains the
# configuration directives that give the server its instructions.
# See http://httpd.apache.org/docs/2.4/ for detailed information about
# the directives and /usr/share/doc/apache2/README.Debian about Debian specific
# hints.
#
#
# Summary of how the Apache 2 configuration works in Debian:
# The Apache 2 web server configuration in Debian is quite different to
# upstream's suggested way to configure the web server. This is because Debian's
# default Apache2 installation attempts to make adding and removing modules,
# virtual hosts, and extra configuration directives as flexible as possible, in
# order to make automating the changes and administering the server as easy as
# possible.
# It is split into several files forming the configuration hierarchy outlined
# below, all located in the /etc/apache2/ directory:
#
# /etc/apache2/
# |-- apache2.conf
# | `-- ports.conf
# |-- mods-enabled
# | |-- *.load
# | `-- *.conf
# |-- conf-enabled
# | `-- *.conf
# `-- sites-enabled
# `-- *.conf
#
#
# * apache2.conf is the main configuration file (this file). It puts the pieces
# together by including all remaining configuration files when starting up the
# web server.
#
# * ports.conf is always included from the main configuration file. It is
# supposed to determine listening ports for incoming connections which can be
# customized anytime.
#
# * Configuration files in the mods-enabled/, conf-enabled/ and sites-enabled/
# directories contain particular configuration snippets which manage modules,
# global configuration fragments, or virtual host configurations,
# respectively.
#
# They are activated by symlinking available configuration files from their
# respective *-available/ counterparts. These should be managed by using our
# helpers a2enmod/a2dismod, a2ensite/a2dissite and a2enconf/a2disconf. See
# their respective man pages for detailed information.
#
# * The binary is called apache2. Due to the use of environment variables, in
# the default configuration, apache2 needs to be started/stopped with
# /etc/init.d/apache2 or apache2ctl. Calling /usr/bin/apache2 directly will not
# work with the default configuration.
# Global configuration
#
#
# ServerRoot: The top of the directory tree under which the server's
# configuration, error, and log files are kept.
#
# NOTE! If you intend to place this on an NFS (or otherwise network)
# mounted filesystem then please read the Mutex documentation (available
# at <URL:http://httpd.apache.org/docs/2.4/mod/core.html#mutex>);
# you will save yourself a lot of trouble.
#
# Do NOT add a slash at the end of the directory path.
#
#ServerRoot "/etc/apache2"
#
# The accept serialization lock file MUST BE STORED ON A LOCAL DISK.
#
Mutex file:${APACHE_LOCK_DIR} default
#
# PidFile: The file in which the server should record its process
# identification number when it starts.
# This needs to be set in /etc/apache2/envvars
#
PidFile ${APACHE_PID_FILE}
#
# Timeout: The number of seconds before receives and sends time out.
#
Timeout 300
#
# KeepAlive: Whether or not to allow persistent connections (more than
# one request per connection). Set to "Off" to deactivate.
#
KeepAlive On
#
# MaxKeepAliveRequests: The maximum number of requests to allow
# during a persistent connection. Set to 0 to allow an unlimited amount.
# We recommend you leave this number high, for maximum performance.
#
MaxKeepAliveRequests 100
#
# KeepAliveTimeout: Number of seconds to wait for the next request from the
# same client on the same connection.
#
KeepAliveTimeout 5
# These need to be set in /etc/apache2/envvars
User ${APACHE_RUN_USER}
Group ${APACHE_RUN_GROUP}
#
# HostnameLookups: Log the names of clients or just their IP addresses
# e.g., www.apache.org (on) or 204.62.129.132 (off).
# The default is off because it'd be overall better for the net if people
# had to knowingly turn this feature on, since enabling it means that
# each client request will result in AT LEAST one lookup request to the
# nameserver.
#
HostnameLookups Off
# ErrorLog: The location of the error log file.
# If you do not specify an ErrorLog directive within a <VirtualHost>
# container, error messages relating to that virtual host will be
# logged here. If you *do* define an error logfile for a <VirtualHost>
# container, that host's errors will be logged there and not here.
#
ErrorLog ${APACHE_LOG_DIR}/error.log
#
# LogLevel: Control the severity of messages logged to the error_log.
# Available values: trace8, ..., trace1, debug, info, notice, warn,
# error, crit, alert, emerg.
# It is also possible to configure the log level for particular modules, e.g.
# "LogLevel info ssl:warn"
#
LogLevel warn
# Include module configuration:
IncludeOptional mods-enabled/*.load
IncludeOptional mods-enabled/*.conf
# Include list of ports to listen on
Include ports.conf
# Sets the default security model of the Apache2 HTTPD server. It does
# not allow access to the root filesystem outside of /usr/share and /var/www.
# The former is used by web applications packaged in Debian,
# the latter may be used for local directories served by the web server. If
# your system is serving content from a sub-directory in /srv you must allow
# access here, or in any related virtual host.
<Directory />
Options FollowSymLinks
AllowOverride None
Require all denied
</Directory>
<Directory /usr/share>
AllowOverride None
Require all granted
</Directory>
<Directory /var/www/>
Options Indexes FollowSymLinks
AllowOverride All
Require all granted
</Directory>
#<Directory /srv/>
# Options Indexes FollowSymLinks
# AllowOverride None
# Require all granted
#</Directory>
# AccessFileName: The name of the file to look for in each directory
# for additional configuration directives. See also the AllowOverride
# directive.
#
AccessFileName .htaccess
#
# The following lines prevent .htaccess and .htpasswd files from being
# viewed by Web clients.
#
<FilesMatch "^\.ht">
Require all denied
</FilesMatch>
#
# The following directives define some format nicknames for use with
# a CustomLog directive.
#
# These deviate from the Common Log Format definitions in that they use %O
# (the actual bytes sent including headers) instead of %b (the size of the
# requested file), because the latter makes it impossible to detect partial
# requests.
#
# Note that the use of %{X-Forwarded-For}i instead of %h is not recommended.
# Use mod_remoteip instead.
#
LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined
LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined
LogFormat "%h %l %u %t \"%r\" %>s %O" common
LogFormat "%{Referer}i -> %U" referer
LogFormat "%{User-agent}i" agent
# Include of directories ignores editors' and dpkg's backup files,
# see README.Debian for details.
# Include generic snippets of statements
IncludeOptional conf-enabled/*.conf
# Include the virtual host configurations:
IncludeOptional sites-enabled/*.conf
# vim: syntax=apache ts=4 sw=4 sts=4 sr noet

View File

@@ -0,0 +1,6 @@
FF_APP_ENV=local
FF_APP_KEY=S0m3R@nd0mString0f32Ch@rsEx@ct1y
FF_DB_HOST=
FF_DB_NAME=
FF_DB_USER=
FF_DB_PASSWORD=

29
.deploy/docker/entrypoint.sh Executable file
View File

@@ -0,0 +1,29 @@
#!/bin/bash
# make sure the correct directories exists (suggested by @chrif):
mkdir -p $FIREFLY_PATH/storage/app
mkdir -p $FIREFLY_PATH/storage/app/public
mkdir -p $FIREFLY_PATH/storage/build
mkdir -p $FIREFLY_PATH/storage/database
mkdir -p $FIREFLY_PATH/storage/debugbar
mkdir -p $FIREFLY_PATH/storage/export
mkdir -p $FIREFLY_PATH/storage/framework/cache
mkdir -p $FIREFLY_PATH/storage/framework/sessions
mkdir -p $FIREFLY_PATH/storage/framework/testing
mkdir -p $FIREFLY_PATH/storage/framework/views
mkdir -p $FIREFLY_PATH/storage/logs
mkdir -p $FIREFLY_PATH/storage/upload
# make sure we own the volumes:
chown -R www-data:www-data -R $FIREFLY_PATH/storage/export $FIREFLY_PATH/storage/upload $FIREFLY_PATH/storage/logs $FIREFLY_PATH/storage/framework/cache
chmod -R 775 $FIREFLY_PATH/storage/export $FIREFLY_PATH/storage/upload $FIREFLY_PATH/storage/upload $FIREFLY_PATH/storage/logs $FIREFLY_PATH/storage/framework/cache
# remove any lingering files that may break upgrades:
rm -f $FIREFLY_PATH/storage/logs/laravel.log
cat .env.docker | envsubst > .env && cat .env
composer dump-autoload
php artisan package:discover
php artisan firefly:instructions install
exec apache2-foreground

View File

@@ -0,0 +1,82 @@
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: mysql-pv-export-claim
labels:
app: firefly-local
spec:
accessModes:
- ReadWriteOnce
resources:
requests:
storage: 20Gi
---
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: mysql-pv-upload-claim
labels:
app: firefly-local
spec:
accessModes:
- ReadWriteOnce
resources:
requests:
storage: 20Gi
---
apiVersion: apps/v1beta1
kind: Deployment
metadata:
name: firefly-local
namespace: firefly
labels:
app: firefly-local
spec:
selector:
matchLabels:
app: firefly-local
template:
metadata:
labels:
app: firefly-local
spec:
containers:
- image: firefly-local
name: firefly-local
env:
- name: FF_APP_ENV
value: "local"
- name: FF_APP_KEY
value: "S0m3R@nd0mString0f32Ch@rsEx@ct1y"
- name: FF_DB_HOST
value: "172.17.0.9"
- name: FF_DB_NAME
value: "firefly_db"
- name: FF_DB_USER
value: "firefly_db"
- name: FF_DB_PASSWORD
value: "password"
volumeMounts:
- mountPath: "/var/www/firefly-iii/storage/export"
name: mysql-persistent-export
- mountPath: "/var/www/firefly-iii/storage/upload"
name: mysql-persistent-upload
imagePullPolicy: IfNotPresent
volumes:
- name: mysql-persistent-export
persistentVolumeClaim:
claimName: mysql-pv-export-claim
- name: mysql-persistent-upload
persistentVolumeClaim:
claimName: mysql-pv-upload-claim
---
apiVersion: v1
kind: Service
metadata:
name: firefly-local
spec:
ports:
- port: 80
type: NodePort
selector:
app: firefly-local

View File

@@ -0,0 +1,49 @@
apiVersion: v1
kind: Secret
metadata:
name: sql-pass
type: Opaque
data:
password: cGFzc3dvcmQ=
---
apiVersion: apps/v1beta1
kind: Deployment
metadata:
name: mysql
namespace: firefly
labels:
app: mysql
spec:
selector:
matchLabels:
app: mysql
template:
metadata:
labels:
app: mysql
spec:
containers:
- image: mysql
imagePullPolicy: IfNotPresent
name: mysql
env:
- name: MYSQL_ROOT_PASSWORD
valueFrom:
secretKeyRef:
name: sql-pass
key: password
ports:
- containerPort: 3306
name: mysql
---
apiVersion: v1
kind: Service
metadata:
name: mysql
spec:
ports:
- port: 3306
type: NodePort
selector:
app: mysql

4
.dockerignore Normal file
View File

@@ -0,0 +1,4 @@
# Ignore composer specific files and vendor folder
composer.phar
composer.lock
vendor

106
.env.docker Normal file
View File

@@ -0,0 +1,106 @@
# You can leave this on "local". If you change it to production most console commands will ask for extra confirmation.
# Never set it to "testing".
APP_ENV=${FF_APP_ENV}
# Set to true if you want to see debug information in error screens.
APP_DEBUG=${APP_DEBUG}
# This should be your email address
SITE_OWNER=${SITE_OWNER}
# The encryption key for your database and sessions. Keep this very secure.
# If you generate a new one all existing data must be considered LOST.
# Change it to a string of exactly 32 chars or use command `php artisan key:generate` to generate it
APP_KEY=${FF_APP_KEY}
# APP_URL and TRUSTED_PROXIES are useful when using Docker and/or a reverse proxy.
APP_URL=${APP_URL}
TRUSTED_PROXIES=${TRUSTED_PROXIES}
# The log channel defines where your log entries go to.
LOG_CHANNEL=${LOG_CHANNEL}
# Database credentials. Make sure the database exists. I recommend a dedicated user for Firefly III
# If you use SQLite, set connection to `sqlite` and remove the database, username and password settings.
DB_CONNECTION=${FF_DB_CONNECTION}
DB_HOST=${FF_DB_HOST}
DB_PORT=${FF_DB_PORT}
DB_DATABASE=${FF_DB_NAME}
DB_USERNAME=${FF_DB_USER}
DB_PASSWORD=${FF_DB_PASSWORD}
# 'daily' is the default logging mode giving you 5 daily rotated log files in /storage/logs/.
# Several other options exist. You can use 'single' for one big fat error log (not recommended).
# Also available are 'syslog' and 'errorlog' which will log to the system itself.
APP_LOG=syslog
# Log level. You can set this from least severe to most severe:
# debug, info, notice, warning, error, critical, alert, emergency
# If you set it to debug your logs will grow large, and fast. If you set it to emergency probably
# nothing will get logged, ever.
APP_LOG_LEVEL=info
# If you're looking for performance improvements, you could install memcached.
CACHE_DRIVER=file
SESSION_DRIVER=file
# Cookie settings. Should not be necessary to change these.
COOKIE_PATH="/"
COOKIE_DOMAIN=
COOKIE_SECURE=false
# If you want Firefly III to mail you, update these settings
# For instructions, see: https://firefly-iii.readthedocs.io/en/latest/installation/mail.html
MAIL_DRIVER=${MAIL_DRIVER}
MAIL_HOST=${MAIL_HOST}
MAIL_PORT=${MAIL_PORT}
MAIL_FROM=${MAIL_FROM}
MAIL_USERNAME=${MAIL_USERNAME}
MAIL_PASSWORD=${MAIL_PASSWORD}
MAIL_ENCRYPTION=${MAIL_ENCRYPTION}
# Other mail drivers:
MAILGUN_DOMAIN=${MAILGUN_DOMAIN}
MAILGUN_SECRET=${MAILGUN_SECRET}
MANDRILL_SECRET=${MANDRILL_SECRET}
SPARKPOST_SECRET=${SPARKPOST_SECRET}
# Firefly III can send you the following messages
SEND_REGISTRATION_MAIL=true
SEND_ERROR_MESSAGE=false
# Set a Mapbox API key here (see mapbox.com) so there might be a map available at various places.
MAPBOX_API_KEY=${MAPBOX_API_KEY}
# Set a Fixer IO API key here (see https://fixer.io) to enable live currency exchange rates.
# Please note that this will only work for paid fixer.io accounts because they severly limited
# the free API up to the point where you might as well offer nothing.
FIXER_API_KEY=${FIXER_API_KEY}
# If you wish to track your own behavior over Firefly III, set a valid analytics tracker ID here.
ANALYTICS_ID=${ANALYTICS_ID}
# Most parts of the database are encrypted by default, but you can turn this off if you want to.
# This makes it easier to migrate your database. Not that some fields will never be decrypted.
USE_ENCRYPTION=true
# Leave the following configuration vars as is.
# Unless you like to tinker and know what you're doing.
APP_NAME=FireflyIII
BROADCAST_DRIVER=log
QUEUE_DRIVER=sync
REDIS_HOST=127.0.0.1
REDIS_PASSWORD=null
REDIS_PORT=6379
CACHE_PREFIX=firefly
SEARCH_RESULT_LIMIT=50
PUSHER_KEY=
PUSHER_SECRET=
PUSHER_ID=
DEMO_USERNAME=
DEMO_PASSWORD=
IS_DOCKER=true
IS_SANDSTORM=false
IS_HEROKU=false
BUNQ_USE_SANDBOX=false
TZ=${TZ}

111
.env.example Normal file
View File

@@ -0,0 +1,111 @@
# You can leave this on "local". If you change it to production most console commands will ask for extra confirmation.
# Never set it to "testing".
APP_ENV=local
# Set to true if you want to see debug information in error screens.
APP_DEBUG=false
# This should be your email address
SITE_OWNER=mail@example.com
# The encryption key for your database and sessions. Keep this very secure.
# If you generate a new one all existing data must be considered LOST.
# Change it to a string of exactly 32 chars or use command `php artisan key:generate` to generate it
APP_KEY=SomeRandomStringOf32CharsExactly
# Change this value to your preferred time zone.
# Example: Europe/Amsterdam
TZ=UTC
# APP_URL and TRUSTED_PROXIES are useful when using Docker and/or a reverse proxy.
APP_URL=http://localhost
TRUSTED_PROXIES=
# The log channel defines where your log entries go to.
LOG_CHANNEL=daily
# Database credentials. Make sure the database exists. I recommend a dedicated user for Firefly III
# For other database types, please see the FAQ: http://firefly-iii.readthedocs.io/en/latest/support/faq.html
DB_CONNECTION=mysql
DB_HOST=127.0.0.1
DB_PORT=3306
DB_DATABASE=homestead
DB_USERNAME=homestead
DB_PASSWORD=secret
# 'daily' is the default logging mode giving you 5 daily rotated log files in /storage/logs/.
# Several other options exist. You can use 'single' for one big fat error log (not recommended).
# Also available are 'syslog' and 'errorlog' which will log to the system itself.
APP_LOG=daily
# Log level. You can set this from least severe to most severe:
# debug, info, notice, warning, error, critical, alert, emergency
# If you set it to debug your logs will grow large, and fast. If you set it to emergency probably
# nothing will get logged, ever.
APP_LOG_LEVEL=notice
# If you're looking for performance improvements, you could install memcached.
CACHE_DRIVER=file
SESSION_DRIVER=file
# Cookie settings. Should not be necessary to change these.
COOKIE_PATH="/"
COOKIE_DOMAIN=
COOKIE_SECURE=false
# If you want Firefly III to mail you, update these settings
# For instructions, see: https://firefly-iii.readthedocs.io/en/latest/installation/mail.html
MAIL_DRIVER=log
MAIL_HOST=smtp.mailtrap.io
MAIL_PORT=2525
MAIL_FROM=changeme@example.com
MAIL_USERNAME=null
MAIL_PASSWORD=null
MAIL_ENCRYPTION=null
# Other mail drivers:
MAILGUN_DOMAIN=
MAILGUN_SECRET=
MANDRILL_SECRET=
SPARKPOST_SECRET=
# Firefly III can send you the following messages
SEND_REGISTRATION_MAIL=true
SEND_ERROR_MESSAGE=true
# Set a Mapbox API key here (see mapbox.com) so there might be a map available at various places.
MAPBOX_API_KEY=
# Set a Fixer IO API key here (see https://fixer.io) to enable live currency exchange rates.
# Please note that this will only work for paid fixer.io accounts because they severly limited
# the free API up to the point where you might as well offer nothing.
FIXER_API_KEY=
# If you wish to track your own behavior over Firefly III, set a valid analytics tracker ID here.
ANALYTICS_ID=
# Most parts of the database are encrypted by default, but you can turn this off if you want to.
# This makes it easier to migrate your database. Not that some fields will never be decrypted.
USE_ENCRYPTION=true
# Leave the following configuration vars as is.
# Unless you like to tinker and know what you're doing.
APP_NAME=FireflyIII
BROADCAST_DRIVER=log
QUEUE_DRIVER=sync
REDIS_HOST=127.0.0.1
REDIS_PASSWORD=null
REDIS_PORT=6379
CACHE_PREFIX=firefly
SEARCH_RESULT_LIMIT=50
PUSHER_KEY=
PUSHER_SECRET=
PUSHER_ID=
DEMO_USERNAME=
DEMO_PASSWORD=
IS_DOCKER=false
IS_SANDSTORM=false
BUNQ_USE_SANDBOX=false
IS_HEROKU=false
MAILGUN_DOMAIN=
MAILGUN_SECRET=

111
.env.heroku Normal file
View File

@@ -0,0 +1,111 @@
# You can leave this on "local". If you change it to production most console commands will ask for extra confirmation.
# Never set it to "testing".
APP_ENV=heroku
# Set to true if you want to see debug information in error screens.
APP_DEBUG=false
# This should be your email address
SITE_OWNER=heroku@example.com
# The encryption key for your database and sessions. Keep this very secure.
# If you generate a new one all existing data must be considered LOST.
# Change it to a string of exactly 32 chars or use command `php artisan key:generate` to generate it
APP_KEY=7ahyYVPVsmxjdhsweWCauGeJfwc92NP2
# Change this value to your preferred time zone.
# Example: Europe/Amsterdam
TZ=UTC
# APP_URL and TRUSTED_PROXIES are useful when using Docker and/or a reverse proxy.
APP_URL=http://localhost
TRUSTED_PROXIES=
# The log channel defines where your log entries go to.
LOG_CHANNEL=syslog
# Database credentials. Make sure the database exists. I recommend a dedicated user for Firefly III
# If you use SQLite, set connection to `sqlite` and remove the database, username and password settings.
DB_CONNECTION=pgsql
# 'daily' is the default logging mode giving you 5 daily rotated log files in /storage/logs/.
# Several other options exist. You can use 'single' for one big fat error log (not recommended).
# Also available are 'syslog' and 'errorlog' which will log to the system itself.
APP_LOG=errorlog
# Log level. You can set this from least severe to most severe:
# debug, info, notice, warning, error, critical, alert, emergency
# If you set it to debug your logs will grow large, and fast. If you set it to emergency probably
# nothing will get logged, ever.
APP_LOG_LEVEL=debug
# If you're looking for performance improvements, you could install memcached.
CACHE_DRIVER=file
SESSION_DRIVER=file
# Cookie settings. Should not be necessary to change these.
COOKIE_PATH="/"
COOKIE_DOMAIN=
COOKIE_SECURE=false
# If you want Firefly III to mail you, update these settings
# For instructions, see: https://firefly-iii.readthedocs.io/en/latest/installation/mail.html
MAIL_DRIVER=log
MAIL_HOST=smtp.mailtrap.io
MAIL_PORT=2525
MAIL_FROM=changeme@example.com
MAIL_USERNAME=null
MAIL_PASSWORD=null
MAIL_ENCRYPTION=null
# Other mail drivers:
MAILGUN_DOMAIN=
MAILGUN_SECRET=
MANDRILL_SECRET=
SPARKPOST_SECRET=
# Firefly III can send you the following messages
SEND_REGISTRATION_MAIL=true
SEND_ERROR_MESSAGE=true
# Set a Mapbox API key here (see mapbox.com) so there might be a map available at various places.
MAPBOX_API_KEY=
# Set a Fixer IO API key here (see https://fixer.io) to enable live currency exchange rates.
# Please note that this will only work for paid fixer.io accounts because they severly limited
# the free API up to the point where you might as well offer nothing.
FIXER_API_KEY=
# If you wish to track your own behavior over Firefly III, set a valid analytics tracker ID here.
ANALYTICS_ID=
# Most parts of the database are encrypted by default, but you can turn this off if you want to.
# This makes it easier to migrate your database. Not that some fields will never be decrypted.
USE_ENCRYPTION=true
# Leave the following configuration vars as is.
# Unless you like to tinker and know what you're doing.
APP_NAME=FireflyIII
BROADCAST_DRIVER=log
QUEUE_DRIVER=sync
REDIS_HOST=127.0.0.1
REDIS_PASSWORD=null
REDIS_PORT=6379
CACHE_PREFIX=firefly
SEARCH_RESULT_LIMIT=50
PUSHER_KEY=
PUSHER_SECRET=
PUSHER_ID=
DEMO_USERNAME=
DEMO_PASSWORD=
IS_DOCKER=false
IS_SANDSTORM=false
BUNQ_USE_SANDBOX=false
IS_HEROKU=true
MAILGUN_DOMAIN=
MAILGUN_SECRET=

111
.env.sandstorm Executable file
View File

@@ -0,0 +1,111 @@
# You can leave this on "local". If you change it to production most console commands will ask for extra confirmation.
# Never set it to "testing".
APP_ENV=local
# Set to true if you want to see debug information in error screens.
APP_DEBUG=false
# This should be your email address
SITE_OWNER=sandstorm@example.com
# The encryption key for your database and sessions. Keep this very secure.
# If you generate a new one all existing data must be considered LOST.
# Change it to a string of exactly 32 chars or use command `php artisan key:generate` to generate it
APP_KEY=SomeRandomStringOf32CharsExactly
# Change this value to your preferred time zone.
# Example: Europe/Amsterdam
TZ=UTC
# APP_URL and TRUSTED_PROXIES are useful when using Docker and/or a reverse proxy.
APP_URL=http://localhost
TRUSTED_PROXIES=
# The log channel defines where your log entries go to.
LOG_CHANNEL=syslog
# Database credentials. Make sure the database exists. I recommend a dedicated user for Firefly III
# If you use SQLite, set connection to `sqlite` and remove the database, username and password settings.
DB_CONNECTION=mysql
DB_HOST=127.0.0.1
DB_PORT=3306
DB_DATABASE=firefly
DB_USERNAME=firefly
DB_PASSWORD=firefly
# 'daily' is the default logging mode giving you 5 daily rotated log files in /storage/logs/.
# Several other options exist. You can use 'single' for one big fat error log (not recommended).
# Also available are 'syslog' and 'errorlog' which will log to the system itself.
APP_LOG=syslog
# Log level. You can set this from least severe to most severe:
# debug, info, notice, warning, error, critical, alert, emergency
# If you set it to debug your logs will grow large, and fast. If you set it to emergency probably
# nothing will get logged, ever.
APP_LOG_LEVEL=info
# If you're looking for performance improvements, you could install memcached.
CACHE_DRIVER=file
SESSION_DRIVER=file
# Cookie settings. Should not be necessary to change these.
COOKIE_PATH="/"
COOKIE_DOMAIN=
COOKIE_SECURE=false
# If you want Firefly III to mail you, update these settings
# For instructions, see: https://firefly-iii.readthedocs.io/en/latest/installation/mail.html
MAIL_DRIVER=log
MAIL_HOST=smtp.mailtrap.io
MAIL_PORT=2525
MAIL_FROM=changeme@example.com
MAIL_USERNAME=null
MAIL_PASSWORD=null
MAIL_ENCRYPTION=null
# Other mail drivers:
MAILGUN_DOMAIN=
MAILGUN_SECRET=
MANDRILL_SECRET=
SPARKPOST_SECRET=
# Firefly III can send you the following messages
SEND_REGISTRATION_MAIL=true
SEND_ERROR_MESSAGE=true
# Set a Mapbox API key here (see mapbox.com) so there might be a map available at various places.
MAPBOX_API_KEY=
# Set a Fixer IO API key here (see https://fixer.io) to enable live currency exchange rates.
# Please note that this will only work for paid fixer.io accounts because they severly limited
# the free API up to the point where you might as well offer nothing.
FIXER_API_KEY=
# If you wish to track your own behavior over Firefly III, set a valid analytics tracker ID here.
ANALYTICS_ID=
# Most parts of the database are encrypted by default, but you can turn this off if you want to.
# This makes it easier to migrate your database. Not that some fields will never be decrypted.
USE_ENCRYPTION=true
# Leave the following configuration vars as is.
# Unless you like to tinker and know what you're doing.
APP_NAME=FireflyIII
BROADCAST_DRIVER=log
QUEUE_DRIVER=sync
REDIS_HOST=127.0.0.1
REDIS_PASSWORD=null
REDIS_PORT=6379
CACHE_PREFIX=firefly
SEARCH_RESULT_LIMIT=50
PUSHER_KEY=
PUSHER_SECRET=
PUSHER_ID=
DEMO_USERNAME=
DEMO_PASSWORD=
IS_DOCKER=false
IS_SANDSTORM=true
BUNQ_USE_SANDBOX=false
IS_HEROKU=false
MAILGUN_DOMAIN=
MAILGUN_SECRET=

103
.env.testing Normal file
View File

@@ -0,0 +1,103 @@
# You can leave this on "local". If you change it to production most console commands will ask for extra confirmation.
# Never set it to "testing".
APP_ENV=testing
# Set to true if you want to see debug information in error screens.
APP_DEBUG=true
# This should be your email address
SITE_OWNER=thegrumpydictator+testing@gmail.com
# The encryption key for your database and sessions. Keep this very secure.
# If you generate a new one all existing data must be considered LOST.
# Change it to a string of exactly 32 chars or use command `php artisan key:generate` to generate it
APP_KEY=TestTestTestTestTestTestTestTest
# Change this value to your preferred time zone.
# Example: Europe/Amsterdam
TZ=Europe/Amsterdam
# APP_URL and TRUSTED_PROXIES are useful when using Docker and/or a reverse proxy.
APP_URL=http://localhost
TRUSTED_PROXIES=
# The log channel defines where your log entries go to.
LOG_CHANNEL=dailytest
# Database credentials. Make sure the database exists. I recommend a dedicated user for Firefly III
# For other database types, please see the FAQ: http://firefly-iii.readthedocs.io/en/latest/support/faq.html
DB_CONNECTION=sqlite
# 'daily' is the default logging mode giving you 5 daily rotated log files in /storage/logs/.
# Several other options exist. You can use 'single' for one big fat error log (not recommended).
# Also available are 'syslog' and 'errorlog' which will log to the system itself.
APP_LOG=daily
# Log level. You can set this from least severe to most severe:
# debug, info, notice, warning, error, critical, alert, emergency
# If you set it to debug your logs will grow large, and fast. If you set it to emergency probably
# nothing will get logged, ever.
APP_LOG_LEVEL=debug
# If you're looking for performance improvements, you could install memcached.
CACHE_DRIVER=file
SESSION_DRIVER=file
# Cookie settings. Should not be necessary to change these.
COOKIE_PATH="/"
COOKIE_DOMAIN=
COOKIE_SECURE=false
# If you want Firefly III to mail you, update these settings
# For instructions, see: https://firefly-iii.readthedocs.io/en/latest/installation/mail.html
MAIL_DRIVER=log
MAIL_HOST=smtp.mailtrap.io
MAIL_PORT=2525
MAIL_FROM=changeme@example.com
MAIL_USERNAME=null
MAIL_PASSWORD=null
MAIL_ENCRYPTION=null
# Other mail drivers:
MAILGUN_DOMAIN=
MAILGUN_SECRET=
MANDRILL_SECRET=
SPARKPOST_SECRET=
# Set a Mapbox API key here (see mapbox.com) so there might be a map available at various places.
MAPBOX_API_KEY=
# Set a Fixer IO API key here (see https://fixer.io) to enable live currency exchange rates.
# Please note that this will only work for paid fixer.io accounts because they severly limited
# the free API up to the point where you might as well offer nothing.
FIXER_API_KEY=
# If you wish to track your own behavior over Firefly III, set a valid analytics tracker ID here.
ANALYTICS_ID=
# Most parts of the database are encrypted by default, but you can turn this off if you want to.
# This makes it easier to migrate your database. Not that some fields will never be decrypted.
USE_ENCRYPTION=false
# Leave the following configuration vars as is.
# Unless you like to tinker and know what you're doing.
APP_NAME=FireflyIII
BROADCAST_DRIVER=log
QUEUE_DRIVER=sync
REDIS_HOST=127.0.0.1
REDIS_PASSWORD=null
REDIS_PORT=6379
CACHE_PREFIX=firefly_tst
SEARCH_RESULT_LIMIT=50
PUSHER_KEY=
PUSHER_SECRET=
PUSHER_ID=
DEMO_USERNAME=
DEMO_PASSWORD=
IS_DOCKER=false
IS_SANDSTORM=false
BUNQ_USE_SANDBOX=true
IS_HEROKU=false
MAILGUN_DOMAIN=
MAILGUN_SECRET=

4
.gitattributes vendored
View File

@@ -1 +1,5 @@
* text=auto
*.css linguist-vendored
*.scss linguist-vendored
*.js linguist-vendored
CHANGELOG.md export-ignore

22
.github/ISSUE_TEMPLATE/Bug_report.md vendored Normal file
View File

@@ -0,0 +1,22 @@
---
name: Bug report
about: Create a report to help Firefly III improve
---
**Bug description**
I am running Firefly III version x.x.x
(please give a clear and concise description of what the bug is)
**Steps to reproduce**
What do you need to do to trigger this bug?
**Extra info**
Please add extra info here, such as OS, browser, and the output from the /debug page of your Firefly III installation (click the version at the bottom).
**Bonus points**
Earn bonus points by:
- Post a stacktrace from your log files
- Add a screenshot

27
.github/ISSUE_TEMPLATE/Custom.md vendored Normal file
View File

@@ -0,0 +1,27 @@
---
name: I have a question or a problem
about: Ask away!
---
I am running Firefly III version x.x.x
**Description**
**Steps to reproduce**
(if relevant of course)
**Extra info**
Please add extra info here, such as OS, browser, and the output from the `/debug`-page of your Firefly III installation (click the version at the bottom).
**Bonus points**
Earn bonus points by:
- Add a screenshot
- Replicate the problem on the demo site https://demo.firefly-iii.org/

View File

@@ -0,0 +1,21 @@
---
name: Feature request
about: Suggest an idea or feature for Firefly III
---
**Description**
Please describe your feature request:
- I would like Firefly III to do X.
- What if you would add feature Y?
- Firefly III doesn't do Z.
**Solution**
Describe what your feature would add to Firefly III.
**What are alternatives?**
Please describe what alternatives currently exist.
**Additional context**
Add any other context or screenshots about the feature request here.

46
.github/code_of_conduct.md vendored Normal file
View File

@@ -0,0 +1,46 @@
# Contributor Covenant Code of Conduct
## Our Pledge
In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
## Our Standards
Examples of behavior that contributes to creating a positive environment include:
* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members
Examples of unacceptable behavior by participants include:
* The use of sexualized language or imagery and unwelcome sexual attention or advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a professional setting
## Our Responsibilities
Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
## Scope
This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
## Enforcement
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at thegrumpydictator@gmail.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
## Attribution
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
[homepage]: http://contributor-covenant.org
[version]: http://contributor-covenant.org/version/1/4/

15
.github/contributing.md vendored Normal file
View File

@@ -0,0 +1,15 @@
# Welcome to Firefly III on Github!
:+1::tada: Thank you for taking the time to contribute something to Firefly III!
## Feature requests
I am always interested in expanding Firefly III's many features. Just open a ticket or [drop me a line](mailto:thegrumpydictator@gmail.com).
## Pull requests
When contributing to Firefly III, please first discuss the change you wish to make via issue, email, or any other method. I can only accept pull requests against the `develop` branch, never the `master` branch.
## Translations :us: :fr: :de:
If you see a spelling error, grammatical error or a weird translation in your language, please join [our CrowdIn](https://crowdin.com/project/firefly-iii) project. There, you can submit your translations and fixes. The GitHub repository will download these automatically and they will be included in the next release.

9
.github/pull_request_template.md vendored Normal file
View File

@@ -0,0 +1,9 @@
Fixes # (if relevant)
Changes in this pull request:
-
-
-
@JC5

56
.github/stale.yml vendored Normal file
View File

@@ -0,0 +1,56 @@
# Configuration for probot-stale - https://github.com/probot/stale
# Number of days of inactivity before an Issue or Pull Request becomes stale
daysUntilStale: 14
# Number of days of inactivity before a stale Issue or Pull Request is closed.
# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
daysUntilClose: 7
# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
# - "[Status] Maybe Later"
exemptLabels:
- enhancement
- feature
- bug
# Set to true to ignore issues in a project (defaults to false)
exemptProjects: false
# Set to true to ignore issues in a milestone (defaults to false)
exemptMilestones: false
# Label to use when marking as stale
staleLabel: stale
# Comment to post when marking as stale. Set to `false` to disable
markComment: >
This issue has been automatically marked as stale because it has not had
recent activity. It will be closed if no further activity occurs. Thank you
for your contributions.
# Comment to post when removing the stale label.
# unmarkComment: >
# Your comment here.
# Comment to post when closing a stale Issue or Pull Request.
# closeComment: >
# Your comment here.
# Limit the number of actions per hour, from 1-30. Default is 30
limitPerRun: 30
# Limit to only `issues` or `pulls`
# only: issues
# Optionally, specify configuration settings that are specific to just 'issues' or 'pulls':
# pulls:
# daysUntilStale: 30
# markComment: >
# This pull request has been automatically marked as stale because it has not had
# recent activity. It will be closed if no further activity occurs. Thank you
# for your contributions.
# issues:
# exemptLabels:
# - confirmed

11
.github/support.md vendored Normal file
View File

@@ -0,0 +1,11 @@
# Welcome to Firefly III on Github!
:+1::tada: Thank you for taking the time to contribute something to Firefly III!
## Bugs
First of all: thank you for reporting a bug instead of ditching the tool altogether. If you find a bug, please take the time and see if the [demo site](https://demo.firefly-iii.org/) is also suffering from this bug. Include as many log files and details as you think are necessary. Bugs have a lot of priority!
## Installation problems
Please take the time to read the [installation guide FAQ](https://firefly-iii.org/installation-guide-faq/) and make sure you search through closed issues for the problems other people have had. Your problem may be among them! If not, open an issue and I will help where I can.

37
.gitignore vendored
View File

@@ -1,27 +1,14 @@
/bootstrap/compiled.php
/node_modules
/public/hot
/public/storage
/storage/*.key
/vendor
/.vagrant
Homestead.json
Homestead.yaml
npm-debug.log
yarn-error.log
.env
public/google*.html
report.html
composer.phar
.env.*.php
.env.php
Thumbs.db
.idea/
tests/_output/*
_ide_helper.php
/build/logs/clover.xml
index.html*
app/storage/firefly-export*
.vagrant
firefly-iii-import-*.json
tests/_output/*
testing.sqlite
_ide_helper_models.php
clean.sqlite
tests/acceptance/AcceptanceTester.php
tests/functional/FunctionalTester.php
tests/unit/UnitTester.php
pi.php
tests/_data/db.sqlite
tests/_data/dump.sql
db.sqlite_snapshot
c3.php
db.sqlite-journal

14
.htaccess Normal file
View File

@@ -0,0 +1,14 @@
# Optional: force HTTPS:
# <IfModule mod_rewrite.c>
# RewriteEngine On
# RewriteCond %{HTTPS} off
# RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R,L]
# </IfModule>
# To hide directory listing
Options All -Indexes
# To prevent access to .env and other files
<Files .*>
Deny from all
</Files>

5
.sandstorm/.gitattributes vendored Normal file
View File

@@ -0,0 +1,5 @@
# vagrant-spk creates shell scripts, which must end in \n, even on a \r\n system.
*.sh text eol=lf

5
.sandstorm/.gitignore vendored Normal file
View File

@@ -0,0 +1,5 @@
# This file stores a list of sub-paths of .sandstorm/ that should be ignored by git.
.vagrant

103
.sandstorm/Vagrantfile vendored Normal file
View File

@@ -0,0 +1,103 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :
# Guess at a reasonable name for the VM based on the folder vagrant-spk is
# run from. The timestamp is there to avoid conflicts if you have multiple
# folders with the same name.
VM_NAME = File.basename(File.dirname(File.dirname(__FILE__))) + "_sandstorm_#{Time.now.utc.to_i}"
# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
VAGRANTFILE_API_VERSION = "2"
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# Base on the Sandstorm snapshots of the official Debian 8 (jessie) box.
config.vm.box = "sandstorm/debian-jessie64"
if Vagrant.has_plugin?("vagrant-vbguest") then
# vagrant-vbguest is a Vagrant plugin that upgrades
# the version of VirtualBox Guest Additions within each
# guest. If you have the vagrant-vbguest plugin, then it
# needs to know how to compile kernel modules, etc., and so
# we give it this hint about operating system type.
config.vm.guest = "debian"
end
# We forward port 6080, the Sandstorm web port, so that developers can
# visit their sandstorm app from their browser as local.sandstorm.io:6080
# (aka 127.0.0.1:6080).
config.vm.network :forwarded_port, guest: 6080, host: 6080
# Use a shell script to "provision" the box. This installs Sandstorm using
# the bundled installer.
config.vm.provision "shell", inline: "sudo bash /opt/app/.sandstorm/global-setup.sh", keep_color: true
# Then, do stack-specific and app-specific setup.
config.vm.provision "shell", inline: "sudo bash /opt/app/.sandstorm/setup.sh", keep_color: true
# Shared folders are configured per-provider since vboxsf can't handle >4096 open files,
# NFS requires privilege escalation every time you bring a VM up,
# and 9p is only available on libvirt.
# Calculate the number of CPUs and the amount of RAM the system has,
# in a platform-dependent way; further logic below.
cpus = nil
total_kB_ram = nil
host = RbConfig::CONFIG['host_os']
if host =~ /darwin/
cpus = `sysctl -n hw.ncpu`.to_i
total_kB_ram = `sysctl -n hw.memsize`.to_i / 1024
elsif host =~ /linux/
cpus = `nproc`.to_i
total_kB_ram = `grep MemTotal /proc/meminfo | awk '{print $2}'`.to_i
elsif host =~ /mingw/
# powershell may not be available on Windows XP and Vista, so wrap this in a rescue block
begin
cpus = `powershell -Command "(Get-WmiObject Win32_Processor -Property NumberOfLogicalProcessors | Select-Object -Property NumberOfLogicalProcessors | Measure-Object NumberOfLogicalProcessors -Sum).Sum"`.to_i
total_kB_ram = `powershell -Command "Get-CimInstance -class cim_physicalmemory | % $_.Capacity}"`.to_i / 1024
rescue
end
end
# Use the same number of CPUs within Vagrant as the system, with 1
# as a default.
#
# Use at least 512MB of RAM, and if the system has more than 2GB of
# RAM, use 1/4 of the system RAM. This seems a reasonable compromise
# between having the Vagrant guest operating system not run out of
# RAM entirely (which it basically would if we went much lower than
# 512MB) and also allowing it to use up a healthily large amount of
# RAM so it can run faster on systems that can afford it.
if cpus.nil? or cpus.zero?
cpus = 1
end
if total_kB_ram.nil? or total_kB_ram < 2048000
assign_ram_mb = 512
else
assign_ram_mb = (total_kB_ram / 1024 / 4)
end
# Actually apply these CPU/memory values to the providers.
config.vm.provider :virtualbox do |vb, override|
vb.cpus = cpus
vb.memory = assign_ram_mb
vb.name = VM_NAME
vb.customize ["modifyvm", :id, "--nictype1", "Am79C973"]
# /opt/app and /host-dot-sandstorm are used by vagrant-spk
override.vm.synced_folder "..", "/opt/app"
override.vm.synced_folder ENV["HOME"] + "/.sandstorm", "/host-dot-sandstorm"
# /vagrant is not used by vagrant-spk; we need this line so it gets disabled; if we removed the
# line, vagrant would automatically insert a synced folder in /vagrant, which is not what we want.
override.vm.synced_folder "..", "/vagrant", disabled: true
end
config.vm.provider :libvirt do |libvirt, override|
libvirt.cpus = cpus
libvirt.memory = assign_ram_mb
libvirt.default_prefix = VM_NAME
# /opt/app and /host-dot-sandstorm are used by vagrant-spk
override.vm.synced_folder "..", "/opt/app", type: "9p", accessmode: "passthrough"
override.vm.synced_folder ENV["HOME"] + "/.sandstorm", "/host-dot-sandstorm", type: "9p", accessmode: "passthrough"
# /vagrant is not used by vagrant-spk; we need this line so it gets disabled; if we removed the
# line, vagrant would automatically insert a synced folder in /vagrant, which is not what we want.
override.vm.synced_folder "..", "/vagrant", type: "9p", accessmode: "passthrough", disabled: true
end
end

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.4 KiB

20
.sandstorm/build.sh Executable file
View File

@@ -0,0 +1,20 @@
#!/bin/bash
# Checks if there's a composer.json, and if so, installs/runs composer.
# This script only runs once, when the app connects to sandstorm.
set -euo pipefail
echo "In build.sh"
cd /opt/app
cp .env.sandstorm .env
if [ -f /opt/app/composer.json ] ; then
if [ ! -f composer.phar ] ; then
curl -sS https://getcomposer.org/installer | php
fi
php composer.phar install --no-dev --no-suggest
fi
# link storage folder
rm -rf /opt/app/storage
ln -s /var/storage /opt/app

272
.sandstorm/changelog.md Normal file
View File

@@ -0,0 +1,272 @@
# 4.7.5
- A new feature called "recurring transactions" that will make Firefly III automatically create transactions for you.
- New API end points for attachments, available budgets, budgets, budget limits, categories, configuration, currency exchange rates, journal links, link types, piggy banks, preferences, recurring transactions, rules, rule groups and tags.
- Added support for YunoHost.
- The 2FA secret is visible so you can type it into 2FA apps.
- Bunq and Spectre imports will now ask to apply rules.
- Sandstorm users can now make API keys.
- Various typo's in the English translations. [issue 1493](https://github.com/firefly-iii/firefly-iii/issues/1493)
- Bug where Spectre was never called [issue 1492](https://github.com/firefly-iii/firefly-iii/issues/1492)
- Clear cache after journal is created through API [issue 1483](https://github.com/firefly-iii/firefly-iii/issues/1483)
- Make sure docker directories exist [issue 1500](https://github.com/firefly-iii/firefly-iii/issues/1500)
- Broken link to bill edit [issue 1505](https://github.com/firefly-iii/firefly-iii/issues/1505)
- Several bugs in the editing of split transactions [issue 1509](https://github.com/firefly-iii/firefly-iii/issues/1509)
- Import routine ignored formatting of several date fields [issue 1510](https://github.com/firefly-iii/firefly-iii/issues/1510)
- Piggy bank events now show the correct currency [issue 1446](https://github.com/firefly-iii/firefly-iii/issues/1446)
- Inactive accounts are no longer suggested [issue 1463](https://github.com/firefly-iii/firefly-iii/issues/1463)
- Some income / expense charts are less confusing [issue 1518](https://github.com/firefly-iii/firefly-iii/issues/1518)
- Validation bug in multi-currency create view [issue 1521](https://github.com/firefly-iii/firefly-iii/issues/1521)
# 4.7.4
- [Issue 1409](https://github.com/firefly-iii/firefly-iii/issues/1409), add Indian Rupee and explain that users can do this themselves [issue 1413](https://github.com/firefly-iii/firefly-iii/issues/1413)
- [Issue 1445](https://github.com/firefly-iii/firefly-iii/issues/1445), upgrade Curl in Docker image.
- [Issue 1386](https://github.com/firefly-iii/firefly-iii/issues/1386), quick links to often used pages.
- [Issue 1405](https://github.com/firefly-iii/firefly-iii/issues/1405), show proposed amount to piggy banks.
- [Issue 1416](https://github.com/firefly-iii/firefly-iii/issues/1416), ability to delete lost attachments.
- A completely rewritten import routine that can handle bunq (thanks everybody for testing!), CSV files and Spectre. Please make sure you read about this at http://bit.ly/FF3-new-import
- [Issue 1392](https://github.com/firefly-iii/firefly-iii/issues/1392), explicitly mention rules are inactive (when they are).
- [Issue 1406](https://github.com/firefly-iii/firefly-iii/issues/1406), bill conversion to rules will be smarter about the rules they create.
- [Issue 1369](https://github.com/firefly-iii/firefly-iii/issues/1369), you can now properly order piggy banks again.
- [Issue 1389](https://github.com/firefly-iii/firefly-iii/issues/1389), null-pointer in the import routine.
- [Issue 1400](https://github.com/firefly-iii/firefly-iii/issues/1400), missing translation.
- [Issue 1403](https://github.com/firefly-iii/firefly-iii/issues/1403), bill would always be marked as inactive in edit screen.
- [Issue 1418](https://github.com/firefly-iii/firefly-iii/issues/1418), missing note text on bill page.
- Export routine would break when encountering un-decryptable files.
- [Issue 1425](https://github.com/firefly-iii/firefly-iii/issues/1425), empty fields when edit multiple transactions at once.
- [Issue 1449](https://github.com/firefly-iii/firefly-iii/issues/1449), bad calculations in "budget left to spend" view.
- [Issue 1451](https://github.com/firefly-iii/firefly-iii/issues/1451), same but in another view.
- [Issue 1453](https://github.com/firefly-iii/firefly-iii/issues/1453), same as [issue 1403](https://github.com/firefly-iii/firefly-iii/issues/1403).
- [Issue 1455](https://github.com/firefly-iii/firefly-iii/issues/1455), could add income to a budget.
- [Issue 1442](https://github.com/firefly-iii/firefly-iii/issues/1442), issues with editing a split deposit.
- [Issue 1452](https://github.com/firefly-iii/firefly-iii/issues/1452), date range problems with tags.
- [Issue 1458](https://github.com/firefly-iii/firefly-iii/issues/1458), same for transactions.
- [Issue 1415](https://github.com/firefly-iii/firefly-iii/issues/1415), will email you when OAuth2 keys are generated.
# 4.7.3.2
- Forgot to increase the version number :(.
# 4.7.3.1
- Fixed a critical bug where the rules-engine would fire inadvertently.
# 4.7.3
- Currency added to API
- Firfely III will also generate a cash wallet for new users.
- Can now reset Spectre and bunq settings
- Docker file has a time zone
- Allow database connection to be configured in Docker file
- Can now view and edit attachments in edit-screen
- User can visit hidden `/attachments` page
- [Issue 1356](https://github.com/firefly-iii/firefly-iii/issues/1356): Budgets will show the remaining amount per day
- [Issue 1367](https://github.com/firefly-iii/firefly-iii/issues/1367): Rules now come in strict and non-strict mode.
- Added a security.txt
- More support for trusted proxies
- Improved edit routine for split transactions.
- Upgrade routine can handle `proc_close` being disabled.
- Bills now use rules to match transactions, making it more flexible.
- [Issue 1328](https://github.com/firefly-iii/firefly-iii/issues/1328): piggy banks no have a more useful chart.
- Spectre API upgraded to v4
- Move to MariaDB ([issue 1366](https://github.com/firefly-iii/firefly-iii/issues/1366))
- Piggy banks take currency from parent account ([issue 1334](https://github.com/firefly-iii/firefly-iii/issues/1334))
- [Issue 1341](https://github.com/firefly-iii/firefly-iii/issues/1341): Removed depricated command from dockerfile
- Several issues with docker image ([issue 1320](https://github.com/firefly-iii/firefly-iii/issues/1320), [issue 1382](https://github.com/firefly-iii/firefly-iii/issues/1382)).
- Fix giant tags and division by zero ([issue 1325](https://github.com/firefly-iii/firefly-iii/issues/1325) and others)
- Several issues with bunq import ([issue 1352](https://github.com/firefly-iii/firefly-iii/issues/1352), [issue 1330](https://github.com/firefly-iii/firefly-iii/issues/1330), [issue 1378](https://github.com/firefly-iii/firefly-iii/issues/1378), [issue 1380](https://github.com/firefly-iii/firefly-iii/issues/1380))
- [Issue 1246](https://github.com/firefly-iii/firefly-iii/issues/1246): date picker is internationalised
- [Issue 1327](https://github.com/firefly-iii/firefly-iii/issues/1327): fix formattting issues in piggy banks
- [Issue 1348](https://github.com/firefly-iii/firefly-iii/issues/1348): 500 error in API
- [Issue 1349](https://github.com/firefly-iii/firefly-iii/issues/1349): Errors in import routine
- Several fixes for (multi-currency) reconciliation ([issue 1336](https://github.com/firefly-iii/firefly-iii/issues/1336), [issue 1363](https://github.com/firefly-iii/firefly-iii/issues/1363))
- [Issue 1353](https://github.com/firefly-iii/firefly-iii/issues/1353): return NULL values in range-indicator
- Bug in split transaction edit routine
- Piggy bank percentage was very specific.
- Logging in Slack is easier to config.
- [Issue 1312](https://github.com/firefly-iii/firefly-iii/issues/1312) Import broken for ING accounts
- [Issue 1313](https://github.com/firefly-iii/firefly-iii/issues/1313) Error when creating new asset account
- [Issue 1317](https://github.com/firefly-iii/firefly-iii/issues/1317) Forgot an include :(
- Null pointer exception in transaction overview.
- Installations running in subdirs were incapable of creating OAuth tokens.
- OAuth keys were not created in all cases.
# 4.7.2
- [Issue 1123](https://github.com/firefly-iii/firefly-iii/issues/1123) First browser based update routine.
- Add support for Italian.
- [Issue 1232](https://github.com/firefly-iii/firefly-iii/issues/1232) Allow user to specify Docker database port.
- [Issue 1197](https://github.com/firefly-iii/firefly-iii/issues/1197) Beter account list overview
- [Issue 1202](https://github.com/firefly-iii/firefly-iii/issues/1202) Some budgetary warnings
- [Issue 1284](https://github.com/firefly-iii/firefly-iii/issues/1284) Experimental support for bunq import
- [Issue 1248](https://github.com/firefly-iii/firefly-iii/issues/1248) Ability to import BIC, ability to import SEPA fields.
- [Issue 1102](https://github.com/firefly-iii/firefly-iii/issues/1102) Summary line for bills
- More info to debug page.
- [Issue 1186](https://github.com/firefly-iii/firefly-iii/issues/1186) You can see the latest account balance in CRUD forms
- Add Kubernetes YAML files, kindly created by a FF3 user.
- [Issue 1244](https://github.com/firefly-iii/firefly-iii/issues/1244) Better line for "today" marker and add it to other chart as well ([issue 1214](https://github.com/firefly-iii/firefly-iii/issues/1214))
- [Issue 1219](https://github.com/firefly-iii/firefly-iii/issues/1219) Languages in dropdown
- [Issue 1189](https://github.com/firefly-iii/firefly-iii/issues/1189) Inactive accounts get removed from net worth
- [Issue 1220](https://github.com/firefly-iii/firefly-iii/issues/1220) Attachment description and notes migrated to just "notes".
- [Issue 1236](https://github.com/firefly-iii/firefly-iii/issues/1236) Multi currency balance box
- [Issue 1240](https://github.com/firefly-iii/firefly-iii/issues/1240) Better overview for accounts.
- [Issue 1292](https://github.com/firefly-iii/firefly-iii/issues/1292) Removed some charts from the "all"-overview of budgets and categories
- [Issue 1245](https://github.com/firefly-iii/firefly-iii/issues/1245) Improved recognition of IBANs
- Improved import routine.
- Update notifier will wait three days before notifying users.
- [Issue 1300](https://github.com/firefly-iii/firefly-iii/issues/1300) Virtual balance of credit cards does not count for net worth
- [Issue 1247](https://github.com/firefly-iii/firefly-iii/issues/1247) Can now see overspent amount
- [Issue 1221](https://github.com/firefly-iii/firefly-iii/issues/1221) Upgrade to Laravel 5.6
- [Issue 1187](https://github.com/firefly-iii/firefly-iii/issues/1187) Updated the password verifier to use Troy Hunt's new API
- Revenue chart is now on frontpage permanently
- [Issue 1153](https://github.com/firefly-iii/firefly-iii/issues/1153) 2FA settings are in your profile now
- [Issue 1227](https://github.com/firefly-iii/firefly-iii/issues/1227) Can set the timezone in config or in Docker
- [Issue 1294](https://github.com/firefly-iii/firefly-iii/issues/1294) Ability to link a transaction to itself
- Correct reference to journal description in split form.
- [Issue 1234](https://github.com/firefly-iii/firefly-iii/issues/1234) Fix budget page issues in SQLite
- [Issue 1262](https://github.com/firefly-iii/firefly-iii/issues/1262) Can now use double and epty headers in CSV files
- [Issue 1258](https://github.com/firefly-iii/firefly-iii/issues/1258) Fixed a possible date mismatch in piggy banks
- [Issue 1283](https://github.com/firefly-iii/firefly-iii/issues/1283) Bulk delete was broken
- [Issue 1293](https://github.com/firefly-iii/firefly-iii/issues/1293) Layout problem with notes
- [Issue 1257](https://github.com/firefly-iii/firefly-iii/issues/1257) Improve transaction lists query count
- [Issue 1291](https://github.com/firefly-iii/firefly-iii/issues/1291) Fixer IO problems
- [Issue 1239](https://github.com/firefly-iii/firefly-iii/issues/1239) Could not edit expense or revenue accounts ([issue 1298](https://github.com/firefly-iii/firefly-iii/issues/1298))
- [Issue 1297](https://github.com/firefly-iii/firefly-iii/issues/1297) Could not convert to withdrawal
- [Issue 1226](https://github.com/firefly-iii/firefly-iii/issues/1226) Category overview in default report shows no income.
- Various other bugs and problems ([issue 1198](https://github.com/firefly-iii/firefly-iii/issues/1198), [issue 1213](https://github.com/firefly-iii/firefly-iii/issues/1213), [issue 1237](https://github.com/firefly-iii/firefly-iii/issues/1237), [issue 1238](https://github.com/firefly-iii/firefly-iii/issues/1238), [issue 1199](https://github.com/firefly-iii/firefly-iii/issues/1199), [issue 1200](https://github.com/firefly-iii/firefly-iii/issues/1200))
- Fixed an issue with token validation on the command line.
# 4.7.1
- A brand new API. Read about it in the [documentation](http://firefly-iii.readthedocs.io/en/latest/).
- Add support for Spanish. [issue 1194](https://github.com/firefly-iii/firefly-iii/issues/1194)
- Some custom preferences are selected by default for a better user experience.
- Some new currencies [issue 1211](https://github.com/firefly-iii/firefly-iii/issues/1211)
- Fixed [issue 1155](https://github.com/firefly-iii/firefly-iii/issues/1155) (reported by [ndandanov](https://github.com/ndandanov))
- [Issue 1156](https://github.com/firefly-iii/firefly-iii/issues/1156) [issue 1182](https://github.com/firefly-iii/firefly-iii/issues/1182) and other issues related to SQLite databases.
- Multi-page budget overview was broken (reported by [jinformatique](https://github.com/jinformatique))
- Importing CSV files with semi-colons in them did not work [issue 1172](https://github.com/firefly-iii/firefly-iii/issues/1172) [issue 1183](https://github.com/firefly-iii/firefly-iii/issues/1183) [issue 1210](https://github.com/firefly-iii/firefly-iii/issues/1210)
- Could not use account number that was in use by a deleted account [issue 1174](https://github.com/firefly-iii/firefly-iii/issues/1174)
- Fixed spelling error that lead to 404's [issue 1175](https://github.com/firefly-iii/firefly-iii/issues/1175) [issue 1190](https://github.com/firefly-iii/firefly-iii/issues/1190)
- Fixed tag autocomplete [issue 1178](https://github.com/firefly-iii/firefly-iii/issues/1178)
- Better links for "new transaction" buttons [issue 1185](https://github.com/firefly-iii/firefly-iii/issues/1185)
- Cache errors in budget charts [issue 1192](https://github.com/firefly-iii/firefly-iii/issues/1192)
- Deleting transactions that are linked to other other transactions would lead to errors [issue 1209](https://github.com/firefly-iii/firefly-iii/issues/1209)
# 4.7.0
- Support for Russian and Portuguese (Brazil)
- Support for the Spectre API (Salt Edge)
- Many strings now translatable thanks to [Nik-vr](https://github.com/Nik-vr) ([issue 1118](https://github.com/firefly-iii/firefly-iii/issues/1118), [issue 1116](https://github.com/firefly-iii/firefly-iii/issues/1116), [issue 1109](https://github.com/firefly-iii/firefly-iii/issues/1109), )
- Many buttons to quickly create stuff
- Sum of tables in reports, requested by [MacPaille](https://github.com/MacPaille) ([issue 1106](https://github.com/firefly-iii/firefly-iii/issues/1106))
- Future versions of Firefly III will notify you there is a new version, as suggested by [8bitgentleman](https://github.com/8bitgentleman) in [issue 1050](https://github.com/firefly-iii/firefly-iii/issues/1050)
- Improved net worth box [issue 1101](https://github.com/firefly-iii/firefly-iii/issues/1101) ([Nik-vr](https://github.com/Nik-vr))
- Nice dropdown in transaction list [issue 1082](https://github.com/firefly-iii/firefly-iii/issues/1082)
- Better support for local fonts thanks to [devlearner](https://github.com/devlearner) ([issue 1145](https://github.com/firefly-iii/firefly-iii/issues/1145))
- Improve attachment support and view capabilities (suggested by [trinhit](https://github.com/trinhit) in [issue 1146](https://github.com/firefly-iii/firefly-iii/issues/1146))
- Whole new [read me file](https://github.com/firefly-iii/firefly-iii/blob/master/readme.md), [new end user documentation](https://firefly-iii.readthedocs.io/en/latest/) and an [updated website](https://www.firefly-iii.org/)!
- Many charts and info-blocks now scale property ([issue 989](https://github.com/firefly-iii/firefly-iii/issues/989) and [issue 1040](https://github.com/firefly-iii/firefly-iii/issues/1040))
- Charts work in IE thanks to [devlearner](https://github.com/devlearner) ([issue 1107](https://github.com/firefly-iii/firefly-iii/issues/1107))
- Various fixes in import routine
- Bug that left charts empty ([issue 1088](https://github.com/firefly-iii/firefly-iii/issues/1088)), reported by various users amongst which [jinformatique](https://github.com/jinformatique)
- [Issue 1124](https://github.com/firefly-iii/firefly-iii/issues/1124), as reported by [gavu](https://github.com/gavu)
- [Issue 1125](https://github.com/firefly-iii/firefly-iii/issues/1125), as reported by [gavu](https://github.com/gavu)
- [Issue 1126](https://github.com/firefly-iii/firefly-iii/issues/1126), as reported by [gavu](https://github.com/gavu)
- [Issue 1131](https://github.com/firefly-iii/firefly-iii/issues/1131), as reported by [dp87](https://github.com/dp87)
- [Issue 1129](https://github.com/firefly-iii/firefly-iii/issues/1129), as reported by [gavu](https://github.com/gavu)
- [Issue 1132](https://github.com/firefly-iii/firefly-iii/issues/1132), as reported by [gavu](https://github.com/gavu)
- Issue with cache in Sandstorm ([issue 1130](https://github.com/firefly-iii/firefly-iii/issues/1130))
- [Issue 1134](https://github.com/firefly-iii/firefly-iii/issues/1134)
- [Issue 1140](https://github.com/firefly-iii/firefly-iii/issues/1140)
- [Issue 1141](https://github.com/firefly-iii/firefly-iii/issues/1141), reported by [ErikFontanel](https://github.com/ErikFontanel)
- [Issue 1142](https://github.com/firefly-iii/firefly-iii/issues/1142)
- Removed many access rights from the demo user
# 4.6.13
- [Issue 1074](https://github.com/firefly-iii/firefly-iii/issues/1074), suggested by [MacPaille](https://github.com/MacPaille)
- [Issue 1077](https://github.com/firefly-iii/firefly-iii/issues/1077), suggested by [wtercato](https://github.com/wtercato)
- Bulk edit of transactions thanks to [vicmosin](https://github.com/vicmosin) ([issue 1078](https://github.com/firefly-iii/firefly-iii/issues/1078))
- Support for Turkish.
- [Issue 1090](https://github.com/firefly-iii/firefly-iii/issues/1090), suggested by [Findus23](https://github.com/Findus23)
- [Issue 1097](https://github.com/firefly-iii/firefly-iii/issues/1097), suggested by [kelvinhammond](https://github.com/kelvinhammond)
- [Issue 1093](https://github.com/firefly-iii/firefly-iii/issues/1093), suggested by [jinformatique](https://github.com/jinformatique)
- [Issue 1098](https://github.com/firefly-iii/firefly-iii/issues/1098), suggested by [Nik-vr](https://github.com/Nik-vr)
- [Issue 972](https://github.com/firefly-iii/firefly-iii/issues/972), reported by [pjotrvdh](https://github.com/pjotrvdh)
- [Issue 1079](https://github.com/firefly-iii/firefly-iii/issues/1079), reported by [gavu](https://github.com/gavu)
- [Issue 1080](https://github.com/firefly-iii/firefly-iii/issues/1080), reported by [zjean](https://github.com/zjean)
- [Issue 1083](https://github.com/firefly-iii/firefly-iii/issues/1083), reported by [skuzzle](https://github.com/skuzzle)
- [Issue 1085](https://github.com/firefly-iii/firefly-iii/issues/1085), reported by [nicoschreiner](https://github.com/nicoschreiner)
- [Issue 1087](https://github.com/firefly-iii/firefly-iii/issues/1087), reported by [4oo4](https://github.com/4oo4)
- [Issue 1089](https://github.com/firefly-iii/firefly-iii/issues/1089), reported by [robin5210](https://github.com/robin5210)
- [Issue 1092](https://github.com/firefly-iii/firefly-iii/issues/1092), reported by [kelvinhammond](https://github.com/kelvinhammond)
- [Issue 1096](https://github.com/firefly-iii/firefly-iii/issues/1096), reported by [wtercato](https://github.com/wtercato)
# 4.6.12
- Support for Indonesian.
- New report, see [issue 384](https://github.com/firefly-iii/firefly-iii/issues/384)
- [Issue 964](https://github.com/firefly-iii/firefly-iii/issues/964) as suggested by [gavu](https://github.com/gavu)
- Greatly improved Docker support and documentation.
- [Issue 1046](https://github.com/firefly-iii/firefly-iii/issues/1046), as reported by [pkoziol](https://github.com/pkoziol)
- [Issue 1047](https://github.com/firefly-iii/firefly-iii/issues/1047), as reported by [pkoziol](https://github.com/pkoziol)
- [Issue 1048](https://github.com/firefly-iii/firefly-iii/issues/1048), as reported by [webence](https://github.com/webence)
- [Issue 1049](https://github.com/firefly-iii/firefly-iii/issues/1049), as reported by [nicoschreiner](https://github.com/nicoschreiner)
- [Issue 1015](https://github.com/firefly-iii/firefly-iii/issues/1015), as reporterd by a user on Tweakers.net
- [Issue 1056](https://github.com/firefly-iii/firefly-iii/issues/1056), as reported by [repercussion](https://github.com/repercussion)
- [Issue 1061](https://github.com/firefly-iii/firefly-iii/issues/1061), as reported by [Meizikyn](https://github.com/Meizikyn)
- [Issue 1045](https://github.com/firefly-iii/firefly-iii/issues/1045), as reported by [gavu](https://github.com/gavu)
- First code for [issue 1040](https://github.com/firefly-iii/firefly-iii/issues/1040) ([simonsmiley](https://github.com/simonsmiley))
- [Issue 1059](https://github.com/firefly-iii/firefly-iii/issues/1059), as reported by [4oo4](https://github.com/4oo4)
- [Issue 1063](https://github.com/firefly-iii/firefly-iii/issues/1063), as reported by [pkoziol](https://github.com/pkoziol)
- [Issue 1064](https://github.com/firefly-iii/firefly-iii/issues/1064), as reported by [pkoziol](https://github.com/pkoziol)
- [Issue 1066](https://github.com/firefly-iii/firefly-iii/issues/1066), reported by [wtercato](https://github.com/wtercato)
# 4.6.1.1
- Import routine can scan for matching bills, [issue 956](https://github.com/firefly-iii/firefly-iii/issues/956)
- Import will no longer scan for rules, this has become optional. Originally suggested in [issue 956](https://github.com/firefly-iii/firefly-iii/issues/956) by [gavu](https://github.com/gavu)
- [Issue 1033](https://github.com/firefly-iii/firefly-iii/issues/1033), as reported by [Jumanjii](https://github.com/Jumanjii)
- [Issue 1033](https://github.com/firefly-iii/firefly-iii/issues/1034), as reported by [Aquariu](https://github.com/Aquariu)
- Extra admin check for [issue 1039](https://github.com/firefly-iii/firefly-iii/issues/1039), as reported by [ocdtrekkie](https://github.com/ocdtrekkie)
- Missing translations ([issue 1026](https://github.com/firefly-iii/firefly-iii/issues/1026)), as reported by [gavu](https://github.com/gavu) and [zjean](https://github.com/zjean)
- [Issue 1028](https://github.com/firefly-iii/firefly-iii/issues/1028), reported by [zjean](https://github.com/zjean)
- [Issue 1029](https://github.com/firefly-iii/firefly-iii/issues/1029), reported by [zjean](https://github.com/zjean)
- [Issue 1030](https://github.com/firefly-iii/firefly-iii/issues/1030), as reported by [Traxxi](https://github.com/Traxxi)
- [Issue 1036](https://github.com/firefly-iii/firefly-iii/issues/1036), as reported by [webence](https://github.com/webence)
- [Issue 1038](https://github.com/firefly-iii/firefly-iii/issues/1038), as reported by [gavu](https://github.com/gavu)
# 4.6.11
- A debug page at `/debug` for easier debug.
- Strings translatable (see [issue 976](https://github.com/firefly-iii/firefly-iii/issues/976)), thanks to [Findus23](https://github.com/Findus23)
- Even more strings are translatable (and translated), thanks to [pkoziol](https://github.com/pkoziol) (see [issue 979](https://github.com/firefly-iii/firefly-iii/issues/979))
- Reconciliation of accounts ([issue 736](https://github.com/firefly-iii/firefly-iii/issues/736)), as requested by [kristophr](https://github.com/kristophr) and several others
- Extended currency list, as suggested by @emuhendis in [issue 994](https://github.com/firefly-iii/firefly-iii/issues/994)
- [Issue 996](https://github.com/firefly-iii/firefly-iii/issues/996) as suggested by [dp87](https://github.com/dp87)
- Disabled Heroku support until I get it working again.
- [Issue 980](https://github.com/firefly-iii/firefly-iii/issues/980), reported by [Tim-Frensch](https://github.com/Tim-Frensch)
- [Issue 987](https://github.com/firefly-iii/firefly-iii/issues/987), reported by [gavu](https://github.com/gavu)
- [Issue 988](https://github.com/firefly-iii/firefly-iii/issues/988), reported by [gavu](https://github.com/gavu)
- [Issue 992](https://github.com/firefly-iii/firefly-iii/issues/992), reported by [ncicovic](https://github.com/ncicovic)
- [Issue 993](https://github.com/firefly-iii/firefly-iii/issues/993), reported by [gavu](https://github.com/gavu)
- [Issue 997](https://github.com/firefly-iii/firefly-iii/issues/997), reported by [gavu](https://github.com/gavu)
- [Issue 1000](https://github.com/firefly-iii/firefly-iii/issues/1000), reported by [xpfgsyb](https://github.com/xpfgsyb)
- [Issue 1001](https://github.com/firefly-iii/firefly-iii/issues/1001), reported by [gavu](https://github.com/gavu)
- [Issue 1002](https://github.com/firefly-iii/firefly-iii/issues/1002), reported by [ursweiss](https://github.com/ursweiss)
- [Issue 1003](https://github.com/firefly-iii/firefly-iii/issues/1003), reported by [ursweiss](https://github.com/ursweiss)
- [Issue 1004](https://github.com/firefly-iii/firefly-iii/issues/1004), reported by [Aquariu](https://github.com/Aquariu)
- [Issue 1010](https://github.com/firefly-iii/firefly-iii/issues/1010)
- [Issue 1014](https://github.com/firefly-iii/firefly-iii/issues/1014), reported by [ursweiss](https://github.com/ursweiss)
- [Issue 1016](https://github.com/firefly-iii/firefly-iii/issues/1016)
- [Issue 1024](https://github.com/firefly-iii/firefly-iii/issues/1024), reported by [gavu](https://github.com/gavu)
- [Issue 1025](https://github.com/firefly-iii/firefly-iii/issues/1025), reported by [gavu](https://github.com/gavu)
# 4.6.10
- Greatly expanded Docker support thanks to [alazare619](https://github.com/alazare619)
- [Issue 967](https://github.com/firefly-iii/firefly-iii/issues/967), thanks to [Aquariu](https://github.com/Aquariu)
- Improved Sandstorm support.
- [Issue 963](https://github.com/firefly-iii/firefly-iii/issues/963), as reported by [gavu](https://github.com/gavu)
- [Issue 970](https://github.com/firefly-iii/firefly-iii/issues/970), as reported by [gavu](https://github.com/gavu)
- [Issue 971](https://github.com/firefly-iii/firefly-iii/issues/971), as reported by [gavu](https://github.com/gavu)
- Various Sandstorm.io related issues.
# 4.6.9.1
- Updated license
- Updated file list
# 4.6.9
- First version that works!
# 3.4.3
- Initial release on Sandstorm.io

View File

@@ -0,0 +1,3 @@
"Firefly III" is a financial manager. It can help you keep track of expenses, income, budgets and everything in between. It even supports credit cards, shared household accounts and savings accounts! Its pretty fancy. You should use it to save and organise money.
Firefly works on the principle that if you know where youre money is going, you can stop it from going there.

44
.sandstorm/global-setup.sh Executable file
View File

@@ -0,0 +1,44 @@
#!/bin/bash
set -euo pipefail
# Set options for curl. Since we only want to show errors from these curl commands, we also use
# 'cat' to buffer the output; for more information:
# https://github.com/sandstorm-io/vagrant-spk/issues/158
CURL_OPTS="--silent --show-error"
echo localhost > /etc/hostname
hostname localhost
# The following line copies stderr through stderr to cat without accidentally leaving it in the
# output file. Be careful when changing. See: https://github.com/sandstorm-io/vagrant-spk/pull/159
curl $CURL_OPTS https://install.sandstorm.io/ 2>&1 > /host-dot-sandstorm/caches/install.sh | cat
SANDSTORM_CURRENT_VERSION=$(curl $CURL_OPTS -f "https://install.sandstorm.io/dev?from=0&type=install")
SANDSTORM_PACKAGE="sandstorm-$SANDSTORM_CURRENT_VERSION.tar.xz"
if [[ ! -f /host-dot-sandstorm/caches/$SANDSTORM_PACKAGE ]] ; then
echo -n "Downloading Sandstorm version ${SANDSTORM_CURRENT_VERSION}..."
curl $CURL_OPTS --output "/host-dot-sandstorm/caches/$SANDSTORM_PACKAGE.partial" "https://dl.sandstorm.io/$SANDSTORM_PACKAGE" 2>&1 | cat
mv "/host-dot-sandstorm/caches/$SANDSTORM_PACKAGE.partial" "/host-dot-sandstorm/caches/$SANDSTORM_PACKAGE"
echo "...done."
fi
if [ ! -e /opt/sandstorm/latest/sandstorm ] ; then
echo -n "Installing Sandstorm version ${SANDSTORM_CURRENT_VERSION}..."
bash /host-dot-sandstorm/caches/install.sh -d -e "/host-dot-sandstorm/caches/$SANDSTORM_PACKAGE" >/dev/null
echo "...done."
fi
modprobe ip_tables
# Make the vagrant user part of the sandstorm group so that commands like
# `spk dev` work.
usermod -a -G 'sandstorm' 'vagrant'
# Bind to all addresses, so the vagrant port-forward works.
sudo sed --in-place='' \
--expression='s/^BIND_IP=.*/BIND_IP=0.0.0.0/' \
/opt/sandstorm/sandstorm.conf
sudo service sandstorm restart
# Enable apt-cacher-ng proxy to make things faster if one appears to be running on the gateway IP
GATEWAY_IP=$(ip route | grep ^default | cut -d ' ' -f 3)
if nc -z "$GATEWAY_IP" 3142 ; then
echo "Acquire::http::Proxy \"http://$GATEWAY_IP:3142\";" > /etc/apt/apt.conf.d/80httpproxy
fi
# Configure apt to retry fetching things that fail to download.
echo "APT::Acquire::Retries \"10\";" > /etc/apt/apt.conf.d/80sandstorm-retry

66
.sandstorm/launcher.sh Executable file
View File

@@ -0,0 +1,66 @@
#!/bin/bash
# Runs every time we create a new grain!
echo "Now in launcher.sh"
# Create a bunch of folders under the clean /var that php, nginx, and mysql expect to exist
mkdir -p /var/lib/mysql
mkdir -p /var/lib/nginx
mkdir -p /var/lib/php/sessions/
mkdir -p /var/log
mkdir -p /var/log/mysql
mkdir -p /var/log/nginx
# Wipe /var/run, since pidfiles and socket files from previous launches should go away
# TODO someday: I'd prefer a tmpfs for these.
rm -rf /var/run
mkdir -p /var/run
rm -rf /var/tmp
mkdir -p /var/tmp
mkdir -p /var/run/mysqld
# make storage directories
rm -rf /var/storage
mkdir -p /var/storage/app/public
mkdir -p /var/storage/build
mkdir -p /var/storage/database
mkdir -p /var/storage/debugbar
mkdir -p /var/storage/export
mkdir -p /var/storage/framework/cache
mkdir -p /var/storage/framework/sessions
mkdir -p /var/storage/framework/views
mkdir -p /var/storage/logs
mkdir -p /var/storage/upload
# Ensure mysql tables created
HOME=/etc/mysql /usr/bin/mysql_install_db --force
# Spawn mysqld, php
HOME=/etc/mysql /usr/sbin/mysqld &
/usr/sbin/php-fpm7.1 --nodaemonize --fpm-config /etc/php/7.1/fpm/php-fpm.conf &
# Wait until mysql and php have bound their sockets, indicating readiness
while [ ! -e /var/run/mysqld/mysqld.sock ] ; do
echo "waiting for mysql to be available at /var/run/mysqld/mysqld.sock"
sleep .5
done
while [ ! -e /var/run/php7.1-fpm.sock ] ; do
echo "waiting for php7.1-fpm to be available at /var/run/php7.1-fpm.sock"
sleep .5
done
echo "Installing database.."
# Install database for Firefly III
echo "CREATE DATABASE IF NOT EXISTS firefly; GRANT ALL on firefly.* TO 'firefly'@'localhost' IDENTIFIED BY 'firefly';" | mysql -uroot
echo "Done!"
echo "Migrating..."
php /opt/app/artisan migrate --seed --force
echo "Done!"
echo "Clear cache.."
php /opt/app/artisan cache:clear
echo "Done"
# Start nginx.
/usr/sbin/nginx -c /opt/app/.sandstorm/service-config/nginx.conf -g "daemon off;"

BIN
.sandstorm/pgp-keyring Normal file

Binary file not shown.

BIN
.sandstorm/pgp-signature Normal file

Binary file not shown.

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,187 @@
@0xb0032512fca90cd9;
using Spk = import "/sandstorm/package.capnp";
# This imports:
# $SANDSTORM_HOME/latest/usr/include/sandstorm/package.capnp
# Check out that file to see the full, documented package definition format.
const pkgdef :Spk.PackageDefinition = (
# The package definition. Note that the spk tool looks specifically for the
# "pkgdef" constant.
id = "uws252ya9mep4t77tevn85333xzsgrpgth8q4y1rhknn1hammw70",
# Your app ID is actually its public key. The private key was placed in
# your keyring. All updates must be signed with the same key.
manifest = (
appTitle = (defaultText = "Firefly III"),
appVersion = 14,
appMarketingVersion = (defaultText = "4.7.5"),
actions = [
# Define your "new document" handlers here.
( nounPhrase = (defaultText = "administration"),
command = .myCommand
# The command to run when starting for the first time. (".myCommand"
# is just a constant defined at the bottom of the file.)
)
],
continueCommand = .myCommand,
# This is the command called to start your app back up after it has been
# shut down for inactivity. Here we're using the same command as for
# starting a new instance, but you could use different commands for each
# case.
metadata = (
icons = (
appGrid = (png = (dpi1x = embed "app-graphics/firefly-iii-128.png")),
grain = (png = (dpi1x = embed "app-graphics/firefly-iii-24.png",
dpi2x = embed "app-graphics/firefly-iii-48.png")),
market = (png = (dpi1x = embed "app-graphics/firefly-iii-150.png"))
),
website = "https://firefly-iii.org/",
codeUrl = "https://github.com/firefly-iii/firefly-iii",
license = (openSource = gpl3),
# The license this package is distributed under. See
# https://docs.sandstorm.io/en/latest/developing/publishing-apps/#license
categories = [productivity],
# A list of categories/genres to which this app belongs, sorted with best fit first.
# See the list of categories at
# https://docs.sandstorm.io/en/latest/developing/publishing-apps/#categories
author = (
contactEmail = "thegrumpydictator@gmail.com",
pgpSignature = embed "pgp-signature",
),
pgpKeyring = embed "pgp-keyring",
description = (defaultText = embed "description.md"),
shortDescription = (defaultText = "Financial management"),
screenshots = [
# Screenshots to use for marketing purposes. Examples below.
# Sizes are given in device-independent pixels, so if you took these
# screenshots on a Retina-style high DPI screen, divide each dimension by two.
(width = 1290, height = 800, png = embed "screenshots/screenshot-1.png"),
(width = 1290, height = 800, png = embed "screenshots/screenshot-2.png"),
(width = 1290, height = 800, png = embed "screenshots/screenshot-3.png"),
],
changeLog = (defaultText = embed "changelog.md"),
),
),
sourceMap = (
# Here we defined where to look for files to copy into your package. The
# `spk dev` command actually figures out what files your app needs
# automatically by running it on a FUSE filesystem. So, the mappings
# here are only to tell it where to find files that the app wants.
searchPath = [
( sourcePath = "." ), # Search this directory first.
( sourcePath = "/", # Then search the system root directory.
hidePaths = [ "home", "proc", "sys",
"etc/passwd", "etc/hosts", "etc/host.conf",
"etc/nsswitch.conf", "etc/resolv.conf" ]
# You probably don't want the app pulling files from these places,
# so we hide them. Note that /dev, /var, and /tmp are implicitly
# hidden because Sandstorm itself provides them.
)
]
),
fileList = "sandstorm-files.list",
# `spk dev` will write a list of all the files your app uses to this file.
# You should review it later, before shipping your app.
alwaysInclude = ["opt/app/app","opt/app/bootstrap","opt/app/config","opt/app/database","opt/app/public","opt/app/resources","opt/app/routes","opt/app/vendor"],
# Fill this list with more names of files or directories that should be
# included in your package, even if not listed in sandstorm-files.list.
# Use this to force-include stuff that you know you need but which may
# not have been detected as a dependency during `spk dev`. If you list
# a directory here, its entire contents will be included recursively.
#bridgeConfig = (
# # Used for integrating permissions and roles into the Sandstorm shell
# # and for sandstorm-http-bridge to pass to your app.
# # Uncomment this block and adjust the permissions and roles to make
# # sense for your app.
# # For more information, see high-level documentation at
# # https://docs.sandstorm.io/en/latest/developing/auth/
# # and advanced details in the "BridgeConfig" section of
# # https://github.com/sandstorm-io/sandstorm/blob/master/src/sandstorm/package.capnp
# viewInfo = (
# # For details on the viewInfo field, consult "ViewInfo" in
# # https://github.com/sandstorm-io/sandstorm/blob/master/src/sandstorm/grain.capnp
#
# permissions = [
# # Permissions which a user may or may not possess. A user's current
# # permissions are passed to the app as a comma-separated list of `name`
# # fields in the X-Sandstorm-Permissions header with each request.
# #
# # IMPORTANT: only ever append to this list! Reordering or removing fields
# # will change behavior and permissions for existing grains! To deprecate a
# # permission, or for more information, see "PermissionDef" in
# # https://github.com/sandstorm-io/sandstorm/blob/master/src/sandstorm/grain.capnp
# (
# name = "editor",
# # Name of the permission, used as an identifier for the permission in cases where string
# # names are preferred. Used in sandstorm-http-bridge's X-Sandstorm-Permissions HTTP header.
#
# title = (defaultText = "editor"),
# # Display name of the permission, e.g. to display in a checklist of permissions
# # that may be assigned when sharing.
#
# description = (defaultText = "grants ability to modify data"),
# # Prose describing what this role means, suitable for a tool tip or similar help text.
# ),
# ],
# roles = [
# # Roles are logical collections of permissions. For instance, your app may have
# # a "viewer" role and an "editor" role
# (
# title = (defaultText = "editor"),
# # Name of the role. Shown in the Sandstorm UI to indicate which users have which roles.
#
# permissions = [true],
# # An array indicating which permissions this role carries.
# # It should be the same length as the permissions array in
# # viewInfo, and the order of the lists must match.
#
# verbPhrase = (defaultText = "can make changes to the document"),
# # Brief explanatory text to show in the sharing UI indicating
# # what a user assigned this role will be able to do with the grain.
#
# description = (defaultText = "editors may view all site data and change settings."),
# # Prose describing what this role means, suitable for a tool tip or similar help text.
# ),
# (
# title = (defaultText = "viewer"),
# permissions = [false],
# verbPhrase = (defaultText = "can view the document"),
# description = (defaultText = "viewers may view what other users have written."),
# ),
# ],
# ),
# #apiPath = "/api",
# # Apps can export an API to the world. The API is to be used primarily by Javascript
# # code and native apps, so it can't serve out regular HTML to browsers. If a request
# # comes in to your app's API, sandstorm-http-bridge will prefix the request's path with
# # this string, if specified.
#),
);
const myCommand :Spk.Manifest.Command = (
# Here we define the command used to start up your server.
argv = ["/sandstorm-http-bridge", "8000", "--", "/bin/bash", "/opt/app/.sandstorm/launcher.sh"],
environ = [
# Note that this defines the *entire* environment seen by your app.
(key = "PATH", value = "/usr/local/bin:/usr/bin:/bin"),
(key = "SANDSTORM", value = "1"),
# Export SANDSTORM=1 into the environment, so that apps running within Sandstorm
# can detect if $SANDSTORM="1" at runtime, switching UI and/or backend to use
# the app's Sandstorm-specific integration code.
]
);

Binary file not shown.

After

Width:  |  Height:  |  Size: 173 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 171 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 163 KiB

View File

@@ -0,0 +1,89 @@
types {
text/html html htm shtml;
text/css css;
text/xml xml;
image/gif gif;
image/jpeg jpeg jpg;
application/javascript js;
application/atom+xml atom;
application/rss+xml rss;
text/mathml mml;
text/plain txt;
text/vnd.sun.j2me.app-descriptor jad;
text/vnd.wap.wml wml;
text/x-component htc;
image/png png;
image/tiff tif tiff;
image/vnd.wap.wbmp wbmp;
image/x-icon ico;
image/x-jng jng;
image/x-ms-bmp bmp;
image/svg+xml svg svgz;
image/webp webp;
application/font-woff woff;
application/java-archive jar war ear;
application/json json;
application/mac-binhex40 hqx;
application/msword doc;
application/pdf pdf;
application/postscript ps eps ai;
application/rtf rtf;
application/vnd.apple.mpegurl m3u8;
application/vnd.ms-excel xls;
application/vnd.ms-fontobject eot;
application/vnd.ms-powerpoint ppt;
application/vnd.wap.wmlc wmlc;
application/vnd.google-earth.kml+xml kml;
application/vnd.google-earth.kmz kmz;
application/x-7z-compressed 7z;
application/x-cocoa cco;
application/x-java-archive-diff jardiff;
application/x-java-jnlp-file jnlp;
application/x-makeself run;
application/x-perl pl pm;
application/x-pilot prc pdb;
application/x-rar-compressed rar;
application/x-redhat-package-manager rpm;
application/x-sea sea;
application/x-shockwave-flash swf;
application/x-stuffit sit;
application/x-tcl tcl tk;
application/x-x509-ca-cert der pem crt;
application/x-xpinstall xpi;
application/xhtml+xml xhtml;
application/xspf+xml xspf;
application/zip zip;
application/octet-stream bin exe dll;
application/octet-stream deb;
application/octet-stream dmg;
application/octet-stream iso img;
application/octet-stream msi msp msm;
application/vnd.openxmlformats-officedocument.wordprocessingml.document docx;
application/vnd.openxmlformats-officedocument.spreadsheetml.sheet xlsx;
application/vnd.openxmlformats-officedocument.presentationml.presentation pptx;
audio/midi mid midi kar;
audio/mpeg mp3;
audio/ogg ogg;
audio/x-m4a m4a;
audio/x-realaudio ra;
video/3gpp 3gpp 3gp;
video/mp2t ts;
video/mp4 mp4;
video/mpeg mpeg mpg;
video/quicktime mov;
video/webm webm;
video/x-flv flv;
video/x-m4v m4v;
video/x-mng mng;
video/x-ms-asf asx asf;
video/x-ms-wmv wmv;
video/x-msvideo avi;
}

View File

@@ -0,0 +1,88 @@
worker_processes 4;
pid /var/run/nginx.pid;
events {
worker_connections 768;
# multi_accept on;
}
http {
# Basic Settings
sendfile on;
tcp_nopush on;
tcp_nodelay on;
keepalive_timeout 65;
types_hash_max_size 2048;
# server_names_hash_bucket_size 64;
server_tokens off;
server_name_in_redirect off;
include mime.types;
default_type application/octet-stream;
# Logging
access_log off;
error_log stderr;
# Prevent nginx from adding compression; this interacts badly with Sandstorm
# WebSession due to https://github.com/sandstorm-io/sandstorm/issues/289
gzip off;
# Trust the sandstorm-http-bridge's X-Forwarded-Proto.
map $http_x_forwarded_proto $fe_https {
default "";
https on;
}
server {
listen 8000 default_server;
listen [::]:8000 default_server ipv6only=on;
# Allow arbitrarily large bodies - Sandstorm can handle them, and requests
# are authenticated already, so there's no reason for apps to add additional
# limits by default.
client_max_body_size 0;
server_name localhost;
root /opt/app/public;
location / {
index index.php;
try_files $uri $uri/ /index.php?$query_string;
autoindex on;
sendfile off;
}
location ~ \.php$ {
try_files $uri =404;
fastcgi_pass unix:/var/run/php7.1-fpm.sock;
fastcgi_index index.php;
fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_read_timeout 900;
fastcgi_param QUERY_STRING $query_string;
fastcgi_param REQUEST_METHOD $request_method;
fastcgi_param CONTENT_TYPE $content_type;
fastcgi_param CONTENT_LENGTH $content_length;
fastcgi_param SCRIPT_NAME $fastcgi_script_name;
fastcgi_param REQUEST_URI $request_uri;
fastcgi_param DOCUMENT_URI $document_uri;
fastcgi_param DOCUMENT_ROOT $document_root;
fastcgi_param SERVER_PROTOCOL $server_protocol;
fastcgi_param HTTPS $fe_https if_not_empty;
fastcgi_param GATEWAY_INTERFACE CGI/1.1;
fastcgi_param SERVER_SOFTWARE nginx/$nginx_version;
fastcgi_param REMOTE_ADDR $remote_addr;
fastcgi_param REMOTE_PORT $remote_port;
fastcgi_param SERVER_ADDR $server_addr;
fastcgi_param SERVER_PORT $server_port;
fastcgi_param SERVER_NAME $server_name;
# PHP only, required if PHP was built with --enable-force-cgi-redirect
#fastcgi_param REDIRECT_STATUS 200;
}
}
}

91
.sandstorm/setup.sh Executable file
View File

@@ -0,0 +1,91 @@
#!/bin/bash
# When you change this file, you must take manual action. Read this doc:
# - https://docs.sandstorm.io/en/latest/vagrant-spk/customizing/#setupsh
echo "Now in setup.sh"
set -euo pipefail
export DEBIAN_FRONTEND=noninteractive
# install packages so we can install apt-add-repository.
apt-get update
apt-get install -y python-software-properties software-properties-common
# install all languages
sed -i 's/# de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/g' /etc/locale.gen
sed -i 's/# es_ES.UTF-8 UTF-8/es_ES.UTF-8 UTF-8/g' /etc/locale.gen
sed -i 's/# fr_FR.UTF-8 UTF-8/fr_FR.UTF-8 UTF-8/g' /etc/locale.gen
sed -i 's/# id_ID.UTF-8 UTF-8/id_ID.UTF-8 UTF-8/g' /etc/locale.gen
sed -i 's/# it_IT.UTF-8 UTF-8/it_IT.UTF-8 UTF-8/g' /etc/locale.gen
sed -i 's/# nl_NL.UTF-8 UTF-8/nl_NL.UTF-8 UTF-8/g' /etc/locale.gen
sed -i 's/# pl_PL.UTF-8 UTF-8/pl_PL.UTF-8 UTF-8/g' /etc/locale.gen
sed -i 's/# pt_BR.UTF-8 UTF-8/pt_BR.UTF-8 UTF-8/g' /etc/locale.gen
sed -i 's/# ru_RU.UTF-8 UTF-8/ru_RU.UTF-8 UTF-8/g' /etc/locale.gen
sed -i 's/# tr_TR.UTF-8 UTF-8/tr_TR.UTF-8 UTF-8/g' /etc/locale.gen
dpkg-reconfigure --frontend=noninteractive locales
# actually add repository
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E9C74FEEA2098A6E
add-apt-repository "deb http://packages.dotdeb.org jessie all"
# add another repos
apt-get install apt-transport-https lsb-release ca-certificates
wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list
# install packages.
apt-get update
apt-get install -y nginx php7.1-fpm php7.1-mysql php7.1-gd php7.1-cli php7.1-curl git php7.1-dev php7.1-zip php7.1-intl php7.1-dom php7.1-mbstring php7.1-bcmath mysql-server
service nginx stop
service php7.1-fpm stop
service mysql stop
systemctl disable nginx
systemctl disable php7.1-fpm
systemctl disable mysql
# make php.ini display errors:
sed -i 's/display_errors = Off/display_errors = On/g' /etc/php/7.1/fpm/php.ini
# patch /etc/php/7.1/fpm/pool.d/www.conf to not change uid/gid to www-data
sed --in-place='' \
--expression='s/^listen.owner = www-data/;listen.owner = www-data/' \
--expression='s/^listen.group = www-data/;listen.group = www-data/' \
/etc/php/7.1/fpm/pool.d/www.conf
# patch /etc/php/7.1/fpm/php-fpm.conf to not have a pidfile
sed --in-place='' \
--expression='s/^pid =/;pid =/' \
/etc/php/7.1/fpm/php-fpm.conf
# move sock file to better dir:
sed --in-place='' \
--expression='s/^listen = \/run\/php\/php7.1-fpm.sock/listen = \/var\/run\/php7.1-fpm.sock/' \
/etc/php/7.1/fpm/pool.d/www.conf
# patch /etc/php/7.1/fpm/pool.d/www.conf to no clear environment variables
# so we can pass in SANDSTORM=1 to apps
sed --in-place='' \
--expression='s/^;clear_env = no/clear_env=no/' \
/etc/php/7.1/fpm/pool.d/www.conf
# patch mysql conf to not change uid, and to use /var/tmp over /tmp
# for secure-file-priv see https://github.com/sandstorm-io/vagrant-spk/issues/195
sed --in-place='' \
--expression='s/^user\t\t= mysql/#user\t\t= mysql/' \
--expression='s,^tmpdir\t\t= /tmp,tmpdir\t\t= /var/tmp,' \
--expression='/\[mysqld]/ a\ secure-file-priv = ""\' \
/etc/mysql/my.cnf
# patch mysql conf to use smaller transaction logs to save disk space
cat <<EOF > /etc/mysql/conf.d/sandstorm.cnf
[mysqld]
# Set the transaction log file to the minimum allowed size to save disk space.
# innodb_log_file_size = 1048576
# Set the main data file to grow by 1MB at a time, rather than 8MB at a time.
innodb_autoextend_increment = 1
EOF

1
.sandstorm/stack Normal file
View File

@@ -0,0 +1 @@
lemp

58
.scrutinizer.yml Normal file
View File

@@ -0,0 +1,58 @@
---
build:
nodes:
analysis:
project_setup:
override: true
tests:
override:
- php-scrutinizer-run
checks:
javascript: true
php:
align_assignments: true
avoid_fixme_comments: true
avoid_multiple_statements_on_same_line: true
avoid_perl_style_comments: true
avoid_todo_comments: true
duplication: false
encourage_single_quotes: true
newline_at_end_of_file: true
no_goto: true
no_long_variable_names:
maximum: "20"
no_short_method_names:
minimum: "3"
no_short_variable_names:
minimum: "3"
optional_parameters_at_the_end: true
parameter_doc_comments: true
remove_extra_empty_lines: true
return_doc_comment_if_not_inferrable: true
return_doc_comments: true
uppercase_constants: true
use_self_instead_of_fqcn: true
coding_style:
php:
spaces:
around_operators:
concatenation: true
other:
after_type_cast: false
filter:
excluded_paths:
- database/migrations/*
- bootstrap/*
- config/*
- docker/*
- public/js/lib/*
- public/lib/adminlte/js/*
- public/lib/bootstrap/js/*
- resources/*
- routes/*
- storage/*
paths:
- app/*
- public/js/ff/*
tools:
external_code_coverage: false

View File

@@ -1,16 +1,29 @@
language: php
php:
- 5.5
- 5.6
- 7.1.18
cache:
directories:
- vendor
- $HOME/.composer/cache
install:
- composer install
- rm composer.lock
- composer update --no-scripts
- cp .env.testing .env
- php artisan clear-compiled
- php artisan env
- wget -q https://github.com/firefly-iii/test-data/raw/master/storage/database.sqlite -O storage/database/database.sqlite
- mkdir -p build/logs
script:
- ./tests/_data/db.sh
- php vendor/bin/codecept build
- php vendor/bin/codecept run --coverage --coverage-xml
- ./vendor/bin/phpunit -c phpunit.coverage.xml
after_script:
- php vendor/bin/coveralls
after_success:
- travis_retry php vendor/bin/php-coveralls -x storage/build/clover-all.xml
# safelist
branches:
only:
- develop
- master

93
Dockerfile Normal file
View File

@@ -0,0 +1,93 @@
# use PHP 7.1 and Apache as a base.
FROM php:7.1-apache
# set working dir
ENV FIREFLY_PATH /var/www/firefly-iii
ENV CURL_VERSION 7.60.0
ENV OPENSSL_VERSION 1.1.1-pre6
WORKDIR $FIREFLY_PATH
ADD . $FIREFLY_PATH
# install packages
RUN apt-get update -y && \
apt-get install -y --no-install-recommends libcurl4-openssl-dev \
zlib1g-dev \
libjpeg62-turbo-dev \
wget \
libpng-dev \
libicu-dev \
libedit-dev \
libtidy-dev \
libxml2-dev \
libsqlite3-dev \
libpq-dev \
libbz2-dev \
gettext-base \
cron \
locales && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*
# Setup the Composer installer
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
# Install latest curl
RUN cd /tmp && \
wget https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz && \
tar -xvf openssl-${OPENSSL_VERSION}.tar.gz && \
cd openssl-${OPENSSL_VERSION} && \
./config && \
make && \
make install
RUN cd /tmp && \
wget https://curl.haxx.se/download/curl-${CURL_VERSION}.tar.gz && \
tar -xvf curl-${CURL_VERSION}.tar.gz && \
cd curl-${CURL_VERSION} && \
./configure --with-ssl && \
make && \
make install
# Create the log file to be able to run tail
RUN touch /var/log/cron.log
# Setup cron job
RUN (crontab -l ; echo "* * * * * root $FIREFLY_PATH/artisan schedule:run >> /var/log/cron.log") | crontab
# Install PHP exentions.
RUN docker-php-ext-install -j$(nproc) curl gd intl json readline tidy zip bcmath xml mbstring pdo_sqlite pdo_mysql bz2 pdo_pgsql
# Generate locales supported by Firefly III
RUN echo "de_DE.UTF-8 UTF-8\nen_US.UTF-8 UTF-8\nes_ES.UTF-8 UTF-8\nfr_FR.UTF-8 UTF-8\nid_ID.UTF-8 UTF-8\nit_IT.UTF-8 UTF-8\nnl_NL.UTF-8 UTF-8\npl_PL.UTF-8 UTF-8pt_BR.UTF-8 UTF-8ru_RU.UTF-8 UTF-8\ntr_TR.UTF-8 UTF-8\n\n" > /etc/locale.gen && locale-gen
# copy Apache config to correct spot.
COPY ./.deploy/docker/apache2.conf /etc/apache2/apache2.conf
# Enable apache mod rewrite..
RUN a2enmod rewrite
# Enable apache mod ssl..
RUN a2enmod ssl
# Create volumes for several directories:
VOLUME $FIREFLY_PATH/storage/export $FIREFLY_PATH/storage/upload
# Enable default site (Firefly III)
COPY ./.deploy/docker/apache-firefly.conf /etc/apache2/sites-available/000-default.conf
# Make sure we own Firefly III directory
RUN chown -R www-data:www-data /var/www && chmod -R 775 $FIREFLY_PATH/storage
# Run composer
RUN composer install --prefer-dist --no-dev --no-scripts --no-suggest
# Expose port 80
EXPOSE 80
# Run the command on container startup
CMD cron
# Run entrypoint thing
ENTRYPOINT [".deploy/docker/entrypoint.sh"]

674
LICENSE Normal file
View File

@@ -0,0 +1,674 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The GNU General Public License is a free, copyleft license for
software and other kinds of works.
The licenses for most software and other practical works are designed
to take away your freedom to share and change the works. By contrast,
the GNU General Public License is intended to guarantee your freedom to
share and change all versions of a program--to make sure it remains free
software for all its users. We, the Free Software Foundation, use the
GNU General Public License for most of our software; it applies also to
any other work released this way by its authors. You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
them if you wish), that you receive source code or can get it if you
want it, that you can change the software or use pieces of it in new
free programs, and that you know you can do these things.
To protect your rights, we need to prevent others from denying you
these rights or asking you to surrender the rights. Therefore, you have
certain responsibilities if you distribute copies of the software, or if
you modify it: responsibilities to respect the freedom of others.
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must pass on to the recipients the same
freedoms that you received. You must make sure that they, too, receive
or can get the source code. And you must show them these terms so they
know their rights.
Developers that use the GNU GPL protect your rights with two steps:
(1) assert copyright on the software, and (2) offer you this License
giving you legal permission to copy, distribute and/or modify it.
For the developers' and authors' protection, the GPL clearly explains
that there is no warranty for this free software. For both users' and
authors' sake, the GPL requires that modified versions be marked as
changed, so that their problems will not be attributed erroneously to
authors of previous versions.
Some devices are designed to deny users access to install or run
modified versions of the software inside them, although the manufacturer
can do so. This is fundamentally incompatible with the aim of
protecting users' freedom to change the software. The systematic
pattern of such abuse occurs in the area of products for individuals to
use, which is precisely where it is most unacceptable. Therefore, we
have designed this version of the GPL to prohibit the practice for those
products. If such problems arise substantially in other domains, we
stand ready to extend this provision to those domains in future versions
of the GPL, as needed to protect the freedom of users.
Finally, every program is threatened constantly by software patents.
States should not allow patents to restrict development and use of
software on general-purpose computers, but in those that do, we wish to
avoid the special danger that patents applied to a free program could
make it effectively proprietary. To prevent this, the GPL assures that
patents cannot be used to render the program non-free.
The precise terms and conditions for copying, distribution and
modification follow.
TERMS AND CONDITIONS
0. Definitions.
"This License" refers to version 3 of the GNU General Public License.
"Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.
"The Program" refers to any copyrightable work licensed under this
License. Each licensee is addressed as "you". "Licensees" and
"recipients" may be individuals or organizations.
To "modify" a work means to copy from or adapt all or part of the work
in a fashion requiring copyright permission, other than the making of an
exact copy. The resulting work is called a "modified version" of the
earlier work or a work "based on" the earlier work.
A "covered work" means either the unmodified Program or a work based
on the Program.
To "propagate" a work means to do anything with it that, without
permission, would make you directly or secondarily liable for
infringement under applicable copyright law, except executing it on a
computer or modifying a private copy. Propagation includes copying,
distribution (with or without modification), making available to the
public, and in some countries other activities as well.
To "convey" a work means any kind of propagation that enables other
parties to make or receive copies. Mere interaction with a user through
a computer network, with no transfer of a copy, is not conveying.
An interactive user interface displays "Appropriate Legal Notices"
to the extent that it includes a convenient and prominently visible
feature that (1) displays an appropriate copyright notice, and (2)
tells the user that there is no warranty for the work (except to the
extent that warranties are provided), that licensees may convey the
work under this License, and how to view a copy of this License. If
the interface presents a list of user commands or options, such as a
menu, a prominent item in the list meets this criterion.
1. Source Code.
The "source code" for a work means the preferred form of the work
for making modifications to it. "Object code" means any non-source
form of a work.
A "Standard Interface" means an interface that either is an official
standard defined by a recognized standards body, or, in the case of
interfaces specified for a particular programming language, one that
is widely used among developers working in that language.
The "System Libraries" of an executable work include anything, other
than the work as a whole, that (a) is included in the normal form of
packaging a Major Component, but which is not part of that Major
Component, and (b) serves only to enable use of the work with that
Major Component, or to implement a Standard Interface for which an
implementation is available to the public in source code form. A
"Major Component", in this context, means a major essential component
(kernel, window system, and so on) of the specific operating system
(if any) on which the executable work runs, or a compiler used to
produce the work, or an object code interpreter used to run it.
The "Corresponding Source" for a work in object code form means all
the source code needed to generate, install, and (for an executable
work) run the object code and to modify the work, including scripts to
control those activities. However, it does not include the work's
System Libraries, or general-purpose tools or generally available free
programs which are used unmodified in performing those activities but
which are not part of the work. For example, Corresponding Source
includes interface definition files associated with source files for
the work, and the source code for shared libraries and dynamically
linked subprograms that the work is specifically designed to require,
such as by intimate data communication or control flow between those
subprograms and other parts of the work.
The Corresponding Source need not include anything that users
can regenerate automatically from other parts of the Corresponding
Source.
The Corresponding Source for a work in source code form is that
same work.
2. Basic Permissions.
All rights granted under this License are granted for the term of
copyright on the Program, and are irrevocable provided the stated
conditions are met. This License explicitly affirms your unlimited
permission to run the unmodified Program. The output from running a
covered work is covered by this License only if the output, given its
content, constitutes a covered work. This License acknowledges your
rights of fair use or other equivalent, as provided by copyright law.
You may make, run and propagate covered works that you do not
convey, without conditions so long as your license otherwise remains
in force. You may convey covered works to others for the sole purpose
of having them make modifications exclusively for you, or provide you
with facilities for running those works, provided that you comply with
the terms of this License in conveying all material for which you do
not control copyright. Those thus making or running the covered works
for you must do so exclusively on your behalf, under your direction
and control, on terms that prohibit them from making any copies of
your copyrighted material outside their relationship with you.
Conveying under any other circumstances is permitted solely under
the conditions stated below. Sublicensing is not allowed; section 10
makes it unnecessary.
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
No covered work shall be deemed part of an effective technological
measure under any applicable law fulfilling obligations under article
11 of the WIPO copyright treaty adopted on 20 December 1996, or
similar laws prohibiting or restricting circumvention of such
measures.
When you convey a covered work, you waive any legal power to forbid
circumvention of technological measures to the extent such circumvention
is effected by exercising rights under this License with respect to
the covered work, and you disclaim any intention to limit operation or
modification of the work as a means of enforcing, against the work's
users, your or third parties' legal rights to forbid circumvention of
technological measures.
4. Conveying Verbatim Copies.
You may convey verbatim copies of the Program's source code as you
receive it, in any medium, provided that you conspicuously and
appropriately publish on each copy an appropriate copyright notice;
keep intact all notices stating that this License and any
non-permissive terms added in accord with section 7 apply to the code;
keep intact all notices of the absence of any warranty; and give all
recipients a copy of this License along with the Program.
You may charge any price or no price for each copy that you convey,
and you may offer support or warranty protection for a fee.
5. Conveying Modified Source Versions.
You may convey a work based on the Program, or the modifications to
produce it from the Program, in the form of source code under the
terms of section 4, provided that you also meet all of these conditions:
a) The work must carry prominent notices stating that you modified
it, and giving a relevant date.
b) The work must carry prominent notices stating that it is
released under this License and any conditions added under section
7. This requirement modifies the requirement in section 4 to
"keep intact all notices".
c) You must license the entire work, as a whole, under this
License to anyone who comes into possession of a copy. This
License will therefore apply, along with any applicable section 7
additional terms, to the whole of the work, and all its parts,
regardless of how they are packaged. This License gives no
permission to license the work in any other way, but it does not
invalidate such permission if you have separately received it.
d) If the work has interactive user interfaces, each must display
Appropriate Legal Notices; however, if the Program has interactive
interfaces that do not display Appropriate Legal Notices, your
work need not make them do so.
A compilation of a covered work with other separate and independent
works, which are not by their nature extensions of the covered work,
and which are not combined with it such as to form a larger program,
in or on a volume of a storage or distribution medium, is called an
"aggregate" if the compilation and its resulting copyright are not
used to limit the access or legal rights of the compilation's users
beyond what the individual works permit. Inclusion of a covered work
in an aggregate does not cause this License to apply to the other
parts of the aggregate.
6. Conveying Non-Source Forms.
You may convey a covered work in object code form under the terms
of sections 4 and 5, provided that you also convey the
machine-readable Corresponding Source under the terms of this License,
in one of these ways:
a) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by the
Corresponding Source fixed on a durable physical medium
customarily used for software interchange.
b) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by a
written offer, valid for at least three years and valid for as
long as you offer spare parts or customer support for that product
model, to give anyone who possesses the object code either (1) a
copy of the Corresponding Source for all the software in the
product that is covered by this License, on a durable physical
medium customarily used for software interchange, for a price no
more than your reasonable cost of physically performing this
conveying of source, or (2) access to copy the
Corresponding Source from a network server at no charge.
c) Convey individual copies of the object code with a copy of the
written offer to provide the Corresponding Source. This
alternative is allowed only occasionally and noncommercially, and
only if you received the object code with such an offer, in accord
with subsection 6b.
d) Convey the object code by offering access from a designated
place (gratis or for a charge), and offer equivalent access to the
Corresponding Source in the same way through the same place at no
further charge. You need not require recipients to copy the
Corresponding Source along with the object code. If the place to
copy the object code is a network server, the Corresponding Source
may be on a different server (operated by you or a third party)
that supports equivalent copying facilities, provided you maintain
clear directions next to the object code saying where to find the
Corresponding Source. Regardless of what server hosts the
Corresponding Source, you remain obligated to ensure that it is
available for as long as needed to satisfy these requirements.
e) Convey the object code using peer-to-peer transmission, provided
you inform other peers where the object code and Corresponding
Source of the work are being offered to the general public at no
charge under subsection 6d.
A separable portion of the object code, whose source code is excluded
from the Corresponding Source as a System Library, need not be
included in conveying the object code work.
A "User Product" is either (1) a "consumer product", which means any
tangible personal property which is normally used for personal, family,
or household purposes, or (2) anything designed or sold for incorporation
into a dwelling. In determining whether a product is a consumer product,
doubtful cases shall be resolved in favor of coverage. For a particular
product received by a particular user, "normally used" refers to a
typical or common use of that class of product, regardless of the status
of the particular user or of the way in which the particular user
actually uses, or expects or is expected to use, the product. A product
is a consumer product regardless of whether the product has substantial
commercial, industrial or non-consumer uses, unless such uses represent
the only significant mode of use of the product.
"Installation Information" for a User Product means any methods,
procedures, authorization keys, or other information required to install
and execute modified versions of a covered work in that User Product from
a modified version of its Corresponding Source. The information must
suffice to ensure that the continued functioning of the modified object
code is in no case prevented or interfered with solely because
modification has been made.
If you convey an object code work under this section in, or with, or
specifically for use in, a User Product, and the conveying occurs as
part of a transaction in which the right of possession and use of the
User Product is transferred to the recipient in perpetuity or for a
fixed term (regardless of how the transaction is characterized), the
Corresponding Source conveyed under this section must be accompanied
by the Installation Information. But this requirement does not apply
if neither you nor any third party retains the ability to install
modified object code on the User Product (for example, the work has
been installed in ROM).
The requirement to provide Installation Information does not include a
requirement to continue to provide support service, warranty, or updates
for a work that has been modified or installed by the recipient, or for
the User Product in which it has been modified or installed. Access to a
network may be denied when the modification itself materially and
adversely affects the operation of the network or violates the rules and
protocols for communication across the network.
Corresponding Source conveyed, and Installation Information provided,
in accord with this section must be in a format that is publicly
documented (and with an implementation available to the public in
source code form), and must require no special password or key for
unpacking, reading or copying.
7. Additional Terms.
"Additional permissions" are terms that supplement the terms of this
License by making exceptions from one or more of its conditions.
Additional permissions that are applicable to the entire Program shall
be treated as though they were included in this License, to the extent
that they are valid under applicable law. If additional permissions
apply only to part of the Program, that part may be used separately
under those permissions, but the entire Program remains governed by
this License without regard to the additional permissions.
When you convey a copy of a covered work, you may at your option
remove any additional permissions from that copy, or from any part of
it. (Additional permissions may be written to require their own
removal in certain cases when you modify the work.) You may place
additional permissions on material, added by you to a covered work,
for which you have or can give appropriate copyright permission.
Notwithstanding any other provision of this License, for material you
add to a covered work, you may (if authorized by the copyright holders of
that material) supplement the terms of this License with terms:
a) Disclaiming warranty or limiting liability differently from the
terms of sections 15 and 16 of this License; or
b) Requiring preservation of specified reasonable legal notices or
author attributions in that material or in the Appropriate Legal
Notices displayed by works containing it; or
c) Prohibiting misrepresentation of the origin of that material, or
requiring that modified versions of such material be marked in
reasonable ways as different from the original version; or
d) Limiting the use for publicity purposes of names of licensors or
authors of the material; or
e) Declining to grant rights under trademark law for use of some
trade names, trademarks, or service marks; or
f) Requiring indemnification of licensors and authors of that
material by anyone who conveys the material (or modified versions of
it) with contractual assumptions of liability to the recipient, for
any liability that these contractual assumptions directly impose on
those licensors and authors.
All other non-permissive additional terms are considered "further
restrictions" within the meaning of section 10. If the Program as you
received it, or any part of it, contains a notice stating that it is
governed by this License along with a term that is a further
restriction, you may remove that term. If a license document contains
a further restriction but permits relicensing or conveying under this
License, you may add to a covered work material governed by the terms
of that license document, provided that the further restriction does
not survive such relicensing or conveying.
If you add terms to a covered work in accord with this section, you
must place, in the relevant source files, a statement of the
additional terms that apply to those files, or a notice indicating
where to find the applicable terms.
Additional terms, permissive or non-permissive, may be stated in the
form of a separately written license, or stated as exceptions;
the above requirements apply either way.
8. Termination.
You may not propagate or modify a covered work except as expressly
provided under this License. Any attempt otherwise to propagate or
modify it is void, and will automatically terminate your rights under
this License (including any patent licenses granted under the third
paragraph of section 11).
However, if you cease all violation of this License, then your
license from a particular copyright holder is reinstated (a)
provisionally, unless and until the copyright holder explicitly and
finally terminates your license, and (b) permanently, if the copyright
holder fails to notify you of the violation by some reasonable means
prior to 60 days after the cessation.
Moreover, your license from a particular copyright holder is
reinstated permanently if the copyright holder notifies you of the
violation by some reasonable means, this is the first time you have
received notice of violation of this License (for any work) from that
copyright holder, and you cure the violation prior to 30 days after
your receipt of the notice.
Termination of your rights under this section does not terminate the
licenses of parties who have received copies or rights from you under
this License. If your rights have been terminated and not permanently
reinstated, you do not qualify to receive new licenses for the same
material under section 10.
9. Acceptance Not Required for Having Copies.
You are not required to accept this License in order to receive or
run a copy of the Program. Ancillary propagation of a covered work
occurring solely as a consequence of using peer-to-peer transmission
to receive a copy likewise does not require acceptance. However,
nothing other than this License grants you permission to propagate or
modify any covered work. These actions infringe copyright if you do
not accept this License. Therefore, by modifying or propagating a
covered work, you indicate your acceptance of this License to do so.
10. Automatic Licensing of Downstream Recipients.
Each time you convey a covered work, the recipient automatically
receives a license from the original licensors, to run, modify and
propagate that work, subject to this License. You are not responsible
for enforcing compliance by third parties with this License.
An "entity transaction" is a transaction transferring control of an
organization, or substantially all assets of one, or subdividing an
organization, or merging organizations. If propagation of a covered
work results from an entity transaction, each party to that
transaction who receives a copy of the work also receives whatever
licenses to the work the party's predecessor in interest had or could
give under the previous paragraph, plus a right to possession of the
Corresponding Source of the work from the predecessor in interest, if
the predecessor has it or can get it with reasonable efforts.
You may not impose any further restrictions on the exercise of the
rights granted or affirmed under this License. For example, you may
not impose a license fee, royalty, or other charge for exercise of
rights granted under this License, and you may not initiate litigation
(including a cross-claim or counterclaim in a lawsuit) alleging that
any patent claim is infringed by making, using, selling, offering for
sale, or importing the Program or any portion of it.
11. Patents.
A "contributor" is a copyright holder who authorizes use under this
License of the Program or a work on which the Program is based. The
work thus licensed is called the contributor's "contributor version".
A contributor's "essential patent claims" are all patent claims
owned or controlled by the contributor, whether already acquired or
hereafter acquired, that would be infringed by some manner, permitted
by this License, of making, using, or selling its contributor version,
but do not include claims that would be infringed only as a
consequence of further modification of the contributor version. For
purposes of this definition, "control" includes the right to grant
patent sublicenses in a manner consistent with the requirements of
this License.
Each contributor grants you a non-exclusive, worldwide, royalty-free
patent license under the contributor's essential patent claims, to
make, use, sell, offer for sale, import and otherwise run, modify and
propagate the contents of its contributor version.
In the following three paragraphs, a "patent license" is any express
agreement or commitment, however denominated, not to enforce a patent
(such as an express permission to practice a patent or covenant not to
sue for patent infringement). To "grant" such a patent license to a
party means to make such an agreement or commitment not to enforce a
patent against the party.
If you convey a covered work, knowingly relying on a patent license,
and the Corresponding Source of the work is not available for anyone
to copy, free of charge and under the terms of this License, through a
publicly available network server or other readily accessible means,
then you must either (1) cause the Corresponding Source to be so
available, or (2) arrange to deprive yourself of the benefit of the
patent license for this particular work, or (3) arrange, in a manner
consistent with the requirements of this License, to extend the patent
license to downstream recipients. "Knowingly relying" means you have
actual knowledge that, but for the patent license, your conveying the
covered work in a country, or your recipient's use of the covered work
in a country, would infringe one or more identifiable patents in that
country that you have reason to believe are valid.
If, pursuant to or in connection with a single transaction or
arrangement, you convey, or propagate by procuring conveyance of, a
covered work, and grant a patent license to some of the parties
receiving the covered work authorizing them to use, propagate, modify
or convey a specific copy of the covered work, then the patent license
you grant is automatically extended to all recipients of the covered
work and works based on it.
A patent license is "discriminatory" if it does not include within
the scope of its coverage, prohibits the exercise of, or is
conditioned on the non-exercise of one or more of the rights that are
specifically granted under this License. You may not convey a covered
work if you are a party to an arrangement with a third party that is
in the business of distributing software, under which you make payment
to the third party based on the extent of your activity of conveying
the work, and under which the third party grants, to any of the
parties who would receive the covered work from you, a discriminatory
patent license (a) in connection with copies of the covered work
conveyed by you (or copies made from those copies), or (b) primarily
for and in connection with specific products or compilations that
contain the covered work, unless you entered into that arrangement,
or that patent license was granted, prior to 28 March 2007.
Nothing in this License shall be construed as excluding or limiting
any implied license or other defenses to infringement that may
otherwise be available to you under applicable patent law.
12. No Surrender of Others' Freedom.
If conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot convey a
covered work so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you may
not convey it at all. For example, if you agree to terms that obligate you
to collect a royalty for further conveying from those to whom you convey
the Program, the only way you could satisfy both those terms and this
License would be to refrain entirely from conveying the Program.
13. Use with the GNU Affero General Public License.
Notwithstanding any other provision of this License, you have
permission to link or combine any covered work with a work licensed
under version 3 of the GNU Affero General Public License into a single
combined work, and to convey the resulting work. The terms of this
License will continue to apply to the part which is the covered work,
but the special requirements of the GNU Affero General Public License,
section 13, concerning interaction through a network will apply to the
combination as such.
14. Revised Versions of this License.
The Free Software Foundation may publish revised and/or new versions of
the GNU General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the
Program specifies that a certain numbered version of the GNU General
Public License "or any later version" applies to it, you have the
option of following the terms and conditions either of that numbered
version or of any later version published by the Free Software
Foundation. If the Program does not specify a version number of the
GNU General Public License, you may choose any version ever published
by the Free Software Foundation.
If the Program specifies that a proxy can decide which future
versions of the GNU General Public License can be used, that proxy's
public statement of acceptance of a version permanently authorizes you
to choose that version for the Program.
Later license versions may give you additional or different
permissions. However, no additional obligations are imposed on any
author or copyright holder as a result of your choosing to follow a
later version.
15. Disclaimer of Warranty.
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. Limitation of Liability.
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
SUCH DAMAGES.
17. Interpretation of Sections 15 and 16.
If the disclaimer of warranty and limitation of liability provided
above cannot be given local legal effect according to their terms,
reviewing courts shall apply local law that most closely approximates
an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
<program> Copyright (C) <year> <name of author>
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, your program's commands
might be different; for a GUI interface, you would use an "about box".
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
<https://www.gnu.org/licenses/>.
The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<https://www.gnu.org/licenses/why-not-lgpl.html>.

1
Procfile Normal file
View File

@@ -0,0 +1 @@
web: vendor/bin/heroku-php-nginx -C nginx_app.conf public/

View File

@@ -1,74 +0,0 @@
Firefly III
===========
[![Build Status](https://travis-ci.org/JC5/firefly-iii.svg?branch=develop)](https://travis-ci.org/JC5/firefly-iii)
[![Project Status](http://stillmaintained.com/JC5/firefly-iii.png?a=b)](http://stillmaintained.com/JC5/firefly-iii)
[![Coverage Status](https://coveralls.io/repos/JC5/firefly-iii/badge.png?branch=master)](https://coveralls.io/r/JC5/firefly-iii?branch=master)
[![SensioLabsInsight](https://insight.sensiolabs.com/projects/d44c7012-5f50-41ad-add8-8445330e4102/mini.png)](https://insight.sensiolabs.com/projects/d44c7012-5f50-41ad-add8-8445330e4102)
[![Latest Stable Version](https://poser.pugx.org/grumpydictator/firefly-iii/v/stable.svg)](https://packagist.org/packages/grumpydictator/firefly-iii)
[![Total Downloads](https://poser.pugx.org/grumpydictator/firefly-iii/downloads.svg)](https://packagist.org/packages/grumpydictator/firefly-iii)
[![Latest Unstable Version](https://poser.pugx.org/grumpydictator/firefly-iii/v/unstable.svg)](https://packagist.org/packages/grumpydictator/firefly-iii)
[![License](https://poser.pugx.org/grumpydictator/firefly-iii/license.svg)](https://packagist.org/packages/grumpydictator/firefly-iii)
Firefly II is a tool to help you manage your finances. Please read the full description [in the wiki](https://github.com/JC5/firefly-iii/wiki/full-description).
Firefly Mark III is a new version of Firefly built upon best practices and lessons learned
from building [Firefly](https://github.com/JC5/Firefly). It's Mark III since the original Firefly never made it outside of my
laptop and [Firefly II](https://github.com/JC5/Firefly) is live.
## Current features
- [A double-entry bookkeeping system](http://en.wikipedia.org/wiki/Double-entry_bookkeeping_system);
- You can store, edit and remove withdrawals, deposits and transfers. This allows you full financial management;
- It's possible to create, change and manage money using _budgets_;
- Organize transactions using categories;
- Save towards a goal using piggy banks;
- Predict and anticipate large expenses using "repeated expenses" (ie. yearly taxes);
- Predict and anticipate bills using "recurring transactions" (rent for example);
- View basic income / expense reports.
- Lots of help text in case you don't get it;
Everything is organised:
- Clear views that should show you how you're doing;
- Easy navigation through your records;
- Browse back and forth to see previous months or even years;
- Lots of charts because we all love them.
## Changes
Firefly III will feature, but does not feature yet:
- Financial reporting showing you how well you are doing;
- More control over other resources outside of personal finance
- Accounts shared with a partner (household accounts)
- Debts
- Credit cards
- More test-coverage;
- Firefly will be able to split transactions; a single purchase can be split in multiple entries, for more fine-grained control.
- Firefly will be able to join transactions.
- Any other features I might not have thought of.
Some stuff has been removed:
- The nesting of budgets, categories and beneficiaries is removed because it was pretty pointless.
- Firefly will not encrypt the content of the (MySQL) tables. Old versions of Firefly had this capability but it sucks when searching, sorting and organizing entries.
## Screenshots
![Index](http://i.imgur.com/TkZNIer.png)
![Accounts](http://i.imgur.com/YE8WavP.png)
![Budgets](http://i.imgur.com/Go0M6Nd.png)
![Reports](http://i.imgur.com/EnEIyQI.png)
## Current state
I have the basics up and running. Test coverage is currently coming, slowly.
Although I have not checked extensively, some forms and views have CSRF vulnerabilities. This is because not all
views escape all characters by default. Will be fixed.
Questions, ideas or other things to contribute? [Let me know](https://github.com/JC5/firefly-iii/issues/new)!

62
app.json Normal file
View File

@@ -0,0 +1,62 @@
{
"name": "Firefly III",
"description": "A free and open source personal finances manager",
"repository": "https://github.com/firefly-iii/firefly-iii",
"website": "https://firefly-iii.org/",
"logo": "https://raw.githubusercontent.com/firefly-iii/firefly-iii/master/public/mstile-150x150.png",
"keywords": [
"finance",
"finances",
"manager",
"management",
"euro",
"dollar",
"laravel",
"money",
"currency",
"financials",
"financial",
"budgets",
"administration",
"tool",
"tooling",
"help",
"helper",
"assistant",
"planning",
"organizing",
"bills",
"personal finance",
"budgets",
"budgeting",
"budgeting tool",
"budgeting application",
"transactions",
"self hosted",
"self-hosted",
"transfers",
"management"
],
"addons": [
{
"plan": "heroku-postgresql",
"options": {
"version": "9.5"
}
}
],
"scripts": {
"postdeploy": "php artisan migrate:refresh --seed;php artisan firefly:instructions install"
},
"buildpacks": [
{
"url": "heroku/php"
}
],
"env": {
"APP_KEY": {
"description": "This key is used to encrypt your data.",
"value": "base64:If1gJN4pyycXTq+WS5TjneDympKuu+8SKvTl6RZnhJg="
}
}
}

View File

@@ -0,0 +1,82 @@
<?php
/**
* AboutController.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers;
use DB;
use FireflyIII\Transformers\UserTransformer;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use League\Fractal\Manager;
use League\Fractal\Resource\Item;
use League\Fractal\Serializer\JsonApiSerializer;
/**
* Returns basic information about this installation.
*
* Class AboutController
*/
class AboutController extends Controller
{
/**
* Returns system information.
*
* @return JsonResponse
*/
public function about(): JsonResponse
{
$search = ['~', '#'];
$replace = ['\~', '# '];
$phpVersion = str_replace($search, $replace, PHP_VERSION);
$phpOs = str_replace($search, $replace, PHP_OS);
$currentDriver = DB::getDriverName();
$data
= [
'version' => config('firefly.version'),
'api_version' => config('firefly.api_version'),
'php_version' => $phpVersion,
'os' => $phpOs,
'driver' => $currentDriver,
];
return response()->json(['data' => $data], 200)->header('Content-Type', 'application/vnd.api+json');
}
/**
* Returns information about the user.
*
* @param Request $request
*
* @return JsonResponse
*/
public function user(Request $request): JsonResponse
{
$manager = new Manager();
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new Item(auth()->user(), new UserTransformer($this->parameters), 'users');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
}

View File

@@ -0,0 +1,263 @@
<?php
/**
* AccountController.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers;
use FireflyIII\Api\V1\Requests\AccountRequest;
use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Transformers\AccountTransformer;
use FireflyIII\User;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Pagination\LengthAwarePaginator;
use League\Fractal\Manager;
use League\Fractal\Pagination\IlluminatePaginatorAdapter;
use League\Fractal\Resource\Collection as FractalCollection;
use League\Fractal\Resource\Item;
use League\Fractal\Serializer\JsonApiSerializer;
/**
* Class AccountController
*/
class AccountController extends Controller
{
/** @var CurrencyRepositoryInterface */
private $currencyRepository;
/** @var AccountRepositoryInterface */
private $repository;
/**
* AccountController constructor.
*/
public function __construct()
{
parent::__construct();
$this->middleware(
function ($request, $next) {
/** @var User $user */
$user = auth()->user();
// @var AccountRepositoryInterface repository
$this->repository = app(AccountRepositoryInterface::class);
$this->repository->setUser($user);
$this->currencyRepository = app(CurrencyRepositoryInterface::class);
$this->currencyRepository->setUser($user);
return $next($request);
}
);
}
/**
* Remove the specified resource from storage.
*
* @param \FireflyIII\Models\Account $account
*
* @return JsonResponse
*/
public function delete(Account $account): JsonResponse
{
$this->repository->destroy($account, null);
return response()->json([], 204);
}
/**
* Display a listing of the resource.
*
* @param Request $request
*
* @return JsonResponse
*/
public function index(Request $request): JsonResponse
{
// create some objects:
$manager = new Manager;
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
// read type from URI
$type = $request->get('type') ?? 'all';
$this->parameters->set('type', $type);
// types to get, page size:
$types = $this->mapTypes($this->parameters->get('type'));
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// get list of accounts. Count it and split it.
$collection = $this->repository->getAccountsByType($types);
$count = $collection->count();
$accounts = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
// make paginator:
$paginator = new LengthAwarePaginator($accounts, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.accounts.index') . $this->buildParams());
// present to user.
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new FractalCollection($accounts, new AccountTransformer($this->parameters), 'accounts');
$resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* @param Request $request
* @param Account $account
*
* @return \Illuminate\Http\JsonResponse
*/
public function show(Request $request, Account $account): JsonResponse
{
$manager = new Manager;
// add include parameter:
$include = $request->get('include') ?? '';
$manager->parseIncludes($include);
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new Item($account, new AccountTransformer($this->parameters), 'accounts');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* @param AccountRequest $request
*
* @return \Illuminate\Http\JsonResponse
*/
public function store(AccountRequest $request): JsonResponse
{
$data = $request->getAll();
// if currency ID is 0, find the currency by the code:
if (0 === $data['currency_id']) {
$currency = $this->currencyRepository->findByCodeNull($data['currency_code']);
$data['currency_id'] = null === $currency ? 0 : $currency->id;
}
$account = $this->repository->store($data);
$manager = new Manager;
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new Item($account, new AccountTransformer($this->parameters), 'accounts');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* Update account.
*
* @param AccountRequest $request
* @param Account $account
*
* @return \Illuminate\Http\JsonResponse
*/
public function update(AccountRequest $request, Account $account): JsonResponse
{
$data = $request->getAll();
// if currency ID is 0, find the currency by the code:
if (0 === $data['currency_id']) {
$currency = $this->currencyRepository->findByCodeNull($data['currency_code']);
$data['currency_id'] = null === $currency ? 0 : $currency->id;
}
// set correct type:
$data['type'] = config('firefly.shortNamesByFullName.' . $account->accountType->type);
$this->repository->update($account, $data);
$manager = new Manager;
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new Item($account, new AccountTransformer($this->parameters), 'accounts');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* @param string $type
*
* @return array
*/
private function mapTypes(string $type): array
{
$types = [
'all' => [
AccountType::DEFAULT,
AccountType::CASH,
AccountType::ASSET,
AccountType::EXPENSE,
AccountType::REVENUE,
AccountType::INITIAL_BALANCE,
AccountType::BENEFICIARY,
AccountType::IMPORT,
AccountType::RECONCILIATION,
AccountType::LOAN,
],
'asset' => [
AccountType::DEFAULT,
AccountType::ASSET,
],
'cash' => [
AccountType::CASH,
],
'expense' => [
AccountType::EXPENSE,
AccountType::BENEFICIARY,
],
'revenue' => [
AccountType::REVENUE,
],
'special' => [
AccountType::CASH,
AccountType::INITIAL_BALANCE,
AccountType::IMPORT,
AccountType::RECONCILIATION,
AccountType::LOAN,
],
'hidden' => [
AccountType::INITIAL_BALANCE,
AccountType::IMPORT,
AccountType::RECONCILIATION,
AccountType::LOAN,
],
AccountType::DEFAULT => [AccountType::DEFAULT],
AccountType::CASH => [AccountType::CASH],
AccountType::ASSET => [AccountType::ASSET],
AccountType::EXPENSE => [AccountType::EXPENSE],
AccountType::REVENUE => [AccountType::REVENUE],
AccountType::INITIAL_BALANCE => [AccountType::INITIAL_BALANCE],
AccountType::BENEFICIARY => [AccountType::BENEFICIARY],
AccountType::IMPORT => [AccountType::IMPORT],
AccountType::RECONCILIATION => [AccountType::RECONCILIATION],
AccountType::LOAN => [AccountType::LOAN],
];
if (isset($types[$type])) {
return $types[$type];
}
return $types['all']; // @codeCoverageIgnore
}
}

View File

@@ -0,0 +1,229 @@
<?php
/**
* AttachmentController.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers;
use FireflyIII\Api\V1\Requests\AttachmentRequest;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
use FireflyIII\Models\Attachment;
use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
use FireflyIII\Transformers\AttachmentTransformer;
use FireflyIII\User;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Http\Response as LaravelResponse;
use Illuminate\Pagination\LengthAwarePaginator;
use League\Fractal\Manager;
use League\Fractal\Pagination\IlluminatePaginatorAdapter;
use League\Fractal\Resource\Collection as FractalCollection;
use League\Fractal\Resource\Item;
use League\Fractal\Serializer\JsonApiSerializer;
/**
* Class AttachmentController
*/
class AttachmentController extends Controller
{
/** @var AttachmentRepositoryInterface */
private $repository;
/**
* AccountController constructor.
*/
public function __construct()
{
parent::__construct();
$this->middleware(
function ($request, $next) {
/** @var User $user */
$user = auth()->user();
$this->repository = app(AttachmentRepositoryInterface::class);
$this->repository->setUser($user);
return $next($request);
}
);
}
/**
* Remove the specified resource from storage.
*
* @param Attachment $attachment
*
* @return JsonResponse
*/
public function delete(Attachment $attachment): JsonResponse
{
$this->repository->destroy($attachment);
return response()->json([], 204);
}
/**
* @param Attachment $attachment
*
* @return LaravelResponse
* @throws FireflyException
*/
public function download(Attachment $attachment): LaravelResponse
{
if ($attachment->uploaded === false) {
throw new FireflyException('No file has been uploaded for this attachment (yet).');
}
if ($this->repository->exists($attachment)) {
$content = $this->repository->getContent($attachment);
$quoted = sprintf('"%s"', addcslashes(basename($attachment->filename), '"\\'));
/** @var LaravelResponse $response */
$response = response($content, 200);
$response
->header('Content-Description', 'File Transfer')
->header('Content-Type', 'application/octet-stream')
->header('Content-Disposition', 'attachment; filename=' . $quoted)
->header('Content-Transfer-Encoding', 'binary')
->header('Connection', 'Keep-Alive')
->header('Expires', '0')
->header('Cache-Control', 'must-revalidate, post-check=0, pre-check=0')
->header('Pragma', 'public')
->header('Content-Length', \strlen($content));
return $response;
}
throw new FireflyException('Could not find the indicated attachment. The file is no longer there.');
}
/**
* Display a listing of the resource.
*
* @param Request $request
*
* @return JsonResponse
*/
public function index(Request $request): JsonResponse
{
// create some objects:
$manager = new Manager;
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
// types to get, page size:
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// get list of accounts. Count it and split it.
$collection = $this->repository->get();
$count = $collection->count();
$attachments = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
// make paginator:
$paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.attachments.index') . $this->buildParams());
// present to user.
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new FractalCollection($attachments, new AttachmentTransformer($this->parameters), 'attachments');
$resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* Display the specified resource.
*
* @param Request $request
* @param Attachment $attachment
*
* @return JsonResponse
*/
public function show(Request $request, Attachment $attachment): JsonResponse
{
$manager = new Manager;
// add include parameter:
$include = $request->get('include') ?? '';
$manager->parseIncludes($include);
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new Item($attachment, new AttachmentTransformer($this->parameters), 'attachments');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* Store a newly created resource in storage.
*
* @param AttachmentRequest $request
*
* @return JsonResponse
* @throws FireflyException
*/
public function store(AttachmentRequest $request): JsonResponse
{
$data = $request->getAll();
$attachment = $this->repository->store($data);
$manager = new Manager;
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new Item($attachment, new AttachmentTransformer($this->parameters), 'attachments');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* Update the specified resource in storage.
*
* @param AttachmentRequest $request
* @param Attachment $attachment
*
* @return JsonResponse
*/
public function update(AttachmentRequest $request, Attachment $attachment): JsonResponse
{
$data = $request->getAll();
$this->repository->update($attachment, $data);
$manager = new Manager;
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new Item($attachment, new AttachmentTransformer($this->parameters), 'attachments');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* @param Request $request
* @param Attachment $attachment
*
* @return JsonResponse
*/
public function upload(Request $request, Attachment $attachment): JsonResponse
{
/** @var AttachmentHelperInterface $helper */
$helper = app(AttachmentHelperInterface::class);
$body = $request->getContent();
$helper->saveAttachmentFromApi($attachment, $body);
return response()->json([], 204);
}
}

View File

@@ -0,0 +1,183 @@
<?php
/**
* AvailableBudgetController.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers;
use FireflyIII\Api\V1\Requests\AvailableBudgetRequest;
use FireflyIII\Models\AvailableBudget;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Transformers\AvailableBudgetTransformer;
use FireflyIII\User;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Pagination\LengthAwarePaginator;
use League\Fractal\Manager;
use League\Fractal\Pagination\IlluminatePaginatorAdapter;
use League\Fractal\Resource\Collection as FractalCollection;
use League\Fractal\Resource\Item;
use League\Fractal\Serializer\JsonApiSerializer;
/**
* Class AvailableBudgetController
*/
class AvailableBudgetController extends Controller
{
/** @var CurrencyRepositoryInterface */
private $currencyRepository;
/** @var BudgetRepositoryInterface */
private $repository;
/**
* AccountController constructor.
*/
public function __construct()
{
parent::__construct();
$this->middleware(
function ($request, $next) {
/** @var User $user */
$user = auth()->user();
$this->repository = app(BudgetRepositoryInterface::class);
$this->currencyRepository = app(CurrencyRepositoryInterface::class);
$this->repository->setUser($user);
return $next($request);
}
);
}
/**
* Remove the specified resource from storage.
*
* @param AvailableBudget $availableBudget
*
* @return JsonResponse
*/
public function delete(AvailableBudget $availableBudget): JsonResponse
{
$this->repository->destroyAvailableBudget($availableBudget);
return response()->json([], 204);
}
/**
* Display a listing of the resource.
*
* @param Request $request
*
* @return JsonResponse
*/
public function index(Request $request): JsonResponse
{
// create some objects:
$manager = new Manager;
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
// types to get, page size:
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// get list of available budgets. Count it and split it.
$collection = $this->repository->getAvailableBudgets();
$count = $collection->count();
$availableBudgets = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
// make paginator:
$paginator = new LengthAwarePaginator($availableBudgets, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.available_budgets.index') . $this->buildParams());
// present to user.
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new FractalCollection($availableBudgets, new AvailableBudgetTransformer($this->parameters), 'available_budgets');
$resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* Display the specified resource.
*
* @param Request $request
* @param AvailableBudget $availableBudget
*
* @return JsonResponse
*/
public function show(Request $request, AvailableBudget $availableBudget): JsonResponse
{
$manager = new Manager;
// add include parameter:
$include = $request->get('include') ?? '';
$manager->parseIncludes($include);
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new Item($availableBudget, new AvailableBudgetTransformer($this->parameters), 'available_budgets');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* Store a newly created resource in storage.
*
* @param AvailableBudgetRequest $request
*
* @return JsonResponse
*/
public function store(AvailableBudgetRequest $request): JsonResponse
{
$data = $request->getAll();
$currency = $this->currencyRepository->findNull($data['transaction_currency_id']);
$availableBudget = $this->repository->setAvailableBudget($currency, $data['start_date'], $data['end_date'], $data['amount']);
$manager = new Manager;
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new Item($availableBudget, new AvailableBudgetTransformer($this->parameters), 'available_budgets');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* Update the specified resource in storage.
*
* @param AvailableBudgetRequest $request
* @param AvailableBudget $availableBudget
*
* @return JsonResponse
*/
public function update(AvailableBudgetRequest $request, AvailableBudget $availableBudget): JsonResponse
{
$data = $request->getAll();
$this->repository->updateAvailableBudget($availableBudget, $data);
$manager = new Manager;
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new Item($availableBudget, new AvailableBudgetTransformer($this->parameters), 'available_budgets');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
}

View File

@@ -0,0 +1,168 @@
<?php
/**
* BillController.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers;
use FireflyIII\Api\V1\Requests\BillRequest;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Bill;
use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use FireflyIII\Transformers\BillTransformer;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Collection;
use League\Fractal\Manager;
use League\Fractal\Pagination\IlluminatePaginatorAdapter;
use League\Fractal\Resource\Collection as FractalCollection;
use League\Fractal\Resource\Item;
use League\Fractal\Serializer\JsonApiSerializer;
/**
* Class BillController
*/
class BillController extends Controller
{
/** @var BillRepositoryInterface */
private $repository;
/**
* BillController constructor.
*/
public function __construct()
{
parent::__construct();
$this->middleware(
function ($request, $next) {
/** @var BillRepositoryInterface repository */
$this->repository = app(BillRepositoryInterface::class);
$this->repository->setUser(auth()->user());
return $next($request);
}
);
}
/**
* Remove the specified resource from storage.
*
* @param Bill $bill
*
* @return JsonResponse
*/
public function delete(Bill $bill): JsonResponse
{
$this->repository->destroy($bill);
return response()->json([], 204);
}
/**
* Display a listing of the resource.
*
* @param Request $request
*
* @return JsonResponse
*/
public function index(Request $request): JsonResponse
{
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$paginator = $this->repository->getPaginator($pageSize);
/** @var Collection $bills */
$bills = $paginator->getCollection();
$manager = new Manager();
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new FractalCollection($bills, new BillTransformer($this->parameters), 'bills');
$resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* @param Request $request
* @param Bill $bill
*
* @return JsonResponse
*/
public function show(Request $request, Bill $bill): JsonResponse
{
$manager = new Manager();
// add include parameter:
$include = $request->get('include') ?? '';
$manager->parseIncludes($include);
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new Item($bill, new BillTransformer($this->parameters), 'bills');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* @param BillRequest $request
*
* @return JsonResponse
* @throws FireflyException
*/
public function store(BillRequest $request): JsonResponse
{
$bill = $this->repository->store($request->getAll());
if (null !== $bill) {
$manager = new Manager();
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new Item($bill, new BillTransformer($this->parameters), 'bills');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
throw new FireflyException('Could not store new bill.'); // @codeCoverageIgnore
}
/**
* @param BillRequest $request
* @param Bill $bill
*
* @return JsonResponse
*/
public function update(BillRequest $request, Bill $bill): JsonResponse
{
$data = $request->getAll();
$bill = $this->repository->update($bill, $data);
$manager = new Manager();
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new Item($bill, new BillTransformer($this->parameters), 'bills');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
}

View File

@@ -0,0 +1,176 @@
<?php
/**
* BudgetController.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers;
use FireflyIII\Api\V1\Requests\BudgetRequest;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Budget;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Transformers\BudgetTransformer;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Pagination\LengthAwarePaginator;
use League\Fractal\Manager;
use League\Fractal\Pagination\IlluminatePaginatorAdapter;
use League\Fractal\Resource\Collection as FractalCollection;
use League\Fractal\Resource\Item;
use League\Fractal\Serializer\JsonApiSerializer;
/**
* Class BudgetController
*/
class BudgetController extends Controller
{
/** @var BudgetRepositoryInterface */
private $repository;
/**
* BudgetController constructor.
*/
public function __construct()
{
parent::__construct();
$this->middleware(
function ($request, $next) {
/** @var BudgetRepositoryInterface repository */
$this->repository = app(BudgetRepositoryInterface::class);
$this->repository->setUser(auth()->user());
return $next($request);
}
);
}
/**
* Remove the specified resource from storage.
*
* @param Budget $budget
*
* @return JsonResponse
*/
public function delete(Budget $budget): JsonResponse
{
$this->repository->destroy($budget);
return response()->json([], 204);
}
/**
* Display a listing of the resource.
*
* @param Request $request
*
* @return JsonResponse
*/
public function index(Request $request): JsonResponse
{
// create some objects:
$manager = new Manager;
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
// types to get, page size:
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// get list of budgets. Count it and split it.
$collection = $this->repository->getBudgets();
$count = $collection->count();
$budgets = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
// make paginator:
$paginator = new LengthAwarePaginator($budgets, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.budgets.index') . $this->buildParams());
// present to user.
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new FractalCollection($budgets, new BudgetTransformer($this->parameters), 'budgets');
$resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* @param Request $request
* @param Budget $budget
*
* @return JsonResponse
*/
public function show(Request $request, Budget $budget): JsonResponse
{
$manager = new Manager();
// add include parameter:
$include = $request->get('include') ?? '';
$manager->parseIncludes($include);
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new Item($budget, new BudgetTransformer($this->parameters), 'budgets');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* @param BudgetRequest $request
*
* @return JsonResponse
* @throws FireflyException
*/
public function store(BudgetRequest $request): JsonResponse
{
$budget = $this->repository->store($request->getAll());
if (null !== $budget) {
$manager = new Manager();
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new Item($budget, new BudgetTransformer($this->parameters), 'budgets');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
throw new FireflyException('Could not store new budget.'); // @codeCoverageIgnore
}
/**
* @param BudgetRequest $request
* @param Budget $budget
*
* @return JsonResponse
*/
public function update(BudgetRequest $request, Budget $budget): JsonResponse
{
$data = $request->getAll();
$budget = $this->repository->update($budget, $data);
$manager = new Manager();
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new Item($budget, new BudgetTransformer($this->parameters), 'budgets');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
}

View File

@@ -0,0 +1,232 @@
<?php
/**
* BudgetLimitController.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers;
use Carbon\Carbon;
use Exception;
use FireflyIII\Api\V1\Requests\AvailableBudgetRequest;
use FireflyIII\Api\V1\Requests\BudgetLimitRequest;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\BudgetLimit;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Transformers\BudgetLimitTransformer;
use FireflyIII\User;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Collection;
use InvalidArgumentException;
use League\Fractal\Manager;
use League\Fractal\Pagination\IlluminatePaginatorAdapter;
use League\Fractal\Resource\Collection as FractalCollection;
use League\Fractal\Resource\Item;
use League\Fractal\Serializer\JsonApiSerializer;
use Log;
use Throwable;
/**
* Class BudgetLimitController
*/
class BudgetLimitController extends Controller
{
///** @var CurrencyRepositoryInterface */
//private $currencyRepository;
/** @var BudgetRepositoryInterface */
private $repository;
/**
* AccountController constructor.
*/
public function __construct()
{
parent::__construct();
$this->middleware(
function ($request, $next) {
/** @var User $user */
$user = auth()->user();
$this->repository = app(BudgetRepositoryInterface::class);
//$this->currencyRepository = app(CurrencyRepositoryInterface::class);
$this->repository->setUser($user);
return $next($request);
}
);
}
/**
* Remove the specified resource from storage.
*
* @param BudgetLimit $budgetLimit
*
* @return JsonResponse
*/
public function delete(BudgetLimit $budgetLimit): JsonResponse
{
$this->repository->destroyBudgetLimit($budgetLimit);
return response()->json([], 204);
}
/**
* Display a listing of the resource.
*
* @param Request $request
*
* @return JsonResponse
*/
public function index(Request $request): JsonResponse
{
// create some objects:
$manager = new Manager;
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
// read budget from request
$budgetId = (int)($request->get('budget_id') ?? 0);
$budget = null;
if ($budgetId > 0) {
$budget = $this->repository->findNull($budgetId);
}
// read start date from request
$start = null;
try {
$start = Carbon::createFromFormat('Y-m-d', $request->get('start'));
$this->parameters->set('start', $start->format('Y-m-d'));
} catch (InvalidArgumentException $e) {
Log::debug(sprintf('Could not parse start date "%s": %s', $request->get('start'), $e->getMessage()));
}
// read end date from request
$end = null;
try {
$end = Carbon::createFromFormat('Y-m-d', $request->get('end'));
$this->parameters->set('end', $end->format('Y-m-d'));
} catch (InvalidArgumentException $e) {
Log::debug(sprintf('Could not parse end date "%s": %s', $request->get('end'), $e->getMessage()));
}
$this->parameters->set('budget_id', $budgetId);
// types to get, page size:
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// get list of budget limits. Count it and split it.
$collection = new Collection;
if (null === $budget) {
$collection = $this->repository->getAllBudgetLimits($start, $end);
}
if (null !== $budget) {
$collection = $this->repository->getBudgetLimits($budget, $start, $end);
}
$count = $collection->count();
$budgetLimits = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
// make paginator:
$paginator = new LengthAwarePaginator($budgetLimits, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.budget_limits.index') . $this->buildParams());
// present to user.
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new FractalCollection($budgetLimits, new BudgetLimitTransformer($this->parameters), 'budget_limits');
$resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* Display the specified resource.
*
* @param Request $request
* @param BudgetLimit $budgetLimit
*
* @return JsonResponse
*/
public function show(Request $request, BudgetLimit $budgetLimit): JsonResponse
{
$manager = new Manager;
// add include parameter:
$include = $request->get('include') ?? '';
$manager->parseIncludes($include);
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new Item($budgetLimit, new BudgetLimitTransformer($this->parameters), 'budget_limits');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* Store a newly created resource in storage.
*
* @param BudgetLimitRequest $request
*
* @return JsonResponse
* @throws FireflyException
*/
public function store(BudgetLimitRequest $request): JsonResponse
{
$data = $request->getAll();
$budget = $this->repository->findNull($data['budget_id']);
if (null === $budget) {
throw new FireflyException('Unknown budget.');
}
$data['budget'] = $budget;
$budgetLimit = $this->repository->storeBudgetLimit($data);
$manager = new Manager;
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new Item($budgetLimit, new BudgetLimitTransformer($this->parameters), 'budget_limits');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* Update the specified resource in storage.
*
* @param AvailableBudgetRequest $request
* @param BudgetLimit $budgetLimit
*
* @return JsonResponse
*/
public function update(BudgetLimitRequest $request, BudgetLimit $budgetLimit): JsonResponse
{
$data = $request->getAll();
$budget = $this->repository->findNull($data['budget_id']);
if (null === $budget) {
$budget = $budgetLimit->budget;
}
$data['budget'] = $budget;
$budgetLimit = $this->repository->updateBudgetLimit($budgetLimit, $data);
$manager = new Manager;
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new Item($budgetLimit, new BudgetLimitTransformer($this->parameters), 'budget_limits');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
}

View File

@@ -0,0 +1,176 @@
<?php
/**
* CategoryController.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers;
use FireflyIII\Api\V1\Requests\CategoryRequest;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Category;
use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
use FireflyIII\Transformers\CategoryTransformer;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Pagination\LengthAwarePaginator;
use League\Fractal\Manager;
use League\Fractal\Pagination\IlluminatePaginatorAdapter;
use League\Fractal\Resource\Collection as FractalCollection;
use League\Fractal\Resource\Item;
use League\Fractal\Serializer\JsonApiSerializer;
/**
* Class CategoryController
*/
class CategoryController extends Controller
{
/** @var CategoryRepositoryInterface */
private $repository;
/**
* CategoryController constructor.
*/
public function __construct()
{
parent::__construct();
$this->middleware(
function ($request, $next) {
/** @var CategoryRepositoryInterface repository */
$this->repository = app(CategoryRepositoryInterface::class);
$this->repository->setUser(auth()->user());
return $next($request);
}
);
}
/**
* Remove the specified resource from storage.
*
* @param Category $category
*
* @return JsonResponse
*/
public function delete(Category $category): JsonResponse
{
$this->repository->destroy($category);
return response()->json([], 204);
}
/**
* Display a listing of the resource.
*
* @param Request $request
*
* @return JsonResponse
*/
public function index(Request $request): JsonResponse
{
// create some objects:
$manager = new Manager;
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
// types to get, page size:
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// get list of budgets. Count it and split it.
$collection = $this->repository->getCategories();
$count = $collection->count();
$categories = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
// make paginator:
$paginator = new LengthAwarePaginator($categories, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.categories.index') . $this->buildParams());
// present to user.
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new FractalCollection($categories, new CategoryTransformer($this->parameters), 'categories');
$resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* @param Request $request
* @param Category $category
*
* @return JsonResponse
*/
public function show(Request $request, Category $category): JsonResponse
{
$manager = new Manager();
// add include parameter:
$include = $request->get('include') ?? '';
$manager->parseIncludes($include);
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new Item($category, new CategoryTransformer($this->parameters), 'categories');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* @param CategoryRequest $request
*
* @return JsonResponse
* @throws FireflyException
*/
public function store(CategoryRequest $request): JsonResponse
{
$category = $this->repository->store($request->getAll());
if (null !== $category) {
$manager = new Manager();
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new Item($category, new CategoryTransformer($this->parameters), 'categories');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
throw new FireflyException('Could not store new category.'); // @codeCoverageIgnore
}
/**
* @param CategoryRequest $request
* @param Category $category
*
* @return JsonResponse
*/
public function update(CategoryRequest $request, Category $category): JsonResponse
{
$data = $request->getAll();
$category = $this->repository->update($category, $data);
$manager = new Manager();
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new Item($category, new CategoryTransformer($this->parameters), 'categories');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
}

View File

@@ -0,0 +1,105 @@
<?php
/**
* ConfigurationController.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Configuration;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
/**
* Class ConfigurationController
*/
class ConfigurationController extends Controller
{
/**
* @throws FireflyException
*/
public function index()
{
if (!auth()->user()->hasRole('owner')) {
throw new FireflyException('No access to method.'); // @codeCoverageIgnore
}
$configData = $this->getConfigData();
return response()->json(['data' => $configData], 200)->header('Content-Type', 'application/vnd.api+json');
}
/**
* @param Request $request
*
* @return JsonResponse
* @throws FireflyException
*/
public function update(Request $request): JsonResponse
{
if (!auth()->user()->hasRole('owner')) {
throw new FireflyException('No access to method.'); // @codeCoverageIgnore
}
$name = $request->get('name');
$value = $request->get('value');
$valid = ['is_demo_site', 'permission_update_check', 'single_user_mode'];
if (!\in_array($name, $valid, true)) {
throw new FireflyException('You cannot edit this configuration value.');
}
$configValue = '';
switch ($name) {
case 'is_demo_site':
case 'single_user_mode':
$configValue = $value === 'true';
break;
case 'permission_update_check':
$configValue = (int)$value >= -1 && (int)$value <= 1 ? (int)$value : -1;
break;
}
app('fireflyconfig')->set($name, $configValue);
$configData = $this->getConfigData();
return response()->json(['data' => $configData], 200)->header('Content-Type', 'application/vnd.api+json');
}
/**
* @return array
*/
private function getConfigData(): array
{
/** @var Configuration $isDemoSite */
$isDemoSite = app('fireflyconfig')->get('is_demo_site');
/** @var Configuration $updateCheck */
$updateCheck = app('fireflyconfig')->get('permission_update_check');
/** @var Configuration $lastCheck */
$lastCheck = app('fireflyconfig')->get('last_update_check');
/** @var Configuration $singleUser */
$singleUser = app('fireflyconfig')->get('single_user_mode');
$data = [
'is_demo_site' => null === $isDemoSite ? null : $isDemoSite->data,
'permission_update_check' => null === $updateCheck ? null : (int)$updateCheck->data,
'last_update_check' => null === $lastCheck ? null : (int)$lastCheck->data,
'single_user_mode' => null === $singleUser ? null : $singleUser->data,
];
return $data;
}
}

View File

@@ -0,0 +1,115 @@
<?php
/**
* Controller.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers;
use Carbon\Carbon;
use Carbon\Exceptions\InvalidDateException;
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Routing\Controller as BaseController;
use Log;
use Symfony\Component\HttpFoundation\ParameterBag;
/**
* Class Controller.
*
* @codeCoverageIgnore
*/
class Controller extends BaseController
{
use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
/** @var ParameterBag */
protected $parameters;
/**
* Controller constructor.
*
*/
public function __construct()
{
// get global parameters
$this->parameters = $this->getParameters();
}
/**
* @return string
*/
protected function buildParams(): string
{
$return = '?';
$params = [];
foreach ($this->parameters as $key => $value) {
if ($key === 'page') {
continue;
}
if ($value instanceof Carbon) {
$params[$key] = $value->format('Y-m-d');
}
if (!$value instanceof Carbon) {
$params[$key] = $value;
}
}
$return .= http_build_query($params);
if (\strlen($return) === 1) {
return '';
}
return $return;
}
/**
* @return ParameterBag
*/
private function getParameters(): ParameterBag
{
$bag = new ParameterBag;
$page = (int)request()->get('page');
if ($page === 0) {
$page = 1;
}
$bag->set('page', $page);
// some date fields:
$dates = ['start', 'end', 'date'];
foreach ($dates as $field) {
$date = request()->get($field);
$obj = null;
if (null !== $date) {
try {
$obj = new Carbon($date);
} catch (InvalidDateException $e) {
// don't care
Log::error(sprintf('Invalid date exception in API controller: %s', $e->getMessage()));
}
}
$bag->set($field, $obj);
}
return $bag;
}
}

View File

@@ -0,0 +1,206 @@
<?php
/**
* CurrencyController.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers;
use FireflyIII\Api\V1\Requests\CurrencyRequest;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Repositories\User\UserRepositoryInterface;
use FireflyIII\Transformers\CurrencyTransformer;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Pagination\LengthAwarePaginator;
use League\Fractal\Manager;
use League\Fractal\Pagination\IlluminatePaginatorAdapter;
use League\Fractal\Resource\Collection as FractalCollection;
use League\Fractal\Resource\Item;
use League\Fractal\Serializer\JsonApiSerializer;
/**
* Class CurrencyController
*/
class CurrencyController extends Controller
{
/** @var CurrencyRepositoryInterface */
private $repository;
/** @var UserRepositoryInterface */
private $userRepository;
/**
* CurrencyRepository constructor.
*
* @throws FireflyException
*/
public function __construct()
{
parent::__construct();
$this->middleware(
function ($request, $next) {
/** @var CurrencyRepositoryInterface repository */
$this->repository = app(CurrencyRepositoryInterface::class);
$this->userRepository = app(UserRepositoryInterface::class);
$this->repository->setUser(auth()->user());
return $next($request);
}
);
}
/**
* Remove the specified resource from storage.
*
* @param TransactionCurrency $currency
*
* @return JsonResponse
* @throws FireflyException
*/
public function delete(TransactionCurrency $currency): JsonResponse
{
if (!$this->userRepository->hasRole(auth()->user(), 'owner')) {
// access denied:
throw new FireflyException('No access to method, user is not owner.'); // @codeCoverageIgnore
}
if (!$this->repository->canDeleteCurrency($currency)) {
throw new FireflyException('No access to method, currency is in use.'); // @codeCoverageIgnore
}
$this->repository->destroy($currency);
return response()->json([], 204);
}
/**
* Display a listing of the resource.
*
* @param Request $request
*
* @return JsonResponse
*/
public function index(Request $request): JsonResponse
{
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$collection = $this->repository->get();
$count = $collection->count();
// slice them:
$currencies = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
$paginator = new LengthAwarePaginator($currencies, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.currencies.index') . $this->buildParams());
$manager = new Manager();
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$defaultCurrency = app('amount')->getDefaultCurrencyByUser(auth()->user());
$this->parameters->set('defaultCurrency', $defaultCurrency);
$resource = new FractalCollection($currencies, new CurrencyTransformer($this->parameters), 'currencies');
$resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* @param Request $request
* @param TransactionCurrency $currency
*
* @return JsonResponse
*/
public function show(Request $request, TransactionCurrency $currency): JsonResponse
{
$manager = new Manager();
// add include parameter:
$include = $request->get('include') ?? '';
$manager->parseIncludes($include);
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$defaultCurrency = app('amount')->getDefaultCurrencyByUser(auth()->user());
$this->parameters->set('defaultCurrency', $defaultCurrency);
$resource = new Item($currency, new CurrencyTransformer($this->parameters), 'currencies');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* @param CurrencyRequest $request
*
* @return JsonResponse
* @throws FireflyException
*/
public function store(CurrencyRequest $request): JsonResponse
{
$currency = $this->repository->store($request->getAll());
if ($request->boolean('default') === true) {
app('preferences')->set('currencyPreference', $currency->code);
app('preferences')->mark();
}
if (null !== $currency) {
$manager = new Manager();
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$defaultCurrency = app('amount')->getDefaultCurrencyByUser(auth()->user());
$this->parameters->set('defaultCurrency', $defaultCurrency);
$resource = new Item($currency, new CurrencyTransformer($this->parameters), 'currencies');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
throw new FireflyException('Could not store new currency.'); // @codeCoverageIgnore
}
/**
* @param CurrencyRequest $request
* @param TransactionCurrency $currency
*
* @return JsonResponse
*/
public function update(CurrencyRequest $request, TransactionCurrency $currency): JsonResponse
{
$data = $request->getAll();
$currency = $this->repository->update($currency, $data);
if ($request->boolean('default') === true) {
app('preferences')->set('currencyPreference', $currency->code);
app('preferences')->mark();
}
$manager = new Manager();
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$defaultCurrency = app('amount')->getDefaultCurrencyByUser(auth()->user());
$this->parameters->set('defaultCurrency', $defaultCurrency);
$resource = new Item($currency, new CurrencyTransformer($this->parameters), 'currencies');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
}

View File

@@ -0,0 +1,115 @@
<?php
/**
* CurrencyExchangeRateController.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers;
use Carbon\Carbon;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Services\Currency\ExchangeRateInterface;
use FireflyIII\Transformers\CurrencyExchangeRateTransformer;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use InvalidArgumentException;
use League\Fractal\Manager;
use League\Fractal\Resource\Item;
use Log;
/**
*
* Class CurrencyExchangeRateController
*/
class CurrencyExchangeRateController extends Controller
{
/** @var CurrencyRepositoryInterface */
private $repository;
/**
* CurrencyExchangeRateController constructor.
*/
public function __construct()
{
parent::__construct();
$this->middleware(
function ($request, $next) {
$this->repository = app(CurrencyRepositoryInterface::class);
$this->repository->setUser(auth()->user());
return $next($request);
}
);
}
/**
* @param Request $request
*
* @return JsonResponse
* @throws FireflyException
*/
public function index(Request $request): JsonResponse
{
// create some objects:
$manager = new Manager;
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
// currencies
$fromCurrency = $this->repository->findByCodeNull($request->get('from') ?? 'EUR');
$toCurrency = $this->repository->findByCodeNull($request->get('to') ?? 'USD');
if (null === $fromCurrency) {
throw new FireflyException('Unknown source currency.');
}
if (null === $toCurrency) {
throw new FireflyException('Unknown destination currency.');
}
$dateObj = new Carbon;
try {
$dateObj = Carbon::createFromFormat('Y-m-d', $request->get('date') ?? date('Y-m-d'));
} catch (InvalidArgumentException $e) {
Log::debug($e->getMessage());
}
$this->parameters->set('from', $fromCurrency->code);
$this->parameters->set('to', $toCurrency->code);
$this->parameters->set('date', $dateObj->format('Y-m-d'));
// get the exchange rate.
$rate = $this->repository->getExchangeRate($fromCurrency, $toCurrency, $dateObj);
if (null === $rate) {
// create service:
/** @var ExchangeRateInterface $service */
$service = app(ExchangeRateInterface::class);
$service->setUser(auth()->user());
// get rate:
$rate = $service->getRate($fromCurrency, $toCurrency, $dateObj);
}
$resource = new Item($rate, new CurrencyExchangeRateTransformer($this->parameters), 'currency_exchange_rates');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
}

View File

@@ -0,0 +1,207 @@
<?php
/**
* JournalLinkController.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers;
use FireflyIII\Api\V1\Requests\JournalLinkRequest;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\TransactionJournalLink;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
use FireflyIII\Transformers\JournalLinkTransformer;
use FireflyIII\User;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Pagination\LengthAwarePaginator;
use League\Fractal\Manager;
use League\Fractal\Pagination\IlluminatePaginatorAdapter;
use League\Fractal\Resource\Collection as FractalCollection;
use League\Fractal\Resource\Item;
use League\Fractal\Serializer\JsonApiSerializer;
class JournalLinkController extends Controller
{
/** @var JournalRepositoryInterface */
private $journalRepository;
/** @var LinkTypeRepositoryInterface */
private $repository;
public function __construct()
{
parent::__construct();
$this->middleware(
function ($request, $next) {
/** @var User $user */
$user = auth()->user();
$this->repository = app(LinkTypeRepositoryInterface::class);
$this->journalRepository = app(JournalRepositoryInterface::class);
$this->repository->setUser($user);
$this->journalRepository->setUser($user);
return $next($request);
}
);
}
/**
* Delete the resource.
*
* @param TransactionJournalLink $link
*
* @return JsonResponse
*/
public function delete(TransactionJournalLink $link): JsonResponse
{
$this->repository->destroyLink($link);
return response()->json([], 204);
}
/**
* List all of them.
*
* @param Request $request
*
* @return JsonResponse]
*/
public function index(Request $request): JsonResponse
{
// create some objects:
$manager = new Manager;
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
// read type from URI
$name = $request->get('name') ?? null;
// types to get, page size:
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$linkType = $this->repository->findByName($name);
// get list of accounts. Count it and split it.
$collection = $this->repository->getJournalLinks($linkType);
$count = $collection->count();
$journalLinks = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
// make paginator:
$paginator = new LengthAwarePaginator($journalLinks, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.journal_links.index') . $this->buildParams());
// present to user.
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new FractalCollection($journalLinks, new JournalLinkTransformer($this->parameters), 'journal_links');
$resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* List single resource.
*
* @param Request $request
* @param TransactionJournalLink $journalLink
*
* @return JsonResponse
*/
public function show(Request $request, TransactionJournalLink $journalLink): JsonResponse
{
$manager = new Manager;
// add include parameter:
$include = $request->get('include') ?? '';
$manager->parseIncludes($include);
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new Item($journalLink, new JournalLinkTransformer($this->parameters), 'journal_links');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* Store new object.
*
* @param JournalLinkRequest $request
*
* @return JsonResponse
* @throws FireflyException
*/
public function store(JournalLinkRequest $request): JsonResponse
{
$manager = new Manager;
// add include parameter:
$include = $request->get('include') ?? '';
$manager->parseIncludes($include);
$data = $request->getAll();
$inward = $this->journalRepository->findNull($data['inward_id'] ?? 0);
$outward = $this->journalRepository->findNull($data['outward_id'] ?? 0);
if (null === $inward || null === $outward) {
throw new FireflyException('Source or destination is NULL.');
}
$data['direction'] = 'inward';
$journalLink = $this->repository->storeLink($data, $inward, $outward);
$resource = new Item($journalLink, new JournalLinkTransformer($this->parameters), 'journal_links');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* @param JournalLinkRequest $request
* @param TransactionJournalLink $journalLink
*
* @return JsonResponse
* @throws FireflyException
*/
public function update(JournalLinkRequest $request, TransactionJournalLink $journalLink): JsonResponse
{
$manager = new Manager;
// add include parameter:
$include = $request->get('include') ?? '';
$manager->parseIncludes($include);
$data = $request->getAll();
$data['inward'] = $this->journalRepository->findNull($data['inward_id'] ?? 0);
$data['outward'] = $this->journalRepository->findNull($data['outward_id'] ?? 0);
if (null === $data['inward'] || null === $data['outward']) {
throw new FireflyException('Source or destination is NULL.');
}
$data['direction'] = 'inward';
$journalLink = $this->repository->updateLink($journalLink, $data);
$resource = new Item($journalLink, new JournalLinkTransformer($this->parameters), 'journal_links');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
}

View File

@@ -0,0 +1,197 @@
<?php
/**
* LinkTypeController.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers;
use FireflyIII\Api\V1\Requests\LinkTypeRequest;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\LinkType;
use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
use FireflyIII\Repositories\User\UserRepositoryInterface;
use FireflyIII\Transformers\LinkTypeTransformer;
use FireflyIII\User;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Pagination\LengthAwarePaginator;
use League\Fractal\Manager;
use League\Fractal\Pagination\IlluminatePaginatorAdapter;
use League\Fractal\Resource\Collection as FractalCollection;
use League\Fractal\Resource\Item;
use League\Fractal\Serializer\JsonApiSerializer;
/**
*
* Class LinkTypeController
*/
class LinkTypeController extends Controller
{
/** @var LinkTypeRepositoryInterface */
private $repository;
/** @var UserRepositoryInterface */
private $userRepository;
public function __construct()
{
parent::__construct();
$this->middleware(
function ($request, $next) {
/** @var User $user */
$user = auth()->user();
$this->repository = app(LinkTypeRepositoryInterface::class);
$this->userRepository = app(UserRepositoryInterface::class);
$this->repository->setUser($user);
return $next($request);
}
);
}
/**
* Delete the resource.
*
* @param LinkType $linkType
*
* @return JsonResponse
* @throws FireflyException
*/
public function delete(LinkType $linkType): JsonResponse
{
if ($linkType->editable === false) {
throw new FireflyException(sprintf('You cannot delete this link type (#%d, "%s")', $linkType->id, $linkType->name));
}
$this->repository->destroy($linkType, null);
return response()->json([], 204);
}
/**
* List all of them.
*
* @param Request $request
*
* @return JsonResponse]
*/
public function index(Request $request): JsonResponse
{
// create some objects:
$manager = new Manager;
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// get list of accounts. Count it and split it.
$collection = $this->repository->get();
$count = $collection->count();
$linkTypes = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
// make paginator:
$paginator = new LengthAwarePaginator($linkTypes, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.link_types.index') . $this->buildParams());
// present to user.
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new FractalCollection($linkTypes, new LinkTypeTransformer($this->parameters), 'link_types');
$resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* List single resource.
*
* @param Request $request
* @param LinkType $linkType
*
* @return JsonResponse
*/
public function show(Request $request, LinkType $linkType): JsonResponse
{
$manager = new Manager;
// add include parameter:
$include = $request->get('include') ?? '';
$manager->parseIncludes($include);
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new Item($linkType, new LinkTypeTransformer($this->parameters), 'link_types');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* Store new object.
*
* @param LinkTypeRequest $request
*
* @return JsonResponse
* @throws FireflyException
*/
public function store(LinkTypeRequest $request): JsonResponse
{
if (!$this->userRepository->hasRole(auth()->user(), 'owner')) {
throw new FireflyException('You need the "owner"-role to do this.');
}
$data = $request->getAll();
// if currency ID is 0, find the currency by the code:
$linkType = $this->repository->store($data);
$manager = new Manager;
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new Item($linkType, new LinkTypeTransformer($this->parameters), 'link_types');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* @param LinkTypeRequest $request
* @param LinkType $linkType
*
* @return JsonResponse
* @throws FireflyException
*/
public function update(LinkTypeRequest $request, LinkType $linkType): JsonResponse
{
if ($linkType->editable === false) {
throw new FireflyException(sprintf('You cannot edit this link type (#%d, "%s")', $linkType->id, $linkType->name));
}
if (!$this->userRepository->hasRole(auth()->user(), 'owner')) {
throw new FireflyException('You need the "owner"-role to do this.');
}
$data = $request->getAll();
$this->repository->update($linkType, $data);
$manager = new Manager;
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new Item($linkType, new LinkTypeTransformer($this->parameters), 'link_types');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
}

View File

@@ -0,0 +1,180 @@
<?php
/**
* PiggyBankController.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers;
use FireflyIII\Api\V1\Requests\PiggyBankRequest;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\PiggyBank;
use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
use FireflyIII\Transformers\PiggyBankTransformer;
use FireflyIII\User;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Pagination\LengthAwarePaginator;
use League\Fractal\Manager;
use League\Fractal\Pagination\IlluminatePaginatorAdapter;
use League\Fractal\Resource\Collection as FractalCollection;
use League\Fractal\Resource\Item;
use League\Fractal\Serializer\JsonApiSerializer;
/**
* TODO order up and down.
* Class PiggyBankController
*/
class PiggyBankController extends Controller
{
/** @var PiggyBankRepositoryInterface */
private $repository;
public function __construct()
{
parent::__construct();
$this->middleware(
function ($request, $next) {
/** @var User $user */
$user = auth()->user();
$this->repository = app(PiggyBankRepositoryInterface::class);
return $next($request);
}
);
}
/**
* Delete the resource.
*
* @param PiggyBank $piggyBank
*
* @return JsonResponse
*/
public function delete(PiggyBank $piggyBank): JsonResponse
{
$this->repository->destroy($piggyBank);
return response()->json([], 204);
}
/**
* List all of them.
*
* @param Request $request
*
* @return JsonResponse]
*/
public function index(Request $request): JsonResponse
{
// create some objects:
$manager = new Manager;
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
// types to get, page size:
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// get list of budgets. Count it and split it.
$collection = $this->repository->getPiggyBanks();
$count = $collection->count();
$piggyBanks = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
// make paginator:
$paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.piggy_banks.index') . $this->buildParams());
// present to user.
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new FractalCollection($piggyBanks, new PiggyBankTransformer($this->parameters), 'piggy_banks');
$resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* List single resource.
*
* @param Request $request
* @param PiggyBank $piggyBank
*
* @return JsonResponse
*/
public function show(Request $request, PiggyBank $piggyBank): JsonResponse
{
$manager = new Manager();
// add include parameter:
$include = $request->get('include') ?? '';
$manager->parseIncludes($include);
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new Item($piggyBank, new PiggyBankTransformer($this->parameters), 'piggy_banks');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* Store new object.
*
* @param PiggyBankRequest $request
*
* @return JsonResponse
* @throws FireflyException
*/
public function store(PiggyBankRequest $request): JsonResponse
{
$piggyBank = $this->repository->store($request->getAll());
if (null !== $piggyBank) {
$manager = new Manager();
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new Item($piggyBank, new PiggyBankTransformer($this->parameters), 'piggy_banks');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
throw new FireflyException('Could not store new piggy bank.'); // @codeCoverageIgnore
}
/**
* @param PiggyBankRequest $request
* @param PiggyBank $piggyBank
*
* @return JsonResponse
*/
public function update(PiggyBankRequest $request, PiggyBank $piggyBank): JsonResponse
{
$piggyBank = $this->repository->update($piggyBank, $request->getAll());
$manager = new Manager();
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new Item($piggyBank, new PiggyBankTransformer($this->parameters), 'piggy_banks');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
}

View File

@@ -0,0 +1,157 @@
<?php
/**
* PreferencesController.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers;
use FireflyIII\Api\V1\Requests\PreferenceRequest;
use FireflyIII\Models\Preference;
use FireflyIII\Transformers\PreferenceTransformer;
use FireflyIII\User;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Collection;
use League\Fractal\Manager;
use League\Fractal\Resource\Collection as FractalCollection;
use League\Fractal\Resource\Item;
use League\Fractal\Serializer\JsonApiSerializer;
use Preferences;
/**
*
* Class PreferenceController
*/
class PreferenceController extends Controller
{
public function __construct()
{
parent::__construct();
$this->middleware(
function ($request, $next) {
/** @var User $user */
$user = auth()->user();
// todo add local repositories.
return $next($request);
}
);
}
/**
* List all of them.
*
* @param Request $request
*
* @return JsonResponse]
*/
public function index(Request $request): JsonResponse
{
/** @var User $user */
$user = auth()->user();
$available = [
'language', 'customFiscalYear', 'fiscalYearStart', 'currencyPreference',
'transaction_journal_optional_fields', 'frontPageAccounts', 'viewRange',
'listPageSize, twoFactorAuthEnabled',
];
$preferences = new Collection;
foreach ($available as $name) {
$pref = Preferences::getForUser($user, $name);
if (null !== $pref) {
$preferences->push($pref);
}
}
// create some objects:
$manager = new Manager;
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
// present to user.
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new FractalCollection($preferences, new PreferenceTransformer($this->parameters), 'preferences');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* List single resource.
*
* @param Request $request
* @param Preference $preference
*
* @return JsonResponse
*/
public function show(Request $request, Preference $preference): JsonResponse
{
// create some objects:
$manager = new Manager;
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
// present to user.
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new Item($preference, new PreferenceTransformer($this->parameters), 'preferences');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* @param PreferenceRequest $request
* @param Preference $preference
*
* @return JsonResponse
*/
public function update(PreferenceRequest $request, Preference $preference): JsonResponse
{
$data = $request->getAll();
$newValue = $data['data'];
switch ($preference->name) {
default:
break;
case 'transaction_journal_optional_fields':
case 'frontPageAccounts':
$newValue = explode(',', $data['data']);
break;
case 'listPageSize':
$newValue = (int)$data['data'];
break;
case 'customFiscalYear':
case 'twoFactorAuthEnabled':
$newValue = (int)$data['data'] === 1;
break;
}
$result = Preferences::set($preference->name, $newValue);
// create some objects:
$manager = new Manager;
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
// present to user.
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new Item($result, new PreferenceTransformer($this->parameters), 'preferences');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
}

View File

@@ -0,0 +1,179 @@
<?php
/**
* RecurrenceController.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers;
use FireflyIII\Api\V1\Requests\RecurrenceRequest;
use FireflyIII\Models\Recurrence;
use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface;
use FireflyIII\Transformers\RecurrenceTransformer;
use FireflyIII\User;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Pagination\LengthAwarePaginator;
use League\Fractal\Manager;
use League\Fractal\Pagination\IlluminatePaginatorAdapter;
use League\Fractal\Resource\Collection as FractalCollection;
use League\Fractal\Resource\Item;
use League\Fractal\Serializer\JsonApiSerializer;
/**
*
* Class RecurrenceController
*/
class RecurrenceController extends Controller
{
/** @var RecurringRepositoryInterface */
private $repository;
public function __construct()
{
parent::__construct();
$this->middleware(
function ($request, $next) {
/** @var User $user */
$user = auth()->user();
/** @var RecurringRepositoryInterface repository */
$this->repository = app(RecurringRepositoryInterface::class);
$this->repository->setUser($user);
return $next($request);
}
);
}
/**
* Delete the resource.
*
* @param Recurrence $recurrence
*
* @return JsonResponse
*/
public function delete(Recurrence $recurrence): JsonResponse
{
$this->repository->destroy($recurrence);
return response()->json([], 204);
}
/**
* List all of them.
*
* @param Request $request
*
* @return JsonResponse]
*/
public function index(Request $request): JsonResponse
{
// create some objects:
$manager = new Manager;
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
// types to get, page size:
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// get list of budgets. Count it and split it.
$collection = $this->repository->getAll();
$count = $collection->count();
$piggyBanks = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
// make paginator:
$paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.recurrences.index') . $this->buildParams());
// present to user.
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new FractalCollection($piggyBanks, new RecurrenceTransformer($this->parameters), 'recurrences');
$resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* List single resource.
*
* @param Request $request
* @param Recurrence $recurrence
*
* @return JsonResponse
*/
public function show(Request $request, Recurrence $recurrence): JsonResponse
{
$manager = new Manager();
// add include parameter:
$include = $request->get('include') ?? '';
$manager->parseIncludes($include);
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new Item($recurrence, new RecurrenceTransformer($this->parameters), 'recurrences');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* Store new object.
*
* @param RecurrenceRequest $request
*
* @return JsonResponse
*/
public function store(RecurrenceRequest $request): JsonResponse
{
$recurrence = $this->repository->store($request->getAll());
$manager = new Manager();
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new Item($recurrence, new RecurrenceTransformer($this->parameters), 'recurrences');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* @param RecurrenceRequest $request
* @param Recurrence $recurrence
*
* @return JsonResponse
*/
public function update(RecurrenceRequest $request, Recurrence $recurrence): JsonResponse
{
$data = $request->getAll();
//
$category = $this->repository->update($recurrence, $data);
$manager = new Manager();
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new Item($category, new RecurrenceTransformer($this->parameters), 'recurrences');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
}

View File

@@ -0,0 +1,173 @@
<?php
/**
* RuleController.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers;
use FireflyIII\Api\V1\Requests\RuleRequest;
use FireflyIII\Models\Rule;
use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
use FireflyIII\Transformers\RuleTransformer;
use FireflyIII\User;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Pagination\LengthAwarePaginator;
use League\Fractal\Manager;
use League\Fractal\Pagination\IlluminatePaginatorAdapter;
use League\Fractal\Resource\Collection as FractalCollection;
use League\Fractal\Resource\Item;
use League\Fractal\Serializer\JsonApiSerializer;
/**
* Class RuleController
*/
class RuleController extends Controller
{
/** @var RuleRepositoryInterface */
private $ruleRepository;
public function __construct()
{
parent::__construct();
$this->middleware(
function ($request, $next) {
/** @var User $user */
$user = auth()->user();
$this->ruleRepository = app(RuleRepositoryInterface::class);
$this->ruleRepository->setUser($user);
return $next($request);
}
);
}
/**
* Delete the resource.
*
* @param Rule $rule
*
* @return JsonResponse
*/
public function delete(Rule $rule): JsonResponse
{
$this->ruleRepository->destroy($rule);
return response()->json([], 204);
}
/**
* List all of them.
*
* @param Request $request
*
* @return JsonResponse]
*/
public function index(Request $request): JsonResponse
{
// create some objects:
$manager = new Manager;
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
// types to get, page size:
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// get list of budgets. Count it and split it.
$collection = $this->ruleRepository->getAll();
$count = $collection->count();
$rules = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
// make paginator:
$paginator = new LengthAwarePaginator($rules, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.piggy_banks.index') . $this->buildParams());
// present to user.
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new FractalCollection($rules, new RuleTransformer($this->parameters), 'rules');
$resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* List single resource.
*
* @param Request $request
* @param Rule $rule
*
* @return JsonResponse
*/
public function show(Request $request, Rule $rule): JsonResponse
{
$manager = new Manager();
// add include parameter:
$include = $request->get('include') ?? '';
$manager->parseIncludes($include);
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new Item($rule, new RuleTransformer($this->parameters), 'rules');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* Store new object.
*
* @param Request $request
*
* @return JsonResponse
*/
public function store(RuleRequest $request): JsonResponse
{
$rule = $this->ruleRepository->store($request->getAll());
$manager = new Manager();
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new Item($rule, new RuleTransformer($this->parameters), 'rules');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* @param RuleRequest $request
* @param Rule $rule
*
* @return JsonResponse
*/
public function update(RuleRequest $request, Rule $rule): JsonResponse
{
$rule = $this->ruleRepository->update($rule, $request->getAll());
$manager = new Manager();
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new Item($rule, new RuleTransformer($this->parameters), 'rules');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
}

View File

@@ -0,0 +1,171 @@
<?php
/**
* RuleGroupController.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers;
use FireflyIII\Api\V1\Requests\RuleGroupRequest;
use FireflyIII\Models\RuleGroup;
use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
use FireflyIII\Transformers\RuleGroupTransformer;
use FireflyIII\User;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Pagination\LengthAwarePaginator;
use League\Fractal\Manager;
use League\Fractal\Pagination\IlluminatePaginatorAdapter;
use League\Fractal\Resource\Collection as FractalCollection;
use League\Fractal\Resource\Item;
use League\Fractal\Serializer\JsonApiSerializer;
class RuleGroupController extends Controller
{
/** @var RuleGroupRepositoryInterface */
private $ruleGroupRepository;
public function __construct()
{
parent::__construct();
$this->middleware(
function ($request, $next) {
/** @var User $user */
$user = auth()->user();
$this->ruleGroupRepository = app(RuleGroupRepositoryInterface::class);
$this->ruleGroupRepository->setUser($user);
return $next($request);
}
);
}
/**
* Delete the resource.
*
* @param string $object
*
* @return JsonResponse
*/
public function delete(RuleGroup $ruleGroup): JsonResponse
{
$this->ruleGroupRepository->destroy($ruleGroup, null);
return response()->json([], 204);
}
/**
* List all of them.
*
* @param Request $request
*
* @return JsonResponse]
*/
public function index(Request $request): JsonResponse
{
// create some objects:
$manager = new Manager;
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
// types to get, page size:
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// get list of budgets. Count it and split it.
$collection = $this->ruleGroupRepository->get();
$count = $collection->count();
$ruleGroups = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
// make paginator:
$paginator = new LengthAwarePaginator($ruleGroups, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.rule_groups.index') . $this->buildParams());
// present to user.
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new FractalCollection($ruleGroups, new RuleGroupTransformer($this->parameters), 'rule_groups');
$resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* List single resource.
*
* @param Request $request
* @param RuleGroup $ruleGroup
*
* @return JsonResponse
*/
public function show(Request $request, RuleGroup $ruleGroup): JsonResponse
{
$manager = new Manager();
// add include parameter:
$include = $request->get('include') ?? '';
$manager->parseIncludes($include);
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new Item($ruleGroup, new RuleGroupTransformer($this->parameters), 'rule_groups');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* Store new object.
*
* @param RuleGroupRequest $request
*
* @return JsonResponse
*/
public function store(RuleGroupRequest $request): JsonResponse
{
$ruleGroup = $this->ruleGroupRepository->store($request->getAll());
$manager = new Manager();
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new Item($ruleGroup, new RuleGroupTransformer($this->parameters), 'rule_groups');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* @param Request $request
* @param string $object
*
* @return JsonResponse
*/
public function update(RuleGroupRequest $request, RuleGroup $ruleGroup): JsonResponse
{
$ruleGroup = $this->ruleGroupRepository->update($ruleGroup, $request->getAll());
$manager = new Manager();
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new Item($ruleGroup, new RuleGroupTransformer($this->parameters), 'rule_groups');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
}

View File

@@ -0,0 +1,336 @@
<?php
/**
* TransactionController.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers;
use FireflyIII\Api\V1\Requests\TransactionRequest;
use FireflyIII\Helpers\Collector\JournalCollectorInterface;
use FireflyIII\Helpers\Filter\InternalTransferFilter;
use FireflyIII\Helpers\Filter\NegativeAmountFilter;
use FireflyIII\Helpers\Filter\PositiveAmountFilter;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Transformers\TransactionTransformer;
use Illuminate\Http\Request;
use Illuminate\Support\Collection;
use League\Fractal\Manager;
use League\Fractal\Pagination\IlluminatePaginatorAdapter;
use League\Fractal\Resource\Collection as FractalCollection;
use League\Fractal\Serializer\JsonApiSerializer;
use Log;
/**
* Class TransactionController
*/
class TransactionController extends Controller
{
/** @var JournalRepositoryInterface */
private $repository;
/**
* TransactionController constructor.
*
* @throws \FireflyIII\Exceptions\FireflyException
*/
public function __construct()
{
parent::__construct();
$this->middleware(
function ($request, $next) {
/** @var JournalRepositoryInterface repository */
$this->repository = app(JournalRepositoryInterface::class);
$this->repository->setUser(auth()->user());
return $next($request);
}
);
}
/**
* Remove the specified resource from storage.
*
* @param \FireflyIII\Models\Transaction $transaction
*
* @return \Illuminate\Http\Response
*/
public function delete(Transaction $transaction)
{
$journal = $transaction->transactionJournal;
$this->repository->destroy($journal);
return response()->json([], 204);
}
/**
* @param Request $request
*
* @return \Illuminate\Http\JsonResponse
*/
public function index(Request $request)
{
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// read type from URI
$type = $request->get('type') ?? 'default';
$this->parameters->set('type', $type);
// types to get, page size:
$types = $this->mapTypes($this->parameters->get('type'));
$manager = new Manager();
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
// collect transactions using the journal collector
$collector = app(JournalCollectorInterface::class);
$collector->setUser(auth()->user());
$collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation();
$collector->setAllAssetAccounts();
// remove internal transfer filter:
if (\in_array(TransactionType::TRANSFER, $types)) {
$collector->removeFilter(InternalTransferFilter::class);
}
if (null !== $this->parameters->get('start') && null !== $this->parameters->get('end')) {
$collector->setRange($this->parameters->get('start'), $this->parameters->get('end'));
}
$collector->setLimit($pageSize)->setPage($this->parameters->get('page'));
$collector->setTypes($types);
$paginator = $collector->getPaginatedJournals();
$paginator->setPath(route('api.v1.transactions.index') . $this->buildParams());
$transactions = $paginator->getCollection();
$resource = new FractalCollection($transactions, new TransactionTransformer($this->parameters), 'transactions');
$resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* @param Request $request
* @param Transaction $transaction
* @param string $include
*
* @return \Illuminate\Http\JsonResponse
*/
public function show(Request $request, Transaction $transaction, string $include = null)
{
$manager = new Manager();
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
// add include parameter:
$include = $include ?? '';
$include = $request->get('include') ?? $include;
$manager->parseIncludes($include);
// collect transactions using the journal collector
$collector = app(JournalCollectorInterface::class);
$collector->setUser(auth()->user());
$collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation();
// filter on specific journals.
$collector->setJournals(new Collection([$transaction->transactionJournal]));
// add filter to remove transactions:
$transactionType = $transaction->transactionJournal->transactionType->type;
if ($transactionType === TransactionType::WITHDRAWAL) {
$collector->addFilter(PositiveAmountFilter::class);
}
if (!($transactionType === TransactionType::WITHDRAWAL)) {
$collector->addFilter(NegativeAmountFilter::class);
}
$transactions = $collector->getJournals();
$resource = new FractalCollection($transactions, new TransactionTransformer($this->parameters), 'transactions');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* @param TransactionRequest $request
*
* @param JournalRepositoryInterface $repository
*
* @return \Illuminate\Http\JsonResponse
*/
public function store(TransactionRequest $request, JournalRepositoryInterface $repository)
{
$data = $request->getAll();
$data['user'] = auth()->user()->id;
$journal = $repository->store($data);
$manager = new Manager();
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
// add include parameter:
$include = $request->get('include') ?? '';
$manager->parseIncludes($include);
// collect transactions using the journal collector
$collector = app(JournalCollectorInterface::class);
$collector->setUser(auth()->user());
$collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation();
// filter on specific journals.
$collector->setJournals(new Collection([$journal]));
// add filter to remove transactions:
$transactionType = $journal->transactionType->type;
if ($transactionType === TransactionType::WITHDRAWAL) {
$collector->addFilter(PositiveAmountFilter::class);
}
if (!($transactionType === TransactionType::WITHDRAWAL)) {
$collector->addFilter(NegativeAmountFilter::class);
}
$transactions = $collector->getJournals();
$resource = new FractalCollection($transactions, new TransactionTransformer($this->parameters), 'transactions');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* @param TransactionRequest $request
* @param JournalRepositoryInterface $repository
* @param Transaction $transaction
*
* @return \Illuminate\Http\JsonResponse
*/
public function update(TransactionRequest $request, JournalRepositoryInterface $repository, Transaction $transaction)
{
$data = $request->getAll();
$data['user'] = auth()->user()->id;
Log::debug('Inside transaction update');
$journal = $repository->update($transaction->transactionJournal, $data);
$manager = new Manager();
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
// add include parameter:
$include = $request->get('include') ?? '';
$manager->parseIncludes($include);
// needs a lot of extra data to match the journal collector. Or just expand that one.
// collect transactions using the journal collector
$collector = app(JournalCollectorInterface::class);
$collector->setUser(auth()->user());
$collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation();
// filter on specific journals.
$collector->setJournals(new Collection([$journal]));
// add filter to remove transactions:
$transactionType = $journal->transactionType->type;
if ($transactionType === TransactionType::WITHDRAWAL) {
$collector->addFilter(PositiveAmountFilter::class);
}
if (!($transactionType === TransactionType::WITHDRAWAL)) {
$collector->addFilter(NegativeAmountFilter::class);
}
$transactions = $collector->getJournals();
$resource = new FractalCollection($transactions, new TransactionTransformer($this->parameters), 'transactions');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* @param string $type
*
* @return array
*/
private function mapTypes(string $type): array
{
$types = [
'all' => [
TransactionType::WITHDRAWAL,
TransactionType::DEPOSIT,
TransactionType::TRANSFER,
TransactionType::OPENING_BALANCE,
TransactionType::RECONCILIATION,
],
'withdrawal' => [
TransactionType::WITHDRAWAL,
],
'withdrawals' => [
TransactionType::WITHDRAWAL,
],
'expense' => [
TransactionType::WITHDRAWAL,
],
'income' => [
TransactionType::DEPOSIT,
],
'deposit' => [
TransactionType::DEPOSIT,
],
'deposits' => [
TransactionType::DEPOSIT,
],
'transfer' => [
TransactionType::TRANSFER,
],
'transfers' => [
TransactionType::TRANSFER,
],
'opening_balance' => [
TransactionType::OPENING_BALANCE,
],
'reconciliation' => [
TransactionType::RECONCILIATION,
],
'reconciliations' => [
TransactionType::RECONCILIATION,
],
'special' => [
TransactionType::OPENING_BALANCE,
TransactionType::RECONCILIATION,
],
'specials' => [
TransactionType::OPENING_BALANCE,
TransactionType::RECONCILIATION,
],
'default' => [
TransactionType::WITHDRAWAL,
TransactionType::DEPOSIT,
TransactionType::TRANSFER,
],
];
if (isset($types[$type])) {
return $types[$type];
}
return $types['default']; // @codeCoverageIgnore
}
}

View File

@@ -0,0 +1,194 @@
<?php
/**
* UserController.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers;
use FireflyIII\Api\V1\Requests\UserRequest;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Repositories\User\UserRepositoryInterface;
use FireflyIII\Transformers\UserTransformer;
use FireflyIII\User;
use Illuminate\Http\Request;
use Illuminate\Pagination\LengthAwarePaginator;
use League\Fractal\Manager;
use League\Fractal\Pagination\IlluminatePaginatorAdapter;
use League\Fractal\Resource\Collection as FractalCollection;
use League\Fractal\Resource\Item;
use League\Fractal\Serializer\JsonApiSerializer;
/**
* Class UserController
*/
class UserController extends Controller
{
/** @var UserRepositoryInterface */
private $repository;
/**
* UserController constructor.
*
* @throws \FireflyIII\Exceptions\FireflyException
*/
public function __construct()
{
parent::__construct();
$this->middleware(
function ($request, $next) {
/** @var UserRepositoryInterface repository */
$this->repository = app(UserRepositoryInterface::class);
return $next($request);
}
);
}
/**
* Remove the specified resource from storage.
*
* @param \FireflyIII\User $user
*
* @return \Illuminate\Http\Response
* @throws FireflyException
*/
public function delete(User $user)
{
if (auth()->user()->hasRole('owner')) {
$this->repository->destroy($user);
return response()->json([], 204);
}
throw new FireflyException('No access to method.'); // @codeCoverageIgnore
}
/**
* Display a listing of the resource.
*
* @param Request $request
*
* @return \Illuminate\Http\JsonResponse
*/
public function index(Request $request)
{
// user preferences
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// make manager
$manager = new Manager();
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
// build collection
$collection = $this->repository->all();
$count = $collection->count();
$users = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
// make paginator:
$paginator = new LengthAwarePaginator($users, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.users.index') . $this->buildParams());
// make resource
$resource = new FractalCollection($users, new UserTransformer($this->parameters), 'users');
$resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* @param Request $request
* @param User $user
*
* @return \Illuminate\Http\JsonResponse
*/
public function show(Request $request, User $user)
{
// make manager
$manager = new Manager();
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
// add include parameter:
$include = $request->get('include') ?? '';
$manager->parseIncludes($include);
// make resource
$resource = new Item($user, new UserTransformer($this->parameters), 'users');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* @param UserRequest $request
*
* @return \Illuminate\Http\JsonResponse
*/
public function store(UserRequest $request)
{
$data = $request->getAll();
$user = $this->repository->store($data);
// make manager
$manager = new Manager();
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
// add include parameter:
$include = $request->get('include') ?? '';
$manager->parseIncludes($include);
// make resource
$resource = new Item($user, new UserTransformer($this->parameters), 'users');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
/**
* @param UserRequest $request
* @param User $user
*
* @return \Illuminate\Http\JsonResponse
*/
public function update(UserRequest $request, User $user)
{
$data = $request->getAll();
$user = $this->repository->update($user, $data);
// make manager
$manager = new Manager();
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
// add include parameter:
$include = $request->get('include') ?? '';
$manager->parseIncludes($include);
// make resource
$resource = new Item($user, new UserTransformer($this->parameters), 'users');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
}
}

View File

@@ -0,0 +1,108 @@
<?php
/**
* AccountRequest.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests;
/**
* Class AccountRequest
*/
class AccountRequest extends Request
{
/**
* @return bool
*/
public function authorize(): bool
{
// Only allow authenticated users
return auth()->check();
}
/**
* @return array
*/
public function getAll(): array
{
$data = [
'name' => $this->string('name'),
'active' => $this->boolean('active'),
'accountType' => $this->string('type'),
'account_type_id' => null,
'currency_id' => $this->integer('currency_id'),
'currency_code' => $this->string('currency_code'),
'virtualBalance' => $this->string('virtual_balance'),
'iban' => $this->string('iban'),
'BIC' => $this->string('bic'),
'accountNumber' => $this->string('account_number'),
'accountRole' => $this->string('account_role'),
'openingBalance' => $this->string('opening_balance'),
'openingBalanceDate' => $this->date('opening_balance_date'),
'ccType' => $this->string('cc_type'),
'ccMonthlyPaymentDate' => $this->string('cc_monthly_payment_date'),
'notes' => $this->string('notes'),
];
return $data;
}
/**
* @return array
*/
public function rules(): array
{
$accountRoles = implode(',', config('firefly.accountRoles'));
$types = implode(',', array_keys(config('firefly.subTitlesByIdentifier')));
$ccPaymentTypes = implode(',', array_keys(config('firefly.ccTypes')));
$rules = [
'name' => 'required|min:1|uniqueAccountForUser',
'opening_balance' => 'numeric|required_with:opening_balance_date|nullable',
'opening_balance_date' => 'date|required_with:opening_balance|nullable',
'iban' => 'iban|nullable',
'bic' => 'bic|nullable',
'virtual_balance' => 'numeric|nullable',
'currency_id' => 'numeric|exists:transaction_currencies,id|required_without:currency_code',
'currency_code' => 'min:3|max:3|exists:transaction_currencies,code|required_without:currency_id',
'account_number' => 'between:1,255|nullable|uniqueAccountNumberForUser',
'account_role' => 'in:' . $accountRoles . '|required_if:type,asset',
'active' => 'required|boolean',
'cc_type' => 'in:' . $ccPaymentTypes . '|required_if:account_role,ccAsset',
'cc_monthly_payment_date' => 'date' . '|required_if:account_role,ccAsset|required_if:cc_type,monthlyFull',
'type' => 'required|in:' . $types,
'notes' => 'min:0|max:65536',
];
switch ($this->method()) {
default:
break;
case 'PUT':
case 'PATCH':
$account = $this->route()->parameter('account');
$rules['name'] .= ':' . $account->id;
$rules['account_number'] .= ':' . $account->id;
$rules['type'] = 'in:' . $types;
break;
}
return $rules;
}
}

View File

@@ -0,0 +1,92 @@
<?php
/**
* AttachmentRequest.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests;
use FireflyIII\Models\Bill;
use FireflyIII\Models\ImportJob;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Rules\IsBase64;
use FireflyIII\Rules\IsValidAttachmentModel;
/**
* Class AttachmentRequest
*/
class AttachmentRequest extends Request
{
/**
* @return bool
*/
public function authorize(): bool
{
// Only allow authenticated users
return auth()->check();
}
/**
* @return array
*/
public function getAll(): array
{
return [
'filename' => $this->string('filename'),
'title' => $this->string('title'),
'notes' => $this->string('notes'),
'model' => $this->string('model'),
'model_id' => $this->integer('model_id'),
];
}
/**
* @return array
*/
public function rules(): array
{
$models = implode(
',', [
Bill::class,
ImportJob::class,
TransactionJournal::class,
]
);
$model = $this->string('model');
$rules = [
'filename' => 'required|between:1,255',
'title' => 'between:1,255',
'notes' => 'between:1,65000',
'model' => sprintf('required|in:%s', $models),
'model_id' => ['required', 'numeric', new IsValidAttachmentModel($model)],
];
switch ($this->method()) {
default:
break;
case 'PUT':
case 'PATCH':
unset($rules['model'], $rules['model_id']);
$rules['filename'] = 'between:1,255';
break;
}
return $rules;
}
}

View File

@@ -0,0 +1,69 @@
<?php
/**
* AvailableBudgetRequest.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests;
/**
* Class AvailableBudgetRequest
*/
class AvailableBudgetRequest extends Request
{
/**
* @return bool
*/
public function authorize(): bool
{
// Only allow authenticated users
return auth()->check();
}
/**
* @return array
*/
public function getAll(): array
{
return [
'transaction_currency_id' => $this->integer('transaction_currency_id'),
'amount' => $this->string('amount'),
'start_date' => $this->date('start_date'),
'end_date' => $this->date('end_date'),
];
}
/**
* @return array
*/
public function rules(): array
{
$rules = [
'transaction_currency_id' => 'required|numeric|exists:transaction_currencies,id',
'amount' => 'required|numeric|more:0',
'start_date' => 'required|date|before:end_date',
'end_date' => 'required|date|after:start_date',
];
return $rules;
}
}

View File

@@ -0,0 +1,117 @@
<?php
/**
* BillRequest.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests;
use Illuminate\Validation\Validator;
/**
* Class BillRequest
*/
class BillRequest extends Request
{
/**
* @return bool
*/
public function authorize(): bool
{
// Only allow authenticated users
return auth()->check();
}
/**
* @return array
*/
public function getAll(): array
{
$data = [
'name' => $this->string('name'),
'amount_min' => $this->string('amount_min'),
'amount_max' => $this->string('amount_max'),
'currency_id' => $this->integer('currency_id'),
'currency_code' => $this->string('currency_code'),
'date' => $this->date('date'),
'repeat_freq' => $this->string('repeat_freq'),
'skip' => $this->integer('skip'),
'automatch' => $this->boolean('automatch'),
'active' => $this->boolean('active'),
'notes' => $this->string('notes'),
];
return $data;
}
/**
* @return array
*/
public function rules(): array
{
$rules = [
'name' => 'required|between:1,255|uniqueObjectForUser:bills,name',
'amount_min' => 'required|numeric|more:0',
'amount_max' => 'required|numeric|more:0',
'currency_id' => 'numeric|exists:transaction_currencies,id|required_without:currency_code',
'currency_code' => 'min:3|max:3|exists:transaction_currencies,code|required_without:currency_id',
'date' => 'required|date',
'repeat_freq' => 'required|in:weekly,monthly,quarterly,half-year,yearly',
'skip' => 'required|between:0,31',
'automatch' => 'required|boolean',
'active' => 'required|boolean',
'notes' => 'between:1,65536',
];
switch ($this->method()) {
default:
break;
case 'PUT':
case 'PATCH':
$bill = $this->route()->parameter('bill');
$rules['name'] .= ',' . $bill->id;
break;
}
return $rules;
}
/**
* Configure the validator instance.
*
* @param Validator $validator
*
* @return void
*/
public function withValidator(Validator $validator): void
{
$validator->after(
function (Validator $validator) {
$data = $validator->getData();
$min = (float)($data['amount_min'] ?? 0);
$max = (float)($data['amount_max'] ?? 0);
if ($min > $max) {
$validator->errors()->add('amount_min', trans('validation.amount_min_over_max'));
}
}
);
}
}

View File

@@ -0,0 +1,77 @@
<?php
/**
* BudgetLimitRequest.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests;
/**
* Class BudgetLimitRequest
*/
class BudgetLimitRequest extends Request
{
/**
* @return bool
*/
public function authorize(): bool
{
// Only allow authenticated users
return auth()->check();
}
/**
* @return array
*/
public function getAll(): array
{
return [
'budget_id' => $this->integer('budget_id'),
'start_date' => $this->date('start_date'),
'end_date' => $this->date('end_date'),
'amount' => $this->string('amount'),
];
}
/**
* @return array
*/
public function rules(): array
{
$rules = [
'budget_id' => 'required|exists:budgets,id|belongsToUser:budgets,id',
'start_date' => 'required|before:end_date|date',
'end_date' => 'required|after:start_date|date',
'amount' => 'required|more:0',
];
switch ($this->method()) {
default:
break;
case 'PUT':
case 'PATCH':
$rules['budget_id'] = 'required|exists:budgets,id|belongsToUser:budgets,id';
break;
}
return $rules;
}
}

View File

@@ -0,0 +1,76 @@
<?php
/**
* BudgetRequest.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests;
use FireflyIII\Models\Budget;
/**
* Class BudgetRequest
*/
class BudgetRequest extends Request
{
/**
* @return bool
*/
public function authorize(): bool
{
// Only allow authenticated users
return auth()->check();
}
/**
* @return array
*/
public function getAll(): array
{
return [
'name' => $this->string('name'),
'active' => $this->boolean('active'),
'order' => 0,
];
}
/**
* @return array
*/
public function rules(): array
{
$rules = [
'name' => 'required|between:1,100|uniqueObjectForUser:budgets,name',
'active' => 'required|boolean',
];
switch ($this->method()) {
default:
break;
case 'PUT':
case 'PATCH':
/** @var Budget $budget */
$budget = $this->route()->parameter('budget');
$rules['name'] = sprintf('required|between:1,100|uniqueObjectForUser:budgets,name,%d', $budget->id);
break;
}
return $rules;
}
}

View File

@@ -0,0 +1,75 @@
<?php
/**
* CategoryRequest.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests;
use FireflyIII\Models\Category;
/**
* Class CategoryRequest
*/
class CategoryRequest extends Request
{
/**
* @return bool
*/
public function authorize(): bool
{
// Only allow authenticated users
return auth()->check();
}
/**
* @return array
*/
public function getAll(): array
{
return [
'name' => $this->string('name'),
'active' => $this->boolean('active'),
];
}
/**
* @return array
*/
public function rules(): array
{
$rules = [
'name' => 'required|between:1,100|uniqueObjectForUser:categories,name',
'active' => 'required|boolean',
];
switch ($this->method()) {
default:
break;
case 'PUT':
case 'PATCH':
/** @var Category $category */
$category = $this->route()->parameter('category');
$rules['name'] = sprintf('required|between:1,100|uniqueObjectForUser:categories,name,%d', $category->id);
break;
}
return $rules;
}
}

View File

@@ -0,0 +1,83 @@
<?php
/**
* CurrencyRequest.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests;
/**
* Class CurrencyRequest
*/
class CurrencyRequest extends Request
{
/**
* @return bool
*/
public function authorize(): bool
{
// Only allow authenticated users
return auth()->check();
}
/**
* @return array
*/
public function getAll(): array
{
return [
'name' => $this->string('name'),
'code' => $this->string('code'),
'symbol' => $this->string('symbol'),
'decimal_places' => $this->integer('decimal_places'),
'default' => $this->boolean('default'),
];
}
/**
* @return array
*/
public function rules(): array
{
$rules = [
'name' => 'required|between:1,255|unique:transaction_currencies,name',
'code' => 'required|between:3,3|unique:transaction_currencies,code',
'symbol' => 'required|between:1,5|unique:transaction_currencies,symbol',
'decimal_places' => 'required|between:0,20|numeric|min:0|max:20',
'default' => 'in:true,false',
];
switch ($this->method()) {
default:
break;
case 'PUT':
case 'PATCH':
$currency = $this->route()->parameter('currency');
$rules['name'] = 'required|between:1,255|unique:transaction_currencies,name,' . $currency->id;
$rules['code'] = 'required|between:1,255|unique:transaction_currencies,code,' . $currency->id;
$rules['symbol'] = 'required|between:1,255|unique:transaction_currencies,symbol,' . $currency->id;
break;
}
return $rules;
}
}

View File

@@ -0,0 +1,68 @@
<?php
/**
* JournalLinkRequest.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests;
/**
*
* Class JournalLinkRequest
*/
class JournalLinkRequest extends Request
{
/**
* @return bool
*/
public function authorize(): bool
{
// Only allow authenticated users
return auth()->check();
}
/**
* @return array
*/
public function getAll(): array
{
return [
'link_type_id' => $this->integer('link_type_id'),
'inward_id' => $this->integer('inward_id'),
'outward_id' => $this->integer('outward_id'),
'notes' => $this->string('notes'),
];
}
/**
* @return array
*/
public function rules(): array
{
return [
'link_type_id' => 'required|exists:link_types,id',
'inward_id' => 'required|belongsToUser:transaction_journals,id',
'outward_id' => 'required|belongsToUser:transaction_journals,id',
'notes' => 'between:0,65000',
];
}
}

View File

@@ -0,0 +1,86 @@
<?php
/**
* LinkTypeRequest.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests;
use FireflyIII\Models\LinkType;
use Illuminate\Validation\Rule;
/**
*
* Class LinkTypeRequest
*/
class LinkTypeRequest extends Request
{
/**
* @return bool
*/
public function authorize(): bool
{
// Only allow authenticated users
return auth()->check();
}
/**
* @return array
*/
public function getAll(): array
{
return [
'name' => $this->string('name'),
'outward' => $this->string('outward'),
'inward' => $this->string('inward'),
];
}
/**
* @return array
*/
public function rules(): array
{
$rules = [
'name' => 'required|unique:link_types,name|min:1',
'outward' => 'required|unique:link_types,outward|min:1|different:inward',
'inward' => 'required|unique:link_types,inward|min:1|different:outward',
];
// Rule::unique('users')->ignore($user->id),
switch ($this->method()) {
default:
break;
case 'PUT':
case 'PATCH':
/** @var LinkType $linkType */
$linkType = $this->route()->parameter('linkType');
$rules['name'] = ['required', Rule::unique('link_types', 'name')->ignore($linkType->id), 'min:1'];
$rules['outward'] = ['required', 'different:inward', Rule::unique('link_types', 'outward')->ignore($linkType->id), 'min:1'];
$rules['inward'] = ['required', 'different:outward', Rule::unique('link_types', 'inward')->ignore($linkType->id), 'min:1'];
break;
}
return $rules;
}
}

View File

@@ -0,0 +1,90 @@
<?php
/**
* PiggyBankRequest.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests;
use FireflyIII\Models\PiggyBank;
use FireflyIII\Rules\IsAssetAccountId;
/**
*
* Class PiggyBankRequest
*/
class PiggyBankRequest extends Request
{
/**
* @return bool
*/
public function authorize(): bool
{
// Only allow authenticated users
return auth()->check();
}
/**
* @return array
*/
public function getAll(): array
{
return [
'name' => $this->string('name'),
'account_id' => $this->integer('account_id'),
'targetamount' => $this->string('target_amount'),
'current_amount' => $this->string('current_amount'),
'start_date' => $this->date('start_date'),
'target_date' => $this->date('target_date'),
'note' => $this->string('notes'),
];
}
/**
* @return array
*/
public function rules(): array
{
$rules = [
'name' => 'required|between:1,255|uniquePiggyBankForUser',
'account_id' => ['required', 'belongsToUser:accounts', new IsAssetAccountId],
'target_amount' => 'required|numeric|more:0',
'current_amount' => 'numeric|more:0|lte:target_amount',
'start_date' => 'date|nullable',
'target_date' => 'date|nullable',
'notes' => 'max:65000',
];
switch ($this->method()) {
default:
break;
case 'PUT':
case 'PATCH':
/** @var PiggyBank $piggyBank */
$piggyBank = $this->route()->parameter('piggyBank');
$rules['name'] = 'required|between:1,255|uniquePiggyBankForUser:' . $piggyBank->id;
break;
}
return $rules;
}
}

View File

@@ -0,0 +1,57 @@
<?php
/**
* PreferenceRequest.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests;
/**
*
* Class PreferenceRequest
*/
class PreferenceRequest extends Request
{
/**
* @return bool
*/
public function authorize(): bool
{
// Only allow authenticated users
return auth()->check();
}
public function getAll(): array
{
return [
'data' => $this->get('data'),
];
}
public function rules(): array
{
return [
'data' => 'required|between:1,65000',
];
}
}

View File

@@ -0,0 +1,482 @@
<?php
/**
* RecurrenceRequest.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests;
use Carbon\Carbon;
use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Rules\BelongsUser;
use Illuminate\Validation\Validator;
use InvalidArgumentException;
use Log;
/**
* Class RecurrenceRequest
*/
class RecurrenceRequest extends Request
{
/**
* @return bool
*/
public function authorize(): bool
{
// Only allow authenticated users
return auth()->check();
}
/**
* @return array
*/
public function getAll(): array
{
$return = [
'recurrence' => [
'type' => $this->string('type'),
'title' => $this->string('title'),
'description' => $this->string('description'),
'first_date' => $this->date('first_date'),
'repeat_until' => $this->date('repeat_until'),
'repetitions' => $this->integer('nr_of_repetitions'),
'apply_rules' => $this->boolean('apply_rules'),
'active' => $this->boolean('active'),
],
'meta' => [
'piggy_bank_id' => $this->integer('piggy_bank_id'),
'piggy_bank_name' => $this->string('piggy_bank_name'),
'tags' => explode(',', $this->string('tags')),
],
'transactions' => [],
'repetitions' => [],
];
// repetition data:
/** @var array $repetitions */
$repetitions = $this->get('repetitions');
/** @var array $repetition */
foreach ($repetitions as $repetition) {
$return['repetitions'][] = [
'type' => $repetition['type'],
'moment' => $repetition['moment'],
'skip' => (int)$repetition['skip'],
'weekend' => (int)$repetition['weekend'],
];
}
// transaction data:
/** @var array $transactions */
$transactions = $this->get('transactions');
/** @var array $transaction */
foreach ($transactions as $transaction) {
$return['transactions'][] = [
'amount' => $transaction['amount'],
'currency_id' => isset($transaction['currency_id']) ? (int)$transaction['currency_id'] : null,
'currency_code' => $transaction['currency_code'] ?? null,
'foreign_amount' => $transaction['foreign_amount'] ?? null,
'foreign_currency_id' => isset($transaction['foreign_currency_id']) ? (int)$transaction['foreign_currency_id'] : null,
'foreign_currency_code' => $transaction['foreign_currency_code'] ?? null,
'budget_id' => isset($transaction['budget_id']) ? (int)$transaction['budget_id'] : null,
'budget_name' => $transaction['budget_name'] ?? null,
'category_id' => isset($transaction['category_id']) ? (int)$transaction['category_id'] : null,
'category_name' => $transaction['category_name'] ?? null,
'source_id' => isset($transaction['source_id']) ? (int)$transaction['source_id'] : null,
'source_name' => isset($transaction['source_name']) ? (string)$transaction['source_name'] : null,
'destination_id' => isset($transaction['destination_id']) ? (int)$transaction['destination_id'] : null,
'destination_name' => isset($transaction['destination_name']) ? (string)$transaction['destination_name'] : null,
'description' => $transaction['description'],
];
}
return $return;
}
/**
* @return array
*/
public function rules(): array
{
$today = new Carbon;
$today->addDay();
return [
'type' => 'required|in:withdrawal,transfer,deposit',
'title' => 'required|between:1,255|uniqueObjectForUser:recurrences,title',
'description' => 'between:1,65000',
'first_date' => sprintf('required|date|after:%s', $today->format('Y-m-d')),
'repeat_until' => sprintf('date|after:%s', $today->format('Y-m-d')),
'nr_of_repetitions' => 'numeric|between:1,31',
'apply_rules' => 'required|boolean',
'active' => 'required|boolean',
// rules for meta values:
'tags' => 'between:1,64000',
'piggy_bank_id' => 'numeric',
// rules for repetitions.
'repetitions.*.type' => 'required|in:daily,weekly,ndom,monthly,yearly',
'repetitions.*.moment' => 'between:0,10',
'repetitions.*.skip' => 'required|numeric|between:0,31',
'repetitions.*.weekend' => 'required|numeric|min:1|max:4',
// rules for transactions.
'transactions.*.currency_id' => 'numeric|exists:transaction_currencies,id|required_without:transactions.*.currency_code',
'transactions.*.currency_code' => 'min:3|max:3|exists:transaction_currencies,code|required_without:transactions.*.currency_id',
'transactions.*.foreign_amount' => 'numeric|more:0',
'transactions.*.foreign_currency_id' => 'numeric|exists:transaction_currencies,id',
'transactions.*.foreign_currency_code' => 'min:3|max:3|exists:transaction_currencies,code',
'transactions.*.budget_id' => ['mustExist:budgets,id', new BelongsUser],
'transactions.*.category_name' => 'between:1,255|nullable',
'transactions.*.source_id' => ['numeric', 'nullable', new BelongsUser],
'transactions.*.source_name' => 'between:1,255|nullable',
'transactions.*.destination_id' => ['numeric', 'nullable', new BelongsUser],
'transactions.*.destination_name' => 'between:1,255|nullable',
'transactions.*.amount' => 'required|numeric|more:0',
'transactions.*.description' => 'required|between:1,255',
];
}
/**
* Configure the validator instance.
*
* @param Validator $validator
*
* @return void
*/
public function withValidator(Validator $validator): void
{
$validator->after(
function (Validator $validator) {
$this->atLeastOneTransaction($validator);
$this->atLeastOneRepetition($validator);
$this->validRepeatsUntil($validator);
$this->validRepetitionMoment($validator);
$this->foreignCurrencyInformation($validator);
$this->validateAccountInformation($validator);
}
);
}
/**
* Throws an error when this asset account is invalid.
*
* @noinspection MoreThanThreeArgumentsInspection
*
* @param Validator $validator
* @param int|null $accountId
* @param null|string $accountName
* @param string $idField
* @param string $nameField
*
* @return null|Account
*/
protected function assetAccountExists(Validator $validator, ?int $accountId, ?string $accountName, string $idField, string $nameField): ?Account
{
$accountId = (int)$accountId;
$accountName = (string)$accountName;
// both empty? hard exit.
if ($accountId < 1 && '' === $accountName) {
$validator->errors()->add($idField, trans('validation.filled', ['attribute' => $idField]));
return null;
}
// ID belongs to user and is asset account:
/** @var AccountRepositoryInterface $repository */
$repository = app(AccountRepositoryInterface::class);
$repository->setUser(auth()->user());
$set = $repository->getAccountsById([$accountId]);
Log::debug(sprintf('Count of accounts found by ID %d is: %d', $accountId, $set->count()));
if ($set->count() === 1) {
/** @var Account $first */
$first = $set->first();
if ($first->accountType->type !== AccountType::ASSET) {
$validator->errors()->add($idField, trans('validation.belongs_user'));
return null;
}
// we ignore the account name at this point.
return $first;
}
$account = $repository->findByName($accountName, [AccountType::ASSET]);
if (null === $account) {
$validator->errors()->add($nameField, trans('validation.belongs_user'));
return null;
}
return $account;
}
/**
* Adds an error to the validator when there are no repetitions in the array of data.
*
* @param Validator $validator
*/
protected function atLeastOneRepetition(Validator $validator): void
{
$data = $validator->getData();
$repetitions = $data['repetitions'] ?? [];
// need at least one transaction
if (\count($repetitions) === 0) {
$validator->errors()->add('description', trans('validation.at_least_one_repetition'));
}
}
/**
* Adds an error to the validator when there are no transactions in the array of data.
*
* @param Validator $validator
*/
protected function atLeastOneTransaction(Validator $validator): void
{
$data = $validator->getData();
$transactions = $data['transactions'] ?? [];
// need at least one transaction
if (\count($transactions) === 0) {
$validator->errors()->add('description', trans('validation.at_least_one_transaction'));
}
}
/**
* TODO can be made a rule?
* If the transactions contain foreign amounts, there must also be foreign currency information.
*
* @param Validator $validator
*/
protected function foreignCurrencyInformation(Validator $validator): void
{
$data = $validator->getData();
$transactions = $data['transactions'] ?? [];
foreach ($transactions as $index => $transaction) {
// must have currency info.
if (isset($transaction['foreign_amount'])
&& !(isset($transaction['foreign_currency_id'])
|| isset($transaction['foreign_currency_code']))) {
$validator->errors()->add(
'transactions.' . $index . '.foreign_amount',
trans('validation.require_currency_info')
);
}
}
}
/**
* Throws an error when the given opposing account (of type $type) is invalid.
* Empty data is allowed, system will default to cash.
*
* @noinspection MoreThanThreeArgumentsInspection
*
* @param Validator $validator
* @param string $type
* @param int|null $accountId
* @param null|string $accountName
* @param string $idField
*
* @return null|Account
*/
protected function opposingAccountExists(Validator $validator, string $type, ?int $accountId, ?string $accountName, string $idField): ?Account
{
$accountId = (int)$accountId;
$accountName = (string)$accountName;
// both empty? done!
if ($accountId < 1 && \strlen($accountName) === 0) {
return null;
}
if ($accountId !== 0) {
// ID belongs to user and is $type account:
/** @var AccountRepositoryInterface $repository */
$repository = app(AccountRepositoryInterface::class);
$repository->setUser(auth()->user());
$set = $repository->getAccountsById([$accountId]);
if ($set->count() === 1) {
/** @var Account $first */
$first = $set->first();
if ($first->accountType->type !== $type) {
$validator->errors()->add($idField, trans('validation.belongs_user'));
return null;
}
// we ignore the account name at this point.
return $first;
}
}
// not having an opposing account by this name is NOT a problem.
return null;
}
/**
* TODO can be a rule?
*
* Validates the given account information. Switches on given transaction type.
*
* @param Validator $validator
*/
protected function validateAccountInformation(Validator $validator): void
{
$data = $validator->getData();
$transactions = $data['transactions'] ?? [];
$idField = 'description';
$transactionType = $data['type'] ?? 'false';
foreach ($transactions as $index => $transaction) {
$sourceId = isset($transaction['source_id']) ? (int)$transaction['source_id'] : null;
$sourceName = $transaction['source_name'] ?? null;
$destinationId = isset($transaction['destination_id']) ? (int)$transaction['destination_id'] : null;
$destinationName = $transaction['destination_name'] ?? null;
$sourceAccount = null;
$destinationAccount = null;
switch ($transactionType) {
case 'withdrawal':
$idField = 'transactions.' . $index . '.source_id';
$nameField = 'transactions.' . $index . '.source_name';
$sourceAccount = $this->assetAccountExists($validator, $sourceId, $sourceName, $idField, $nameField);
$idField = 'transactions.' . $index . '.destination_id';
$destinationAccount = $this->opposingAccountExists($validator, AccountType::EXPENSE, $destinationId, $destinationName, $idField);
break;
case 'deposit':
$idField = 'transactions.' . $index . '.source_id';
$sourceAccount = $this->opposingAccountExists($validator, AccountType::REVENUE, $sourceId, $sourceName, $idField);
$idField = 'transactions.' . $index . '.destination_id';
$nameField = 'transactions.' . $index . '.destination_name';
$destinationAccount = $this->assetAccountExists($validator, $destinationId, $destinationName, $idField, $nameField);
break;
case 'transfer':
$idField = 'transactions.' . $index . '.source_id';
$nameField = 'transactions.' . $index . '.source_name';
$sourceAccount = $this->assetAccountExists($validator, $sourceId, $sourceName, $idField, $nameField);
$idField = 'transactions.' . $index . '.destination_id';
$nameField = 'transactions.' . $index . '.destination_name';
$destinationAccount = $this->assetAccountExists($validator, $destinationId, $destinationName, $idField, $nameField);
break;
default:
$validator->errors()->add($idField, trans('validation.invalid_account_info'));
return;
}
// add some errors in case of same account submitted:
if (null !== $sourceAccount && null !== $destinationAccount && $sourceAccount->id === $destinationAccount->id) {
$validator->errors()->add($idField, trans('validation.source_equals_destination'));
}
}
}
/**
* @param Validator $validator
*/
private function validRepeatsUntil(Validator $validator): void
{
$data = $validator->getData();
$repetitions = $data['nr_of_repetitions'] ?? null;
$repeatUntil = $data['repeat_until'] ?? null;
if (null !== $repetitions && null !== $repeatUntil) {
// expect a date OR count:
$validator->errors()->add('repeat_until', trans('validation.require_repeat_until'));
$validator->errors()->add('nr_of_repetitions', trans('validation.require_repeat_until'));
return;
}
}
/**
* TODO merge this in a rule somehow.
*
* @param Validator $validator
*/
private function validRepetitionMoment(Validator $validator): void
{
$data = $validator->getData();
$repetitions = $data['repetitions'] ?? [];
/**
* @var int $index
* @var array $repetition
*/
foreach ($repetitions as $index => $repetition) {
switch ($repetition['type']) {
default:
$validator->errors()->add(sprintf('repetitions.%d.type', $index), trans('validation.valid_recurrence_rep_type'));
return;
case 'daily':
if ('' !== (string)$repetition['moment']) {
$validator->errors()->add(sprintf('repetitions.%d.moment', $index), trans('validation.valid_recurrence_rep_moment'));
}
return;
case 'monthly':
$dayOfMonth = (int)$repetition['moment'];
if ($dayOfMonth < 1 || $dayOfMonth > 31) {
$validator->errors()->add(sprintf('repetitions.%d.moment', $index), trans('validation.valid_recurrence_rep_moment'));
}
return;
case 'ndom':
$parameters = explode(',', $repetition['moment']);
if (\count($parameters) !== 2) {
$validator->errors()->add(sprintf('repetitions.%d.moment', $index), trans('validation.valid_recurrence_rep_moment'));
return;
}
$nthDay = (int)($parameters[0] ?? 0.0);
$dayOfWeek = (int)($parameters[1] ?? 0.0);
if ($nthDay < 1 || $nthDay > 5) {
$validator->errors()->add(sprintf('repetitions.%d.moment', $index), trans('validation.valid_recurrence_rep_moment'));
return;
}
if ($dayOfWeek < 1 || $dayOfWeek > 7) {
$validator->errors()->add(sprintf('repetitions.%d.moment', $index), trans('validation.valid_recurrence_rep_moment'));
return;
}
return;
case 'weekly':
$dayOfWeek = (int)$repetition['moment'];
if ($dayOfWeek < 1 || $dayOfWeek > 7) {
$validator->errors()->add(sprintf('repetitions.%d.moment', $index), trans('validation.valid_recurrence_rep_moment'));
return;
}
break;
case 'yearly':
try {
Carbon::createFromFormat('Y-m-d', $repetition['moment']);
} catch (InvalidArgumentException $e) {
$validator->errors()->add(sprintf('repetitions.%d.moment', $index), trans('validation.valid_recurrence_rep_moment'));
return;
}
}
}
}
}

View File

@@ -0,0 +1,35 @@
<?php
/**
* Request.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests;
use FireflyIII\Http\Requests\Request as FireflyIIIRequest;
/**
* Class Request.
*/
class Request extends FireflyIIIRequest
{
}

View File

@@ -0,0 +1,79 @@
<?php
/**
* RuleGroupRequest.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests;
use FireflyIII\Models\RuleGroup;
/**
*
* Class RuleGroupRequest
*/
class RuleGroupRequest extends Request
{
/**
* @return bool
*/
public function authorize(): bool
{
// Only allow authenticated users
return auth()->check();
}
/**
* @return array
*/
public function getAll(): array
{
return [
'title' => $this->string('title'),
'description' => $this->string('description'),
'active' => $this->boolean('active'),
];
}
/**
* @return array
*/
public function rules(): array
{
$rules = [
'title' => 'required|between:1,100|uniqueObjectForUser:rule_groups,title',
'description' => 'between:1,5000|nullable',
'active' => 'required|boolean',
];
switch ($this->method()) {
default:
break;
case 'PUT':
case 'PATCH':
/** @var RuleGroup $ruleGroup */
$ruleGroup = $this->route()->parameter('ruleGroup');
$rules['title'] = 'required|between:1,100|uniqueObjectForUser:rule_groups,title,' . $ruleGroup->id;
break;
}
return $rules;
}
}

View File

@@ -0,0 +1,156 @@
<?php
/**
* RuleRequest.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests;
use Illuminate\Validation\Validator;
/**
* Class RuleRequest
*/
class RuleRequest extends Request
{
/**
* @return bool
*/
public function authorize(): bool
{
// Only allow authenticated users
return auth()->check();
}
/**
* @return array
*/
public function getAll(): array
{
$data = [
'title' => $this->string('title'),
'description' => $this->string('description'),
'rule_group_id' => $this->integer('rule_group_id'),
'rule_group_title' => $this->string('rule_group_title'),
'trigger' => $this->string('trigger'),
'strict' => $this->boolean('strict'),
'stop-processing' => $this->boolean('stop_processing'),
'active' => $this->boolean('active'),
'rule-triggers' => [],
'rule-actions' => [],
];
foreach ($this->get('rule-triggers') as $trigger) {
$data['rule-triggers'][] = [
'name' => $trigger['name'],
'value' => $trigger['value'],
'stop-processing' => (int)($trigger['stop-processing'] ?? 0) === 1,
];
}
foreach ($this->get('rule-actions') as $action) {
$data['rule-actions'][] = [
'name' => $action['name'],
'value' => $action['value'],
'stop-processing' => (int)($action['stop-processing'] ?? 0) === 1,
];
}
return $data;
}
/**
* @return array
*/
public function rules(): array
{
$validTriggers = array_keys(config('firefly.rule-triggers'));
$validActions = array_keys(config('firefly.rule-actions'));
// some actions require text:
$contextActions = implode(',', config('firefly.rule-actions-text'));
$rules = [
'title' => 'required|between:1,100|uniqueObjectForUser:rules,title',
'description' => 'between:1,5000|nullable',
'rule_group_id' => 'required|belongsToUser:rule_groups|required_without:rule_group_title',
'rule_group_title' => 'nullable|between:1,255|required_without:rule_group_id|belongsToUser:rule_groups,title',
'trigger' => 'required|in:store-journal,update-journal',
'rule-triggers.*.name' => 'required|in:' . implode(',', $validTriggers),
'rule-triggers.*.stop-processing' => 'boolean',
'rule-triggers.*.value' => 'required|min:1|ruleTriggerValue', //
'rule-actions.*.name' => 'required|in:' . implode(',', $validActions),
'rule-actions.*.value' => 'required_if:rule-action.*.type,' . $contextActions . '|ruleActionValue',
'rule-actions.*.stop-processing' => 'boolean',
'strict' => 'required|boolean',
'stop_processing' => 'required|boolean',
'active' => 'required|boolean',
];
return $rules;
}
/**
* Configure the validator instance.
*
* @param Validator $validator
*
* @return void
*/
public function withValidator(Validator $validator): void
{
$validator->after(
function (Validator $validator) {
$this->atLeastOneTrigger($validator);
$this->atLeastOneAction($validator);
}
);
}
/**
* Adds an error to the validator when there are no repetitions in the array of data.
*
* @param Validator $validator
*/
protected function atLeastOneAction(Validator $validator): void
{
$data = $validator->getData();
$repetitions = $data['rule-actions'] ?? [];
// need at least one transaction
if (\count($repetitions) === 0) {
$validator->errors()->add('title', trans('validation.at_least_one_action'));
}
}
/**
* Adds an error to the validator when there are no repetitions in the array of data.
*
* @param Validator $validator
*/
protected function atLeastOneTrigger(Validator $validator): void
{
$data = $validator->getData();
$repetitions = $data['rule-triggers'] ?? [];
// need at least one transaction
if (\count($repetitions) === 0) {
$validator->errors()->add('title', trans('validation.at_least_one_trigger'));
}
}
}

View File

@@ -0,0 +1,520 @@
<?php
/**
* TransactionRequest.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType;
use FireflyIII\Models\Transaction;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Rules\BelongsUser;
use Illuminate\Validation\Validator;
/**
* Class TransactionRequest
*/
class TransactionRequest extends Request
{
/**
* @return bool
*/
public function authorize(): bool
{
// Only allow authenticated users
return auth()->check();
}
/**
* @return array
*/
public function getAll(): array
{
$data = [
// basic fields for journal:
'type' => $this->string('type'),
'date' => $this->date('date'),
'description' => $this->string('description'),
'piggy_bank_id' => $this->integer('piggy_bank_id'),
'piggy_bank_name' => $this->string('piggy_bank_name'),
'bill_id' => $this->integer('bill_id'),
'bill_name' => $this->string('bill_name'),
'tags' => explode(',', $this->string('tags')),
// then, custom fields for journal
'interest_date' => $this->date('interest_date'),
'book_date' => $this->date('book_date'),
'process_date' => $this->date('process_date'),
'due_date' => $this->date('due_date'),
'payment_date' => $this->date('payment_date'),
'invoice_date' => $this->date('invoice_date'),
'internal_reference' => $this->string('internal_reference'),
'notes' => $this->string('notes'),
// then, transactions (see below).
'transactions' => [],
];
foreach ($this->get('transactions') as $index => $transaction) {
$array = [
'description' => $transaction['description'] ?? null,
'amount' => $transaction['amount'],
'currency_id' => isset($transaction['currency_id']) ? (int)$transaction['currency_id'] : null,
'currency_code' => $transaction['currency_code'] ?? null,
'foreign_amount' => $transaction['foreign_amount'] ?? null,
'foreign_currency_id' => isset($transaction['foreign_currency_id']) ? (int)$transaction['foreign_currency_id'] : null,
'foreign_currency_code' => $transaction['foreign_currency_code'] ?? null,
'budget_id' => isset($transaction['budget_id']) ? (int)$transaction['budget_id'] : null,
'budget_name' => $transaction['budget_name'] ?? null,
'category_id' => isset($transaction['category_id']) ? (int)$transaction['category_id'] : null,
'category_name' => $transaction['category_name'] ?? null,
'source_id' => isset($transaction['source_id']) ? (int)$transaction['source_id'] : null,
'source_name' => isset($transaction['source_name']) ? (string)$transaction['source_name'] : null,
'destination_id' => isset($transaction['destination_id']) ? (int)$transaction['destination_id'] : null,
'destination_name' => isset($transaction['destination_name']) ? (string)$transaction['destination_name'] : null,
'reconciled' => $transaction['reconciled'] ?? false,
'identifier' => $index,
];
$data['transactions'][] = $array;
}
return $data;
}
/**
* @return array
*/
public function rules(): array
{
$rules = [
// basic fields for journal:
'type' => 'required|in:withdrawal,deposit,transfer',
'date' => 'required|date',
'description' => 'between:1,255',
'piggy_bank_id' => ['numeric', 'nullable', 'mustExist:piggy_banks,id', new BelongsUser],
'piggy_bank_name' => ['between:1,255', 'nullable', new BelongsUser],
'bill_id' => ['numeric', 'nullable', 'mustExist:bills,id', new BelongsUser],
'bill_name' => ['between:1,255', 'nullable', new BelongsUser],
'tags' => 'between:1,255',
// then, custom fields for journal
'interest_date' => 'date|nullable',
'book_date' => 'date|nullable',
'process_date' => 'date|nullable',
'due_date' => 'date|nullable',
'payment_date' => 'date|nullable',
'invoice_date' => 'date|nullable',
'internal_reference' => 'min:1,max:255|nullable',
'notes' => 'min:1,max:50000|nullable',
// transaction rules (in array for splits):
'transactions.*.description' => 'nullable|between:1,255',
'transactions.*.amount' => 'required|numeric|more:0',
'transactions.*.currency_id' => 'numeric|exists:transaction_currencies,id|required_without:transactions.*.currency_code',
'transactions.*.currency_code' => 'min:3|max:3|exists:transaction_currencies,code|required_without:transactions.*.currency_id',
'transactions.*.foreign_amount' => 'numeric|more:0',
'transactions.*.foreign_currency_id' => 'numeric|exists:transaction_currencies,id',
'transactions.*.foreign_currency_code' => 'min:3|max:3|exists:transaction_currencies,code',
'transactions.*.budget_id' => ['mustExist:budgets,id', new BelongsUser],
'transactions.*.budget_name' => ['between:1,255', 'nullable', new BelongsUser],
'transactions.*.category_id' => ['mustExist:categories,id', new BelongsUser],
'transactions.*.category_name' => 'between:1,255|nullable',
'transactions.*.reconciled' => 'boolean|nullable',
// basic rules will be expanded later.
'transactions.*.source_id' => ['numeric', 'nullable', new BelongsUser],
'transactions.*.source_name' => 'between:1,255|nullable',
'transactions.*.destination_id' => ['numeric', 'nullable', new BelongsUser],
'transactions.*.destination_name' => 'between:1,255|nullable',
];
switch ($this->method()) {
default:
break;
case 'PUT':
case 'PATCH':
unset($rules['type'], $rules['piggy_bank_id'], $rules['piggy_bank_name']);
break;
}
return $rules;
}
/**
* Configure the validator instance.
*
* @param Validator $validator
*
* @return void
*/
public function withValidator(Validator $validator): void
{
$validator->after(
function (Validator $validator) {
$this->atLeastOneTransaction($validator);
$this->checkValidDescriptions($validator);
$this->equalToJournalDescription($validator);
$this->emptySplitDescriptions($validator);
$this->foreignCurrencyInformation($validator);
$this->validateAccountInformation($validator);
$this->validateSplitAccounts($validator);
}
);
}
/**
* Throws an error when this asset account is invalid.
*
* @noinspection MoreThanThreeArgumentsInspection
*
* @param Validator $validator
* @param int|null $accountId
* @param null|string $accountName
* @param string $idField
* @param string $nameField
*
* @return null|Account
*/
protected function assetAccountExists(Validator $validator, ?int $accountId, ?string $accountName, string $idField, string $nameField): ?Account
{
$accountId = (int)$accountId;
$accountName = (string)$accountName;
// both empty? hard exit.
if ($accountId < 1 && \strlen($accountName) === 0) {
$validator->errors()->add($idField, trans('validation.filled', ['attribute' => $idField]));
return null;
}
// ID belongs to user and is asset account:
/** @var AccountRepositoryInterface $repository */
$repository = app(AccountRepositoryInterface::class);
$repository->setUser(auth()->user());
$set = $repository->getAccountsById([$accountId]);
if ($set->count() === 1) {
/** @var Account $first */
$first = $set->first();
if ($first->accountType->type !== AccountType::ASSET) {
$validator->errors()->add($idField, trans('validation.belongs_user'));
return null;
}
// we ignore the account name at this point.
return $first;
}
$account = $repository->findByName($accountName, [AccountType::ASSET]);
if (null === $account) {
$validator->errors()->add($nameField, trans('validation.belongs_user'));
return null;
}
return $account;
}
/**
* Adds an error to the validator when there are no transactions in the array of data.
*
* @param Validator $validator
*/
protected function atLeastOneTransaction(Validator $validator): void
{
$data = $validator->getData();
$transactions = $data['transactions'] ?? [];
// need at least one transaction
if (\count($transactions) === 0) {
$validator->errors()->add('description', trans('validation.at_least_one_transaction'));
}
}
/**
* Adds an error to the "description" field when the user has submitted no descriptions and no
* journal description.
*
* @param Validator $validator
*/
protected function checkValidDescriptions(Validator $validator): void
{
$data = $validator->getData();
$transactions = $data['transactions'] ?? [];
$journalDescription = (string)($data['description'] ?? '');
$validDescriptions = 0;
foreach ($transactions as $index => $transaction) {
if (\strlen((string)($transaction['description'] ?? '')) > 0) {
$validDescriptions++;
}
}
// no valid descriptions and empty journal description? error.
if ($validDescriptions === 0 && \strlen($journalDescription) === 0) {
$validator->errors()->add('description', trans('validation.filled', ['attribute' => trans('validation.attributes.description')]));
}
}
/**
* Adds an error to the validator when the user submits a split transaction (more than 1 transactions)
* but does not give them a description.
*
* @param Validator $validator
*/
protected function emptySplitDescriptions(Validator $validator): void
{
$data = $validator->getData();
$transactions = $data['transactions'] ?? [];
foreach ($transactions as $index => $transaction) {
$description = (string)($transaction['description'] ?? '');
// filled description is mandatory for split transactions.
if (\count($transactions) > 1 && \strlen($description) === 0) {
$validator->errors()->add(
'transactions.' . $index . '.description',
trans('validation.filled', ['attribute' => trans('validation.attributes.transaction_description')])
);
}
}
}
/**
* Adds an error to the validator when any transaction descriptions are equal to the journal description.
*
* @param Validator $validator
*/
protected function equalToJournalDescription(Validator $validator): void
{
$data = $validator->getData();
$transactions = $data['transactions'] ?? [];
$journalDescription = (string)($data['description'] ?? '');
foreach ($transactions as $index => $transaction) {
$description = (string)($transaction['description'] ?? '');
// description cannot be equal to journal description.
if ($description === $journalDescription) {
$validator->errors()->add('transactions.' . $index . '.description', trans('validation.equal_description'));
}
}
}
/**
* TODO can be made a rule?
*
* If the transactions contain foreign amounts, there must also be foreign currency information.
*
* @param Validator $validator
*/
protected function foreignCurrencyInformation(Validator $validator): void
{
$data = $validator->getData();
$transactions = $data['transactions'] ?? [];
foreach ($transactions as $index => $transaction) {
// must have currency info.
if (isset($transaction['foreign_amount'])
&& !(isset($transaction['foreign_currency_id'])
|| isset($transaction['foreign_currency_code']))) {
$validator->errors()->add(
'transactions.' . $index . '.foreign_amount',
trans('validation.require_currency_info')
);
}
}
}
/**
* Throws an error when the given opposing account (of type $type) is invalid.
* Empty data is allowed, system will default to cash.
*
* @noinspection MoreThanThreeArgumentsInspection
*
* @param Validator $validator
* @param string $type
* @param int|null $accountId
* @param null|string $accountName
* @param string $idField
*
* @return null|Account
*/
protected function opposingAccountExists(Validator $validator, string $type, ?int $accountId, ?string $accountName, string $idField): ?Account
{
$accountId = (int)$accountId;
$accountName = (string)$accountName;
// both empty? done!
if ($accountId < 1 && \strlen($accountName) === 0) {
return null;
}
if ($accountId !== 0) {
// ID belongs to user and is $type account:
/** @var AccountRepositoryInterface $repository */
$repository = app(AccountRepositoryInterface::class);
$repository->setUser(auth()->user());
$set = $repository->getAccountsById([$accountId]);
if ($set->count() === 1) {
/** @var Account $first */
$first = $set->first();
if ($first->accountType->type !== $type) {
$validator->errors()->add($idField, trans('validation.belongs_user'));
return null;
}
// we ignore the account name at this point.
return $first;
}
}
// not having an opposing account by this name is NOT a problem.
return null;
}
/**
* Validates the given account information. Switches on given transaction type.
*
* @param Validator $validator
*
* @throws FireflyException
*/
protected function validateAccountInformation(Validator $validator): void
{
$data = $validator->getData();
$transactions = $data['transactions'] ?? [];
if (!isset($data['type'])) {
// the journal may exist in the request:
/** @var Transaction $transaction */
$transaction = $this->route()->parameter('transaction');
if (null === $transaction) {
return; // @codeCoverageIgnore
}
$data['type'] = strtolower($transaction->transactionJournal->transactionType->type);
}
foreach ($transactions as $index => $transaction) {
$sourceId = isset($transaction['source_id']) ? (int)$transaction['source_id'] : null;
$sourceName = $transaction['source_name'] ?? null;
$destinationId = isset($transaction['destination_id']) ? (int)$transaction['destination_id'] : null;
$destinationName = $transaction['destination_name'] ?? null;
$sourceAccount = null;
$destinationAccount = null;
switch ($data['type']) {
case 'withdrawal':
$idField = 'transactions.' . $index . '.source_id';
$nameField = 'transactions.' . $index . '.source_name';
$sourceAccount = $this->assetAccountExists($validator, $sourceId, $sourceName, $idField, $nameField);
$idField = 'transactions.' . $index . '.destination_id';
$destinationAccount = $this->opposingAccountExists($validator, AccountType::EXPENSE, $destinationId, $destinationName, $idField);
break;
case 'deposit':
$idField = 'transactions.' . $index . '.source_id';
$sourceAccount = $this->opposingAccountExists($validator, AccountType::REVENUE, $sourceId, $sourceName, $idField);
$idField = 'transactions.' . $index . '.destination_id';
$nameField = 'transactions.' . $index . '.destination_name';
$destinationAccount = $this->assetAccountExists($validator, $destinationId, $destinationName, $idField, $nameField);
break;
case 'transfer':
$idField = 'transactions.' . $index . '.source_id';
$nameField = 'transactions.' . $index . '.source_name';
$sourceAccount = $this->assetAccountExists($validator, $sourceId, $sourceName, $idField, $nameField);
$idField = 'transactions.' . $index . '.destination_id';
$nameField = 'transactions.' . $index . '.destination_name';
$destinationAccount = $this->assetAccountExists($validator, $destinationId, $destinationName, $idField, $nameField);
break;
default:
// @codeCoverageIgnoreStart
throw new FireflyException(
sprintf('The validator cannot handle transaction type "%s" in validateAccountInformation().', $data['type'])
);
// @codeCoverageIgnoreEnd
}
// add some errors in case of same account submitted:
if (null !== $sourceAccount && null !== $destinationAccount && $sourceAccount->id === $destinationAccount->id) {
$validator->errors()->add($idField, trans('validation.source_equals_destination'));
}
}
}
/**
* @param Validator $validator
*
* @throws FireflyException
*/
protected function validateSplitAccounts(Validator $validator): void
{
$data = $validator->getData();
$count = isset($data['transactions']) ? \count($data['transactions']) : 0;
if ($count < 2) {
return;
}
// this is pretty much impossible:
// @codeCoverageIgnoreStart
if (!isset($data['type'])) {
// the journal may exist in the request:
/** @var Transaction $transaction */
$transaction = $this->route()->parameter('transaction');
if (null === $transaction) {
return;
}
$data['type'] = strtolower($transaction->transactionJournal->transactionType->type);
}
// @codeCoverageIgnoreEnd
// collect all source ID's and destination ID's, if present:
$sources = [];
$destinations = [];
foreach ($data['transactions'] as $transaction) {
$sources[] = isset($transaction['source_id']) ? (int)$transaction['source_id'] : 0;
$destinations[] = isset($transaction['destination_id']) ? (int)$transaction['destination_id'] : 0;
}
$destinations = array_unique($destinations);
$sources = array_unique($sources);
// switch on type:
switch ($data['type']) {
case 'withdrawal':
if (\count($sources) > 1) {
$validator->errors()->add('transactions.0.source_id', trans('validation.all_accounts_equal'));
}
break;
case 'deposit':
if (\count($destinations) > 1) {
$validator->errors()->add('transactions.0.destination_id', trans('validation.all_accounts_equal'));
}
break;
case 'transfer':
if (\count($sources) > 1 || \count($destinations) > 1) {
$validator->errors()->add('transactions.0.source_id', trans('validation.all_accounts_equal'));
$validator->errors()->add('transactions.0.destination_id', trans('validation.all_accounts_equal'));
}
break;
default:
// @codeCoverageIgnoreStart
throw new FireflyException(
sprintf('The validator cannot handle transaction type "%s" in validateSplitAccounts().', $data['type'])
);
// @codeCoverageIgnoreEnd
}
}
}

View File

@@ -0,0 +1,90 @@
<?php
/**
* UserRequest.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests;
use FireflyIII\User;
/**
* Class UserRequest
*/
class UserRequest extends Request
{
/**
* @return bool
*/
public function authorize(): bool
{
// Only allow authenticated users
if (!auth()->check()) {
return false; // @codeCoverageIgnore
}
/** @var User $user */
$user = auth()->user();
if (!$user->hasRole('owner')) {
return false; // @codeCoverageIgnore
}
return true;
}
/**
* @return array
*/
public function getAll(): array
{
$data = [
'email' => $this->string('email'),
'blocked' => $this->boolean('blocked'),
'blocked_code' => $this->string('blocked_code'),
];
return $data;
}
/**
* @return array
*/
public function rules(): array
{
$rules = [
'email' => 'required|email|unique:users,email,',
'blocked' => 'required|boolean',
'blocked_code' => 'in:email_changed',
];
switch ($this->method()) {
default:
break;
case 'PUT':
case 'PATCH':
$user = $this->route()->parameter('user');
$rules['email'] = 'required|email|unique:users,email,' . $user->id;
break;
}
return $rules;
}
}

View File

@@ -0,0 +1,137 @@
<?php
/**
* CreateExport.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Console\Commands;
use Carbon\Carbon;
use FireflyIII\Export\ProcessorInterface;
use FireflyIII\Models\AccountType;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\ExportJob\ExportJobRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Repositories\User\UserRepositoryInterface;
use Illuminate\Console\Command;
use Storage;
/**
* Class CreateExport.
*
* Generates export from the command line.
*/
class CreateExport extends Command
{
use VerifiesAccessToken;
/**
* The console command description.
*
* @var string
*/
protected $description = 'Use this command to create a new import. Your user ID can be found on the /profile page.';
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature
= 'firefly:create-export
{--user= : The user ID that the import should import for.}
{--token= : The user\'s access token.}
{--with_attachments : Include user\'s attachments?}
{--with_uploads : Include user\'s uploads?}';
/**
* Execute the console command.
*
* @return mixed
*/
public function handle()
{
if (!$this->verifyAccessToken()) {
$this->error('Invalid access token.');
return 1;
}
$this->line('Full export is running...');
// make repositories
/** @var UserRepositoryInterface $userRepository */
$userRepository = app(UserRepositoryInterface::class);
/** @var ExportJobRepositoryInterface $jobRepository */
$jobRepository = app(ExportJobRepositoryInterface::class);
/** @var AccountRepositoryInterface $accountRepository */
$accountRepository = app(AccountRepositoryInterface::class);
/** @var JournalRepositoryInterface $journalRepository */
$journalRepository = app(JournalRepositoryInterface::class);
// set user
$user = $userRepository->findNull((int)$this->option('user'));
$jobRepository->setUser($user);
$journalRepository->setUser($user);
$accountRepository->setUser($user);
// first date
$firstJournal = $journalRepository->firstNull();
$first = new Carbon;
if (null !== $firstJournal) {
$first = $firstJournal->date;
}
// create job and settings.
$job = $jobRepository->create();
$settings = [
'accounts' => $accountRepository->getAccountsByType([AccountType::ASSET, AccountType::DEFAULT]),
'startDate' => $first,
'endDate' => new Carbon,
'exportFormat' => 'csv',
'includeAttachments' => $this->option('with_attachments'),
'includeOldUploads' => $this->option('with_uploads'),
'job' => $job,
];
/** @var ProcessorInterface $processor */
$processor = app(ProcessorInterface::class);
$processor->setSettings($settings);
$processor->collectJournals();
$processor->convertJournals();
$processor->exportJournals();
if ($settings['includeAttachments']) {
$processor->collectAttachments();
}
if ($settings['includeOldUploads']) {
$processor->collectOldUploads();
}
$processor->createZipFile();
$disk = Storage::disk('export');
$fileName = sprintf('export-%s.zip', date('Y-m-d_H-i-s'));
$disk->move($job->key . '.zip', $fileName);
$this->line('The export has finished! You can find the ZIP file in this location:');
$this->line(storage_path(sprintf('export/%s', $fileName)));
return 0;
}
}

View File

@@ -0,0 +1,297 @@
<?php
/**
* CreateImport.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Console\Commands;
use Exception;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Import\Prerequisites\PrerequisitesInterface;
use FireflyIII\Import\Routine\RoutineInterface;
use FireflyIII\Import\Storage\ImportArrayStorage;
use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
use FireflyIII\Repositories\User\UserRepositoryInterface;
use Illuminate\Console\Command;
use Log;
use Preferences;
/**
* Class CreateImport.
*/
class CreateImport extends Command
{
use VerifiesAccessToken;
/**
* The console command description.
*
* @var string
*/
protected $description = 'Use this command to create a new import. Your user ID can be found on the /profile page.';
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature
= 'firefly:create-import
{file? : The file to import.}
{configuration? : The configuration file to use for the import.}
{--type=csv : The file type of the import.}
{--provider=file : The file type of the import.}
{--user=1 : The user ID that the import should import for.}
{--token= : The user\'s access token.}
{--start : Starts the job immediately.}';
/**
* Run the command.
*
* @throws FireflyException
*/
public function handle(): int
{
if (!$this->verifyAccessToken()) {
$this->errorLine('Invalid access token.');
return 1;
}
/** @var UserRepositoryInterface $userRepository */
$userRepository = app(UserRepositoryInterface::class);
$file = (string)$this->argument('file');
$configuration = (string)$this->argument('configuration');
$user = $userRepository->findNull((int)$this->option('user'));
$cwd = getcwd();
$type = strtolower((string)$this->option('type'));
$provider = strtolower((string)$this->option('provider'));
$configurationData = [];
if (!$this->validArguments()) {
$this->errorLine('Invalid arguments.');
return 1;
}
if (\strlen($configuration) > 0) {
$configurationData = json_decode(file_get_contents($configuration), true);
if (null === $configurationData) {
$this->errorLine(sprintf('Firefly III cannot read the contents of configuration file "%s" (working directory: "%s").', $configuration, $cwd));
return 1;
}
}
$this->infoLine(sprintf('Going to create a job to import file: %s', $file));
$this->infoLine(sprintf('Using configuration file: %s', $configuration));
$this->infoLine(sprintf('Import into user: #%d (%s)', $user->id, $user->email));
$this->infoLine(sprintf('Type of import: %s', $provider));
/** @var ImportJobRepositoryInterface $jobRepository */
$jobRepository = app(ImportJobRepositoryInterface::class);
$jobRepository->setUser($user);
$importJob = $jobRepository->create($provider);
$this->infoLine(sprintf('Created job "%s"', $importJob->key));
// make sure that job has no prerequisites.
if ((bool)config(sprintf('import.has_prereq.%s', $provider))) {
// make prerequisites thing.
$class = (string)config(sprintf('import.prerequisites.%s', $provider));
if (!class_exists($class)) {
throw new FireflyException(sprintf('No class to handle prerequisites for "%s".', $provider)); // @codeCoverageIgnore
}
/** @var PrerequisitesInterface $object */
$object = app($class);
$object->setUser($user);
if (!$object->isComplete()) {
$this->errorLine(sprintf('Import provider "%s" has prerequisites that can only be filled in using the browser.', $provider));
return 1;
}
}
// store file as attachment.
if (\strlen($file) > 0) {
$messages = $jobRepository->storeCLIUpload($importJob, 'import_file', $file);
if ($messages->count() > 0) {
$this->errorLine($messages->first());
return 1;
}
$this->infoLine('File content saved.');
}
$this->infoLine('Job configuration saved.');
$jobRepository->setConfiguration($importJob, $configurationData);
$jobRepository->setStatus($importJob, 'ready_to_run');
if (true === $this->option('start')) {
$this->infoLine('The has started. The process is not visible. Please wait.');
Log::debug('Go for import!');
// run it!
$key = sprintf('import.routine.%s', $provider);
$className = config($key);
if (null === $className || !class_exists($className)) {
// @codeCoverageIgnoreStart
$this->errorLine(sprintf('No routine for provider "%s"', $provider));
return 1;
// @codeCoverageIgnoreEnd
}
// keep repeating this call until job lands on "provider_finished"
$valid = ['provider_finished'];
$count = 0;
while (!\in_array($importJob->status, $valid, true) && $count < 6) {
Log::debug(sprintf('Now in loop #%d.', $count + 1));
/** @var RoutineInterface $routine */
$routine = app($className);
$routine->setImportJob($importJob);
try {
$routine->run();
} catch (FireflyException|Exception $e) {
$message = 'The import routine crashed: ' . $e->getMessage();
Log::error($message);
Log::error($e->getTraceAsString());
// set job errored out:
$jobRepository->setStatus($importJob, 'error');
$this->errorLine($message);
return 1;
}
$count++;
}
if ($importJob->status === 'provider_finished') {
$this->infoLine('Import has finished. Please wait for storage of data.');
// set job to be storing data:
$jobRepository->setStatus($importJob, 'storing_data');
/** @var ImportArrayStorage $storage */
$storage = app(ImportArrayStorage::class);
$storage->setImportJob($importJob);
try {
$storage->store();
} catch (FireflyException|Exception $e) {
$message = 'The import routine crashed: ' . $e->getMessage();
Log::error($message);
Log::error($e->getTraceAsString());
// set job errored out:
$jobRepository->setStatus($importJob, 'error');
$this->errorLine($message);
return 1;
}
// set storage to be finished:
$jobRepository->setStatus($importJob, 'storage_finished');
}
// give feedback:
$this->infoLine('Job has finished.');
if (null !== $importJob->tag) {
$this->infoLine(sprintf('%d transaction(s) have been imported.', $importJob->tag->transactionJournals->count()));
$this->infoLine(sprintf('You can find your transactions under tag "%s"', $importJob->tag->tag));
}
if (null === $importJob->tag) {
$this->errorLine('No transactions have been imported :(.');
}
if (\count($importJob->errors) > 0) {
$this->infoLine(sprintf('%d error(s) occurred:', \count($importJob->errors)));
foreach ($importJob->errors as $err) {
$this->errorLine('- ' . $err);
}
}
}
// clear cache for user:
Preferences::setForUser($user, 'lastActivity', microtime());
return 0;
}
/**
* @param string $message
* @param array|null $data
*/
private function errorLine(string $message, array $data = null): void
{
Log::error($message, $data ?? []);
$this->error($message);
}
/**
* @param string $message
* @param array $data
*/
private function infoLine(string $message, array $data = null): void
{
Log::info($message, $data ?? []);
$this->line($message);
}
/**
* Verify user inserts correct arguments.
*
* @noinspection MultipleReturnStatementsInspection
* @return bool
*/
private function validArguments(): bool
{
$file = $this->argument('file');
$configuration = $this->argument('configuration');
$cwd = getcwd();
$validTypes = config('import.options.file.import_formats');
$type = strtolower($this->option('type'));
$provider = strtolower($this->option('provider'));
$enabled = (bool)config(sprintf('import.enabled.%s', $provider));
if (false === $enabled) {
$this->errorLine(sprintf('Provider "%s" is not enabled.', $provider));
return false;
}
if ($provider === 'file' && !\in_array($type, $validTypes, true)) {
$this->errorLine(sprintf('Cannot import file of type "%s"', $type));
return false;
}
if ($provider === 'file' && !file_exists($file)) {
$this->errorLine(sprintf('Firefly III cannot find file "%s" (working directory: "%s").', $file, $cwd));
return false;
}
if ($provider === 'file' && !file_exists($configuration)) {
$this->errorLine(sprintf('Firefly III cannot find configuration file "%s" (working directory: "%s").', $configuration, $cwd));
return false;
}
return true;
}
}

View File

@@ -0,0 +1,106 @@
<?php
/**
* DecryptAttachment.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Console\Commands;
use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
use Illuminate\Console\Command;
use Log;
/**
* Class DecryptAttachment.
*/
class DecryptAttachment extends Command
{
/**
* The console command description.
*
* @var string
*/
protected $description = 'Decrypts an attachment and dumps the content in a file in the given directory.';
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature
= 'firefly:decrypt-attachment {id:The ID of the attachment.} {name:The file name of the attachment.}
{directory:Where the file must be stored.}';
/**
* Execute the console command.
*
* @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's five its fine.
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function handle()
{
/** @var AttachmentRepositoryInterface $repository */
$repository = app(AttachmentRepositoryInterface::class);
$attachmentId = (int)$this->argument('id');
$attachment = $repository->findWithoutUser($attachmentId);
$attachmentName = trim($this->argument('name'));
$storagePath = realpath(trim($this->argument('directory')));
if (null === $attachment->id) {
$this->error(sprintf('No attachment with id #%d', $attachmentId));
Log::error(sprintf('DecryptAttachment: No attachment with id #%d', $attachmentId));
return;
}
if ($attachmentName !== $attachment->filename) {
$this->error('File name does not match.');
Log::error('DecryptAttachment: File name does not match.');
return;
}
if (!is_dir($storagePath)) {
$this->error(sprintf('Path "%s" is not a directory.', $storagePath));
Log::error(sprintf('DecryptAttachment: Path "%s" is not a directory.', $storagePath));
return;
}
if (!is_writable($storagePath)) {
$this->error(sprintf('Path "%s" is not writable.', $storagePath));
Log::error(sprintf('DecryptAttachment: Path "%s" is not writable.', $storagePath));
return;
}
$fullPath = $storagePath . DIRECTORY_SEPARATOR . $attachment->filename;
$content = $repository->getContent($attachment);
$this->line(sprintf('Going to write content for attachment #%d into file "%s"', $attachment->id, $fullPath));
$result = file_put_contents($fullPath, $content);
if (false === $result) {
$this->error('Could not write to file.');
return;
}
$this->info(sprintf('%d bytes written. Exiting now..', $result));
}
}

View File

@@ -0,0 +1,72 @@
<?php
/**
* EncryptFile.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Console\Commands;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Services\Internal\File\EncryptService;
use Illuminate\Console\Command;
/**
* Class EncryptFile.
*/
class EncryptFile extends Command
{
/**
* The console command description.
*
* @var string
*/
protected $description = 'Encrypts a file and places it in the storage/upload directory.';
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'firefly:encrypt-file {file} {key}';
/**
* Execute the console command.
*
* @throws \Illuminate\Contracts\Encryption\EncryptException
*/
public function handle(): int
{
$code = 0;
$file = (string)$this->argument('file');
$key = (string)$this->argument('key');
/** @var EncryptService $service */
$service = app(EncryptService::class);
try {
$service->encrypt($file, $key);
} catch (FireflyException $e) {
$this->error($e->getMessage());
$code = 1;
}
return $code;
}
}

View File

@@ -0,0 +1,145 @@
<?php
/**
* Import.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Console\Commands;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Import\Routine\RoutineInterface;
use FireflyIII\Models\ImportJob;
use Illuminate\Console\Command;
use Illuminate\Support\MessageBag;
use Log;
/**
* Class Import.
*/
class Import extends Command
{
/**
* The console command description.
*
* @var string
*/
protected $description = 'This will start a new import.';
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'firefly:start-import {key}';
/**
* Run the import routine.
*
* @throws FireflyException
*/
public function handle()
{
Log::debug('Start start-import command');
$jobKey = $this->argument('key');
$job = ImportJob::where('key', $jobKey)->first();
if (null === $job) {
$this->errorLine(sprintf('No job found with key "%s"', $jobKey));
return;
}
if (!$this->isValid($job)) {
$this->errorLine('Job is not valid for some reason. Exit.');
return;
}
$this->infoLine(sprintf('Going to import job with key "%s" of type "%s"', $job->key, $job->file_type));
// actually start job:
$type = 'csv' === $job->file_type ? 'file' : $job->file_type;
$key = sprintf('import.routine.%s', $type);
$className = config($key);
if (null === $className || !class_exists($className)) {
throw new FireflyException(sprintf('Cannot find import routine class for job of type "%s".', $type)); // @codeCoverageIgnore
}
/** @var RoutineInterface $routine */
$routine = app($className);
$routine->setJob($job);
$routine->run();
/** @var MessageBag $error */
foreach ($routine->getErrors() as $index => $error) {
$this->errorLine(sprintf('Error importing line #%d: %s', $index, $error));
}
$this->infoLine(
sprintf('The import has finished. %d transactions have been imported out of %d records.', $routine->getJournals()->count(), $routine->getLines())
);
}
/**
* @param string $message
* @param array|null $data
*/
private function errorLine(string $message, array $data = null): void
{
Log::error($message, $data ?? []);
$this->error($message);
}
/**
* @param string $message
* @param array $data
*/
private function infoLine(string $message, array $data = null): void
{
Log::info($message, $data ?? []);
$this->line($message);
}
/**
* Check if job is valid to be imported.
*
* @param ImportJob $job
*
* @return bool
*/
private function isValid(ImportJob $job): bool
{
if (null === $job) {
$this->errorLine('This job does not seem to exist.');
return false;
}
if ('configured' !== $job->status) {
Log::error(sprintf('This job is not ready to be imported (status is %s).', $job->status));
$this->errorLine('This job is not ready to be imported.');
return false;
}
return true;
}
}

View File

@@ -0,0 +1,85 @@
<?php
/**
* ScanAttachments.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Console\Commands;
use Crypt;
use FireflyIII\Models\Attachment;
use Illuminate\Console\Command;
use Illuminate\Contracts\Encryption\DecryptException;
use Illuminate\Contracts\Filesystem\FileNotFoundException;
use Storage;
/**
* Class ScanAttachments.
*/
class ScanAttachments extends Command
{
/**
* The console command description.
*
* @var string
*/
protected $description = 'Rescan all attachments and re-set the MD5 hash and mime.';
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'firefly:scan-attachments';
/**
* Execute the console command.
*/
public function handle()
{
$attachments = Attachment::get();
$disk = Storage::disk('upload');
/** @var Attachment $attachment */
foreach ($attachments as $attachment) {
$fileName = $attachment->fileName();
try {
$content = $disk->get($fileName);
} catch (FileNotFoundException $e) {
$this->error(sprintf('Could not find data for attachment #%d', $attachment->id));
continue;
}
try {
$decrypted = Crypt::decrypt($content);
} catch (DecryptException $e) {
$this->error(sprintf('Could not decrypt data of attachment #%d', $attachment->id));
continue;
}
$tmpfname = tempnam(sys_get_temp_dir(), 'FireflyIII');
file_put_contents($tmpfname, $decrypted);
$md5 = md5_file($tmpfname);
$mime = mime_content_type($tmpfname);
$attachment->md5 = $md5;
$attachment->mime = $mime;
$attachment->save();
$this->line(sprintf('Fixed attachment #%d', $attachment->id));
}
}
}

Some files were not shown because too many files have changed in this diff Show More