Commit graph

Select branches

Hide pull requests

TBSliver/Minion-Tasks

TBSliver/NewGraphs

ben/feature/push-notifications

ben/fix/failing-tests

development

finn/dashboardfixes

finn/memoryimprovements

finn/minionimport

finn/orgdataimport

finn/postcodeimport

iron59/range-duration

james/medalschema

master

#10

#100

#101

#102

#102

#103

#104

#105

#106

#107

#108

#109

#110

#111

#112

#113

#114

#115

#116

#117

#118

#119

#120

#121

#122

#123

#124

#125

#126

#127

#135

#139

#14

#140

#140

#142

#15

#16

#17

#18

#19

#20

#22

#23

#25

#26

#27

#28

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#42

#43

#44

#45

#46

#47

#49

#49

#5

#50

#51

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#70

#71

#72

#73

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#90

#91

#92

#93

#94

#95

#96

#97

#98

#99

v0.001

v0.002

v0.003

v0.004

v0.005

v0.006

v0.007

v0.008

v0.008.1

v0.009

v0.10.10

v0.10.3

v0.10.4

v0.10.4_alpha.1

v0.10.5

v0.10.6

v0.10.7

v0.10.8

v0.10.9

v0.9.1

v0.9.2

v0.9.3

v0.9.4

v0.9.5

v0.9.6

v0.9.7

Mono Color

• e6c236e1ff schema and map code updated, test fixed Finn 2017-12-08 13:19:22 +0000
• af7dcde7aa esta added to schema and updated admin interface Finn 2017-12-08 12:30:49 +0000
• fb25cbe773 esta added to schema and updated admin interface Finn 2017-12-08 12:30:49 +0000
• 95398d2790 Merge pull request #81 from Pear-Trading/finn/linkcorrections Finn 2017-12-08 11:27:44 +0000
• 0b6d823145
  Merge pull request #81 from Pear-Trading/finn/linkcorrections Finn 2017-12-08 11:27:44 +0000
• 0b48c69612 added new tab linking and corrected redirect Finn 2017-12-04 12:27:53 +0000
• 1e02062ca3 added new tab linking and corrected redirect Finn 2017-12-04 12:27:53 +0000
• d8403b8b11 Revert "added new tab linking and corrected redirect" Finn 2017-12-04 12:27:53 +0000
• 8b91c3b3c8 Revert "added new tab linking and corrected redirect" Finn 2017-12-04 12:27:53 +0000
• e926d40779 added new tab linking and corrected redirect Finn 2017-12-04 12:27:53 +0000
• 4eb5a4fd3f added new tab linking and corrected redirect Finn 2017-12-04 12:27:53 +0000
• 4255b70f8e Merge pull request #80 from Pear-Trading/finn/validationfix Finn 2017-11-30 12:27:17 +0000
• 3868721324
  Merge pull request #80 from Pear-Trading/finn/validationfix Finn 2017-11-30 12:27:17 +0000
• 36cd695ed5 Amended validation on orgs Finn 2017-11-29 16:24:03 +0000
• a95bfccdf9 Amended validation on orgs Finn 2017-11-29 16:24:03 +0000
• e4e5bd9722 Merge pull request #79 from Pear-Trading/master Tom Bloor 2017-11-29 15:08:08 +0000
• a14277ee48
  Merge pull request #79 from Pear-Trading/master Tom Bloor 2017-11-29 15:08:08 +0000
• 6c9cf10280 Merge pull request #78 from Pear-Trading/Release-v0.9.7 v0.9.7 Tom Bloor 2017-11-28 18:36:03 +0000
• 738a72b64e
  Merge pull request #78 from Pear-Trading/Release-v0.9.7 Tom Bloor 2017-11-28 18:36:03 +0000
• 6e7527d6bd Updated changelog for 0.9.7 Thomas Bloor 2017-11-28 18:33:58 +0000
• 6e016641cd
  Updated changelog for 0.9.7 Thomas Bloor 2017-11-28 18:33:58 +0000
• deb1b42823 Merge pull request #77 from Pear-Trading/TBSliver/Import-Fixes Tom Bloor 2017-11-28 18:31:55 +0000
• c8e876711c
  Merge pull request #77 from Pear-Trading/TBSliver/Import-Fixes Tom Bloor 2017-11-28 18:31:55 +0000
• f6f50d4932 Merge branch 'development' into TBSliver/Import-Fixes Tom Bloor 2017-11-28 17:52:56 +0000
• 843037ea78
  Merge branch 'development' into TBSliver/Import-Fixes Tom Bloor 2017-11-28 17:52:56 +0000
