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

• 7c9ab69d1c Merge pull request #54 from Pear-Trading/TBSliver/Graph-Fix Finn 2017-09-08 13:13:40 +0100
• ebfd162b07 Make leaderboard calc script executable Tom Bloor 2017-09-08 13:12:56 +0100
• 26a37904d2 Naming sanitised Finn 2017-09-08 13:00:42 +0100
• 6de616584a Add customer_range graph Tom Bloor 2017-09-08 12:47:20 +0100
• 4176c61c00 Remove post user/day, and reformat validators Tom Bloor 2017-09-08 12:46:54 +0100
• 9cfd5536b9 Removed redundant code and added error messages Finn 2017-09-08 12:15:11 +0100
• 83094f380d Continue defaulting to 0 as well Tom Bloor 2017-09-08 12:03:48 +0100
• e13a128179 Add zero to sums to force number on output Tom Bloor 2017-09-08 12:00:23 +0100
• 662219fc6e Initial API for submission added Finn 2017-09-08 11:41:21 +0100
• c6679e1261 Merge pull request #53 from Pear-Trading/TBSliver/Org-Snippets Tom Bloor 2017-09-07 16:25:21 +0100
• 5a7bce28fd Merge branch 'TBSliver/Boolean-Fix' into development Tom Bloor 2017-09-07 16:19:35 +0100
• d5dd71661d Fix inflation of booleans from database Tom Bloor 2017-09-07 16:18:26 +0100
• ff466b4ed8 Added basic test for snippets data Tom Bloor 2017-09-07 16:06:51 +0100
• 05c20b9e85 Added new snippets endpoints Tom Bloor 2017-09-07 16:03:01 +0100
• ebbbbd865a Merge pull request #52 from Pear-Trading/finn/DeleteTransaction Finn 2017-09-07 13:39:32 +0100
• 54c2b7f64d Added count to test Finn 2017-09-07 13:26:03 +0100
• 21fda8aec6 Merge edac93bef5 into 8034844cec Finn 2017-09-07 12:21:16 +0000
• edac93bef5 Changed deletion method to POST and working test Finn 2017-09-07 13:20:53 +0100
• 416ac6343a Added ability to delete transactions successfully Finn 2017-09-07 12:53:01 +0100
• 8034844cec Merge pull request #50 from Pear-Trading/finn/TransactionViewAPI Finn 2017-09-06 17:52:56 +0100
• ebe6ccb33e Fixed page no Finn 2017-09-06 17:03:53 +0100
• 6e9e90eab1 Merge 4e7c8bbfae into b4cdc2cfa6 Finn 2017-09-06 16:03:23 +0000
• b4cdc2cfa6 Merge branch 'TBSliver/Table-Clearup' into development Tom Bloor 2017-09-06 16:55:18 +0100
• b90534babb Fixed table clearup sql for migration Tom Bloor 2017-09-06 16:55:05 +0100
• ca9dbcd822 Merge branch 'TBSliver/Spelling-Fail' into development Tom Bloor 2017-09-06 16:49:27 +0100
• 3d44bad077 Failed to spell schema correctly in migration script Tom Bloor 2017-09-06 16:49:12 +0100
• 076a6c98e8 Merge branch 'TBSliver/More-Postgres-Fixes' into development Tom Bloor 2017-09-06 16:48:20 +0100
• 941b89ca66 Missed a constraint Tom Bloor 2017-09-06 16:48:06 +0100
• 260cb1e752 Merge branch 'TBSliver/Postgres-Index-Fix' into development Tom Bloor 2017-09-06 16:45:57 +0100
• 007afbc394 Missed some tables required for migration, and dropping indecies for postgres etc. Tom Bloor 2017-09-06 16:45:29 +0100
• 0eeae0d28d Fixed index which needed renaming for upgrade Tom Bloor 2017-09-06 16:20:48 +0100
• d02f8f3931 Merge branch 'TBSliver/Postgres-Fixes' into development Tom Bloor 2017-09-06 16:18:11 +0100
• f3335810b3 Change postgres upgrade script to use proper boolean defaults Tom Bloor 2017-09-06 16:16:35 +0100
• 2320ec7e23 Change postgres deploy to use false for boolean default value Tom Bloor 2017-09-06 16:15:07 +0100
• 681ccf1370 Change defaults to be pure false Tom Bloor 2017-09-06 16:14:11 +0100
• 2c718e4337 Fix layout issue in upload test and change to using pure json Tom Bloor 2017-09-06 16:13:00 +0100
• 6ed0be4801 Use normal 1 instead of deferenced for proper inflation Tom Bloor 2017-09-06 16:12:36 +0100
• 8eda4f88b2 Fixed boolean inflation for User table Tom Bloor 2017-09-06 16:11:57 +0100
• d2b769d471 Auto inflate correctly based on database type for booleans Tom Bloor 2017-09-06 16:10:34 +0100
• 4e7c8bbfae Created test and fixed things Finn 2017-09-05 17:24:04 +0100
• 06858fc005 Added outgoing transaction list API Finn 2017-09-05 16:37:31 +0100
• bb239ba000 Merge pull request #47 from Pear-Trading/finn/ViewTransactionList Finn 2017-09-05 14:21:43 +0100
• 1d5fdadc56 Better "no transaction image" picture Finn 2017-09-05 14:08:05 +0100
• 42e1642344 Added viewing transactions from organisation and user list view Finn 2017-09-05 13:58:57 +0100
• 60e6b2717e Added ability for when there is no image Finn 2017-09-05 13:52:05 +0100
• e7631dd90e Code for viewing single transaction added Finn 2017-09-05 13:44:58 +0100
• e330812cf8 Merge pull request #46 from Pear-Trading/finn/ViewUserTransactions Finn 2017-09-05 12:39:06 +0100
• cd6c075588 View Transactions from a User on their page Finn 2017-09-05 12:27:37 +0100
• cae2806ad2 Merge pull request #44 from Pear-Trading/finn/StopSameOrgPurchase Tom Bloor 2017-09-05 12:20:25 +0100
• 1693bc7fb6 Merge pull request #45 from Pear-Trading/TBSliver/Org-Graph-Improvements Tom Bloor 2017-09-05 12:19:18 +0100
• a463b99fa9 Stopped Orgs from buying for themselves & added to test Finn 2017-09-05 12:03:49 +0100
• 4ba6a443fc Stop null values on org graphs Tom Bloor 2017-09-04 17:39:48 +0100
• 4d21de7bae Improved Graphs and added sales and purchase data graphs. Tom Bloor 2017-09-04 17:29:28 +0100
• 5452dac826 Merge pull request #43 from Pear-Trading/finn/OrgAccountUpdatefix Finn 2017-09-04 17:26:49 +0100
• fabd01f988 Fixed for sector in account editing Finn 2017-09-04 17:05:10 +0100
• efe47c2bce Merge 2137b5607f into 537048b506 Finn 2017-09-04 15:12:25 +0000
• 2137b5607f Fixed Org account editing for portal Finn 2017-09-04 16:12:03 +0100
• 537048b506 Merge pull request #41 from Pear-Trading/TBSliver/Schema-Changes Finn 2017-09-04 14:31:20 +0100
• 161d50e095 Fix editing user in Admin Tom Bloor 2017-09-04 14:10:38 +0100
• 4fa52901cb Update add org to work with new form Tom Bloor 2017-09-04 14:09:36 +0100
• 2ef5193e41 Fixed organisaiton listing and editing in backend Tom Bloor 2017-09-04 14:03:58 +0100
• 2594d826ef Finished upgrade to schema for entity upgrade Tom Bloor 2017-09-04 14:03:39 +0100
• cca27b5475 Fix org graphs test for entity upgrade Tom Bloor 2017-08-31 19:12:13 +0100
• adfcd8880f Fix User endpoints for entity upgrade Tom Bloor 2017-08-31 19:08:22 +0100
• dd6e21eb50 Fix upload tests for entity upgrade Tom Bloor 2017-08-31 19:03:49 +0100
• e91863a3d7 Fixed stats endpoint for leaderboards on entity upgrade Tom Bloor 2017-08-31 18:31:42 +0100
• 96c8fa16c8 fixed resultset_leaderboard schema test for entity changes Tom Bloor 2017-08-31 18:28:36 +0100
• 44c29ad7a2 Fixed leaderboard_trend test for entity upgrade Tom Bloor 2017-08-31 18:27:44 +0100
• 66cc99b975 Fixed schema leaderboard test for entity changes Tom Bloor 2017-08-31 18:26:19 +0100
• aa6cc63506 Refactor leaderboard creation functions for entity upgrade Tom Bloor 2017-08-31 18:25:27 +0100
• 8d205d62c2 Refactor stats test to use fixtures and fix stats endpoints for entity update Tom Bloor 2017-08-31 18:04:51 +0100
• 2980fd129f Fix search test for entity upgrade Tom Bloor 2017-08-31 17:53:54 +0100
• 1ab2d0b71c Added new search data fixtures Tom Bloor 2017-08-31 16:58:23 +0100
• bf16077b10 Fix register for new entity work Tom Bloor 2017-08-31 16:46:25 +0100
• 4cc8aad367 Fix admin user test for entity upgrade Tom Bloor 2017-08-31 16:38:03 +0100
• 815056b771 Fix error in fixtures data Tom Bloor 2017-08-31 16:35:51 +0100
• 5d425df4f8 Merge branch 'development' v0.009 Tom Bloor 2017-08-31 15:32:57 +0100
• 758089bad1 Removed pending_read template as uneccessary now Tom Bloor 2017-08-31 14:53:04 +0100
• 92afe1c531 Fix admin organisation management tests Tom Bloor 2017-08-31 14:52:45 +0100
• 0159ef91dc Fix undef issue on valid_read template Tom Bloor 2017-08-31 14:52:25 +0100
• 18992784b2 Fix admin login test and required changes for entity upgrade Tom Bloor 2017-08-31 13:35:49 +0100
• 6cd3113912 Updated basic test to use fixtures Tom Bloor 2017-08-31 13:20:24 +0100
• 0b6bb47072 Added documentation for user fixtures Tom Bloor 2017-08-31 13:20:06 +0100
• d4ccd0b7a2 Update user fixtures with new entity code Tom Bloor 2017-08-31 13:18:04 +0100
• bd8b1f91a4 Merge branch 'development' into TBSliver/Schema-Changes Tom Bloor 2017-08-31 13:07:23 +0100
• db63b5b3cf Merge pull request #40 from Pear-Trading/finn/ReceiptListImprove Finn 2017-08-31 13:06:31 +0100
• 6b9e1763b8 Added schema graph for v6 Tom Bloor 2017-08-31 12:54:41 +0100
• b2312f7dbc Fix unique constraint on LB values Tom Bloor 2017-08-31 12:40:42 +0100
• 27d06fbe37 Bump schema version number to 6 Tom Bloor 2017-08-31 12:39:36 +0100
• fd98670333 Updated user to use new Entity table Tom Bloor 2017-08-31 12:39:10 +0100
• 2954297b35 Change transaction to use entity table Tom Bloor 2017-08-31 12:30:52 +0100
• 8acf3af28a Removed pending org and transaction Tom Bloor 2017-08-31 12:30:37 +0100
• 4f99ef82f6 Update organisation with extra information required for entity upgrade Tom Bloor 2017-08-31 12:29:06 +0100
• 7042020969 Change LB Value to link to entity instead of user Tom Bloor 2017-08-31 12:19:47 +0100
• 64cab5f17c Fixed whitespace in Feedback table Tom Bloor 2017-08-31 12:18:07 +0100
• 6a720b0a46 Added Entity to customer Tom Bloor 2017-08-31 12:17:05 +0100
• 736ffb89cf Added entity table Tom Bloor 2017-08-31 12:16:38 +0100
• 4189025c6f Added timings and descending submit at time for receipts Finn 2017-08-31 11:51:22 +0100
• 72813ff2a3 Made image upload optional Finn 2017-08-31 11:41:38 +0100
• 36e91866c9 Remove Administrator column Tom Bloor 2017-08-31 11:26:30 +0100