Commit graph

  • 536d4c44ae Release users from the burden of needing to have a dagschotel tl3ilaxu 2016-03-02 00:43:27 +0100
  • 7d07d12493 increase frecency memory Ilion Beyst 2016-03-01 22:56:00 +0100
  • 5d7210b228 Merge pull request #102 from ZeusWPI/mobile benji 2016-03-01 18:17:11 +0100
  • fb2d24e0fe Merge pull request #103 from ZeusWPI/letterlijk-1-lijn benji 2016-03-01 17:55:41 +0100
  • 5f73efc7d4 Don't let users generate money tl3ilaxu 2016-03-01 17:15:29 +0100
  • fefe6f1a0c Indentation anti-nazi commit tl3ilaxu 2016-03-01 16:50:19 +0100
  • 9700f12655 Fix annoying ass stock numbers tl3ilaxu 2016-03-01 16:38:03 +0100
  • 648b0362c5 greater_than_or_equal_to: 0 } Merge branch 'master' of https://github.com/ZeusWPI/Tap into mobile tl3ilaxu 2016-03-01 16:10:15 +0100
  • 13d0f27c7e Merge branch 'master' of https://github.com/ZeusWPI/Tap into letterlijk-1-lijn tl3ilaxu 2016-03-01 16:07:22 +0100
  • d9c7e5249e Fix tests for now benji 2016-03-01 16:05:46 +0100
  • 18ea5ad627 LETTERLIJK 1 LIJN tl3ilaxu 2016-03-01 15:25:44 +0100
  • a88dd7d4c0 Merge branch 'master' of https://github.com/ZeusWPI/Tap into mobile tl3ilaxu 2016-03-01 15:11:26 +0100
  • 135e04536f Add random tweaks tl3ilaxu 2016-03-01 15:11:19 +0100
  • 26973a330a Betaal uw fucking schulden benji 2016-02-29 11:27:05 +0100
  • 95c209001d Merge tl3ilaxu 2016-02-16 18:16:48 +0100
  • 4ae5adac64 Add line brake tl3ilaxu 2016-02-16 18:13:17 +0100
  • da11d20f2c Fix mobile tl3ilaxu 2016-02-16 16:51:36 +0100
  • 935049c1bf Merge pull request #96 from ZeusWPI/frecency benji 2016-02-16 15:46:27 +0100
  • c6dc220d3d fix formula and test it Ilion Beyst 2016-02-16 15:38:44 +0100
  • b5970738b9 I cannot into rails Ilion Beyst 2016-02-16 15:04:49 +0100
  • 3b47847276 also save the model after changing it ... Ilion Beyst 2016-02-16 15:03:15 +0100
  • 727372c7ef implement frecency Ilion Beyst 2016-02-16 15:00:43 +0100
  • 0b63edd40e Merge pull request #92 from ZeusWPI/interface benji 2016-02-11 17:15:32 +0100
  • fab824fad3 Merge branch 'master' of https://github.com/ZeusWPI/Tap into interface tl3ilaxu 2016-02-11 16:27:20 +0100
  • 353df49dbf Merge pull request #90 from ZeusWPI/bootstrap_switch benji 2016-02-10 13:50:26 +0100
  • 9cfb4bfaed Merge pull request #91 from ZeusWPI/fix/remove-avatar-label benji 2016-02-09 15:00:08 +0100
  • bdb5bbc851 Remove label for avatar field benji 2016-02-09 00:29:51 +0100
  • 3a602b55dc Use bootstrap switch for the private/public button benji 2016-02-09 00:12:54 +0100
  • 5915e2d6b8 Merge pull request #89 from ZeusWPI/ruby2.3.0 benji 2016-02-08 21:31:00 +0100
  • 7561685e79 Upgrade ruby version benji 2016-02-08 21:27:41 +0100
  • a4776da803 Merge pull request #87 from ZeusWPI/fix/side-bar-layout benji 2016-02-08 20:28:43 +0100
  • d30945a265 Merge pull request #88 from ZeusWPI/fix/coverage-models-user benji 2016-02-08 18:16:13 +0100
  • 91e551e35e cover the user model Felix Van der Jeugt 2016-02-05 22:47:51 +0100
  • 7e1d6735d3 add tests for avatar upload Felix Van der Jeugt 2016-02-05 20:51:19 +0100
  • 60827e1492 plz no vendor yes? Felix Van der Jeugt 2016-02-05 20:02:36 +0100
  • 6dc80bbaeb Merge branch 'master' into fix/side-bar-layout Felix Van der Jeugt 2016-02-05 19:52:37 +0100
  • 6d06ebdac8 "fix" tests Felix Van der Jeugt 2016-02-05 19:51:39 +0100
  • e72e76e9a3 fix form errors and notice when nothing changed Felix Van der Jeugt 2016-02-05 09:16:02 +0100
  • 670b17622d show error flash on failed file stuffs Felix Van der Jeugt 2016-02-04 23:47:34 +0100
  • 9c31d9d6b4 remove the edit page - it's not used anyway Felix Van der Jeugt 2016-02-04 23:33:07 +0100
  • 63539e01f7 put settings in side bar Felix Van der Jeugt 2016-02-04 23:28:13 +0100
  • 71fc48cd71 Find correct user on users#show benji 2016-02-04 21:03:03 +0100
  • d723c46c2a Little design fix benji 2016-02-04 19:03:02 +0100
  • a2f5b172e3 Who wants feedback anyway? benji 2016-02-04 18:46:33 +0100
  • 2791df4f62 Fix guest url benji 2016-02-04 18:26:20 +0100
  • 69d458cfa9 Put delay for tap to tab transactions back to 5 minutes benji 2016-02-04 18:15:58 +0100
  • bcfa1670dd Fix version of mysql2 to deploy benji 2016-02-04 16:57:33 +0100
  • 36bb7b5fda Rebuild Gemfile.lock after downgrading benji 2016-02-04 16:50:38 +0100
  • 0cac19597a Put back to ruby 2.2.2 to deploy benji 2016-02-04 15:56:49 +0100
  • da166cf7eb Make code not horrible tl3ilaxu 2016-02-04 14:24:02 +0100
  • 634e507836 Merge branch 'master' of github.com:ZeusWPI/Tap benji 2016-02-04 13:28:56 +0100
  • 412cd4b103 Minor interface fixes tl3ilaxu 2016-02-04 00:23:12 +0100
  • 913abe24fd Merge pull request #85 from ZeusWPI/production benji 2016-02-02 18:55:06 +0100
  • ca5e7825dd Merge branch 'production' of github.com:ZeusWPI/Tap into production benji 2016-02-02 18:49:28 +0100
  • 1c52891210 remove the right test benji 2016-02-02 18:49:22 +0100
  • e07cf38986 Revert "Fix failing test" benji 2016-02-02 18:46:05 +0100
  • 20a0378ac2 Merge branch 'master' into production benji 2016-02-02 18:39:05 +0100
  • 969ae541a1 Fix failing test benji 2016-02-02 18:35:32 +0100
  • 7969b71564 Merge branch 'master' of github.com:ZeusWPI/Tap benji 2016-02-02 18:37:09 +0100
  • a6ea7450c5 Fix failing test benji 2016-02-02 18:35:32 +0100
  • 0ee070d27e Make link of balance benji 2016-02-02 17:50:22 +0100
  • 6aec736c52 Little bug with user order benji 2016-02-02 15:20:04 +0100
  • e396401a4a Fix some stuff benji 2016-02-02 14:42:02 +0100
  • 9ab2072654 Merge pull request #82 from ZeusWPI/production benji 2016-02-01 15:12:40 +0100
  • e91e3213d7 Prepare some things for production phase benji 2015-12-31 17:30:57 +0100
  • 0a1747246e Fix versions of airbrake and omniauth benji 2015-12-31 16:36:08 +0100
  • 83d74e7eda Merge pull request #81 from ZeusWPI/update_version benji 2015-12-01 22:02:43 +0100
  • 841d53ea16 Merge branch 'master' into update_version benji 2015-12-01 21:57:05 +0100
  • 0b0e766c86 Merge pull request #79 from ZeusWPI/tests benji 2015-12-01 21:56:54 +0100
  • 124937bc7f Update to ruby 2.2.3 and rails 4.2.4 benji 2015-12-01 21:54:35 +0100
  • edfb5e3988 Merge branch 'master' into tests benji 2015-12-01 21:33:20 +0100
  • 871e36a293 Merge pull request #80 from ZeusWPI/helper_method_for_guest benji 2015-12-01 21:32:30 +0100
  • d092e08718 Add better helper benji 2015-12-01 21:19:35 +0100
  • 4f67230258 Merge branch 'master' into tests benji 2015-12-01 21:07:51 +0100
  • 7f07d1a0ab Merge branch 'guest_account' benji 2015-12-01 20:57:46 +0100
  • 45af959d45 Merge branch 'master' into guest_account benji 2015-12-01 20:57:33 +0100
  • 5bff129f58 Merge pull request #78 from ZeusWPI/barcode_test benji 2015-12-01 20:50:15 +0100
  • d361abc91e Add tests for barcode controller benji 2015-12-01 20:02:08 +0100
  • 49898d484f Add guest account benji 2015-11-30 18:20:54 +0100
  • e3fe271c4f Fix errbit host Tom Naessens 2015-11-29 15:20:26 +0100
  • da8ac14623 Merge branch 'master' of https://github.com/ZeusWPI/Tap benji 2015-11-05 19:52:41 +0100
  • 47713d12ab little something benji 2015-11-05 19:52:34 +0100
  • 512a3aeede Rewrite ability benji 2015-10-29 15:42:23 +0100
  • f089653f0f Merge pull request #76 from ZeusWPI/tests benji 2015-10-29 14:48:29 +0100
  • 41d67556f4 Fix ability test benji 2015-10-29 14:27:06 +0100
  • b7ac8c32f7 Simplify ability benji 2015-10-29 14:09:52 +0100
  • 7cc2ec6a20 product controller benji 2015-10-29 13:53:11 +0100
  • f109f5eb18 Remove format html from quickpay benji 2015-10-29 11:54:02 +0100
  • 6248e1211a user controller test benji 2015-10-29 11:50:16 +0100
  • b5782b13d8 user test benji 2015-10-28 23:34:03 +0100
  • f5e6a6e7bf product test benji 2015-10-28 22:58:56 +0100
  • a453a6ada2 order test benji 2015-10-28 22:48:49 +0100
  • 839151405b Remove hack for nested models benji 2015-10-28 22:07:48 +0100
  • 895c523bb9 annotate benji 2015-10-28 21:55:59 +0100
  • 539b65b75f barcode model test benji 2015-10-28 21:54:55 +0100
  • 8906ca7e39 Add flash messages on quickpay benji 2015-10-28 20:48:49 +0100
  • 5b922ceab5 Add way to see changes in quickpay benji 2015-10-28 16:57:11 +0100
  • e8e4fc6855 Old tab in footer benji 2015-10-27 23:00:01 +0100
  • 3299f46ed7 Rewrite flash messages benji 2015-10-27 22:54:06 +0100
  • 6b3e57ab45 Add barcodes index and destroy benji 2015-10-27 22:09:01 +0100