Commit graph

159 commits

Author SHA1 Message Date
Tom Bloor
f527bbb748 Added test:once and ci npm commands 2017-09-13 17:42:09 +01:00
Tom Bloor
9f629f2e6a Merge pull request #12 from Pear-Trading/TBSliver/Disable-Unused-Forms
Disabled and removed unused forms
2017-09-08 15:48:50 +01:00
Tom Bloor
8548cc7cae Disabled and removed unused forms 2017-09-08 15:48:20 +01:00
Tom Bloor
d3eee9901c Merge pull request #11 from Pear-Trading/TBSliver/Login-Fix
Fix errors found on logout then login again
2017-09-08 15:22:57 +01:00
Tom Bloor
cf1980d768 Stop using multiple apiService instances 2017-09-08 15:22:15 +01:00
Tom Bloor
7d637e84e4 Fix race condition in login 2017-09-08 14:59:31 +01:00
Tom Bloor
b1c2f531bb Fixed linter errors and removed inneeded api call 2017-09-08 14:49:57 +01:00
Tom Bloor
5279dfae10 Merge pull request #10 from Pear-Trading/TBSliver/Widget-Graph-Improvements
Refactored large graph
2017-09-08 13:25:20 +01:00
piratefinn
3915a49e12 Replaced some template text 2017-09-08 13:22:34 +01:00
Tom Bloor
732526322f Move large graph into graph-panel component and show real data 2017-09-08 13:09:23 +01:00
Tom Bloor
cd77e14178 Add ability to make panel components etc. in tslint 2017-09-08 13:08:51 +01:00
piratefinn
ab3daf177d Merge branch 'finn/OrgData' into development 2017-09-08 12:55:49 +01:00
piratefinn
085220d5b5 Sanitised names 2017-09-08 12:55:42 +01:00
piratefinn
3167472357 Merge branch 'finn/OrgData' into development 2017-09-08 12:16:53 +01:00
piratefinn
2c23b8a64d added required to data submissions 2017-09-08 12:16:43 +01:00
piratefinn
755588c7cd Merge branch 'finn/OrgData' into development 2017-09-08 11:54:45 +01:00
piratefinn
1982ce6790 Added Org submission API and transaction fixes 2017-09-08 11:54:34 +01:00
piratefinn
65cbea5d5d Merge branch 'finn/Tablecsschange' into development 2017-09-07 17:45:38 +01:00
piratefinn
a378ab4b28 headers for tables changed 2017-09-07 17:45:20 +01:00
Tom Bloor
b8e0df3906 Remove footer from graph panel 2017-09-07 17:14:35 +01:00
Tom Bloor
4161b57476 Merge pull request #9 from Pear-Trading/TBSliver/Widget-Graph-Improvements
Widget graph and Snippet addition for organisations
2017-09-07 16:25:57 +01:00
Tom Bloor
f0ed1e9369 Update snippets to use new snippets api and dataset 2017-09-07 16:02:29 +01:00
Tom Bloor
a0e077852d Change to using new api for snippets 2017-09-07 15:36:19 +01:00
Tom Bloor
20da5f1e92 Made data optional on api post 2017-09-07 15:35:55 +01:00
Tom Bloor
cfb131b800 Refactored snippet bar into seperate component 2017-09-07 15:12:49 +01:00
Tom Bloor
1774f2f0d5 Allow snippet html prefix 2017-09-07 15:11:36 +01:00
Tom Bloor
e301a063ed Remove unneeded code from dashboard ts 2017-09-07 13:58:51 +01:00
Tom Bloor
9bc9e34c51 Remove if blocks from snippets 2017-09-07 13:58:25 +01:00
Tom Bloor
e19db92a20 Removed unused graphs from display 2017-09-07 13:45:14 +01:00
Tom Bloor
1b075cdff6 Merge branch 'development' into TBSliver/Widget-Graph-Improvements 2017-09-07 13:37:49 +01:00
Tom Bloor
555675c313 Add update to dashboard for widget graph types 2017-09-07 13:32:59 +01:00
Tom Bloor
dd735e517e Give graph ability to support different datatypes 2017-09-07 13:32:42 +01:00
Tom Bloor
44e6ba4c8b Added data-type enum package 2017-09-07 13:32:06 +01:00
piratefinn
35114c9362 Merge branch 'finn/tableCSS' into development 2017-09-07 11:49:36 +01:00
piratefinn
a661ceba02 Changed table CSS 2017-09-07 11:49:19 +01:00
Finn
12b799423a Merge pull request #8 from Pear-Trading/finn/TransactionLog
View Transaction List
2017-09-06 17:53:35 +01:00
piratefinn
6c52c09e43 Added in pagination for transaction list 2017-09-06 17:51:56 +01:00
piratefinn
2e27e7a43b Added ability to read Transactions from server 2017-09-06 16:05:35 +01:00
Tom Bloor
00d713fff0 Merge pull request #7 from Pear-Trading/TBSliver/Extra-Widgets
Added extra widgets and fixed api issue
2017-09-05 12:05:26 +01:00
Tom Bloor
ec49bff840 Added extra widgets and fixed api issue 2017-09-05 12:04:36 +01:00
Tom Bloor
e0a78c0f43 Merge pull request #6 from Pear-Trading/TBSliver/Guard-Fixes
Made guards less likely to give infinite loop
2017-09-05 11:42:17 +01:00
Tom Bloor
f29cf1eba5 Made guards less likely to give infinite loop 2017-09-05 11:40:51 +01:00
Finn
b4df7d8a64 Merge pull request #5 from Pear-Trading/finn/AccountFix
Fixed account updating and display name for org
2017-09-04 17:26:29 +01:00
piratefinn
098b93f837 Fixed account updating and display name for org 2017-09-04 17:26:01 +01:00
Finn
7bdcc5fb7e Merge pull request #4 from Pear-Trading/finn/AccountFix
Fixed account editing
2017-09-04 16:31:19 +01:00
piratefinn
b6b1b3414c Fixed account editing 2017-09-04 16:30:56 +01:00
Finn
2596802a55 Merge pull request #3 from Pear-Trading/finn/profilepiccommentout
Commented out currently unusable code
2017-09-04 16:15:59 +01:00
piratefinn
1eb85cc7f6 Commented out currently unusable code 2017-09-04 16:15:32 +01:00
Finn
d24666362d Merge pull request #2 from Pear-Trading/finn/MoreCoreUI
Putting all the work into dev branch
2017-09-04 12:06:36 +01:00
Finn
b711ab43ba Merge branch 'development' into finn/MoreCoreUI 2017-09-04 12:06:23 +01:00