Finn
|
3868721324
|
Merge pull request #80 from Pear-Trading/finn/validationfix
Amended validation on orgs
|
2017-11-30 12:27:17 +00:00 |
|
|
Finn
|
a95bfccdf9
|
Amended validation on orgs
|
2017-11-29 16:24:03 +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
|
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
|
6e016641cd
|
Updated changelog for 0.9.7
|
2017-11-28 18:33:58 +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
|
843037ea78
|
Merge branch 'development' into TBSliver/Import-Fixes
|
2017-11-28 17:52:56 +00:00 |
|
|
Finn
|
6c738993f4
|
Merge pull request #76 from Pear-Trading/finn/association
associations added
|
2017-11-27 17:30:39 +00:00 |
|
|
Finn
|
65cadb5d24
|
test fixed
|
2017-11-27 17:17:22 +00:00 |
|
|
Finn
|
9a71c1b7f5
|
extra info fixed and test amended and fixtures changed
|
2017-11-27 17:16:22 +00:00 |
|
|
Finn
|
9adf9668b1
|
added location info to main map
|
2017-11-27 11:36:21 +00:00 |
|
|
Finn
|
b6397aedf4
|
changelog updated
|
2017-11-23 17:19:21 +00:00 |
|
|
Tom Bloor
|
0799d6eeb1
|
Updated changelog
|
2017-11-23 17:18:07 +00:00 |
|
|
Tom Bloor
|
1bc56016e7
|
Fix dev_data Command for testing
|
2017-11-23 16:52:52 +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
|
460c9e6049
|
extra org data added
|
2017-11-23 16:35:45 +00:00 |
|
|
Finn
|
8ada3f86b6
|
fixes added and working admin interface
|
2017-11-23 16:25:14 +00:00 |
|
|
Finn
|
0072a97a3a
|
endpoint and code added for LIS orgs
|
2017-11-23 15:42:37 +00:00 |
|
|
Finn
|
8c166464cc
|
database upgraded and interface added
|
2017-11-23 14:54:59 +00:00 |
|
|
Finn
|
d36091528f
|
Entity Assoiciations added to database
|
2017-11-23 13:20:26 +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
|
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
|
fc0d2f6fa0
|
Fixed schema issue for import value foreign key being set wrong
|
2017-11-21 11:13:04 +00:00 |
|
|
Tom Bloor
|
13cd5ed950
|
Updated Changelog for v0.9.6
|
2017-11-21 11:07:03 +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
|
951a0b233f
|
Fix minor issue in ddl for SQLite
|
2017-11-21 10:48:32 +00:00 |
|
|
Tom Bloor
|
9f4d39e029
|
Added logging on admin login endpoint
|
2017-11-21 10:42:23 +00:00 |
|
|
Tom Bloor
|
addd5c640c
|
dded minor logging to API login endpoint
|
2017-11-21 10:40:22 +00:00 |
|
|
Tom Bloor
|
6d508cc432
|
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
|
b0883b5522
|
Updated Changelog
|
2017-11-20 13:32:10 +00:00 |
|
|
Tom Bloor
|
9aaf3b4718
|
Added badges to users and pagination
|
2017-11-20 13:26:52 +00:00 |
|
|
Tom Bloor
|
bccb292441
|
Added badge on organisations showing if they are a user or not
|
2017-11-20 13:02:07 +00:00 |
|
|
Tom Bloor
|
14410b475a
|
Added major merge code for merging organisations
|
2017-11-17 18:10:16 +00:00 |
|
|
Tom Bloor
|
a0cdaac370
|
Refactored valid read template slightly and added merge link
|
2017-11-17 18:09:49 +00:00 |
|
|
Tom Bloor
|
e02638ac58
|
Removed unused template
|
2017-11-17 18:09:08 +00:00 |
|
|
Tom Bloor
|
7155011841
|
Changed non-local-org badge to secondary colour in backend
|
2017-11-16 15:12:46 +00:00 |
|
|
Tom Bloor
|
f49fb93658
|
Finishing off CSV import functionality
|
2017-11-15 18:22:49 +00:00 |
|
|
Tom Bloor
|
1015be7810
|
Allow for ignoring of values in import and toggle showing of them
|
2017-11-14 18:41:54 +00:00 |
|
|
Tom Bloor
|
7df6fecfc4
|
Added org lookup and assignment for import
|
2017-11-14 15:02:46 +00:00 |
|
|
Tom Bloor
|
37bc29829f
|
Refactored csv import flash errors
|
2017-11-14 12:57:28 +00:00 |
|
Tom Bloor
|
cb7ab797f5
|
Merge branch 'development' into TBSliver/Admin-Improvements
Conflicts:
CHANGELOG.md
|
2017-11-14 12:43:29 +00:00 |
|
|
Tom Bloor
|
ead0dff76d
|
Merge pull request #71 from Pear-Trading/master
Master merge for 0.9.5
|
2017-11-14 12:42:00 +00:00 |
|
Tom Bloor
|
747a834156
|
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
|
233df00c7b
|
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
|
594fc865eb
|
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 |
|