Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 009bdeec76
  Merge pull request #138 from ZeusWPI/frecencydebtupdate master Wout Schellaert 2019-09-07 12:05:57 +0200
• 85b6cc7d7b
  All animals are equal, but some animals are more equal than others redfast00 2019-09-06 23:31:46 +0200
• 2069ea91db
  Merge pull request #137 from ZeusWPI/update-devise redfast00 2019-08-24 21:57:32 +0200
• e61365a818
  Update spec files for new devise version redfast00 2019-08-24 21:53:19 +0200
• b243a54ce5
  Update devise redfast00 2019-08-24 21:34:00 +0200
• 031d539e88
  Merge pull request #136 from ZeusWPI/update-rails redfast00 2019-08-24 21:31:06 +0200
• 0079cb1d22
  Update to latest compatible rails redfast00 2019-08-24 21:24:56 +0200
• 965e080c0d
  Add git SCM plugin to remove deprecation warning redfast00 2019-08-24 18:28:12 +0200
• c4bb1759ab
  Merge pull request #135 from ZeusWPI/update-deps redfast00 2019-08-24 18:19:35 +0200
• a3177d2e49
  Update dependencies redfast00 2019-08-24 18:09:20 +0200
• a26ce32e49
  Merge pull request #134 from ZeusWPI/fix/paperclip redfast00 2019-08-19 14:27:52 +0200
• f870fefda5
  Fix unittests redfast00 2019-08-19 13:19:14 +0200
• a827014293
  Update paperclip redfast00 2019-08-19 12:27:56 +0200
• 2b7c7de9f5
  Merge pull request #133 from ZeusWPI/fix-quickpay redfast00 2019-08-04 14:22:05 +0200
• fa3b511940
  Fix quickpay by making the user order their order instead of koelkast redfast00 2019-08-04 13:46:35 +0200
• 66b15c0e7d
  Update README to include seed setup redfast00 2019-08-04 12:41:14 +0200
• 1af15ed3cc
  Update scheme redfast00 2019-08-04 12:38:47 +0200
• 9b5fd844a0
  Add favicon redfast00 2019-06-28 16:13:52 +0200
• 0aab29f0cb
  Order from API redfast00 2019-05-12 23:09:18 +0200
• c484741c16
  This only took me a full hour redfast00 2019-05-07 23:58:43 +0200
• 02929551ee
  Actually authenticate now redfast00 2019-05-07 22:45:05 +0200
• 3cebd229c9
  Display barcodes with api token Robbe Van Herck 2019-04-22 15:35:57 +0200
• be2a3f1535
  Make barcodes visible Robbe Van Herck 2019-04-20 15:36:23 +0200
• 4863a7c66c
  Allow showing of products with key Robbe Van Herck 2019-04-20 13:59:58 +0200
• e4416549bd
  Allow showing of users Robbe Van Herck 2019-04-20 13:56:04 +0200
• 0d2a24fb41
  Merge pull request #130 from ZeusWPI/order-api redfast00 2019-04-19 22:10:08 +0200
• 1b9b765240
  List all products redfast00 2019-04-19 21:33:40 +0200
• 9c1d505a10
  Merge pull request #129 from ZeusWPI/API redfast00 2019-04-19 20:44:38 +0200
• c588d0f6d4
  Better authentication redfast00 2019-04-18 22:50:33 +0200
• e97ce98ac3
  Merge branch 'master' of github.com:ZeusWPI/Tap into API redfast00 2019-04-18 21:52:01 +0200
• 28f3775ad8
  Merge pull request #128 from ZeusWPI/fix-dependency redfast00 2019-04-08 21:23:21 +0200
• f0f81b365f
  Fix vulnerability redfast00 2019-04-08 21:15:33 +0200
• 357b1eb0b5
  Fix bootstrap-sass version redfast00 2019-04-08 20:57:45 +0200
• a57848b3a6
  Added User API and userkey Robbe Van Herck 2019-04-08 16:41:19 +0200
• 9f3de720c8
  Merge pull request #107 from ZeusWPI/fix/quickpay-hidden redfast00 2019-02-08 10:42:58 +0100
• a558a5175b
  Merge pull request #125 from Jan-PieterBaert/patch-1 redfast00 2019-02-07 21:42:52 +0100
• b2415b6638
  typo fix Jan-Pieter Baert 2019-02-07 20:09:54 +0100
• c019f6fbfd
  Add instructions if delayed job breaks redfast00 2019-01-09 11:17:16 +0100
• 91d18edf5e
  Merge pull request #124 from ZeusWPI/update-dependencies redfast00 2018-12-30 20:22:48 +0100
• 2e3ee95de8
  Removed non-deterministic test, corrected typo redfast00 2018-12-30 20:01:57 +0100
• 05c83fb5cc
  Mock HTTP requests to Tab redfast00 2018-12-30 19:50:59 +0100
• c6ef077f7e
  Update dependencies redfast00 2018-12-30 18:03:43 +0100
• ac484315cc Fix floating point difference with Travis Wout Schellaert 2018-12-13 20:59:52 +0100
• a00711b223 Fix tests Wout Schellaert 2018-12-13 20:49:09 +0100
• dc29c1d897 Fix some test by actually having balance in a test env Wout Schellaert 2018-12-13 20:08:37 +0100
• ac298f6869 Update gemfile to fix travis Wout Schellaert 2018-12-13 19:42:18 +0100
• a68f6295b9 Disable order button after clicking it Wout Schellaert 2018-12-13 19:39:58 +0100
• 90505fd1e5
  Merge pull request #121 from tibovanheule/WindowSupport redfast00 2018-12-13 15:42:26 +0100
