IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-12-23 23:50:09 -06:00
Code Issues Packages Projects Releases Wiki Activity
10,369 Commits 4 Branches 470 Tags 864 MiB
c2945c532e
Commit Graph

284 Commits

Author SHA1 Message Date
James Cole
b355c18e0c Some code cleanup and copyright cleanup. [skip ci] 2016-10-05 06:52:15 +02:00
James Cole
abc4f856ce Fix nullable fields. 2016-09-24 17:22:42 +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
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
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
6e33e26ddf Update copyright notices, update German language. 2016-09-17 07:57:32 +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
3d25fd79ca First set of upgrade to 5.3 stuff. 2016-09-16 06:19:40 +02:00
James Cole
3fe831c7d8 Bit of code cleanup courtesy of PHPStorm. 2016-09-13 19:20:09 +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
9f250fc61b Renamed migration. 2016-08-25 11:16:17 +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
2775690fc8 Extend model to allow for more data during the import. 2016-08-13 18:53:16 +02:00
James Cole
62d30c7b0e Fix migration (call to empty table name) 2016-08-12 16:06:11 +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
0aaf9a6fda Extend rule set for import. 2016-08-11 18:44:11 +02:00
James Cole
1392275b81 Lots of new code for importer and some preferences. 2016-07-24 18:47:55 +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
2c826451d1 Fix delete routine and some NULLs 2016-06-23 12:07:31 +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
5a79bc0a99 Initial code base for new CSV import. 2016-06-10 21:00:00 +02:00
James Cole
a74a646777 Code cleanup. Moving closer to new release. 2016-05-20 17:53:03 +02:00
James Cole
66d7fd7d4c Declare strict types. 2016-05-20 08:57:45 +02:00
James Cole
bd818b2dea Code clean up. 2016-05-15 15:39:22 +02:00
James Cole
f373c72679 Remove tests. 2016-05-15 15:01:29 +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
863227c55c Some refactoring. 2016-05-14 13:51:33 +02:00
James Cole
d7ab482ae1 Various updates for split transactions. 2016-05-12 22:44:31 +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
eb3d2b1749 Building split transactions and fixing tests. 2016-05-05 18:59:46 +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
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
0e3ccebd0b First attempt at #142. Needs a lot of work still. 2016-04-29 20:59:28 +02:00
Antonio Spinelli
568186828c add brazilian currency and translation 
fix #257
 2016-04-29 07:30:22 -03:00
