Foodloop-Server

Pear-Trading/Foodloop-Server

Archived

Fork 0

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

c2a099c3e2 Added transaction categories tables Finn 2018-01-11 14:00:20 +0000
2f9673edcd Merge pull request #95 from Pear-Trading/master Tom Bloor 2018-01-03 15:41:07 +0000
7ea96a74d0

Merge pull request #95 from Pear-Trading/master Tom Bloor 2018-01-03 15:41:07 +0000
b405d3a5ed Merge pull request #94 from Pear-Trading/Release-v0.10.2 Tom Bloor 2018-01-03 14:24:11 +0000
4ee40b0732

Merge pull request #94 from Pear-Trading/Release-v0.10.2 Tom Bloor 2018-01-03 14:24:11 +0000
4c50bfaf63 Updated Changelog Thomas Bloor 2018-01-03 14:23:26 +0000
40dfa1c102

Updated Changelog Thomas Bloor 2018-01-03 14:23:26 +0000
30a49baad4 Merge pull request #93 from Pear-Trading/TBSliver/Org-Fairly-Trading Tom Bloor 2018-01-03 14:21:58 +0000
bef55a85d5

Merge pull request #93 from Pear-Trading/TBSliver/Org-Fairly-Trading Tom Bloor 2018-01-03 14:21:58 +0000
6dd574e046 Add missed location updating in organisation edit on admin backend Tom Bloor 2018-01-02 22:12:38 +0000
cc2360ab22

Add missed location updating in organisation edit on admin backend Tom Bloor 2018-01-02 22:12:38 +0000
60a41c9645 Disable postgres tests while investigating unrelated issue to current branch Tom Bloor 2018-01-02 21:58:20 +0000
500b61928b

Disable postgres tests while investigating unrelated issue to current branch Tom Bloor 2018-01-02 21:58:20 +0000
44ade264c9 Added error dump on failing test for debugging Tom Bloor 2018-01-02 21:40:41 +0000
0f9a3eadd8

Added error dump on failing test for debugging Tom Bloor 2018-01-02 21:40:41 +0000
d331fe41fe Added testing with postgres to travis Tom Bloor 2018-01-02 20:05:27 +0000
e0d3035929

Added testing with postgres to travis Tom Bloor 2018-01-02 20:05:27 +0000
725bebb00b Added fairly trading org field and change org transactions to show purchases not sales Tom Bloor 2018-01-02 19:57:12 +0000
8be16867bb

Added fairly trading org field and change org transactions to show purchases not sales Tom Bloor 2018-01-02 19:57:12 +0000
e29badb59d Added is_fair column for fairly trading organisations Tom Bloor 2018-01-02 19:56:48 +0000
d4ff855251

Added is_fair column for fairly trading organisations Tom Bloor 2018-01-02 19:56:48 +0000
69811229c8 Fix booleans on sqlite ddl Tom Bloor 2018-01-02 19:56:10 +0000
d6d4121cb3

Fix booleans on sqlite ddl Tom Bloor 2018-01-02 19:56:10 +0000
c4a99e9ec5 Merge pull request #92 from Pear-Trading/master Finn 2017-12-21 16:14:46 +0000
67394ce8fa

Merge pull request #92 from Pear-Trading/master Finn 2017-12-21 16:14:46 +0000
0c42ad0fe2 Merge pull request #91 from Pear-Trading/Release-v0.10.1 Finn 2017-12-21 15:51:10 +0000
0214ad4558

Merge pull request #91 from Pear-Trading/Release-v0.10.1 Finn 2017-12-21 15:51:10 +0000
44155cd33e updated changelog Finn 2017-12-21 15:39:34 +0000
3346dbd0d4 updated changelog Finn 2017-12-21 15:39:34 +0000
cca147a8e1 Merge pull request #90 from Pear-Trading/master Finn 2017-12-21 15:37:53 +0000
2673f79f98

Merge pull request #90 from Pear-Trading/master Finn 2017-12-21 15:37:53 +0000
cd9420da42 Merge pull request #89 from Pear-Trading/finn/loopdashboard Finn 2017-12-20 13:25:22 +0000
2bbc1d508e

Merge pull request #89 from Pear-Trading/finn/loopdashboard Finn 2017-12-20 13:25:22 +0000
17ba1e75fd frontpage stats amended for sectors and weeks Finn 2017-12-19 18:03:15 +0000
bb254cb278 frontpage stats amended for sectors and weeks Finn 2017-12-19 18:03:15 +0000
86184cfbdb Merge pull request #88 from Pear-Trading/finn/sectorU Finn 2017-12-19 18:01:55 +0000
12364c2a17

Merge pull request #88 from Pear-Trading/finn/sectorU Finn 2017-12-19 18:01:55 +0000
201594d331 added new sector Finn 2017-12-18 16:19:10 +0000
cdde2f5ca8 added new sector Finn 2017-12-18 16:19:10 +0000
6484ef277a Merge pull request #87 from Pear-Trading/finn/applegacy Finn 2017-12-18 15:50:17 +0000
38f8883ab1

Merge pull request #87 from Pear-Trading/finn/applegacy Finn 2017-12-18 15:50:17 +0000
9f9a79c69d reverted fix and did different fix to order_by Finn 2017-12-18 15:36:24 +0000
feeba76523 reverted fix and did different fix to order_by Finn 2017-12-18 15:36:24 +0000
e87931e825 Merge pull request #86 from Pear-Trading/finn/applegacy Finn 2017-12-18 15:20:17 +0000
9851ef5b6f

