Pear-Trading/FoodLoop-Web
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Commit graph

  • 72ceabf43f
         Merge pull request #29 from Pear-Trading/finn/moremaps Finn 2017-11-14 11:11:01 +00:00
  • d587ddd339 Changelog updated piratefinn 2017-11-14 11:08:17 +00:00
  • 1c0cd372d5 Changelog updated piratefinn 2017-11-14 11:08:17 +00:00
  • 7a73cb3e3e Fixed and working zoom level change piratefinn 2017-11-14 11:03:19 +00:00
  • 52834af3fc Fixed and working zoom level change piratefinn 2017-11-14 11:03:19 +00:00
  • 12889fd687 Initial agmcluster commit with broken maxZoom Finn 2017-11-13 22:21:59 +00:00
  • 0286887ead Initial agmcluster commit with broken maxZoom Finn 2017-11-13 22:21:59 +00:00
  • a05b0c3dae Merge pull request #28 from Pear-Trading/finn/leaderboardfix Finn 2017-11-13 16:25:07 +00:00
  • 994dcdfb63
         Merge pull request #28 from Pear-Trading/finn/leaderboardfix Finn 2017-11-13 16:25:07 +00:00
  • 1739e998a5 changed login username input to email and changed test piratefinn 2017-11-13 15:49:17 +00:00
  • 0688685676 changed login username input to email and changed test piratefinn 2017-11-13 15:49:17 +00:00
  • e1230c770a Transaction fix added piratefinn 2017-11-13 13:05:42 +00:00
  • a5b73c7e59 Transaction fix added piratefinn 2017-11-13 13:05:42 +00:00
  • 40ebfb3e9c Changelog updated piratefinn 2017-11-13 12:47:32 +00:00
  • 03299fb5a8 Changelog updated piratefinn 2017-11-13 12:47:32 +00:00
  • 49be482299 Map changed and made available to customers piratefinn 2017-11-13 12:39:31 +00:00
  • 3009365682 Map changed and made available to customers piratefinn 2017-11-13 12:39:31 +00:00
  • 306821b09f Fixed authguard piratefinn 2017-11-13 12:26:24 +00:00
  • 8f725b93af Fixed authguard piratefinn 2017-11-13 12:26:24 +00:00
  • 97aa432c4e Merge pull request #27 from Pear-Trading/finn/leaderboard Finn 2017-11-13 11:48:42 +00:00
  • 356aeae974
         Merge pull request #27 from Pear-Trading/finn/leaderboard Finn 2017-11-13 11:48:42 +00:00
  • c4a9790eb8 Web app leaderboard done piratefinn 2017-11-10 18:41:35 +00:00
  • faea82d2cc route fix piratefinn 2017-11-10 17:17:04 +00:00
  • 86337146f3 Merge pull request #26 from Pear-Trading/finn/typofix Finn 2017-11-10 17:15:59 +00:00
  • 40e20679e0
         Merge pull request #26 from Pear-Trading/finn/typofix Finn 2017-11-10 17:15:59 +00:00
  • 8a5236ad3a Leaderboard pages added and routing sorted piratefinn 2017-11-10 17:15:11 +00:00
  • f5239a3822 Added password reset placeholder piratefinn 2017-11-10 15:20:48 +00:00
  • 0b2c9c20f8 Unusable password reset button disabled piratefinn 2017-11-10 14:14:11 +00:00
  • 0a54cdc091 fixed register name in place piratefinn 2017-11-10 14:13:28 +00:00
  • bca2d62fdc Merge pull request #25 from Pear-Trading/finn/transactionFix Finn 2017-10-20 13:27:11 +01:00
  • 0a9e80fc97 Fixed transaction submission piratefinn 2017-10-20 13:21:49 +01:00
  • 1ce755d2d3 Merge pull request #24 from Pear-Trading/master Tom Bloor 2017-09-28 14:47:42 +01:00
  • 1171f935a7 Merge pull request #23 from Pear-Trading/Release-v0.0.2 v0.0.2 Tom Bloor 2017-09-28 14:38:34 +01:00
  • ed3a14806b Bumped package version number to 0.0.2 Tom Bloor 2017-09-28 14:34:33 +01:00
  • aeda2ec027 Updated changelog Tom Bloor 2017-09-28 14:32:58 +01:00
  • e82c12d265 Merge pull request #22 from Pear-Trading/TBSliver/Maps Tom Bloor 2017-09-28 14:23:37 +01:00
  • 0cd7cdc96c Added CI environment to angular cli file Tom Bloor 2017-09-28 14:15:51 +01:00
  • cea000b90c Added ci specific e2e and test scripts Tom Bloor 2017-09-28 14:12:25 +01:00
  • ed738b287a Added placeholder for mapApiKey Tom Bloor 2017-09-28 13:28:57 +01:00
  • 8520328582 Changed path of dev environment Tom Bloor 2017-09-28 13:25:19 +01:00
  • 1eb8d71b4a Removed prod environment file from repo Tom Bloor 2017-09-28 13:21:28 +01:00
  • d8b92af1a3 Ignore prod and dev env settings Tom Bloor 2017-09-28 13:12:34 +01:00
  • 2ffe32c6f5 Change to a map icon for the Supplier Map Tom Bloor 2017-09-28 12:55:48 +01:00
  • a622b0d871 Fix issue with supplier location api url Tom Bloor 2017-09-28 12:47:09 +01:00
  • f402d46db8 Added API changes piratefinn 2017-09-27 17:46:25 +01:00
  • b59351addf made looping markers piratefinn 2017-09-27 14:34:46 +01:00
  • 1eb79aa047 Added API and fixes piratefinn 2017-09-27 13:54:10 +01:00
  • 64e028f0c5 Added default zoom piratefinn 2017-09-27 12:02:46 +01:00
  • 5d3283171c styling improved piratefinn 2017-09-26 17:51:14 +01:00
  • 40bd7459b5 Map page added with map piratefinn 2017-09-26 17:31:40 +01:00
  • 67bb904770 Package added & npm updated piratefinn 2017-09-26 16:22:54 +01:00
  • 7cf8af3058 Merge pull request #21 from Pear-Trading/finn/PayrollSubmit Finn 2017-09-19 17:31:45 +01:00
  • 089e7f7a97 Functionality fully added piratefinn 2017-09-19 17:22:19 +01:00
  • 7b03f6adff Initial addition of API for payroll log piratefinn 2017-09-19 15:38:35 +01:00
  • f1a6b1886f Merge branch 'development' into finn/PayrollSubmit piratefinn 2017-09-19 15:37:17 +01:00
  • e32d29b310 Merge pull request #19 from Pear-Trading/TBSliver/More-Automation Tom Bloor 2017-09-19 15:31:29 +01:00
  • f70d3945b6 Merge pull request #20 from Pear-Trading/TBSliver/Lint-Errors Tom Bloor 2017-09-19 15:31:03 +01:00
  • e62a46c312 Ignore linter error in transaction-result component Tom Bloor 2017-09-19 15:21:03 +01:00
  • 8f164ca94a ignore linter errors in org-result items Tom Bloor 2017-09-19 15:19:50 +01:00
  • a5b786a749 Linter errors in dashboard-customer component Tom Bloor 2017-09-19 15:04:49 +01:00
  • 0907134ff7 Fix linter errors for transaction-log component Tom Bloor 2017-09-19 15:02:48 +01:00
  • 662d6be5c9 Linter error fixes for feedback component Tom Bloor 2017-09-19 14:59:19 +01:00
  • 921b25718d Linter error fixes for account-edit component Tom Bloor 2017-09-19 14:56:07 +01:00
  • f6c0583481 Fix linter errors in add-data component Tom Bloor 2017-09-19 14:53:25 +01:00
  • 61ac856cc2 fix linter errors on register component Tom Bloor 2017-09-19 14:48:22 +01:00
  • dec53b4630 Fix linter errors in full-layout Tom Bloor 2017-09-19 11:10:56 +01:00
  • 8807ba6cc9 linter errors in auth.guard.ts Tom Bloor 2017-09-19 11:09:30 +01:00
  • baf64ff4b7 whitespace changes for linter in pages 500 Tom Bloor 2017-09-19 11:06:41 +01:00
  • 49be004bbc whitespace changes for pages 404 Tom Bloor 2017-09-19 11:04:59 +01:00
  • 10664f0da9 Added script for automating prod and dev builds Tom Bloor 2017-09-19 10:59:08 +01:00
  • 78af694c04 Merge pull request #18 from Pear-Trading/finn/ValidationFix Finn 2017-09-18 14:08:36 +01:00
  • d1eb79b394 Fixed Transaction Validation piratefinn 2017-09-18 13:58:38 +01:00
  • d2f75af362 Merge pull request #17 from Pear-Trading/finn/RegisterViewFix Finn 2017-09-18 10:50:01 +01:00
  • 7f3e9f4fd0 Added better error messaging piratefinn 2017-09-15 17:33:34 +01:00
  • f34c558d41 Fixes to receipt form piratefinn 2017-09-15 16:50:53 +01:00
  • 70be2cbc2b Amended changelog piratefinn 2017-09-15 16:36:37 +01:00
  • 7b1771b45f Fixed Register View on mobile piratefinn 2017-09-15 16:35:04 +01:00
  • bd0c9e4aa5 Merge branch 'Release-v0.0.1' into development Tom Bloor 2017-09-15 15:52:37 +01:00
  • 4188456e0b Merge branch 'Release-v0.0.1' v0.0.1 Tom Bloor 2017-09-15 15:51:40 +01:00
  • 091179f627 Merge tag 'v0.0.1-alpha.1' Tom Bloor 2017-09-15 15:51:25 +01:00
  • eff3b31a18 update Licence file from Core-UI and add licence listing to Readme Tom Bloor 2017-09-15 15:50:02 +01:00
  • a659fd9d08 Update package.json to be correct Tom Bloor 2017-09-15 15:49:47 +01:00
  • 9cea3b4a3a Updated changelog for v0.0.1 release Tom Bloor 2017-09-15 15:45:41 +01:00
  • 37cf45e53b Merge pull request #16 from Pear-Trading/TBSliver/Logo-Changes Tom Bloor 2017-09-15 15:43:34 +01:00
  • 3623e4162f Updated logos and changelog Tom Bloor 2017-09-15 15:35:41 +01:00
  • 34465afc8d Merge pull request #15 from Pear-Trading/TBSliver/Testing Tom Bloor 2017-09-15 12:43:00 +01:00
  • 88ed71d767 Merge pull request #14 from Pear-Trading/TBSliver/Logos Tom Bloor 2017-09-14 17:08:25 +01:00
  • a5f5945428 Change to block comment as css is stupid Tom Bloor 2017-09-14 17:02:44 +01:00
  • 56c5b5dd2f Added loading spinner Tom Bloor 2017-09-14 17:01:55 +01:00
  • d418988e84 Added basic title etc for LocalLoop Tom Bloor 2017-09-14 17:01:44 +01:00
  • 7531347565 Change footer to have Pear trading on the bottom Tom Bloor 2017-09-14 16:47:46 +01:00
  • e218e50349 Fix logo url Tom Bloor 2017-09-14 16:44:49 +01:00
  • 22b61623e0 Added new favicon and logo Tom Bloor 2017-09-14 16:40:00 +01:00
  • 399175fa60 Added changelog Tom Bloor 2017-09-14 13:28:41 +01:00
  • c2609b949a Initial framework for org-graphs tests Tom Bloor 2017-09-14 13:01:09 +01:00
  • e994085dfe Fix links and image urls for travis Tom Bloor 2017-09-14 12:42:49 +01:00
  • 40b6a1401a Merge pull request #13 from Pear-Trading/TBSliver/Travis-Testing Tom Bloor 2017-09-14 11:22:48 +01:00
  • df3d7d5fc5 Fixed table in README Tom Bloor 2017-09-14 11:07:00 +01:00
  • 238fd8cfc8 Added Travis markings to README Tom Bloor 2017-09-14 11:06:14 +01:00
  • 135fa16258 use chrome addon instead of apt in travis Tom Bloor 2017-09-13 17:51:12 +01:00