Commit graph

809 commits

Author SHA1 Message Date
Finn
5049fa9eed Placeholder test added for graphs 2017-12-12 17:23:32 +00:00
Finn
1057eda445 added snippet endpoint and test 2017-12-12 17:21:32 +00:00
Finn
7d309755c6 adding paths and placeholder for customer dash API 2017-12-12 13:32:52 +00:00
Tom Bloor
9d799620e0 Merge pull request #83 from Pear-Trading/Release-v0.10.0
Release v0.10.0
2017-12-08 16:36:22 +00:00
Thomas Bloor
2015c15684 Updated Changelog 2017-12-08 16:21:31 +00:00
Finn
e73c65d97b Merge pull request #82 from Pear-Trading/finn/esta
added ESTA and fixed association map code
2017-12-08 14:01:10 +00:00
Finn
9ea3125bca changelog updated 2017-12-08 13:30:21 +00:00
Finn
cd59547311 schema and map code updated, test fixed 2017-12-08 13:19:22 +00:00
Finn
af7dcde7aa esta added to schema and updated admin interface 2017-12-08 12:30:49 +00:00
Finn
95398d2790 Merge pull request #81 from Pear-Trading/finn/linkcorrections
added link corrections
2017-12-08 11:27:44 +00:00
Finn
0b48c69612 added new tab linking and corrected redirect 2017-12-04 12:30:10 +00:00
Finn
d8403b8b11 Revert "added new tab linking and corrected redirect"
This reverts commit 4eb5a4fd3f.
2017-12-04 12:29:34 +00:00
Finn
e926d40779 added new tab linking and corrected redirect 2017-12-04 12:27:53 +00:00
Finn
4255b70f8e Merge pull request #80 from Pear-Trading/finn/validationfix
Amended validation on orgs
2017-11-30 12:27:17 +00:00
Finn
36cd695ed5 Amended validation on orgs 2017-11-29 16:24:03 +00:00
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
6c9cf10280 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
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
f6f50d4932 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
361e0e359c 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
3f0f046c30 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
Tom Bloor
8c48e490fc 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
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
Finn
96a9b152d1 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
8754ffd93a 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
f5b94098fb 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
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
d4ad360f38 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
c41bbdc35f 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
b92ea1f7c6 Added logging on admin login endpoint 2017-11-21 10:42:23 +00:00
Tom Bloor
832dab70cb dded minor logging to API login endpoint 2017-11-21 10:40:22 +00:00
Tom Bloor
29cd70ca1c Merge pull request #72 from Pear-Trading/TBSliver/Admin-Improvements
Major improvements to Admin Interface
2017-11-20 16:07:33 +00:00
Tom Bloor
d3a2410507 Updated Changelog 2017-11-20 13:32:10 +00:00
Tom Bloor
733107539d Added badges to users and pagination 2017-11-20 13:26:52 +00:00
Tom Bloor
c3ae7a2615 Added badge on organisations showing if they are a user or not 2017-11-20 13:02:07 +00:00
Tom Bloor
baffe144f3 Added major merge code for merging organisations 2017-11-17 18:10:16 +00:00
Tom Bloor
a11727ba1c Refactored valid read template slightly and added merge link 2017-11-17 18:09:49 +00:00
Tom Bloor
9517b98c24 Removed unused template 2017-11-17 18:09:08 +00:00
Tom Bloor
b3036c13ee Changed non-local-org badge to secondary colour in backend 2017-11-16 15:12:46 +00:00
Tom Bloor
91677034ca Finishing off CSV import functionality 2017-11-15 18:22:49 +00:00