Commit Graph

460 Commits

Author SHA1 Message Date
429b9ccaf8 small key toggle fix, add empty message file waste.php 2017-03-19 15:35:44 +01:00
59e6166bf7 Merge branch 'release/v.0.1.0' 2017-03-07 22:34:16 +01:00
21506a3762 fix delete contract in admin 2017-03-07 22:33:51 +01:00
aade9dac75 Merge branch 'develop' of http://rocho02.ddns.net:4080/gogs/rocho/fitness_web into develop 2017-03-07 22:30:37 +01:00
cb5a19d752 add admin delete contract 2017-03-07 22:25:32 +01:00
a3f6c34be4 Merge tag 'version/release/v.0.0.99' into develop
finished release
2017-03-07 08:23:09 +01:00
6a4536c877 Merge branch 'release/release/v.0.0.99' 2017-03-07 08:22:39 +01:00
f55f18706c change version to v.0.0.99 2017-03-07 08:22:13 +01:00
dda482a338 add checked webcam start - only when https... 2017-03-07 08:16:12 +01:00
81e2d51e59 Merge branch 'release/release/v.0.0.98' 2017-02-28 20:43:20 +01:00
8da2a517a0 change version to v.0.0.98 2017-02-28 20:42:13 +01:00
1ff1d03a07 add feature enable/disable reception door log 2017-02-28 20:29:10 +01:00
585cf15d4e Merge tag 'version/release/v.0.0.97' into develop
Tag for version v.0.097
2017-02-07 22:28:10 +01:00
f27528d4cb Merge branch 'release/release/v.0.0.97'
add property to show/hide stock (reception > products )
2017-02-07 22:27:02 +01:00
fb67171e71 change version to v.0.0.97 2017-02-07 22:25:26 +01:00
c8e3ef6754 Add property reception show stock. 2017-02-06 08:20:18 +01:00
7bbd4dcfa4 Merge tag 'version/v0.0.96' into develop
Add asset compress component
2017-01-13 22:22:17 +01:00
4d6e384b32 Merge branch 'release/v0.0.96' 2017-01-13 22:21:45 +01:00
2973ef9e3e add asset compress 2017-01-13 22:20:48 +01:00
33b4eb0cf3 add fronend asset compression 2017-01-13 21:31:43 +01:00
75b1cb04ed add door log related indexes 2017-01-13 20:25:04 +01:00
c0d36c525e add backend door log 2017-01-12 22:34:06 +01:00
fa0eba3a11 add door log related indexes 2017-01-11 07:30:40 +01:00
19c7049562 Merge tag 'version/v.0.0.95' into develop
Finish release
2017-01-06 19:34:12 +01:00
d98ceaf328 Merge branch 'release/v.0.0.95' 2017-01-06 19:32:56 +01:00
88dd75531f change version to v.0.0.95 2017-01-06 19:00:31 +01:00
6ca4e14c97 Merge branch 'feature/inventory' into develop 2017-01-06 18:55:30 +01:00
9679081815 add iml files to gitignore 2017-01-06 18:25:44 +01:00
f3d00953c8 Add inventory changes ( tax, net purchase price 2017-01-06 18:24:43 +01:00
9ddea8e531 Finish version/v.0.0.94 2016-12-29 19:22:03 +01:00
6de07dac93 restore flag_out logic, toggleKey logic 2016-12-29 19:17:31 +01:00
7b2ebd51af Finish version/v.0.0.93 2016-11-13 12:51:07 +01:00
c673c5f73d add shebang line to botond_daily 2016-11-13 12:47:26 +01:00
3748a2edd3 Finish version/v.0.0.92 2016-10-23 21:05:14 +02:00
a556c605a8 add ticket controller fix, change version to -0.0.92 2016-10-23 20:58:26 +02:00
88db9de462 Finish account_state_non_cash 2016-10-23 20:41:52 +02:00
90c598f8c6 add editable account on reception/customer-cart, add towel handling 2016-10-21 20:39:02 +02:00
8585286150 add non cash money display to account state 2016-10-05 07:56:50 +02:00
f595056b94 Finish version/v.0.0.91 2016-10-02 21:54:09 +02:00
892f81908f Invalidate dor log trigger changes 2016-10-02 21:52:46 +02:00
d3df0f057d Finish version/v.0.0.90 2016-10-02 09:44:02 +02:00
f065ecb1b5 Change version and changelog 2016-10-02 09:42:24 +02:00
7975d6ffc9 Finish flagout 2016-10-01 18:49:51 +02:00
4cbc1bd4c8 Finish reception_changes 2016-10-01 18:42:43 +02:00
8b6b506d17 Add transfer and account_state today view to reception 2016-10-01 18:41:21 +02:00
e30bb082fa Remove trigger condition - maximalize enter count with ticket 2016-09-29 18:38:53 +02:00
606f18950f Add new flag / flag_out logick 2016-09-25 13:32:42 +02:00
0ad2dafdeb Add new flag / flag_out logick 2016-09-25 13:32:27 +02:00
d46e717b53 Typo fix "Sikeres beszedés" 2016-09-15 08:16:56 +02:00
7ff496c454 Finish version/v.0.0.89 2016-09-14 20:56:24 +02:00