IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-20 11:48:27 -06:00
Code Issues Packages Projects Releases Wiki Activity
11,796 Commits 4 Branches 526 Tags 1.1 GiB
ca9f8b56f7
Commit Graph

589 Commits

Author SHA1 Message Date
James Cole
ca9f8b56f7
Merge tag '4.7.17.5' into develop 
4.7.17.5

# Conflicts:
#	resources/views/v1/transactions/convert.twig
 2019-08-02 20:59:57 +02:00
James Cole
b217acfe26
New version + correct credits. 2019-08-02 20:59:06 +02:00
James Cole
3435cb937c
Merge tag '4.7.17.4' into develop 
4.7.17.4

# Conflicts:
#	config/firefly.php
#	resources/views/v1/transactions/convert.twig
 2019-08-02 17:10:55 +02:00
James Cole
1b3d3de969
Update version. 2019-08-02 17:08:24 +02:00
James Cole
9b574ce7ad
Improve test coverage. 2019-07-31 16:53:09 +02:00
James Cole
6ff4a0b45c
Improve test coverage. 2019-07-25 14:19:49 +02:00
James Cole
889b7e9a18
Improve mass controller and test controllers. 2019-07-20 16:02:50 +02:00
James Cole
6d34cfb940
Implemented new link thing. 2019-07-20 06:47:34 +02:00
James Cole
a9f34e9dd1
Update version. 2019-07-16 19:22:45 +02:00
James Cole
def307010c
Fix #2335, attempt 2. 2019-07-15 19:12:20 +02:00
James Cole
45ddb64186
Fix #2335 2019-07-15 16:50:18 +02:00
James Cole
6197c77303
Improve recurrences 2019-06-29 19:47:40 +02:00
Sander Kleykens
9e9e5bd6dd CSV file fix for ING Belgium 
Parse the description and opposing account information (IBAN and name) from ING Belgium CSV files.
 2019-06-23 22:24:52 +02:00
James Cole
abf70a235a
Debug the account-create controller. 2019-06-22 05:51:32 +02:00
James Cole
2ab9d2e6ee
Improve test coverage. 2019-06-10 20:14:00 +02:00
James Cole
85f9c256a1
Refactor some code for recurrences. 2019-06-08 06:19:21 +02:00
James Cole
bff156aad4
Add copyright things. 2019-05-29 21:56:39 +02:00
James Cole
fd28589395
Fix model and add debug info. 2019-05-11 05:32:09 +02:00
James Cole
d5c5fa4fad Lots of new code for new transaction screen. 2019-05-04 20:58:11 +02:00
James Cole
912fe99981 New code for overview. Temp submit. 2019-04-19 07:00:19 +02:00
James Cole
63070bffc3 Merge branch 'develop' into v480 
* develop:
  Fix #2204
  CSV file fix for Belfius
 2019-04-09 07:51:11 +02:00
Sander Kleykens
251e9f9ba1 CSV file fix for Belfius 
Correct the description for outgoing recurring transactions in Belfius CSV files
 2019-04-06 20:47:35 +02:00
James Cole
c519b4d0df Is now capable of updating transactions over the API. 2019-04-06 08:10:50 +02:00
James Cole
b692cccdfb User can submit new journal through API. 2019-03-31 13:36:49 +02:00
James Cole
bc43ea2c25 Update version etc. 2019-03-24 14:52:45 +01:00
James Cole
1b0be2a47e Refactor upgrade and verify commands. 2019-03-23 08:10:59 +01:00
James Cole
f84655e339 Update config for Romanian. 2019-03-22 18:29:34 +01:00
James Cole
01219c951c Enable norsk, update version of DB 2019-03-17 09:14:52 +01:00
James Cole
6462d2b87a
Merge pull request #2167 from wrouesnel/bugfix/ldapauth 
Fix LDAP auth configuration paths.
 2019-03-16 18:58:21 +01:00
Will Rouesnel
cb4ff35adb
Fix LDAP auth configuration paths. 
This commit fixes parameters broken in the latest version of `adldap2`.

Specifically:

* `adldap` auth parameters have changed in the latest version.
  * "usernames" has become `identities` and `discover` has changed to
    `discover_users_by`, `auth` has changed to `bind_users_by`
* Add the missing objectguid field to the users table for adldap2.
  * This is added as a nullable (optional) field at the moment to support
    tracking LDAP users as adldap2 wants to.
 2019-03-12 09:12:54 +11:00
James Cole
d063f32c1c Fix some cache issues and a version bump. 2019-03-08 17:57:42 +01:00
James Cole
4aac969ae4 Update version and changelog. 2019-03-05 17:52:44 +01:00
James Cole
48219c9af3 Update libraries. 2019-03-02 20:14:45 +01:00
James Cole
e85ac07c49 Update meta files for new release. 2019-03-02 15:55:01 +01:00
James Cole
3a57e09447 Fix for #2128 2019-03-02 14:33:46 +01:00
James Cole
ad31cc1c1f Fixes #2119 and bump version. 2019-02-24 07:27:24 +01:00
James Cole
d8b4af34e0 Update files for release 4.7.13 2019-02-23 14:32:24 +01:00
James Cole
64ae56757e Updated meta files. 2019-02-16 19:22:16 +01:00
James Cole
451c86e431 Final touches for #2085 2019-02-16 19:04:36 +01:00
James Cole
59fdf5b77a Updates to the login procedure [skip ci] 2019-02-16 07:20:25 +01:00
James Cole
19710c3eab Update LDAP config for #2085 2019-02-15 07:39:12 +01:00
James Cole
0782354160 Updated LDAP code #2085 2019-02-15 07:22:51 +01:00
James Cole
b273af341c Update version. 2019-02-12 21:01:19 +01:00
James Cole
4f274a290e Generic debug info. 2019-02-09 20:44:31 +01:00
James Cole
41d22876c4 Update changelog and version. 2019-02-08 17:00:46 +01:00
James Cole
d63c9c9aea Add audit logging. 2019-02-08 07:13:59 +01:00
James Cole
926e2db1d6 Update meta files for new release. 2019-02-03 10:09:04 +01:00
James Cole
4307bf3b83 Remove Firefly III's ability to encrypt data in the database. 2019-01-31 19:56:09 +01:00
James Cole
9f2f258ad9 Added new language, Chinese Traditional. 2019-01-28 20:10:52 +01:00
James Cole
d905849b71 Experimental fix for #2031 2019-01-27 21:23:18 +01:00