Commit graph

396 commits

Author SHA1 Message Date
0d4ec82ed0 Merge branch 'ben/fix/error-messages' into ben/feature/push-notifications 2020-11-28 19:38:58 +00:00
384b8f3f3d Fix line 2020-11-28 19:38:43 +00:00
a4edd74fcc Merge branch 'ben/fix/error-messages' into ben/feature/push-notifications 2020-11-28 19:37:00 +00:00
f53dbed80e Correct HTTP500 error text 2020-11-28 19:36:31 +00:00
bfb9f9b582 Add database connection check 2020-11-28 19:36:19 +00:00
113a100ba1 Add device token management 2020-11-28 19:33:36 +00:00
1b7146b92d Integrate service with app 2020-11-08 17:38:49 +00:00
d7adc0f514 Add messaging service 2020-11-08 17:38:37 +00:00
659b37b589 Add packages and pre-reqs 2020-11-08 17:38:01 +00:00
bf8acced6c Clear up API code a little 2020-11-08 17:37:26 +00:00
d0165eaf9e Add organisation push notification page 2020-11-01 18:05:20 +00:00
b4bcdf0149 Clear up Feedback component 2020-11-01 18:05:03 +00:00
73352def35 Fix merge conflicts 2020-11-01 18:04:06 +00:00
a19ddcb1b7 Add property to component 2020-10-18 14:03:23 +01:00
Rumperuu
49e5951747
Merge branch 'development' into ben/fix/sidebar-links 2020-10-18 13:33:54 +01:00
5ccd39d845 Update copyright declaration 2020-10-17 19:02:50 +01:00
df386d0407 Rearrange sidebar links, add titles 2020-10-17 19:01:03 +01:00
f71c4466e9 Rename and move 'submit feedback' 2020-10-17 18:54:44 +01:00
191e220a0d Rename 'add/submit transaction' 2020-10-17 18:52:03 +01:00
0a4a41705f Fix cosmetic issues 2020-10-17 18:39:59 +01:00
e839ab28b6 Capitalise entered postcodes 2020-10-17 16:41:10 +01:00
7be68c3fc0 Correct which links are shown for different users 2020-10-17 16:21:05 +01:00
Tom Bloor
2a5e790e3d
Fix e2e test and actually check login works 2020-08-13 16:24:49 +01:00
Finn Kempers
e4dcc2e664 fixing agm 2020-08-12 13:27:34 +01:00
Finn Kempers
a0e28cb440 Fixes to declaration name of agm markers 2020-08-12 13:12:11 +01:00
Finn Kempers
4312f2ad8b fixed a variable 2020-08-10 10:11:22 +01:00
Finn Kempers
55eb053b08 package fixes due to missing peer & npm warnings 2020-07-29 20:13:08 +01:00
Finn Kempers
fba44b237a Additional fix needed for clusters 2020-07-29 14:55:20 +01:00
Finn Kempers
611dbc4bac changed agm cluster and updated agm dependencies
the changelog didnt mention this properly to do but as seen in change 7982bfbcf0 the module was renamed and needed changing.
2020-07-29 14:32:51 +01:00
Finn Kempers
3ed88a4d5e ng update to 9 2020-07-29 13:31:46 +01:00
Thomas Bloor
75edb86abe
update secret files 2019-09-09 21:19:51 +01:00
Thomas Bloor
87160f5387
remove uneccessary stuff and work on CI 2019-09-09 20:45:24 +01:00
Thomas Bloor
7883dbb169
Fix a large amount of things in the ui 2019-09-09 19:52:38 +01:00
Finn
52bce4dd0a Added initial working table for transaction types 2019-09-09 16:13:34 +01:00
Finn
5c85d5aae9 ward import fixed 2019-09-05 17:18:52 +01:00
Finn
db5f982ed3 BROKEN: Added wards table 2019-09-04 18:21:21 +01:00
Tom Slater
1dc46a55e0 Misc chart work
Search feature on both suppliers and the pagination feature on the spend history still not functional
2019-08-30 16:50:19 +01:00
Tom Slater
420174e953 chart work 2019-08-28 10:47:44 +01:00
Tom Slater
5e91665e0b Merge remote-tracking branch 'origin/tyu-tyu/charts' into tyu-tyu/charts 2019-08-23 11:42:39 +01:00
Tom Slater
301f706365 Chart improvements
Minor fixes  + refresh on supplier spend chart
2019-08-22 16:59:51 +01:00
Tom Slater
ade578d78b Merge remote-tracking branch 'origin/tyu-tyu/char' into tyu-tyu/charts 2019-08-21 11:53:53 +01:00
Tom Slater
8859c6977c Colour fixes 2019-08-21 11:51:10 +01:00
Tom Slater
9fbe36e401 Misc chart work 2019-08-20 16:47:20 +01:00
Finn
55e62a6b87
properly displaying essential purchases dataset 2019-08-20 16:43:53 +01:00
Finn
03e9e365fc
removed console logs that show password 2019-08-20 14:33:44 +01:00
Tom Slater
4181a09b96 Merge remote-tracking branch 'origin/felix/customranges' into tyu-tyu/char 2019-08-19 13:48:47 +01:00
Tom Slater
4b42a08af1 Chart work update
working on essential purchase graph
2019-08-19 12:30:36 +01:00
Tom Slater
156a2f3764 Misc Chart work 2019-08-16 16:58:35 +01:00
Felix
7c5eedaa87 removed test graph 2019-08-16 15:55:22 +01:00
Felix
301a6e619a commented out console.logs 2019-08-16 15:24:49 +01:00