tl3ilaxu
|
95c209001d
|
Merge
|
2016-02-16 18:16:48 +01:00 |
|
tl3ilaxu
|
4ae5adac64
|
Add line brake
|
2016-02-16 18:13:17 +01:00 |
|
tl3ilaxu
|
da11d20f2c
|
Fix mobile
|
2016-02-16 16:51:36 +01:00 |
|
Ilion Beyst
|
c6dc220d3d
|
fix formula and test it
|
2016-02-16 15:38:44 +01:00 |
|
Ilion Beyst
|
b5970738b9
|
I cannot into rails
|
2016-02-16 15:04:49 +01:00 |
|
Ilion Beyst
|
3b47847276
|
also save the model after changing it ...
|
2016-02-16 15:03:15 +01:00 |
|
Ilion Beyst
|
727372c7ef
|
implement frecency
|
2016-02-16 15:00:43 +01:00 |
|
tl3ilaxu
|
fab824fad3
|
Merge branch 'master' of https://github.com/ZeusWPI/Tap into interface
|
2016-02-11 16:27:20 +01:00 |
|
benji
|
353df49dbf
|
Merge pull request #90 from ZeusWPI/bootstrap_switch
Use bootstrap switch for the private/public button
|
2016-02-10 13:50:26 +01:00 |
|
benji
|
bdb5bbc851
|
Remove label for avatar field
|
2016-02-09 00:29:51 +01:00 |
|
benji
|
3a602b55dc
|
Use bootstrap switch for the private/public button
|
2016-02-09 00:12:54 +01:00 |
|
Felix Van der Jeugt
|
6dc80bbaeb
|
Merge branch 'master' into fix/side-bar-layout
|
2016-02-05 19:52:37 +01:00 |
|
Felix Van der Jeugt
|
e72e76e9a3
|
fix form errors and notice when nothing changed
|
2016-02-05 09:16:02 +01:00 |
|
Felix Van der Jeugt
|
670b17622d
|
show error flash on failed file stuffs
|
2016-02-04 23:47:34 +01:00 |
|
Felix Van der Jeugt
|
9c31d9d6b4
|
remove the edit page - it's not used anyway
|
2016-02-04 23:38:10 +01:00 |
|
Felix Van der Jeugt
|
63539e01f7
|
put settings in side bar
|
2016-02-04 23:28:13 +01:00 |
|
benji
|
71fc48cd71
|
Find correct user on users#show
|
2016-02-04 21:03:03 +01:00 |
|
benji
|
d723c46c2a
|
Little design fix
|
2016-02-04 19:03:02 +01:00 |
|
benji
|
a2f5b172e3
|
Who wants feedback anyway?
|
2016-02-04 18:46:33 +01:00 |
|
benji
|
2791df4f62
|
Fix guest url
|
2016-02-04 18:26:20 +01:00 |
|
tl3ilaxu
|
da166cf7eb
|
Make code not horrible
|
2016-02-04 14:24:02 +01:00 |
|
tl3ilaxu
|
412cd4b103
|
Minor interface fixes
|
2016-02-04 00:23:12 +01:00 |
|
benji
|
0ee070d27e
|
Make link of balance
|
2016-02-02 17:50:22 +01:00 |
|
benji
|
6aec736c52
|
Little bug with user order
|
2016-02-02 15:20:04 +01:00 |
|
benji
|
e396401a4a
|
Fix some stuff
|
2016-02-02 14:42:02 +01:00 |
|
benji
|
e91e3213d7
|
Prepare some things for production phase
|
2015-12-31 17:30:57 +01:00 |
|
benji
|
edfb5e3988
|
Merge branch 'master' into tests
|
2015-12-01 21:33:20 +01:00 |
|
benji
|
d092e08718
|
Add better helper
|
2015-12-01 21:19:35 +01:00 |
|
benji
|
4f67230258
|
Merge branch 'master' into tests
|
2015-12-01 21:07:51 +01:00 |
|
benji
|
49898d484f
|
Add guest account
|
2015-11-30 18:29:18 +01:00 |
|
benji
|
da8ac14623
|
Merge branch 'master' of https://github.com/ZeusWPI/Tap
|
2015-11-05 19:52:41 +01:00 |
|
benji
|
47713d12ab
|
little something
|
2015-11-05 19:52:34 +01:00 |
|
benji
|
512a3aeede
|
Rewrite ability
|
2015-10-29 15:42:23 +01:00 |
|
benji
|
41d67556f4
|
Fix ability test
|
2015-10-29 14:27:06 +01:00 |
|
benji
|
b7ac8c32f7
|
Simplify ability
|
2015-10-29 14:09:52 +01:00 |
|
benji
|
f109f5eb18
|
Remove format html from quickpay
|
2015-10-29 11:54:02 +01:00 |
|
benji
|
b5782b13d8
|
user test
|
2015-10-28 23:34:03 +01:00 |
|
benji
|
839151405b
|
Remove hack for nested models
|
2015-10-28 22:07:48 +01:00 |
|
benji
|
539b65b75f
|
barcode model test
|
2015-10-28 21:54:55 +01:00 |
|
benji
|
8906ca7e39
|
Add flash messages on quickpay
|
2015-10-28 20:48:49 +01:00 |
|
benji
|
5b922ceab5
|
Add way to see changes in quickpay
|
2015-10-28 16:57:11 +01:00 |
|
benji
|
e8e4fc6855
|
Old tab in footer
|
2015-10-27 23:00:01 +01:00 |
|
benji
|
3299f46ed7
|
Rewrite flash messages
|
2015-10-27 22:54:06 +01:00 |
|
benji
|
6b3e57ab45
|
Add barcodes index and destroy
|
2015-10-27 22:09:01 +01:00 |
|
benji
|
80899f21aa
|
double barcodes
|
2015-10-27 20:57:43 +01:00 |
|
benji
|
aec212e754
|
Really fix it
|
2015-10-27 17:11:12 +01:00 |
|
benji
|
9c9511b95e
|
Add error when barcode not found
|
2015-10-27 16:52:06 +01:00 |
|
benji
|
62075f9cb1
|
Remove redirect loop for koelkast
|
2015-10-27 16:31:10 +01:00 |
|
benji
|
8099de435b
|
Fix 69
|
2015-10-26 18:57:59 +01:00 |
|
benji
|
344f259efd
|
Use try so it doesn't crash
|
2015-10-07 16:49:29 +02:00 |
|
benji
|
3d9afce424
|
load barcode
|
2015-10-07 16:42:05 +02:00 |
|
benji
|
cf4cb74087
|
authorization
|
2015-10-07 16:39:06 +02:00 |
|
benji
|
d575de04eb
|
Relative url
|
2015-10-07 16:04:09 +02:00 |
|
benji
|
5b22c54c0f
|
shallow
|
2015-10-07 15:55:47 +02:00 |
|
benji
|
f0032448d5
|
Ability
|
2015-10-07 15:52:05 +02:00 |
|
benji
|
c8b21ed1d1
|
Load barcode through product
|
2015-10-07 15:34:22 +02:00 |
|
benji
|
0baa857458
|
urgh
|
2015-10-07 15:10:14 +02:00 |
|
benji
|
328f806d39
|
Change token login to get
|
2015-10-07 15:06:01 +02:00 |
|
benji
|
4c1a630415
|
Some view changes to make stuff more obvious
|
2015-10-07 14:52:44 +02:00 |
|
benji
|
e6264fd6c8
|
Move some stuff to barcodecontroller where it belongs + refactoring
|
2015-09-28 21:51:40 +02:00 |
|
benji
|
bd27ac3cca
|
Add styling to stockentry
|
2015-09-26 12:13:43 +02:00 |
|
benji
|
efa85e7758
|
Add some useful flash messages
|
2015-09-26 11:57:41 +02:00 |
|
benji
|
1848edea8b
|
Use radix for javascript parseInt
|
2015-09-25 17:11:26 +02:00 |
|
benji
|
19dec68c59
|
add workflow for adding products/stock through barcodes
|
2015-09-25 14:24:32 +02:00 |
|
benji
|
bfe86ae481
|
Change barcode to a has_many relation
|
2015-09-23 11:09:24 +02:00 |
|
benji
|
0885359d71
|
users controller test
|
2015-09-22 20:06:50 +02:00 |
|
benji
|
71659e246d
|
Change koelkast login to login with token
|
2015-09-22 07:13:35 +02:00 |
|
benji
|
046b2c382c
|
Merge branch 'master' into barcode
|
2015-09-21 19:07:03 +02:00 |
|
benji
|
e9aa52736a
|
Fix calculate_price when order_item without product is provided
|
2015-09-21 17:38:22 +02:00 |
|
benji
|
5a538a924b
|
oops
|
2015-09-21 13:00:22 +02:00 |
|
benji
|
ec2174171d
|
format balance
|
2015-09-21 12:48:30 +02:00 |
|
benji
|
f05c25e405
|
tab callback for user balance
|
2015-09-21 12:46:39 +02:00 |
|
benji
|
571fce83fd
|
Add warning for testfase
|
2015-09-21 12:25:27 +02:00 |
|
benji
|
4f24651b84
|
Annotate
|
2015-09-21 08:54:50 +02:00 |
|
benji
|
e9d89c1e95
|
Edit product test
|
2015-09-21 08:40:15 +02:00 |
|
benji
|
a28c89469e
|
Edit abiltiy test
|
2015-09-21 08:23:43 +02:00 |
|
benji
|
6403835872
|
Use barcode to create new order
|
2015-09-20 21:21:18 +02:00 |
|
benji
|
ec2b516727
|
Refactor views
|
2015-09-19 11:05:43 +02:00 |
|
benji
|
17a54723ec
|
Remove index and destroy on userscontroller
|
2015-09-18 21:05:32 +02:00 |
|
benji
|
b81a615408
|
@user
|
2015-09-18 15:53:45 +02:00 |
|
benji
|
397dd169a6
|
place extra ability
|
2015-09-18 15:46:11 +02:00 |
|
benji
|
76f8332e97
|
Remove some gems
|
2015-09-18 13:20:57 +02:00 |
|
benji
|
442c694122
|
Fix some small bugs
|
2015-09-17 15:32:39 +02:00 |
|
benji
|
ef75909298
|
Change erb to haml
|
2015-09-17 14:05:33 +02:00 |
|
benji
|
5e666d8cb8
|
Fix failing tests
|
2015-09-14 20:55:49 +02:00 |
|
benji
|
b55ba47209
|
Refactor
|
2015-09-14 20:26:16 +02:00 |
|
benji
|
de1436f5c7
|
Allow destroying of orders
|
2015-09-14 17:52:25 +02:00 |
|
benji
|
251d3b69b7
|
Move tab api to seperate job
|
2015-09-14 17:29:00 +02:00 |
|
benji
|
02b27233cd
|
Save transaction id
|
2015-09-14 11:20:52 +02:00 |
|
benji
|
891e596fda
|
replace tab api key to secrets
|
2015-09-12 11:47:00 +02:00 |
|
benji
|
5ba36e431f
|
Merge branch 'rspec'
|
2015-09-12 11:30:59 +02:00 |
|
benji
|
48aaaa354d
|
Merge branch 'master' into rspec
|
2015-09-12 11:30:09 +02:00 |
|
benji
|
c24d7ad956
|
Implement tab api cancelled
|
2015-09-12 11:28:50 +02:00 |
|
benji
|
825dee8e02
|
Add delayed job to post requests to tab
|
2015-09-12 11:17:58 +02:00 |
|
Tom Naessens
|
0f5bfa0432
|
Annnd another substitute
|
2015-09-08 13:35:56 +02:00 |
|
Tom Naessens
|
81691282f8
|
Merge branch 'master' of github.com:ZeusWPI/Tap
|
2015-09-08 13:30:24 +02:00 |
|
Tom Naessens
|
8ac363911e
|
s/tab/tap/g
|
2015-09-08 13:30:18 +02:00 |
|
benji
|
28774b3175
|
Add tests for user controller
|
2015-09-07 21:15:16 +02:00 |
|
benji
|
084e542dd5
|
Add tests for products_controller
|
2015-09-07 14:26:07 +02:00 |
|
benji
|
b1dbe76746
|
Add order price test
|
2015-09-04 16:47:49 +02:00 |
|