• 7e1c533f98 Windows installation documentation Tibo Vanheule 2018-12-12 23:00:21 +0100
• 6db0a41f9d
  Merge pull request #117 from ZeusWPI/readme-migrate Robbe Van Herck 2018-12-04 23:48:38 +0100
• 5e144948f3 added migration to README Kerraii 2018-12-04 22:27:44 +0100
• cda4431aac
  Merge pull request #115 from ZeusWPI/frecency-update Wout Schellaert 2018-11-28 19:48:21 +0100
• 49115863a2 Update frecency formula Wout Schellaert 2018-11-28 19:32:14 +0100
• a3e894574c
  Merge pull request #113 from ZeusWPI/feature/frecendebt Rien 2018-10-23 21:27:49 +0200
• b7896f64e7
  Fix some spacing Rien Maertens 2018-10-23 20:55:56 +0200
• 8a0f45002a frecendebt hannes 2018-10-23 20:47:30 +0200
• 019301e819
  FIX ALLES OOIT Lorin Werthen 2018-09-18 15:07:35 +0200
• c88dcf2b12
  Remove runtime header, properly Rien Maertens 2018-08-08 14:18:34 +0200
• ccc7f9b330
  Don't send runtime information Rien Maertens 2018-08-08 14:08:10 +0200
• a8a3e2dcfb
  Security++ Rien Maertens 2018-08-08 14:03:51 +0200
• ce44b029dd
  Deploy from master again Rien Maertens 2018-08-08 00:35:19 +0200
• 1da93d233e
  What is this doing here? Rien Maertens 2018-08-08 00:34:28 +0200
• a953b1ceb0
  Update travis ruby Rien Maertens 2018-08-08 00:31:01 +0200
• 4ff6ac7a03
  Merge branch 'fix-tap-on-herbert' Rien Maertens 2018-08-08 00:30:23 +0200
• e22953c41b
  Revert to unbroken state Rien Maertens 2018-08-08 00:30:01 +0200
• 171963ce67
  Added installation instructions to README.md Robbe Van Herck 2018-05-18 01:03:12 +0200
• 32e2977739
  Fix deploying on herbert Rien Maertens 2018-08-08 00:24:39 +0200
• db69e5dccb
  Use Ruby 2.4.0 and deploy to herbert Rien Maertens 2018-08-07 23:02:17 +0200
• fa331f8a76
  Bloody typos redfast00 2018-07-26 18:47:54 +0200
• 7a0b44e038
  Fix paperclip maybe? redfast00 2018-07-26 18:29:04 +0200
• b023d925e5
  Fix relative url redfast00 2018-07-26 17:28:08 +0200
• 8ca507a38c
  Maybe this fixes CSS? redfast00 2018-07-26 17:22:34 +0200
• abfd00a52a
  Update ruby version in .travis.yml lorin 2018-07-26 17:14:44 +0200
• 86657215df
  It didn't work, pls work now? redfast00 2018-07-26 17:03:36 +0200
• 98eb53863e
  Updated again, pls work redfast00 2018-07-26 16:58:34 +0200
• 3d28785e3a
  Change rails version redfast00 2018-07-26 16:55:05 +0200
• 6afe54221f
  Update delayed_job redfast00 2018-07-26 16:50:30 +0200
• fd19756c05
  Update rails and mysql redfast00 2018-07-26 15:47:39 +0200
• 1a851555c6
  Herbert redfast00 2018-07-25 21:34:09 +0200
• 775fd1cb64 Frecency out of bounds benji 2017-10-13 17:28:07 +0200
• b848f08792 Lower frecency number benji 2017-10-13 17:24:01 +0200
• eb541fc668
  Use adams for oauth Rien Maertens 2017-02-18 19:06:14 +0100
• 4527972cd8 Fix json request bug benji 2017-01-18 21:56:45 +0100
• 8ea5799daf apply common sense Felix Van der Jeugt 2016-09-29 15:32:55 +0200
• ae1d324b04 https \o/ benji 2016-06-29 22:03:17 +0200
• f2a985e6c0 Merge pull request #104 from ZeusWPI/dagschotel benji 2016-03-08 17:02:30 +0100
• 6eaa107b8c I totally saw that tl3ilaxu 2016-03-08 16:49:23 +0100
• 33184af8b3 Add literally all the annotation tl3ilaxu 2016-03-08 15:53:50 +0100
• 87a383bfd2 Clean up job tl3ilaxu 2016-03-08 15:30:32 +0100
• 676cb00884 Make dagschotels great again tl3ilaxu 2016-03-08 13:59:36 +0100
• c718b56562 Add button to hide dagschotel on koelkast tl3ilaxu 2016-03-04 22:45:36 +0100
• 8e05b48ca0 Make people pay their debts tl3ilaxu 2016-03-04 14:14:56 +0100
• c6303101a9 Do not let every user log in as tleilaxu tl3ilaxu 2016-03-03 22:39:24 +0100
• 9292dd807f Remove obsolete json tl3ilaxu 2016-03-03 22:30:23 +0100
• f3669117a2 Make quick pay reload, the good way tl3ilaxu 2016-03-03 22:20:56 +0100
• 0ecde8201e Make quick pay reload, the bad way tl3ilaxu 2016-03-03 00:10:34 +0100
• 8265004df5 Seperate javascript tl3ilaxu 2016-03-02 23:11:37 +0100
• 3a4c45a4eb Use new ruby style tl3ilaxu 2016-03-02 22:03:07 +0100
• 67c07d50b8 Remove obsolete text when there's no dagschotel tl3ilaxu 2016-03-02 18:56:27 +0100
• d99304b065 Add ordering form sidebar tl3ilaxu 2016-03-02 18:51:04 +0100