Commit Graph
100 Commits
Author SHA1 Message Date
James Cole 27d533dd5b New docker things. 2017-10-11 10:07:09 +02:00
James Cole 011e28e8c2 Updated docker file. 2017-10-11 09:34:03 +02:00
James Cole dadeb4616e Updated docker file. 2017-10-11 09:14:34 +02:00
James Cole bea0c8dd55 Update docker files. #919 and #915 2017-10-11 08:16:57 +02:00
James Cole b6245d4b0b Updated composer lock file. 2017-10-09 20:43:36 +02:00
James Cole 74494a0df6 Added language. 2017-10-09 20:43:25 +02:00
James Cole 9cdd79ee30 Updated changelog. 2017-10-09 20:43:19 +02:00
James Cole f90a27ce59 Remove twig clean from test script 2017-10-09 20:30:57 +02:00
James Cole 624b654fa6 Fix #917 2017-10-09 20:30:46 +02:00
James Cole 09118013c9 Update for #915 2017-10-08 18:35:24 +02:00
James Cole e934d8943f Fix #915 2017-10-08 18:27:51 +02:00
James Cole 9a8ddf5c05 Some debug for #916 2017-10-08 10:14:26 +02:00
James Cole 70d5737d83 Fix #910 2017-10-08 06:08:20 +02:00
James Cole b1b2bb4cc9 Fix #911 2017-10-08 06:07:15 +02:00
James Cole 511d2c8d1e Update log thing. 2017-10-06 16:16:01 +02:00
James Cole 9aaee0a951 Met coverage enabled this time. 2017-10-06 15:55:28 +02:00
James Cole a606a3eef4 Test code coverage. 2017-10-06 15:52:06 +02:00
James Cole 67ed6e14aa New tests. 2017-10-06 15:41:21 +02:00
James Cole 29e02ce31f A longer search string will no longer partly match on account name! 2017-10-06 07:07:12 +02:00
James Cole e5514bc61a Fix #904 2017-10-06 06:36:00 +02:00
James Cole e68594a93b Various code cleanup. 2017-10-05 11:49:06 +02:00
James Cole b18012a36c Fix tests 2017-10-05 08:26:08 +02:00
James Cole 61eeb84db6 Merge branch 'develop' of https://github.com/firefly-iii/firefly-iii into develop
* 'develop' of https://github.com/firefly-iii/firefly-iii:
  Add missing translations strings in search
2017-10-05 07:34:04 +02:00
James Cole 1ba304462f make search query a string 2017-10-05 07:19:23 +02:00
James Cole fb4df3484c New tests 2017-10-04 16:43:01 +02:00
James Cole c17a278e57 New unit tests. 2017-10-04 15:27:20 +02:00
James Cole 6770b8396a Fix sprintf error #893 2017-10-04 14:58:03 +02:00
James Cole 81da87287e Make French a completed language. 2017-10-04 14:53:16 +02:00
James Cole 35a5310485 Fix #893 2017-10-04 07:19:19 +02:00
James Cole a22a2fb4ef Fix #891 and 892 [skip ci] 2017-10-03 13:30:43 +02:00
James Cole c000fe4557 Update tests 2017-10-03 10:41:48 +02:00
James Cole dd9528f531 Migrate notes in upgrade database routine. 2017-10-03 10:41:29 +02:00
James Cole d1a6b37eb3 Use note object instead of field #888 2017-10-03 10:30:56 +02:00
James Cole 4af0c18020 Add missing translation [skip ci] 2017-10-03 05:31:48 +02:00
James Cole 95b5793f63 New triggers and actions for notes. #872 2017-10-03 05:28:00 +02:00
James Cole 7a57c60891 Add config value to .env value. #882 2017-10-02 18:20:03 +02:00
James Cole ebcd8dbd7c Set trusted proxies value from config if present. #882 2017-10-02 18:19:17 +02:00
James Cole 1bfa8f0139 Expand test coverage. 2017-10-02 16:27:21 +02:00
James Cole 2dfe2ddaf3 Attempt to cover all cases in amount converter, this fixes #840 2017-10-02 16:25:48 +02:00
James Cole 03f33c5e7e Remove routes (for help) 2017-10-02 16:24:31 +02:00
James Cole 2b73747ecf Button instead of a link #884 2017-10-02 14:41:06 +02:00
James Cole 174d01292f Fix #881 2017-10-02 08:47:57 +02:00
James Cole cc61281523 Add openstreetmap with a mapbox.com layer. #420 2017-09-30 17:50:22 +02:00
James Cole c0d62dfc86 Merge branch 'develop' of https://github.com/firefly-iii/firefly-iii into develop
* 'develop' of https://github.com/firefly-iii/firefly-iii:
  Fix dates in CHANGELOG. [skip ci]
2017-09-30 13:17:45 +02:00
James Cole 134f21bada Fix for #825 2017-09-30 13:16:12 +02:00
James Cole aea6575358 Merge branch 'release/4.6.6' 2017-09-30 09:11:16 +02:00
James Cole d0054e657e Updated composer file. 2017-09-30 09:03:13 +02:00
James Cole d2e312e1c3 Update changelog. [skip ci] 2017-09-30 08:40:36 +02:00
James Cole 8678f9af65 Add redirect for tag thing. See #875 2017-09-29 16:54:23 +02:00
James Cole cca29bcdfe Take redirect uri from controller class. 2017-09-29 16:53:09 +02:00
James Cole 40f2659b91 Smooth error catching. 2017-09-29 15:32:47 +02:00
James Cole d306183c95 Catch exceptions in FixerIO 2017-09-29 15:32:35 +02:00
James Cole aa4682af6a Expand budget box and clear some languages. 2017-09-29 14:22:40 +02:00
James Cole 76ed261441 A basic box for #786 2017-09-29 08:52:15 +02:00
James Cole aaac47ebfc Icons will not break [skip ci] 2017-09-28 08:59:59 +02:00
James Cole fd1feadc67 Fix #826 2017-09-28 08:59:40 +02:00
James Cole c19c7c680b Small improvements to bunq import. 2017-09-28 08:17:32 +02:00
James Cole b80b026246 Fix tests. 2017-09-27 15:46:08 +02:00
James Cole a1a93d9bbb Send test message from admin. 2017-09-27 15:45:55 +02:00
James Cole c9cb310a2f Remove crappy translation of link types. Still needs a solution. 2017-09-27 14:50:04 +02:00
James Cole fdfe18a952 Fix code for boxes. 2017-09-27 14:42:12 +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 d99adb515a More code for #857 2017-09-26 09:15:21 +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 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 1a81cd45f2 Fix #866 2017-09-25 06:14:37 +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 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 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 3f93941dd9 Fix #854 2017-09-17 19:21:03 +02: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 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 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 fc67c9a476 Add missing translation for #843 2017-09-14 17:45:43 +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 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