Commit graph

451 commits

Author SHA1 Message Date
Tom Bloor
63006e4be1 Bump version number in Changelog 2017-11-14 11:13:25 +00:00
Tom Bloor
c4d1bf5a07 Fix build-release script to put stuff in a folder 2017-11-14 11:12:29 +00:00
Finn
72ceabf43f
Merge pull request #29 from Pear-Trading/finn/moremaps
Added zoom level to map
2017-11-14 11:11:01 +00:00
piratefinn
1c0cd372d5 Changelog updated 2017-11-14 11:08:17 +00:00
piratefinn
52834af3fc Fixed and working zoom level change 2017-11-14 11:03:19 +00:00
Finn
0286887ead Initial agmcluster commit with broken maxZoom 2017-11-13 22:21:59 +00:00
Finn
994dcdfb63
Merge pull request #28 from Pear-Trading/finn/leaderboardfix
Fixes made
2017-11-13 16:25:07 +00:00
piratefinn
0688685676 changed login username input to email and changed test 2017-11-13 15:49:17 +00:00
piratefinn
a5b73c7e59 Transaction fix added 2017-11-13 13:05:42 +00:00
piratefinn
03299fb5a8 Changelog updated 2017-11-13 12:47:32 +00:00
piratefinn
3009365682 Map changed and made available to customers 2017-11-13 12:39:31 +00:00
piratefinn
8f725b93af Fixed authguard 2017-11-13 12:26:24 +00:00
Finn
356aeae974
Merge pull request #27 from Pear-Trading/finn/leaderboard
Web App Leaderboard added
2017-11-13 11:48:42 +00:00
piratefinn
c4a9790eb8 Web app leaderboard done 2017-11-10 18:41:35 +00:00
piratefinn
faea82d2cc route fix 2017-11-10 17:17:04 +00:00
Finn
40e20679e0
Merge pull request #26 from Pear-Trading/finn/typofix
fixes
2017-11-10 17:15:59 +00:00
piratefinn
8a5236ad3a Leaderboard pages added and routing sorted 2017-11-10 17:15:11 +00:00
piratefinn
f5239a3822 Added password reset placeholder 2017-11-10 15:20:48 +00:00
piratefinn
0b2c9c20f8 Unusable password reset button disabled 2017-11-10 14:14:11 +00:00
piratefinn
0a54cdc091 fixed register name in place 2017-11-10 14:13:28 +00:00
Finn
bca2d62fdc Merge pull request #25 from Pear-Trading/finn/transactionFix
Fixed transaction submission
2017-10-20 13:27:11 +01:00
piratefinn
0a9e80fc97 Fixed transaction submission 2017-10-20 13:21:49 +01:00
Tom Bloor
1ce755d2d3 Merge pull request #24 from Pear-Trading/master
Master merge for v0.0.2
2017-09-28 14:47:42 +01:00
Tom Bloor
1171f935a7 Merge pull request #23 from Pear-Trading/Release-v0.0.2
Release v0.0.2
2017-09-28 14:38:34 +01:00
Tom Bloor
ed3a14806b Bumped package version number to 0.0.2 2017-09-28 14:34:33 +01:00
Tom Bloor
aeda2ec027 Updated changelog 2017-09-28 14:32:58 +01:00
Tom Bloor
e82c12d265 Merge pull request #22 from Pear-Trading/TBSliver/Maps
Added map for suppliers to trader portal
2017-09-28 14:23:37 +01:00
Tom Bloor
0cd7cdc96c Added CI environment to angular cli file 2017-09-28 14:15:51 +01:00
Tom Bloor
cea000b90c Added ci specific e2e and test scripts 2017-09-28 14:12:25 +01:00
Tom Bloor
ed738b287a Added placeholder for mapApiKey 2017-09-28 13:28:57 +01:00
Tom Bloor
8520328582 Changed path of dev environment 2017-09-28 13:25:19 +01:00
Tom Bloor
1eb8d71b4a Removed prod environment file from repo 2017-09-28 13:21:28 +01:00
Tom Bloor
d8b92af1a3 Ignore prod and dev env settings 2017-09-28 13:12:34 +01:00
Tom Bloor
2ffe32c6f5 Change to a map icon for the Supplier Map 2017-09-28 12:55:48 +01:00
Tom Bloor
a622b0d871 Fix issue with supplier location api url 2017-09-28 12:47:09 +01:00
piratefinn
f402d46db8 Added API changes 2017-09-27 17:46:25 +01:00
piratefinn
b59351addf made looping markers 2017-09-27 14:34:46 +01:00
piratefinn
1eb79aa047 Added API and fixes 2017-09-27 13:54:10 +01:00
piratefinn
64e028f0c5 Added default zoom 2017-09-27 12:02:46 +01:00
piratefinn
5d3283171c styling improved 2017-09-26 17:51:14 +01:00
piratefinn
40bd7459b5 Map page added with map 2017-09-26 17:31:40 +01:00
piratefinn
67bb904770 Package added & npm updated 2017-09-26 16:22:54 +01:00
Finn
7cf8af3058 Merge pull request #21 from Pear-Trading/finn/PayrollSubmit
Transaction submitting and log added
2017-09-19 17:31:45 +01:00
piratefinn
089e7f7a97 Functionality fully added 2017-09-19 17:22:19 +01:00
piratefinn
7b03f6adff Initial addition of API for payroll log 2017-09-19 15:38:35 +01:00
piratefinn
f1a6b1886f Merge branch 'development' into finn/PayrollSubmit 2017-09-19 15:37:17 +01:00
Tom Bloor
e32d29b310 Merge pull request #19 from Pear-Trading/TBSliver/More-Automation
Added script for automating prod and dev builds
2017-09-19 15:31:29 +01:00
Tom Bloor
f70d3945b6 Merge pull request #20 from Pear-Trading/TBSliver/Lint-Errors
Tb sliver/lint errors
2017-09-19 15:31:03 +01:00
Tom Bloor
e62a46c312 Ignore linter error in transaction-result component 2017-09-19 15:21:03 +01:00
Tom Bloor
8f164ca94a ignore linter errors in org-result items 2017-09-19 15:19:50 +01:00