Commit graph

471 commits

Author SHA1 Message Date
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
piratefinn
0aa6340454 Made it load email on feedback form load 2017-09-01 17:33:23 +01:00
piratefinn
68cef62bde Help texts edited 2017-09-01 16:26:47 +01:00
piratefinn
95653e2a11 Finished Feedback form code to working and added routing 2017-09-01 15:02:05 +01:00
piratefinn
506e3b36da help texts edited, customer dashboard finished and feedback form added 2017-09-01 14:36:31 +01:00
piratefinn
24037e0454 Lots of refactor with auth guards and functional customer routing 2017-08-31 18:44:17 +01:00
piratefinn
52fbda7157 Removed redundant code and started abiliyt for customer entry 2017-08-31 16:06:47 +01:00
piratefinn
ccb743ec43 Merge remote-tracking branch 'origin/TBSliver/CoreUI' into finn/MoreCoreUI 2017-08-31 11:11:14 +01:00
piratefinn
52de477cc2 Fully working table org search and better error 2017-08-30 16:09:57 +01:00
Tom Bloor
4731ed9a22 Fix various linter errors in dashboard 2017-08-30 12:41:28 +01:00
Tom Bloor
cd0dd73c1c Fixed dashboard to use new graph widget, and a widget list 2017-08-30 12:35:43 +01:00
Tom Bloor
8a509e5051 Renamed customers widget to graph widget 2017-08-30 12:35:25 +01:00
piratefinn
f040a26794 Adding Stuff for submit transaction 2017-08-29 18:15:47 +01:00
Tom Bloor
5e2471aebf Refactor customer graph to use new service for org graphs 2017-08-29 17:39:27 +01:00
Tom Bloor
7342db0713 First pass on factoring out graph widgets to seperate classes 2017-08-29 16:42:32 +01:00
Tom Bloor
70a37dbba6 Allow for widget selector prefix and Widget class suffix 2017-08-29 16:03:33 +01:00
piratefinn
d3c0e9ec57 Typo fix 2017-08-25 15:52:29 +01:00
Tom Bloor
dfff1695ba Removed uneccessary components from dashboard 2017-08-25 14:00:39 +01:00
Tom Bloor
dd0151e18c Added roboto font 2017-08-25 14:00:29 +01:00
piratefinn
529461870f Fix to required entry data 2017-08-25 13:00:58 +01:00
piratefinn
4fd1b60369 Merge branch 'TBSliver/CoreUI' into finn/MoreCoreUI 2017-08-25 12:20:44 +01:00
piratefinn
c1381b812c More errors added 2017-08-25 12:18:14 +01:00
Tom Bloor
9c5c309ef0 Updated login page tests to check for username and password fields 2017-08-25 12:17:15 +01:00
Tom Bloor
2d0633a393 Added id's to login form 2017-08-25 12:17:06 +01:00
Tom Bloor
7fb84fac70 Refactored e2e test naming 2017-08-25 11:55:53 +01:00
Tom Bloor
10ab95044b Added new typings for jasminewd2 2017-08-25 11:55:38 +01:00
Tom Bloor
dada7384c2 Fix end to end tests to actually run and test something 2017-08-24 18:33:21 +01:00
Tom Bloor
21fb03bacf Update all testing dev deps 2017-08-24 18:33:11 +01:00
Tom Bloor
371f019595 Moved assignments out of beforeEach as per test guidelines 2017-08-24 17:20:46 +01:00
piratefinn
b45bc19ba7 Basic Error messages and some correct valid added to login & register 2017-08-24 17:09:01 +01:00
Tom Bloor
d7bb20870e Change from attaching directly to body tag for app 2017-08-24 16:38:41 +01:00
piratefinn
c9b994a11e Fixed routing on login page 2017-08-24 16:30:34 +01:00
Tom Bloor
9934f618b5 Got initial spec file passing 2017-08-24 16:25:23 +01:00
Tom Bloor
c46e91e795 Fix linter errors on account-edit 2017-08-24 16:20:55 +01:00
Tom Bloor
346ea2c6fd Fixed indentation in app.module.ts 2017-08-24 16:03:45 +01:00
Tom Bloor
ddadae9a07 Fix indentation in api-service 2017-08-16 16:12:40 +01:00
Tom Bloor
59693df214 Fix indentation on login component 2017-08-16 16:10:32 +01:00
Tom Bloor
ee7b81ad3c Remove widgets module as unused 2017-08-16 16:05:47 +01:00
Tom Bloor
eee8f8e949 Router redirect to login instead of window reload 2017-08-16 15:58:31 +01:00