James Cole
b47a140c2f Updates to budgets. 2016-04-28 10:59:36 +02:00
James Cole
b4f18dbe77 Database stuff. 2016-04-25 11:44:41 +02:00
James Cole
5ed53d5f04 Some new code for CSV. 2016-04-08 20:36:11 +02:00
James Cole
67caf6ef1f Code cleanup [skip ci] 2016-04-01 16:46:11 +02: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
3dce5e162f New field for #122 2016-03-12 07:36:35 +01:00
James Cole
35ff3f0cbf Some code cleanup. 2016-03-03 10:24:59 +01:00
James Cole
6ec0471e8b Code cleanup. 2016-03-03 08:31:31 +01:00
James Cole
dd1b4e21f5 New table for #196 2016-02-24 20:14:09 +01:00
James Cole
68a7078614 Clean up TestData 2016-02-12 05:29:41 +01:00
James Cole
2da33bae43 Some code used for #164 2016-02-11 08:13:04 +01:00
James Cole
426351bb54 Added new lines. 2016-02-10 16:01:18 +01:00
James Cole
bc67113d77 This fixes the broken tests. 2016-02-10 12:01:45 +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
baecc256f6 Secretly updated some migrations. 2016-02-05 07:55:36 +01:00
James Cole
3bb107e192 New migrations (also for export). 2016-02-04 17:13:58 +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
4916c06797 Added new dates to transaction journal, see #122 2016-01-30 09:52:05 +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
5f9cb61160 Some stuff moving around in test data generation. 2016-01-29 13:24:33 +01:00
James Cole
6755ec7eb0 Some code cleanup. 2016-01-29 07:17:50 +01:00
James Cole
dc7f5a562b Clean up some migrations. 2016-01-29 07:08:04 +01:00
James Cole
168ed5ac56 Renamed some stuff, courtesy of sensiolabs. 2016-01-28 21:50:20 +01:00
James Cole
167c057e8a Removed executable rights. 2016-01-28 21:22:26 +01:00
James Cole
08131e42af Implemented some new tests. 2016-01-24 20:38:58 +01:00
James Cole
0f12ebb31c Expanded tests. 2016-01-24 16:25:03 +01:00
James Cole
92616c6ae3 New test data with required role. 2016-01-24 16:05:14 +01:00
James Cole
e1cf285272 Various updates in test data and test configuration. 2016-01-22 20:47:48 +01:00
James Cole
441ba79ec7 Some tests 2016-01-20 15:27:53 +01:00
James Cole
78b56712fc More new tests. 2016-01-20 10:47:29 +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
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
f80bc214f9 Edit rules. 2016-01-15 08:45:39 +01:00
James Cole
81b9d5da09 User can now re-order triggers and actions. 2016-01-14 11:27:15 +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
1087b9f5df Can now trigger. 2016-01-13 07:47:26 +01:00
James Cole
31c336b3b1 New test data. 2016-01-12 21:40:31 +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
44e76f9518 Cleanup rule migration. 2016-01-12 20:56:43 +01:00
James Cole
06d11c9133 New stuff for the rule thing. 2016-01-12 20:36:47 +01:00
James Cole
c1346d4c86 Migration for rules. 2016-01-11 21:10:11 +01:00
James Cole
38895afea6 New migration (empty) 2016-01-11 20:42:08 +01:00
James Cole
b26164a168 More test data. 2016-01-10 12:16:34 +01:00
James Cole
180ec52798 Various new files after upgrade to Laravel 5.2 2016-01-08 15:56:35 +01:00
James Cole
66703b30b3 Updated git files after laravel 5.2 upgrade 2016-01-08 14:27:05 +01:00
James Cole
ada4aaf69a This will generate buttloads of test data. 2015-12-14 20:21:24 +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
17a8c4918c Code cleanup. 2015-07-26 15:51:07 +02:00
James Cole
150b6fe5b6 Add block code [skip ci] 2015-07-25 07:03:42 +02:00
James Cole
63f16c458d Small fixes for piggy banks data seed. 2015-07-19 22:19:26 +02:00
James Cole
fc886f6bc1 Seed some tags. 2015-07-19 13:46:41 +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
c0ea19e15e Test data no longer runs into the future. 2015-07-19 09:37:52 +02:00
James Cole
0dbe4e94fa Allow to edit an attachment. 2015-07-19 09:37:28 +02:00
James Cole
fea0557b47 Going to allow edit of attachment. 2015-07-18 22:49:27 +02:00
James Cole
b0beab4cd3 Attachment model and database changes. 2015-07-18 09:49:19 +02:00
James Cole
a15fbc8094 Now committing to correct branch. 2015-07-14 22:48:34 +02:00
James Cole
e0a9b19802 Some new translations and what-not. 2015-07-10 20:17:17 +02:00
James Cole
9c9fc2b5dc Some fixes in csv importer. 2015-07-09 18:33:09 +02:00
James Cole
43669648ce New test data. 2015-07-07 11:10:13 +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
d2c018f7da First (almost) functional CSV importer. 2015-07-04 07:53:37 +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
fc7d65629a Reorder bill chart [skip ci] 2015-07-01 13:18:50 +02:00
James Cole
e0d863a46f Create bills in test data, sort them [skip ci] 2015-07-01 10:52:42 +02:00
James Cole
428e331b3e Reinstated the help button. 2015-06-29 15:23:50 +02:00
James Cole
c15c45f765 Some small fixes. 2015-06-28 08:42:06 +02:00
James Cole
9e5484937e Code cleanup [skip ci] 2015-06-27 08:06:24 +02:00
James Cole
cd27f0ad69 Some database and css fixes. [skip ci] 2015-06-23 21:14:21 +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
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
ce5b20027e Newlines [skip ci] 2015-06-14 11:22:41 +02:00
James Cole
67d9154563 Added some new code to implement a permission scheme. 2015-05-28 06:43:07 +02:00
James Cole
812aae358f Some code cleanup. 2015-05-26 08:17:58 +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
e6263f9ff5 Some cleaning up 2015-05-17 09:18:44 +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
fb047bd5f4 Fix migration. 2015-05-01 08:34:53 +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
e7165a526b First attempt at basic tag functionality. 2015-04-28 08:58:01 +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
bf354275b3 Some general cleaning up. 2015-04-07 18:25:21 +02:00