Commit Graph

595 Commits

Author SHA1 Message Date
b9399acc2e Merge branch 'release/v0.1.07' into develop 2017-05-16 08:16:38 +02:00
84dda3dd2c Merge branch 'release/v0.1.07' 2017-05-16 08:16:37 +02:00
2cf6ceeb01 Change version to v0.1.07 2017-05-16 08:15:54 +02:00
22cf5883ac fix displaying available accounts on frontend/sellTicket 2017-05-16 08:10:57 +02:00
4d22e60760 Merge branch 'release/v.0.1.06' into develop 2017-05-01 22:16:29 +02:00
656ad21e41 Merge branch 'release/v.0.1.06' 2017-05-01 22:16:28 +02:00
d3042371ae change version v.0.1.06 2017-05-01 22:16:06 +02:00
1a04a6e351 add waste to invetory gui 2017-05-01 22:04:05 +02:00
c5860f0260 add clear key status flag_out 2017-04-29 08:17:19 +02:00
4826c566fe Merge branch 'release/v.0.1.05' 2017-04-27 20:58:12 +02:00
010ff62506 chagne version to v.0.1.05 2017-04-27 20:56:40 +02:00
567592b73e add wate to inventory 2017-04-27 20:53:35 +02:00
ec5968511b add geoip nullsafe checks 2017-04-04 07:54:08 +02:00
bec2d4c436 Merge branch 'release/v0.1.04' into develop 2017-03-25 22:27:18 +01:00
6f75985127 Merge branch 'release/v0.1.04' 2017-03-25 22:27:17 +01:00
f3422cdef9 change version to v0.1.04 2017-03-25 22:27:00 +01:00
b9c442fe22 add inventory daily 2017-03-25 22:18:27 +01:00
2b5f5f60fd add some key_required property related fix 2017-03-23 18:29:29 +01:00
57e578540c add app param 'key_required' 2017-03-22 07:55:12 +01:00
59f6b32e7c Merge tag 'version/v.0.1.03' into develop
tag for version v.0.1.03
2017-03-21 22:16:18 +01:00
d03b3e8e9b Merge branch 'release/v.0.1.03' 2017-03-21 22:15:49 +01:00
252bf441ca change version to v.0.1.03 2017-03-21 22:15:14 +01:00
f99707715b fix cutler daily script for azure server 2017-03-21 22:10:01 +01:00
d93408803a Merge tag 'version/v.0.1.02' into develop
tag for version v.0.1.02
2017-03-20 19:00:18 +01:00
378f4b7244 Merge branch 'release/v.0.1.02' 2017-03-20 18:59:40 +01:00
e68d20545d change version number to v.0.1.02 2017-03-20 18:59:09 +01:00
bdb7776500 Merge branch 'develop' of http://rocho02.ddns.net:4080/gogs/rocho/fitness_web into develop 2017-03-20 18:57:02 +01:00
16fbd266ca add vscode config folder to git ignore 2017-03-20 18:39:00 +01:00
69cf685126 add date time behaviour to ugiro reques assignment type 2017-03-20 18:30:43 +01:00
fc5be6c71b Merge tag 'version/v.0.1.01' into develop
finish release v.0.1.01
2017-03-19 15:44:26 +01:00
840c99e57b Merge branch 'release/v.0.1.01' 2017-03-19 15:44:02 +01:00
289b3d5ba9 change version to v.0.0.01 2017-03-19 15:43:47 +01:00
208744e958 add small keytoggleform changes 2017-03-19 15:38:16 +01:00
04c9af29b9 .Merge branch 'develop' of http://rocho02.ddns.net:4080/gogs/rocho/fitness_web into develop 2017-03-19 15:36:03 +01:00
429b9ccaf8 small key toggle fix, add empty message file waste.php 2017-03-19 15:35:44 +01:00
854d7909c6 small key toggle fix, add empty message file waste.php 2017-03-19 15:29:01 +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