Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 4afbf63922 Merge branch 'release/201906061800' Roland Schneider 2019-06-06 18:04:22 +02:00
• a64b7ccfa9 bump up version to v0.1.17 Roland Schneider 2019-06-06 18:03:44 +02:00
• bd05edae1c fix script botond_daily for the new server Roland Schneider 2019-06-06 17:54:23 +02:00
• 762ba0b833 Merge branch 'release/v0.1.16' Roland Schneider 2019-06-04 07:25:51 +02:00
• a56998f5fd change version to v0.1.16 Roland Schneider 2019-06-04 07:24:30 +02:00
• 6e66ab204d improve employee card validity calculation Roland Schneider 2019-06-03 18:10:32 +02:00
• 6d93718aae Merge tag 'version/v0.1.15' into develop Roland Schneider 2019-04-01 07:54:52 +02:00
• 274e0c8c5c Merge branch 'release/v0.1.15' Roland Schneider 2019-04-01 07:54:52 +02:00
• 655b54a857 fix ticket expires warning null pointer Roland Schneider 2019-04-01 07:54:01 +02:00
• 8cdd8a6fe4 Merge tag 'version/v0.1.14' into develop Roland Schneider 2019-03-30 20:53:30 +01:00
• c062c8157b Merge branch 'release/v0.1.14' Roland Schneider 2019-03-30 20:53:30 +01:00
• ee8662e1c8 change expires soon colors Roland Schneider 2019-03-30 20:52:44 +01:00
• 216c48df93 Merge tag 'version/v0.1.13' into develop Roland Schneider 2019-03-30 20:05:47 +01:00
• b5a94853d4 Merge branch 'release/v0.1.13' Roland Schneider 2019-03-30 20:05:47 +01:00
• 58d1f756e8 set version string and changelog for v0.1.12 Roland Schneider 2019-03-30 20:05:09 +01:00
• 55a6d14dbd Merge tag 'version/v0.1.12' into develop Roland Schneider 2019-03-30 19:58:35 +01:00
• c7538af485 Merge branch 'release/v0.1.12' Roland Schneider 2019-03-30 19:58:35 +01:00
• e87f778323 set version string and changelog for v0.1.12 Roland Schneider 2019-03-30 19:56:37 +01:00
• 8de73c0585 implement feature 'put to cart ticket installment request' Roland Schneider 2019-03-26 07:29:47 +01:00
• 3fce2c70c2 implement ticket expires-soon Roland Schneider 2019-01-07 07:48:28 +01:00
• 4741cce196 Merge tag 'version/v0.1.11' into develop Roland Schneider 2018-09-12 17:55:50 +02:00
• 27b404e6ea Merge branch 'release/v0.1.11' Roland Schneider 2018-09-12 17:55:50 +02:00
• f531af6def Merge branch 'feature/fwda' into develop Roland Schneider 2018-09-12 17:51:45 +02:00
• 564701f520 change version to v.0.1.11 Roland Schneider 2018-09-12 17:51:17 +02:00
• 4fc125df0c add contract controller(s) changes Roland Schneider 2018-09-12 17:45:02 +02:00
• 792d0caab5 add contract controller(s) changes Roland Schneider 2018-09-10 07:40:50 +02:00
• dd0d6c50c9 add provider to rest/discount-status Roland Schneider 2018-09-03 07:18:25 +02:00
• 7ec1a95a07 add rest application and discount-status rest method - lastXdays fix Roland Schneider 2018-09-01 22:19:31 +02:00
• 767211d6c7 add rest application and discount-status rest method Roland Schneider 2018-08-31 07:50:14 +02:00
• 017bf0f9e4 add cutler_kartya_grafika Roland Schneider 2018-03-12 09:30:41 +01:00
• 4d750cc34a Merge tag 'version/version/v0.1.10' into develop Roland Schneider 2018-02-07 17:49:19 +01:00
• 020a1f8cac Merge branch 'release/version/v0.1.10' Roland Schneider 2018-02-07 17:49:19 +01:00
• 79fc9a2803 #1: Log Card Read In Botond - change version number to v.0.1.10 Roland Schneider 2018-02-07 17:48:08 +01:00
• b04a8f7761 Merge branch 'feature/#1_Log_Card_Read_In_Botond' into develop Roland Schneider 2018-02-07 08:59:09 +01:00
• cf08823d3f #1: Log Card Read In Botond Roland Schneider 2018-02-07 08:23:26 +01:00
• acb5b040c5 add docker container for development environmet Roland Schneider 2018-02-06 08:06:43 +01:00
• ee58366748 Merge branch 'release/v.0.1.09' into develop Roland Schneider 2017-09-09 10:22:37 +02:00
• 69c765a02a Merge branch 'release/v.0.1.09' Roland Schneider 2017-09-09 10:22:36 +02:00
• e5e429cac9 fix migration original_price Roland Schneider 2017-09-09 10:22:18 +02:00
• dc968f5a5c fix migration original_price Roland Schneider 2017-09-09 10:20:28 +02:00
• cf00e18a16 Merge branch 'release/v.0.1.07' Roland Schneider 2017-09-08 19:55:08 +02:00
• 900415d97f Merge branch 'release/v.0.1.07' into develop Roland Schneider 2017-09-08 19:55:08 +02:00
• f88fb6d510 add ticket original end and original price add helper links to related object in admin Roland Schneider 2017-09-08 19:55:01 +02:00
• 1eb8c93fdc Merge branch 'feature/mover_cutler_door' into develop Roland Schneider 2017-09-08 19:50:51 +02:00
• 90d19d17b6 add ticket original end and original price add helper links to related object in admin Roland Schneider 2017-09-06 12:14:12 +02:00
• bacfc36487 add mover cutler door Roland Schneider 2017-06-17 22:01:22 +02:00
• f538a82def add mover cutler door Roland Schneider 2017-06-17 22:01:11 +02:00
• b9399acc2e Merge branch 'release/v0.1.07' into develop Roland Schneider 2017-05-16 08:16:38 +02:00
• 84dda3dd2c Merge branch 'release/v0.1.07' Roland Schneider 2017-05-16 08:16:37 +02:00
• 2cf6ceeb01 Change version to v0.1.07 Roland Schneider 2017-05-16 08:15:54 +02:00
• 22cf5883ac fix displaying available accounts on frontend/sellTicket Roland Schneider 2017-05-16 08:10:57 +02:00
• 4d22e60760 Merge branch 'release/v.0.1.06' into develop Roland Schneider 2017-05-01 22:16:29 +02:00
• 656ad21e41 Merge branch 'release/v.0.1.06' Roland Schneider 2017-05-01 22:16:28 +02:00
• d3042371ae change version v.0.1.06 Roland Schneider 2017-05-01 22:16:06 +02:00
• 1a04a6e351 add waste to invetory gui Roland Schneider 2017-05-01 22:04:05 +02:00
• c5860f0260 add clear key status flag_out Roland Schneider 2017-04-29 08:17:19 +02:00
• 4826c566fe Merge branch 'release/v.0.1.05' Roland Schneider 2017-04-27 20:58:12 +02:00
• 010ff62506 chagne version to v.0.1.05 Roland Schneider 2017-04-27 20:56:40 +02:00
• 567592b73e add wate to inventory Roland Schneider 2017-04-27 20:53:35 +02:00
• ec5968511b add geoip nullsafe checks Roland Schneider 2017-04-04 07:54:08 +02:00
• bec2d4c436 Merge branch 'release/v0.1.04' into develop Roland Schneider 2017-03-25 22:27:18 +01:00
• 6f75985127 Merge branch 'release/v0.1.04' Roland Schneider 2017-03-25 22:27:17 +01:00
• f3422cdef9 change version to v0.1.04 Roland Schneider 2017-03-25 22:27:00 +01:00
• b9c442fe22 add inventory daily Roland Schneider 2017-03-25 22:18:27 +01:00
• 2b5f5f60fd add some key_required property related fix Roland Schneider 2017-03-23 18:29:29 +01:00
• 57e578540c add app param 'key_required' Roland Schneider 2017-03-22 07:55:12 +01:00
• 59f6b32e7c Merge tag 'version/v.0.1.03' into develop Roland Schneider 2017-03-21 22:16:18 +01:00
• d03b3e8e9b Merge branch 'release/v.0.1.03' Roland Schneider 2017-03-21 22:15:49 +01:00
• 252bf441ca change version to v.0.1.03 Roland Schneider 2017-03-21 22:15:14 +01:00
• f99707715b fix cutler daily script for azure server Roland Schneider 2017-03-21 22:10:01 +01:00
• d93408803a Merge tag 'version/v.0.1.02' into develop Roland Schneider 2017-03-20 19:00:18 +01:00
• 378f4b7244 Merge branch 'release/v.0.1.02' Roland Schneider 2017-03-20 18:59:40 +01:00
• e68d20545d change version number to v.0.1.02 Roland Schneider 2017-03-20 18:59:09 +01:00
• bdb7776500 Merge branch 'develop' of http://rocho02.ddns.net:4080/gogs/rocho/fitness_web into develop Roland Schneider 2017-03-20 18:57:02 +01:00
• 16fbd266ca add vscode config folder to git ignore Roland Schneider 2017-03-20 18:39:00 +01:00
• 69cf685126 add date time behaviour to ugiro reques assignment type Roland Schneider 2017-03-20 18:30:43 +01:00
• fc5be6c71b Merge tag 'version/v.0.1.01' into develop Roland Schneider 2017-03-19 15:44:26 +01:00
• 840c99e57b Merge branch 'release/v.0.1.01' Roland Schneider 2017-03-19 15:44:02 +01:00
• 289b3d5ba9 change version to v.0.0.01 Roland Schneider 2017-03-19 15:43:47 +01:00
• 208744e958 add small keytoggleform changes Roland Schneider 2017-03-19 15:38:16 +01:00
• 04c9af29b9 .Merge branch 'develop' of http://rocho02.ddns.net:4080/gogs/rocho/fitness_web into develop Roland Schneider 2017-03-19 15:36:03 +01:00
• 429b9ccaf8 small key toggle fix, add empty message file waste.php Roland Schneider 2017-03-19 15:29:01 +01:00
• 854d7909c6 small key toggle fix, add empty message file waste.php Roland Schneider 2017-03-19 15:29:01 +01:00
• 59e6166bf7 Merge branch 'release/v.0.1.0' Roland Schneider 2017-03-07 22:34:16 +01:00
• 21506a3762 fix delete contract in admin Roland Schneider 2017-03-07 22:33:51 +01:00
• aade9dac75 Merge branch 'develop' of http://rocho02.ddns.net:4080/gogs/rocho/fitness_web into develop Roland Schneider 2017-03-07 22:30:37 +01:00
• cb5a19d752 add admin delete contract Roland Schneider 2017-03-07 22:25:32 +01:00
• a3f6c34be4 Merge tag 'version/release/v.0.0.99' into develop Roland Schneider 2017-03-07 08:23:09 +01:00
• 6a4536c877 Merge branch 'release/release/v.0.0.99' Roland Schneider 2017-03-07 08:22:39 +01:00
• f55f18706c change version to v.0.0.99 Roland Schneider 2017-03-07 08:22:13 +01:00
• dda482a338 add checked webcam start - only when https... Roland Schneider 2017-03-07 08:16:12 +01:00
• 81e2d51e59 Merge branch 'release/release/v.0.0.98' Roland Schneider 2017-02-28 20:43:20 +01:00
• 8da2a517a0 change version to v.0.0.98 Roland Schneider 2017-02-28 20:42:13 +01:00
• 1ff1d03a07 add feature enable/disable reception door log Roland Schneider 2017-02-28 20:29:10 +01:00
• 585cf15d4e Merge tag 'version/release/v.0.0.97' into develop Roland Schneider 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 ) Roland Schneider 2017-02-07 22:27:02 +01:00
• fb67171e71 change version to v.0.0.97 Roland Schneider 2017-02-07 22:25:26 +01:00
• c8e3ef6754 Add property reception show stock. Roland Schneider 2017-02-06 08:20:18 +01:00
• 7bbd4dcfa4 Merge tag 'version/v0.0.96' into develop Roland Schneider 2017-01-13 22:22:17 +01:00
• 4d6e384b32 Merge branch 'release/v0.0.96' Roland Schneider 2017-01-13 22:21:45 +01:00