• d301d4a7c9 Merge pull request #76 from Pear-Trading/finn/association Finn 2017-11-27 17:30:39 +0000
• 6c738993f4
  Merge pull request #76 from Pear-Trading/finn/association Finn 2017-11-27 17:30:39 +0000
• 361e0e359c test fixed Finn 2017-11-27 17:17:22 +0000
• 65cadb5d24 test fixed Finn 2017-11-27 17:17:22 +0000
• f68479b5ac extra info fixed and test amended and fixtures changed Finn 2017-11-27 17:16:22 +0000
• 9a71c1b7f5 extra info fixed and test amended and fixtures changed Finn 2017-11-27 17:16:22 +0000
• 3f0f046c30 added location info to main map Finn 2017-11-27 11:36:21 +0000
• 9adf9668b1 added location info to main map Finn 2017-11-27 11:36:21 +0000
• 850bd3d711 changelog updated Finn 2017-11-23 17:19:21 +0000
• b6397aedf4 changelog updated Finn 2017-11-23 17:19:21 +0000
• 8c48e490fc Updated changelog Tom Bloor 2017-11-23 17:18:07 +0000
• 0799d6eeb1 Updated changelog Tom Bloor 2017-11-23 17:18:07 +0000
• 9d8db81f2f Fix dev_data Command for testing Tom Bloor 2017-11-23 16:52:52 +0000
• 1bc56016e7 Fix dev_data Command for testing Tom Bloor 2017-11-23 16:52:52 +0000
• d718cfee42 Fixed issue with Importset for users and orgs trying to much data for the group by Tom Bloor 2017-11-23 16:52:33 +0000
• 6d138af016 Fixed issue with Importset for users and orgs trying to much data for the group by Tom Bloor 2017-11-23 16:52:33 +0000
• 96a9b152d1 extra org data added Finn 2017-11-23 16:35:45 +0000
• 460c9e6049 extra org data added Finn 2017-11-23 16:35:45 +0000
• 54dcbf6fb8 fixes added and working admin interface Finn 2017-11-23 16:25:14 +0000
• 8ada3f86b6 fixes added and working admin interface Finn 2017-11-23 16:25:14 +0000
• 8754ffd93a endpoint and code added for LIS orgs Finn 2017-11-23 15:42:37 +0000
• 0072a97a3a endpoint and code added for LIS orgs Finn 2017-11-23 15:42:37 +0000
• a4b307ad6c database upgraded and interface added Finn 2017-11-23 14:54:59 +0000
• 8c166464cc database upgraded and interface added Finn 2017-11-23 14:54:59 +0000
• f5b94098fb Entity Assoiciations added to database Finn 2017-11-23 13:20:26 +0000
• d36091528f Entity Assoiciations added to database Finn 2017-11-23 13:20:26 +0000
• 1fc275022a Merge pull request #75 from Pear-Trading/master Tom Bloor 2017-11-22 11:38:34 +0000
• cb9c219b27
  Merge pull request #75 from Pear-Trading/master Tom Bloor 2017-11-22 11:38:34 +0000
• 6309d44076 Merge pull request #74 from Pear-Trading/Release-v0.9.6 v0.9.6 Tom Bloor 2017-11-21 15:49:07 +0000
• cf83137f9f
  Merge pull request #74 from Pear-Trading/Release-v0.9.6 Tom Bloor 2017-11-21 15:49:07 +0000
• d4ad360f38 Fixed schema issue for import value foreign key being set wrong Tom Bloor 2017-11-21 11:13:04 +0000
• fc0d2f6fa0
  Fixed schema issue for import value foreign key being set wrong Tom Bloor 2017-11-21 11:13:04 +0000
• 76a4b2178c Updated Changelog for v0.9.6 Tom Bloor 2017-11-21 11:07:03 +0000
• 13cd5ed950
  Updated Changelog for v0.9.6 Tom Bloor 2017-11-21 11:07:03 +0000
• c41bbdc35f Merge pull request #73 from Pear-Trading/TBSliver/Log-Improvement Tom Bloor 2017-11-21 11:04:17 +0000
• 9c500ab24b
  Merge pull request #73 from Pear-Trading/TBSliver/Log-Improvement Tom Bloor 2017-11-21 11:04:17 +0000
• 8855d64a6e Fix minor issue in ddl for SQLite Tom Bloor 2017-11-21 10:48:32 +0000
• 951a0b233f
  Fix minor issue in ddl for SQLite Tom Bloor 2017-11-21 10:48:32 +0000
