Pear-Trading
/
Foodloop-Server
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • 712959c37e Fixed code to ensure tests passed Finn 2018-03-02 17:33:57 +0000
  • 8aacc32c71 Fixed code to ensure tests passed Finn 2018-03-02 17:33:57 +0000
  • 23185985b8 category test fixed Finn 2018-03-02 17:00:01 +0000
  • 5c73aa917d category test fixed Finn 2018-03-02 17:00:01 +0000
  • 1377742acd removed debug line and unneeded code Finn 2018-03-02 16:42:30 +0000
  • 4ebe99f6ad removed debug line and unneeded code Finn 2018-03-02 16:42:30 +0000
  • dbb3d649df
         Merge ebcc79fd36 into 480c8ed78f Finn 2018-03-02 16:33:52 +0000
  • 8db595c43b added fixes for budget view and working essential Finn 2018-03-02 16:32:28 +0000
  • ebcc79fd36 added fixes for budget view and working essential Finn 2018-03-02 16:32:28 +0000
  • 61aa73a486 added viewing of purchase being essential in transaction read Finn 2018-03-01 17:20:50 +0000
  • af6d198c8f added viewing of purchase being essential in transaction read Finn 2018-03-01 17:20:50 +0000
  • 18edad5f42 amended upload code to allow for essential purchases Finn 2018-03-01 17:08:44 +0000
  • 396cb3c8f6 amended upload code to allow for essential purchases Finn 2018-03-01 17:08:44 +0000
  • f966c1a5a1 added essential flag to transactions in schema Finn 2018-03-01 17:08:30 +0000
  • 28a33cf27f added essential flag to transactions in schema Finn 2018-03-01 17:08:30 +0000
  • 9563851941 Fixed schema and added update for sql Finn 2018-02-21 12:51:43 +0000
  • f519bb9f2f Fixed schema and added update for sql Finn 2018-02-21 12:51:43 +0000
  • 62dbc1a49e fixed table name and added initial org medal schema Finn 2018-02-20 17:44:22 +0000
  • 413479b94f fixed table name and added initial org medal schema Finn 2018-02-20 17:44:22 +0000
  • 5171a88db2 Added initial schema for medals Finn 2018-02-20 17:20:51 +0000
  • 940d96921c Added initial schema for medals Finn 2018-02-20 17:20:51 +0000
  • 328ffc10e0 Merge pull request #101 from Pear-Trading/finn/medals Finn 2018-02-08 12:17:12 +0000
  • 480c8ed78f
         Merge pull request #101 from Pear-Trading/finn/medals Finn 2018-02-08 12:17:12 +0000
  • 46a2727ef8 Added placeholder API for user points Finn 2018-02-05 14:58:55 +0000
  • 156af841c2 Added placeholder API for user points Finn 2018-02-05 14:58:55 +0000
  • 565c90d56a Merge pull request #100 from Pear-Trading/finn/medals Finn 2018-02-01 11:11:30 +0000
  • 26191d413d
         Merge pull request #100 from Pear-Trading/finn/medals Finn 2018-02-01 11:11:30 +0000
  • 8a48dc571b made placeholder more obvious Finn 2018-01-31 12:54:14 +0000
  • 6879a8b3b8 made placeholder more obvious Finn 2018-01-31 12:54:14 +0000
  • e26a2330df Added routing and placeholder for medal data Finn 2018-01-31 12:52:52 +0000
  • 613272f413 Added routing and placeholder for medal data Finn 2018-01-31 12:52:52 +0000
  • 4e82e0ec98 Merge pull request #99 from Pear-Trading/finn/categoryAPI Finn 2018-01-26 10:29:31 +0000
  • da86e52735
         Merge pull request #99 from Pear-Trading/finn/categoryAPI Finn 2018-01-26 10:29:31 +0000
  • 7006999ab1 Updated changelog Finn 2018-01-26 10:09:47 +0000
  • a4706ef05e Updated changelog Finn 2018-01-26 10:09:47 +0000
  • fb3582d2a9 Updated data view Finn 2018-01-26 09:51:28 +0000
  • 1b74931248 Updated data view Finn 2018-01-26 09:51:28 +0000
  • b00b581417 Merge pull request #98 from Pear-Trading/finn/categorylist Finn 2018-01-25 16:22:45 +0000
  • 9f3971815e
         Merge pull request #98 from Pear-Trading/finn/categorylist Finn 2018-01-25 16:22:45 +0000
  • 2daef6c36a Working test added Finn 2018-01-24 16:08:20 +0000
  • 3ea79ad8de Working test added Finn 2018-01-24 16:08:20 +0000
  • 1914f564fb category purchase list fully grouped Finn 2018-01-24 13:19:35 +0000
  • ecbcd205fe category purchase list fully grouped Finn 2018-01-24 13:19:35 +0000
  • 4aae7fb3ea working API with arrays Finn 2018-01-22 16:26:45 +0000
  • 6cd7df1259 working API with arrays Finn 2018-01-22 16:26:45 +0000
  • d14f1fb7f0 Merge branch 'development' into finn/categorylist Finn 2018-01-19 12:31:32 +0000
  • 6e970de92c Merge branch 'development' into finn/categorylist Finn 2018-01-19 12:31:32 +0000
  • 5ebbb492f3 Merge branch 'master' into development Finn 2018-01-18 14:26:18 +0000
  • 41928e1ff6 Merge branch 'master' into development Finn 2018-01-18 14:26:18 +0000
  • 5e0adc1350 Merge branch 'Hotfix-categoryandstatsfix' Finn 2018-01-18 14:26:04 +0000
  • 7a44797a56 Merge branch 'Hotfix-categoryandstatsfix' Finn 2018-01-18 14:26:04 +0000
  • 759d9615b9 fixed to admin interface categories & stats Finn 2018-01-18 14:24:47 +0000
  • 65a4447478 fixed to admin interface categories & stats Finn 2018-01-18 14:24:47 +0000
  • e524f1d421 fixed to admin interface categories & stats Finn 2018-01-18 14:24:47 +0000
  • e64e4bcbc8 fixed to admin interface categories & stats Finn 2018-01-18 14:24:47 +0000
  • b542db2c0b Merge pull request #97 from Pear-Trading/development Finn 2018-01-18 12:24:05 +0000
  • cab32fbf92
         Merge pull request #97 from Pear-Trading/development Finn 2018-01-18 12:24:05 +0000
  • 1730592afb Updated changelog Finn 2018-01-18 12:21:47 +0000
  • 8c8da1f795 Updated changelog Finn 2018-01-18 12:21:47 +0000
  • 99887926db Added version to changelog v0.10.3 Finn 2018-01-18 12:06:07 +0000
  • 39549d257f Added version to changelog Finn 2018-01-18 12:06:07 +0000
  • 8ec32e3b3c Changed logic for transaction list API Finn 2018-01-17 17:38:24 +0000
  • b247183914 Changed logic for transaction list API Finn 2018-01-17 17:38:24 +0000
  • 8c9bcbf85c added further fix Finn 2018-01-17 17:38:07 +0000
  • de9d70432f added further fix Finn 2018-01-17 17:38:07 +0000
  • 25f9d818f8 Fixed transaction ID edit Finn 2018-01-17 17:36:55 +0000
  • cd4f13bf8c Fixed transaction ID edit Finn 2018-01-17 17:36:55 +0000
  • 06e4345927 Added ability to change ID Finn 2018-01-17 17:23:12 +0000
  • 3e9746ca22 Added ability to change ID Finn 2018-01-17 17:23:12 +0000
  • 005388b27e fixed api and quantised statement code Finn 2018-01-17 17:14:50 +0000
  • 6fe4cd9a31 fixed api and quantised statement code Finn 2018-01-17 17:14:50 +0000
  • d3f0ebb62f Added initial ability to get transaction category list from month Finn 2018-01-17 16:47:05 +0000
  • b383284519 Added initial ability to get transaction category list from month Finn 2018-01-17 16:47:05 +0000
  • 0d221d9f08 Merge branch 'finn/transactioncategory' into development Finn 2018-01-16 16:43:17 +0000
  • 36947bfeab Merge branch 'finn/transactioncategory' into development Finn 2018-01-16 16:43:17 +0000
  • 5eb25efa5b updated changelog Finn 2018-01-16 16:42:50 +0000
  • a9ca2efe9a updated changelog Finn 2018-01-16 16:42:50 +0000
  • ffc9712268 Merge pull request #96 from Pear-Trading/finn/transactioncategory Finn 2018-01-16 16:40:46 +0000
  • 7f9c53aa5a
         Merge pull request #96 from Pear-Trading/finn/transactioncategory Finn 2018-01-16 16:40:46 +0000
  • ace66d0447 Tests fixed adding for category Finn 2018-01-16 15:55:19 +0000
  • 8e00135390 Tests fixed adding for category Finn 2018-01-16 15:55:19 +0000
  • 85a9647294 fixed delete checking for category on transaction Finn 2018-01-16 14:52:16 +0000
  • dddbb04023 fixed delete checking for category on transaction Finn 2018-01-16 14:52:16 +0000
  • 5ad83795bd fixed reading transactions and category deletion Finn 2018-01-16 14:47:17 +0000
  • ad30cf9cd9 fixed reading transactions and category deletion Finn 2018-01-16 14:47:17 +0000
  • f79ec09782 redid relationships of transactions/categories Finn 2018-01-16 13:07:12 +0000
  • 8a0f933f07 redid relationships of transactions/categories Finn 2018-01-16 13:07:12 +0000
  • 670d770d84 Fixed upload and added category read to transaction Finn 2018-01-15 17:14:16 +0000
  • 1f70f9b40a Fixed upload and added category read to transaction Finn 2018-01-15 17:14:16 +0000
  • 4e9312148c Fixed upload code Finn 2018-01-15 17:01:59 +0000
  • c4f68332b9 Fixed upload code Finn 2018-01-15 17:01:59 +0000
  • 93de8fdf9e functional category loading and category in upload Finn 2018-01-15 16:57:19 +0000
  • 175026e37e functional category loading and category in upload Finn 2018-01-15 16:57:19 +0000
  • f4cd25dd68 fixed faulty syntax Finn 2018-01-15 14:34:02 +0000
  • 53b63aa655 fixed faulty syntax Finn 2018-01-15 14:34:02 +0000
  • 5a88c283d5 added category API Finn 2018-01-15 14:18:27 +0000
  • 4369a95054 added category API Finn 2018-01-15 14:18:27 +0000
  • b12cd3fcfc Categories admin interface fully implemented Finn 2018-01-11 16:23:42 +0000
  • 4e74c871a2 Categories admin interface fully implemented Finn 2018-01-11 16:23:42 +0000
  • 8531d73930 Added transaction categories tables Finn 2018-01-11 14:00:20 +0000