Commit Graph

3311 Commits

Author SHA1 Message Date
Aleksandras Mikuta
282a62121e Merged in bugfix/14-alex (pull request #944)
Bugfix/14 alex
2020-02-05 11:58:05 +00:00
Mikuta Aleksandras
0ed75a6c55 code refurbishment 2020-02-05 12:29:36 +01:00
Adrian Toczydłowski
98d20c0878 Merged in devtask/MR-error (pull request #977)
Fix MR error with static injector
2020-02-05 11:09:58 +00:00
Adrian Toczydlowski
459c6d5bda Fix MR error with static injector 2020-02-05 12:07:56 +01:00
Peter Skrlj
10b6bd4d13 Merge branch 'develop' of bitbucket.org:umwerk/hugendubel-instore-ma into develop 2020-02-05 11:07:32 +01:00
Peter Skrlj
d4a67c27fc Adjiust Logout workflow for container apps, to reopen QR code scanner 2020-02-05 11:07:16 +01:00
Adrian Toczydłowski
f6ae7e93ae Merged in devtask/library-update (pull request #974)
Nwer version of the @isa and @cmf libraries
2020-02-05 09:04:57 +00:00
Peter Skrlj
d92d08a355 update readme 2020-02-05 09:51:29 +01:00
Adrian Toczydlowski
f71d57e2f3 Nwer version of the @isa and @cmf libraries 2020-02-05 09:49:07 +01:00
Adrian Toczydłowski
82184de6d8 Merged in bugfixes/remission (pull request #972)
Remission improvements
2020-02-05 01:44:46 +00:00
Adrian Toczydlowski
9284100715 Remission improvements 2020-02-05 02:44:15 +01:00
Adrian Toczydłowski
c2f3ba169b Merged in bugifx/HIMA-1043_invalid-bar-code-fix (pull request #970)
Extend symbol range
2020-02-04 21:47:18 +00:00
Adrian Toczydlowski
f3aab0cfdd Extend symbol range 2020-02-04 22:46:02 +01:00
Adrian Toczydłowski
872b22468e Merged in bugifx/HIMA-1043_invalid-bar-code-fix (pull request #969)
HIMA-1043 set custom symbol counts
2020-02-04 21:44:30 +00:00
Adrian Toczydlowski
14f41bd81e HIMA-1043 set custom symbol counts 2020-02-04 22:38:53 +01:00
Adrian Toczydłowski
1e37fe8e80 Merged in bugifx/HIMA-1043_invalid-bar-code-fix (pull request #967)
Initialize filters
2020-02-04 18:45:30 +00:00
Adrian Toczydlowski
dd211b1224 Initialize filters 2020-02-04 19:45:01 +01:00
Adrian Toczydłowski
ff8795bba0 Merged in bugifx/HIMA-1043_invalid-bar-code (pull request #965)
Testing
2020-02-04 18:29:24 +00:00
Adrian Toczydlowski
c54740e093 Testing 2020-02-04 19:27:52 +01:00
Adrian Toczydłowski
491c8b6f7b Merged in task/HIMA-790_add-new-articles (pull request #963)
Task/HIMA-790 add new articles
2020-02-04 17:33:33 +00:00
Adrian Toczydlowski
a42ae9f179 Change remission model 2020-02-04 18:33:13 +01:00
Adrian Toczydlowski
4c6003befc Resolve MR conflicts 2020-02-04 18:32:33 +01:00
Adrian Toczydlowski
2c17b07242 HIMA-790 fix progress statisticsc 2020-02-04 18:32:02 +01:00
Adrian Toczydlowski
997ac743b1 Add code 25 2020-02-04 18:27:15 +01:00
Adrian Toczydłowski
12ab1cfd81 Merged in task/HIMA_1043_add-a-new-barcode-type (pull request #961)
Change npmrc password
2020-02-04 16:44:29 +00:00
Adrian Toczydlowski
56bfa1fada Change npmrc password 2020-02-04 17:44:02 +01:00
Adrian Toczydłowski
cefa1f2dd5 Merged in task/HIMA_1043_add-a-new-barcode-type (pull request #959)
HIMA-1043
2020-02-04 15:19:43 +00:00
Adrian Toczydlowski
ea028c699e HIMA-1043 2020-02-04 16:19:15 +01:00
Adrian Toczydlowski
20cdbcba95 HIMA-790 add a new article 2020-02-04 16:14:47 +01:00
Mikuta Aleksandras
9c379360e1 HIMA-751 Lists scroll style adjustments 2020-02-04 13:01:35 +01:00
Mikuta Aleksandras
64034c9df1 Merge branch 'develop' into bugfix/14-alex 2020-02-04 12:53:55 +01:00
Mikuta Aleksandras
1f911b06a8 HIMA-751 Lists scroll style adjustments 2020-02-04 12:41:02 +01:00
Mikuta Aleksandras
c17a19f9b9 HIMA-425 customer form country list height adjustment 2020-02-04 12:01:10 +01:00
Adrian Toczydłowski
aec27273ed Merged in task/HIMA-790_add-new-articles (pull request #957)
HIMA-790 Add new articles
2020-02-04 09:47:42 +00:00
Adrian Toczydlowski
ca1a8b3d6f HIMA-790 Add new articles 2020-02-04 10:47:10 +01:00
Mikuta Aleksandras
4bdf34c9c8 HIMA-751 Artikelsuche scroll style adjustments 2020-02-04 09:57:38 +01:00
Mikuta Aleksandras
0b9a966fbd Merge branch 'develop' into bugfix/14-alex 2020-02-04 06:41:46 +01:00
Adrian Toczydłowski
55d6d794f5 Merged in task/HIMA-710_remission-reminder-fix (pull request #955)
HIMA-710 fix for emission reminder
2020-02-03 23:10:54 +00:00
Adrian Toczydlowski
aa903a3e64 HIMA-710 fix for emission reminder 2020-02-03 23:54:58 +01:00
Adrian Toczydłowski
bc906a664f Merged in task/HIMA-702_progress-bar_animations (pull request #953)
HIMA-702 change the animations flow, improve updates of statistics. Change printer methods
2020-02-03 20:05:16 +00:00
Adrian Toczydlowski
c2806a4d31 HIMA-702 change the animations flow, improve updates of statistics. Change printer methods 2020-02-03 21:04:42 +01:00
Adrian Toczydłowski
9ba47c8abd Merged in devtask/remission-library-update (pull request #951)
Upgrade the remission library
2020-02-03 13:22:16 +00:00
Adrian Toczydlowski
803abfd18f Upgrade the remission library 2020-02-03 14:20:12 +01:00
Adrian Toczydłowski
33b692d39c Merged in task/HIMA-709_leaving-remission-popup (pull request #949)
HIMA-709 handle extra cases in the remission finish component
2020-02-03 13:04:47 +00:00
Adrian Toczydlowski
0042157648 HIMA-709 handle extra cases in the remission finish component 2020-02-03 14:03:36 +01:00
Adrian Toczydłowski
c95c7d52a5 Merged in task/HIMA-703_remimenge (pull request #947)
HIMA-703 allow a user to provide 0 as a valid value
2020-02-03 12:47:47 +00:00
Adrian Toczydlowski
0788fb89d5 HIMA-703 allow a user to provide 0 as a valid value 2020-02-03 13:47:16 +01:00
Adrian Toczydłowski
7f26224445 Merged in task/key-card-login (pull request #945)
Fix the custom query paremeter for the key card login
2020-02-03 11:25:11 +00:00
Adrian Toczydlowski
12efeddf5e Fix the custom query paremeter for the key card login 2020-02-03 12:23:56 +01:00
Mikuta Aleksandras
b2f207c6e0 HIMA-899 cart item quantity style adjustments 2020-02-03 00:41:22 +01:00