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

Commit graph

  • 0924388619 Merge branch 'master' into development piratefinn 2018-03-12 17:36:27 +0000
  • 0b27aa43e4 Merge branch 'master' into development piratefinn 2018-03-12 17:36:27 +0000
  • 180a854c60 emergency fix for category viewing on purchase piratefinn 2018-03-12 17:35:18 +0000
  • c8c52d33c4 emergency fix for category viewing on purchase piratefinn 2018-03-12 17:35:18 +0000
  • de39179179 Converted category select into buttons, no color yet piratefinn 2018-03-12 16:36:26 +0000
  • aaaa7c7a05 Converted category select into buttons, no color yet piratefinn 2018-03-12 16:36:26 +0000
  • 8d02effbc2 Merge pull request #69 from Pear-Trading/master Finn 2018-03-09 17:28:53 +0000
  • c62e74e07a
         Merge pull request #69 from Pear-Trading/master Finn 2018-03-09 17:28:53 +0000
  • 9470671621 Merge pull request #68 from Pear-Trading/Release-v0.1.4 v0.1.4 Finn 2018-03-09 17:11:47 +0000
  • 675f319993
         Merge pull request #68 from Pear-Trading/Release-v0.1.4 Finn 2018-03-09 17:11:47 +0000
  • 45e15b7dd9 version bumps piratefinn 2018-03-09 16:51:58 +0000
  • eee50b9073 version bumps piratefinn 2018-03-09 16:51:58 +0000
  • bd9dd64a84 Updated angular CLI to solve security dependency issue v0.1.4_alpha.1 piratefinn 2018-03-09 15:48:04 +0000
  • c37b30bea5 Updated angular CLI to solve security dependency issue piratefinn 2018-03-09 15:48:04 +0000
  • d2d6b55339 Merge branch 'finn/changelog' into development piratefinn 2018-03-09 14:29:05 +0000
  • db8d27a888 Merge branch 'finn/changelog' into development piratefinn 2018-03-09 14:29:05 +0000
  • 0aa3d45c82 updated changelog piratefinn 2018-03-09 14:28:55 +0000
  • 247e38e680 updated changelog piratefinn 2018-03-09 14:28:55 +0000
  • 85a429c4f2 emergency fix to upload for category piratefinn 2018-03-08 15:09:35 +0000
  • f7697178fd emergency fix to upload for category piratefinn 2018-03-08 15:09:35 +0000
  • ab0ba52b6f Updated Hero Points Page with latest work james/heropoints Unknown 2018-03-08 11:32:24 +0000
  • aa8763d5a6 Merge branch 'development' into theslby/pushapi piratefinn 2018-03-07 13:09:14 +0000
  • 99c02d7a21 Merge pull request #67 from Pear-Trading/finn/recurring Finn 2018-03-07 13:06:07 +0000
  • b4f3f754c2
         Merge pull request #67 from Pear-Trading/finn/recurring Finn 2018-03-07 13:06:07 +0000
  • d1357d459c updated moment to fix known vulnerability piratefinn 2018-03-07 13:02:42 +0000
  • d97c21caf8 updated moment to fix known vulnerability piratefinn 2018-03-07 13:02:42 +0000
  • ce9abe14df added fixes to category viewing piratefinn 2018-03-07 12:58:01 +0000
  • f6ef50f686 added fixes to category viewing piratefinn 2018-03-07 12:58:01 +0000
  • 700ee3c155 fixes piratefinn 2018-03-07 12:27:16 +0000
  • ff0fe0202f /pushapi: Auto stash before merge of "theslby/pushapi" and "development" Unknown 2018-03-06 15:41:13 +0000
  • 9b37fbbe26 added fixes for input piratefinn 2018-03-06 15:19:35 +0000
  • 450b63620f added fixes for input piratefinn 2018-03-06 15:19:35 +0000
  • 59cbc920c2 Merge branch 'development' into theslby/pushapi Unknown 2018-03-06 12:25:58 +0000
  • ddd0011ea2 amended upload for recurring piratefinn 2018-03-05 15:35:26 +0000
  • 6e9f4133d2 amended upload for recurring piratefinn 2018-03-05 15:35:26 +0000
  • 1cbfb334de amended if code and validation piratefinn 2018-03-05 13:42:28 +0000
  • f5c0a76032 amended if code and validation piratefinn 2018-03-05 13:42:28 +0000
  • 0a7b49a387 added recurring purchase inputs piratefinn 2018-03-05 13:33:26 +0000
  • 45d016c897 added recurring purchase inputs piratefinn 2018-03-05 13:33:26 +0000
  • 5f3c4c927f Merge pull request #66 from Pear-Trading/finn/essentialpurchase Finn 2018-03-02 17:00:17 +0000
  • db5a712a5d
         Merge pull request #66 from Pear-Trading/finn/essentialpurchase Finn 2018-03-02 17:00:17 +0000
  • db2aa19801 fixed display with essential and categories piratefinn 2018-03-02 16:31:14 +0000
  • 8b7b5e50be fixed display with essential and categories piratefinn 2018-03-02 16:31:14 +0000
  • 96cbe87013 removed unnecessary console logs and cleaned essential input piratefinn 2018-03-01 17:07:25 +0000
  • 5762b35fbe removed unnecessary console logs and cleaned essential input piratefinn 2018-03-01 17:07:25 +0000
  • eb560a6c18 added initial essential branch checkbox piratefinn 2018-02-28 12:02:01 +0000
  • f6dd18bfc8 added initial essential branch checkbox piratefinn 2018-02-28 12:02:01 +0000
  • e1bf569f37 Merge remote-tracking branch 'origin/development' into james/heropoints Unknown 2018-02-07 11:55:48 +0000
  • c7efe060eb Merge remote-tracking branch 'origin/james/heropoints' into james/heropoints Unknown 2018-02-07 11:55:20 +0000
  • e378f57a8c Updated Hero Points Page Unknown 2018-02-07 11:52:41 +0000
  • 910cb46f5f Merge pull request #65 from Pear-Trading/finn/categories Finn 2018-01-25 16:25:19 +0000
  • 46e2efeaba
         Merge pull request #65 from Pear-Trading/finn/categories Finn 2018-01-25 16:25:19 +0000
  • efcfaa72ab updated changelog piratefinn 2018-01-25 16:21:52 +0000
  • 9bbf7a5c2e updated changelog piratefinn 2018-01-25 16:21:52 +0000
  • 24b39c06af made input two columns if wide enough piratefinn 2018-01-25 16:19:02 +0000
  • bf965448c5 made input two columns if wide enough piratefinn 2018-01-25 16:19:02 +0000
  • 6dd8aeaad9 removed unnecessary console logging piratefinn 2018-01-25 15:56:23 +0000
  • d11fbcb4e6 removed unnecessary console logging piratefinn 2018-01-25 15:56:23 +0000
  • 182679e9ac Changed percentages on budget view screen piratefinn 2018-01-25 11:18:31 +0000
  • 5d112ff4a6 Changed percentages on budget view screen piratefinn 2018-01-25 11:18:31 +0000
  • d1d47785e5 Changed to radio buttons on transaction category input piratefinn 2018-01-25 11:18:13 +0000
  • ec1aef6627 Changed to radio buttons on transaction category input piratefinn 2018-01-25 11:18:13 +0000
  • dd0e9266c3 Merge pull request #64 from Pear-Trading/finn/categories Finn 2018-01-24 16:09:55 +0000
  • 6c16b7aee0
         Merge pull request #64 from Pear-Trading/finn/categories Finn 2018-01-24 16:09:55 +0000
  • 4d2ca8be74 list fully finished piratefinn 2018-01-24 13:18:51 +0000
  • d674c5b59b list fully finished piratefinn 2018-01-24 13:18:51 +0000
  • 1fee46a086 No longer throwing errors and proper limit & slice piratefinn 2018-01-24 12:51:03 +0000
  • ca2cf0fdab No longer throwing errors and proper limit & slice piratefinn 2018-01-24 12:51:03 +0000
  • 2976166371 properly viewing category list piratefinn 2018-01-24 12:38:58 +0000
  • 9446ef11d4 properly viewing category list piratefinn 2018-01-24 12:38:58 +0000
  • b33000edc5 Placeholder and date math piratefinn 2018-01-22 17:23:56 +0000
  • 5f2eee81ba Placeholder and date math piratefinn 2018-01-22 17:23:56 +0000
  • 175c2decdd Merge remote-tracking branch 'origin/master' into theslby/pushapi Unknown 2018-01-19 13:40:17 +0000
  • 6e0b059241 push stuff Unknown 2018-01-19 13:39:54 +0000
  • 929b9417d1 changed category list size piratefinn 2018-01-19 13:22:18 +0000
  • 6cca97cc68 changed category list size piratefinn 2018-01-19 13:22:18 +0000
  • 477efe4093 Merge branch 'master' into finn/categories piratefinn 2018-01-19 13:22:00 +0000
  • fae6b7ce31 Merge branch 'master' into finn/categories piratefinn 2018-01-19 13:22:00 +0000
  • daffda50de Merge pull request #63 from Pear-Trading/Release-v0.1.3 Finn 2018-01-18 13:08:01 +0000
  • 2cc087a295
         Merge pull request #63 from Pear-Trading/Release-v0.1.3 Finn 2018-01-18 13:08:01 +0000
  • f7adc3a08f updated changelog piratefinn 2018-01-18 13:04:32 +0000
  • 43144da9fc updated changelog piratefinn 2018-01-18 13:04:32 +0000
  • a37784e1f9 Merge pull request #62 from Pear-Trading/TBSliver/Travis-Temp-Fix v0.1.3 Tom Bloor 2018-01-18 13:00:26 +0000
  • d27d18e729
         Merge pull request #62 from Pear-Trading/TBSliver/Travis-Temp-Fix Tom Bloor 2018-01-18 13:00:26 +0000
  • 1d3fa11b45 Update .travis.yml Tom Bloor 2018-01-18 12:57:38 +0000
  • 40973b87ff
         Update .travis.yml Tom Bloor 2018-01-18 12:57:38 +0000
  • de6b547473 Merge pull request #61 from Pear-Trading/development v0.1.2 Finn 2018-01-18 12:41:34 +0000
  • 9e122bf4bc
         Merge pull request #61 from Pear-Trading/development Finn 2018-01-18 12:41:34 +0000
  • 4819138de7 Merge pull request #60 from Pear-Trading/finn/categoryrelease Finn 2018-01-18 12:23:20 +0000
  • 4a388a4c3e
         Merge pull request #60 from Pear-Trading/finn/categoryrelease Finn 2018-01-18 12:23:20 +0000
  • 779224089b updated changelog piratefinn 2018-01-18 12:20:26 +0000
  • 22b3e00eaa updated changelog piratefinn 2018-01-18 12:20:26 +0000
  • 551eff0d48 Changed transaction category input piratefinn 2018-01-18 12:16:37 +0000
  • a20d94d9cb Changed transaction category input piratefinn 2018-01-18 12:16:37 +0000
  • 003f973192 added just in case for font loading file attribute piratefinn 2018-01-17 15:02:53 +0000
  • 7284452317 added just in case for font loading file attribute piratefinn 2018-01-17 15:02:53 +0000
  • 214524f7dd removed unused button on pie piratefinn 2018-01-17 15:02:32 +0000
  • d285b04119 removed unused button on pie piratefinn 2018-01-17 15:02:32 +0000
  • 4f29307fdb Changed transaction category input piratefinn 2018-01-18 12:16:37 +0000
  • 004c30cc28 Changed transaction category input piratefinn 2018-01-18 12:16:37 +0000