Commit graph

1187 commits

Author SHA1 Message Date
Tom Bloor
e4e5bd9722 Merge pull request #79 from Pear-Trading/master
Master merge for v0.9.7
2017-11-29 15:08:08 +00:00
Tom Bloor
a14277ee48
Merge pull request #79 from Pear-Trading/master
Master merge for v0.9.7
2017-11-29 15:08:08 +00:00
Tom Bloor
6c9cf10280 Merge pull request #78 from Pear-Trading/Release-v0.9.7
Release v0.9.7
2017-11-28 18:36:03 +00:00
Tom Bloor
738a72b64e
Merge pull request #78 from Pear-Trading/Release-v0.9.7
Release v0.9.7
2017-11-28 18:36:03 +00:00
Thomas Bloor
6e7527d6bd Updated changelog for 0.9.7 2017-11-28 18:33:58 +00:00
Thomas Bloor
6e016641cd
Updated changelog for 0.9.7 2017-11-28 18:33:58 +00:00
Tom Bloor
deb1b42823 Merge pull request #77 from Pear-Trading/TBSliver/Import-Fixes
Fix import screen
2017-11-28 18:31:55 +00:00
Tom Bloor
c8e876711c
Merge pull request #77 from Pear-Trading/TBSliver/Import-Fixes
Fix import screen
2017-11-28 18:31:55 +00:00
Tom Bloor
f6f50d4932 Merge branch 'development' into TBSliver/Import-Fixes 2017-11-28 17:52:56 +00:00
Tom Bloor
843037ea78
Merge branch 'development' into TBSliver/Import-Fixes 2017-11-28 17:52:56 +00:00
Finn
d301d4a7c9 Merge pull request #76 from Pear-Trading/finn/association
associations added
2017-11-27 17:30:39 +00:00
Finn
6c738993f4
Merge pull request #76 from Pear-Trading/finn/association
associations added
2017-11-27 17:30:39 +00:00
Finn
361e0e359c test fixed 2017-11-27 17:17:22 +00:00
Finn
65cadb5d24 test fixed 2017-11-27 17:17:22 +00:00
Finn
f68479b5ac extra info fixed and test amended and fixtures changed 2017-11-27 17:16:22 +00:00
Finn
9a71c1b7f5 extra info fixed and test amended and fixtures changed 2017-11-27 17:16:22 +00:00
Finn
3f0f046c30 added location info to main map 2017-11-27 11:36:21 +00:00
Finn
9adf9668b1 added location info to main map 2017-11-27 11:36:21 +00:00
Finn
850bd3d711 changelog updated 2017-11-23 17:19:21 +00:00
Finn
b6397aedf4 changelog updated 2017-11-23 17:19:21 +00:00
Tom Bloor
8c48e490fc Updated changelog 2017-11-23 17:18:07 +00:00
Tom Bloor
0799d6eeb1 Updated changelog 2017-11-23 17:18:07 +00:00
Tom Bloor
9d8db81f2f Fix dev_data Command for testing 2017-11-23 16:52:52 +00:00
Tom Bloor
1bc56016e7 Fix dev_data Command for testing 2017-11-23 16:52:52 +00:00
Tom Bloor
d718cfee42 Fixed issue with Importset for users and orgs trying to much data for
the group by
2017-11-23 16:52:33 +00:00
Tom Bloor
6d138af016 Fixed issue with Importset for users and orgs trying to much data for
the group by
2017-11-23 16:52:33 +00:00
Finn
96a9b152d1 extra org data added 2017-11-23 16:35:45 +00:00
Finn
460c9e6049 extra org data added 2017-11-23 16:35:45 +00:00
Finn
54dcbf6fb8 fixes added and working admin interface 2017-11-23 16:25:14 +00:00
Finn
8ada3f86b6 fixes added and working admin interface 2017-11-23 16:25:14 +00:00
Finn
8754ffd93a endpoint and code added for LIS orgs 2017-11-23 15:42:37 +00:00
Finn
0072a97a3a endpoint and code added for LIS orgs 2017-11-23 15:42:37 +00:00
Finn
a4b307ad6c database upgraded and interface added 2017-11-23 14:54:59 +00:00
Finn
8c166464cc database upgraded and interface added 2017-11-23 14:54:59 +00:00
Finn
f5b94098fb Entity Assoiciations added to database 2017-11-23 13:20:26 +00:00
Finn
d36091528f Entity Assoiciations added to database 2017-11-23 13:20:26 +00:00
Tom Bloor
1fc275022a Merge pull request #75 from Pear-Trading/master
Master merge for v0.9.6
2017-11-22 11:38:34 +00:00
Tom Bloor
cb9c219b27
Merge pull request #75 from Pear-Trading/master
Master merge for v0.9.6
2017-11-22 11:38:34 +00:00
Tom Bloor
6309d44076 Merge pull request #74 from Pear-Trading/Release-v0.9.6
Release v0.9.6
2017-11-21 15:49:07 +00:00
Tom Bloor
cf83137f9f
Merge pull request #74 from Pear-Trading/Release-v0.9.6
Release v0.9.6
2017-11-21 15:49:07 +00:00
Tom Bloor
d4ad360f38 Fixed schema issue for import value foreign key being set wrong 2017-11-21 11:13:04 +00:00
Tom Bloor
fc0d2f6fa0
Fixed schema issue for import value foreign key being set wrong 2017-11-21 11:13:04 +00:00
Tom Bloor
76a4b2178c Updated Changelog for v0.9.6 2017-11-21 11:07:03 +00:00
Tom Bloor
13cd5ed950
Updated Changelog for v0.9.6 2017-11-21 11:07:03 +00:00
Tom Bloor
c41bbdc35f Merge pull request #73 from Pear-Trading/TBSliver/Log-Improvement
Minor logging improvements
2017-11-21 11:04:17 +00:00
Tom Bloor
9c500ab24b
Merge pull request #73 from Pear-Trading/TBSliver/Log-Improvement
Minor logging improvements
2017-11-21 11:04:17 +00:00
Tom Bloor
8855d64a6e Fix minor issue in ddl for SQLite 2017-11-21 10:48:32 +00:00
Tom Bloor
951a0b233f
Fix minor issue in ddl for SQLite 2017-11-21 10:48:32 +00:00
Tom Bloor
b92ea1f7c6 Added logging on admin login endpoint 2017-11-21 10:42:23 +00:00
Tom Bloor
9f4d39e029
Added logging on admin login endpoint 2017-11-21 10:42:23 +00:00