• b92ea1f7c6 Added logging on admin login endpoint Tom Bloor 2017-11-21 10:42:23 +0000
• 9f4d39e029
  Added logging on admin login endpoint Tom Bloor 2017-11-21 10:42:23 +0000
• 832dab70cb dded minor logging to API login endpoint Tom Bloor 2017-11-21 10:40:22 +0000
• addd5c640c
  dded minor logging to API login endpoint Tom Bloor 2017-11-21 10:40:22 +0000
• 29cd70ca1c Merge pull request #72 from Pear-Trading/TBSliver/Admin-Improvements Tom Bloor 2017-11-20 16:07:33 +0000
• 6d508cc432
  Merge pull request #72 from Pear-Trading/TBSliver/Admin-Improvements Tom Bloor 2017-11-20 16:07:33 +0000
• d3a2410507 Updated Changelog Tom Bloor 2017-11-20 13:32:10 +0000
• b0883b5522
  Updated Changelog Tom Bloor 2017-11-20 13:32:10 +0000
• 733107539d Added badges to users and pagination Tom Bloor 2017-11-20 13:26:52 +0000
• 9aaf3b4718
  Added badges to users and pagination Tom Bloor 2017-11-20 13:26:52 +0000
• c3ae7a2615 Added badge on organisations showing if they are a user or not Tom Bloor 2017-11-20 13:02:07 +0000
• bccb292441
  Added badge on organisations showing if they are a user or not Tom Bloor 2017-11-20 13:02:07 +0000
• baffe144f3 Added major merge code for merging organisations Tom Bloor 2017-11-17 18:10:16 +0000
• 14410b475a
  Added major merge code for merging organisations Tom Bloor 2017-11-17 18:10:16 +0000
• a11727ba1c Refactored valid read template slightly and added merge link Tom Bloor 2017-11-17 18:09:49 +0000
• a0cdaac370
  Refactored valid read template slightly and added merge link Tom Bloor 2017-11-17 18:09:49 +0000
• 9517b98c24 Removed unused template Tom Bloor 2017-11-17 18:09:08 +0000
• e02638ac58
  Removed unused template Tom Bloor 2017-11-17 18:09:08 +0000
• b3036c13ee Changed non-local-org badge to secondary colour in backend Tom Bloor 2017-11-16 15:12:46 +0000
• 7155011841
  Changed non-local-org badge to secondary colour in backend Tom Bloor 2017-11-16 15:12:46 +0000
• 91677034ca Finishing off CSV import functionality Tom Bloor 2017-11-15 18:22:49 +0000
• f49fb93658
  Finishing off CSV import functionality Tom Bloor 2017-11-15 18:22:49 +0000
• 423c68aca2 Allow for ignoring of values in import and toggle showing of them Tom Bloor 2017-11-14 18:41:54 +0000
• 1015be7810
  Allow for ignoring of values in import and toggle showing of them Tom Bloor 2017-11-14 18:41:54 +0000
• 9d07830e27 Added org lookup and assignment for import Tom Bloor 2017-11-14 15:02:46 +0000
• 7df6fecfc4
  Added org lookup and assignment for import Tom Bloor 2017-11-14 15:02:46 +0000
• f0b1540f3e Refactored csv import flash errors Tom Bloor 2017-11-14 12:57:28 +0000
• 37bc29829f
  Refactored csv import flash errors Tom Bloor 2017-11-14 12:57:28 +0000
• b873e63d55 Merge branch 'development' into TBSliver/Admin-Improvements Tom Bloor 2017-11-14 12:43:29 +0000
• cb7ab797f5 Merge branch 'development' into TBSliver/Admin-Improvements Tom Bloor 2017-11-14 12:43:29 +0000
• 08b5d25764 Merge pull request #71 from Pear-Trading/master Tom Bloor 2017-11-14 12:42:00 +0000
• ead0dff76d
  Merge pull request #71 from Pear-Trading/master Tom Bloor 2017-11-14 12:42:00 +0000
• 18d223743d Merge pull request #70 from Pear-Trading/Release-v0.9.5 v0.9.5 Tom Bloor 2017-11-14 11:07:39 +0000
• 747a834156
  Merge pull request #70 from Pear-Trading/Release-v0.9.5 Tom Bloor 2017-11-14 11:07:39 +0000
• af312ffbe3 Updated changelog for 0.9.5 Tom Bloor 2017-11-13 22:12:36 +0000
• 233df00c7b Updated changelog for 0.9.5 Tom Bloor 2017-11-13 22:12:36 +0000
• 72929bf86b Added assigning users to import values Tom Bloor 2017-11-13 19:00:34 +0000