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 |
|
Tom Bloor
|
423c68aca2
|
Allow for ignoring of values in import and toggle showing of them
|
2017-11-14 18:41:54 +00:00 |
|
Tom Bloor
|
9d07830e27
|
Added org lookup and assignment for import
|
2017-11-14 15:02:46 +00:00 |
|
Tom Bloor
|
f0b1540f3e
|
Refactored csv import flash errors
|
2017-11-14 12:57:28 +00:00 |
|
Tom Bloor
|
b873e63d55
|
Merge branch 'development' into TBSliver/Admin-Improvements
Conflicts:
CHANGELOG.md
|
2017-11-14 12:43:29 +00:00 |
|
Tom Bloor
|
08b5d25764
|
Merge pull request #71 from Pear-Trading/master
Master merge for 0.9.5
|
2017-11-14 12:42:00 +00:00 |
|
Tom Bloor
|
18d223743d
|
Merge pull request #70 from Pear-Trading/Release-v0.9.5
Update for 0.9.5
|
2017-11-14 11:07:39 +00:00 |
|
Tom Bloor
|
af312ffbe3
|
Updated changelog for 0.9.5
|
2017-11-13 22:12:36 +00:00 |
|
Tom Bloor
|
72929bf86b
|
Added assigning users to import values
|
2017-11-13 19:00:34 +00:00 |
|
Tom Bloor
|
9096bef00d
|
Further work on import functions
|
2017-11-13 13:30:33 +00:00 |
|
Tom Bloor
|
593efcedfa
|
Schema update for v 16 to include import lookups
|
2017-11-13 13:02:22 +00:00 |
|
Tom Bloor
|
6b2b61856f
|
Merge pull request #69 from Pear-Trading/finn/appleaderboard
Web App Leaderboard endpoint
|
2017-11-13 11:48:37 +00:00 |
|
Finn
|
105c9093b8
|
fixes
|
2017-11-10 18:39:00 +00:00 |
|
Finn
|
049b4836c5
|
Added code to leaderboard web app API
|
2017-11-10 17:07:41 +00:00 |
|
Finn
|
c4681ffc3a
|
web app api leaderboard added
|
2017-11-10 16:45:58 +00:00 |
|
Tom Bloor
|
40dbd1eb50
|
Added ignore_value boolean to Import Value table
|
2017-10-27 12:10:52 +01:00 |
|
Tom Bloor
|
e09974f0d9
|
First pass of importing data
|
2017-10-26 17:01:23 +01:00 |
|
Tom Bloor
|
eebac70276
|
update changelog
|
2017-10-24 17:56:24 +01:00 |
|
Tom Bloor
|
3e3f667053
|
Rework transaction views
|
2017-10-24 17:55:49 +01:00 |
|