Commit Graph

813 Commits

Author SHA1 Message Date
017bf0f9e4 add cutler_kartya_grafika 2018-03-12 09:30:41 +01:00
020a1f8cac Merge branch 'release/version/v0.1.10' 2018-02-07 17:49:19 +01:00
4d750cc34a Merge tag 'version/version/v0.1.10' into develop
Tagging version version/v0.1.10 version/version/v0.1.10
2018-02-07 17:49:19 +01:00
79fc9a2803 #1: Log Card Read In Botond - change version number to v.0.1.10 2018-02-07 17:48:08 +01:00
b04a8f7761 Merge branch 'feature/#1_Log_Card_Read_In_Botond' into develop 2018-02-07 08:59:09 +01:00
cf08823d3f #1: Log Card Read In Botond 2018-02-07 08:23:26 +01:00
acb5b040c5 add docker container for development environmet 2018-02-06 08:06:43 +01:00
ee58366748 Merge branch 'release/v.0.1.09' into develop 2017-09-09 10:22:37 +02:00
69c765a02a Merge branch 'release/v.0.1.09' 2017-09-09 10:22:36 +02:00
e5e429cac9 fix migration original_price 2017-09-09 10:22:18 +02:00
dc968f5a5c fix migration original_price 2017-09-09 10:20:28 +02:00
cf00e18a16 Merge branch 'release/v.0.1.07' 2017-09-08 19:55:08 +02:00
900415d97f Merge branch 'release/v.0.1.07' into develop 2017-09-08 19:55:08 +02:00
f88fb6d510 add ticket original end and original price
add helper links to related object in admin
2017-09-08 19:55:01 +02:00
1eb8c93fdc Merge branch 'feature/mover_cutler_door' into develop 2017-09-08 19:50:51 +02:00
90d19d17b6 add ticket original end and original price
add helper links to related object in admin
2017-09-06 12:14:12 +02:00
bacfc36487 add mover cutler door 2017-06-17 22:01:22 +02:00
f538a82def add mover cutler door 2017-06-17 22:01:11 +02:00
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