Merge pull request #86 from Pear-Trading/finn/applegacy Finn 2017-12-18 15:20:17 +0000
b7493af6c6 added missing pg_or_sqlite sub Finn 2017-12-18 15:08:15 +0000
8e34f34bd6 added missing pg_or_sqlite sub Finn 2017-12-18 15:08:15 +0000
713fee37d6 fixed counts for sqlite vs postgres Finn 2017-12-18 14:46:32 +0000
cc0ca06470 fixed counts for sqlite vs postgres Finn 2017-12-18 14:46:32 +0000
5ae8aa92f8 Merge pull request #85 from Pear-Trading/finn/applegacy Finn 2017-12-18 14:20:09 +0000
4653f713fa

Merge pull request #85 from Pear-Trading/finn/applegacy Finn 2017-12-18 14:20:09 +0000
6f085ff541 Fixed stats test Finn 2017-12-18 14:05:51 +0000
f1c1748b34 Fixed stats test Finn 2017-12-18 14:05:51 +0000
e6ce9cc81a added support for mobile app back Finn 2017-12-18 12:56:45 +0000
3914ec44a8 added support for mobile app back Finn 2017-12-18 12:56:45 +0000
8ed5e5d9ff Merge pull request #84 from Pear-Trading/finn/customerdashboard Finn 2017-12-15 18:10:48 +0000
2dceb4067e

Merge pull request #84 from Pear-Trading/finn/customerdashboard Finn 2017-12-15 18:10:48 +0000
767ed73234 changelog updated Finn 2017-12-15 17:56:39 +0000
5ce2f0beea changelog updated Finn 2017-12-15 17:56:39 +0000
7d044addeb tests fixed Finn 2017-12-15 17:52:02 +0000
a89a320685 tests fixed Finn 2017-12-15 17:52:02 +0000
9edf15b95b pie test added Finn 2017-12-15 17:09:15 +0000
5dabc7a28a pie test added Finn 2017-12-15 17:09:15 +0000
2012e67273 sectors code added Finn 2017-12-15 15:30:47 +0000
74a1b3d238 sectors code added Finn 2017-12-15 15:30:47 +0000
8c811d52bf fixed stats test Finn 2017-12-15 15:05:04 +0000
229c2bb801 fixed stats test Finn 2017-12-15 15:05:04 +0000
7ffdfc5bd3 pie code made functional and relevant distance code updated Finn 2017-12-15 14:59:38 +0000
88aa5becff pie code made functional and relevant distance code updated Finn 2017-12-15 14:59:38 +0000
cb39b419d6 Added new stats and fixed test Finn 2017-12-14 20:30:44 +0000
c4b7fa5102 Added new stats and fixed test Finn 2017-12-14 20:30:44 +0000
12bd6b3ec9 org graphs and relevant test fixed Finn 2017-12-14 17:25:00 +0000
b9a57c7dcb org graphs and relevant test fixed Finn 2017-12-14 17:25:00 +0000
9594f9f746 widget graph test fixed Finn 2017-12-14 17:22:09 +0000
60615e9b4a widget graph test fixed Finn 2017-12-14 17:22:09 +0000
006cc7eb1e fixing graph code and added placeholder pie code Finn 2017-12-14 17:20:06 +0000
b2627eea4f fixing graph code and added placeholder pie code Finn 2017-12-14 17:20:06 +0000
a03d3f5977 Fixed admin interface for org users Finn 2017-12-13 15:29:35 +0000
af95b31eb8 Fixed admin interface for org users Finn 2017-12-13 15:29:35 +0000
3b191e5c76 working graphs on frontend Finn 2017-12-13 14:29:17 +0000
f50c5e685c working graphs on frontend Finn 2017-12-13 14:29:17 +0000
5b745f666b made customer graphs work with passing test Finn 2017-12-13 13:33:29 +0000
8067d3cb96 made customer graphs work with passing test Finn 2017-12-13 13:33:29 +0000
536ab21551 fixed snippets if no values to get Finn 2017-12-12 17:31:05 +0000
8e1e9b2ec2 fixed snippets if no values to get Finn 2017-12-12 17:31:05 +0000
5049fa9eed Placeholder test added for graphs Finn 2017-12-12 17:23:32 +0000
59dd053b45 Placeholder test added for graphs Finn 2017-12-12 17:23:32 +0000
1057eda445 added snippet endpoint and test Finn 2017-12-12 17:21:32 +0000
3100fec233 added snippet endpoint and test Finn 2017-12-12 17:21:32 +0000
7d309755c6 adding paths and placeholder for customer dash API Finn 2017-12-12 13:32:52 +0000
b3f1a018b5 adding paths and placeholder for customer dash API Finn 2017-12-12 13:32:52 +0000
9d799620e0 Merge pull request #83 from Pear-Trading/Release-v0.10.0 Tom Bloor 2017-12-08 16:36:22 +0000
20ca523f1e

Merge pull request #83 from Pear-Trading/Release-v0.10.0 Tom Bloor 2017-12-08 16:36:22 +0000
2015c15684 Updated Changelog Thomas Bloor 2017-12-08 16:21:31 +0000
5b0f8bffab

Updated Changelog Thomas Bloor 2017-12-08 16:21:31 +0000
e73c65d97b Merge pull request #82 from Pear-Trading/finn/esta Finn 2017-12-08 14:01:10 +0000
da320d250f

Merge pull request #82 from Pear-Trading/finn/esta Finn 2017-12-08 14:01:10 +0000
9ea3125bca changelog updated Finn 2017-12-08 13:30:21 +0000
db95f239cd changelog updated Finn 2017-12-08 13:30:21 +0000
cd59547311 schema and map code updated, test fixed Finn 2017-12-08 13:19:22 +0000