Commit Graph

96 Commits

Author SHA1 Message Date
yasaman aliakbari
a9b54edd7d Merge branch 'feature/debug_fns_clock' into 'develop'
debug all datatables

See merge request witel3/loan-facilities-expert!36
2023-07-18 11:28:33 +00:00
Yasiu1376
d20a33d3bd debug all datatables 2023-07-18 14:56:32 +03:30
yasaman aliakbari
74245025d6 Merge branch 'feature/debug_datatable_filtering' into 'develop'
debug datatable

See merge request witel3/loan-facilities-expert!35
2023-07-17 08:33:22 +00:00
c5b8cd964f debug datatable 2023-07-17 11:59:19 +03:30
Yasiu1376
1139ba0636 debug api routes 2023-07-16 17:04:29 +03:30
yasaman aliakbari
41b211461d Merge branch 'feature/transportation_assistance_design' into 'develop'
Feature/transportation assistance design

See merge request witel3/loan-facilities-expert!34
2023-07-16 13:32:10 +00:00
0a5bb44770 merge conflict 2023-07-16 16:59:10 +03:30
yasaman aliakbari
a683c4029f Merge branch 'feature/machinary_office_implement' into 'develop'
Feature/machinary office implement

See merge request witel3/loan-facilities-expert!33
2023-07-16 13:18:45 +00:00
1ae9532055 Merge branch 'develop' of https://gitlab.com/witel3/loan-facilities-expert into feature/machinary_office_implement 2023-07-16 16:46:19 +03:30
yasaman aliakbari
28d5bd635a Merge branch 'feature/datatable_localize' into 'develop'
datatable_locale

See merge request witel3/loan-facilities-expert!32
2023-07-16 13:15:40 +00:00
Yasiu1376
05d436058e datatable_locale 2023-07-16 16:38:26 +03:30
c505f57cfb change id to national id in passenger office 2023-07-16 16:01:22 +03:30
4e9d81ca71 change id to national id 2023-07-16 15:59:31 +03:30
yasaman aliakbari
231e21d8c5 Merge branch 'feature/notification_actions' into 'develop'
add notification to datatable

See merge request witel3/loan-facilities-expert!31
2023-07-16 12:13:22 +00:00
Yasiu1376
69a7f3525a add notification to datatable 2023-07-16 15:41:58 +03:30
yasaman aliakbari
bb8f145957 Merge branch 'feature/machinary_office_implement' into 'develop'
Feature/machinary office implement

See merge request witel3/loan-facilities-expert!30
2023-07-16 12:09:53 +00:00
c2259031fc confirm data 2023-07-16 15:31:20 +03:30
9422fcc366 Merge branch 'develop' of https://gitlab.com/witel3/loan-facilities-expert into feature/machinary_office_implement 2023-07-16 15:16:46 +03:30
29d031a83e machinary implement 2023-07-16 15:16:31 +03:30
Yasiu1376
7d5d69203f fix confirm data 2023-07-16 14:55:54 +03:30
632f009f2c Merge branch 'develop' of https://gitlab.com/witel3/loan-facilities-expert into feature/machinary_office_implement 2023-07-16 14:38:45 +03:30
9caf417101 transportation assistance design 2023-07-16 14:37:24 +03:30
yasaman aliakbari
4b94b04ff8 Merge branch 'feature/reject_passenger' into 'develop'
reject_passenger

See merge request witel3/loan-facilities-expert!29
2023-07-16 10:56:04 +00:00
Yasiu1376
f7dfd03017 reject_passenger 2023-07-16 14:23:44 +03:30
024da3baf7 machinary implement 2023-07-16 13:39:46 +03:30
a588ad6612 confirm data conflict 2023-07-16 11:02:16 +03:30
390bd2fd7c machinary office implement 2023-07-16 11:00:57 +03:30
yasaman aliakbari
1a988183aa Merge branch 'feature/debug_datatable' into 'develop'
debug confirm datatable

See merge request witel3/loan-facilities-expert!28
2023-07-16 07:29:01 +00:00
Yasiu1376
43d801af3e debug confirm datatable 2023-07-16 10:57:21 +03:30
yasaman aliakbari
c4603b9d7c Merge branch 'feature/machinary_office_design' into 'develop'
Feature/machinary office design

See merge request witel3/loan-facilities-expert!27
2023-07-16 06:49:40 +00:00
915741ae05 Merge branch 'develop' of https://gitlab.com/witel3/loan-facilities-expert into feature/machinary_office_design 2023-07-16 10:14:48 +03:30
yasaman aliakbari
fa3c87eb0e Merge branch 'feature/passenger_office_implement' into 'develop'
Feature/passenger office implement

See merge request witel3/loan-facilities-expert!26
2023-07-16 06:42:51 +00:00
acbfaceb28 interaction with back 2023-07-16 10:08:40 +03:30
abcd523663 confirm data and reject data 2023-07-15 17:17:53 +03:30
d7f3638b67 merg conflict 2023-07-15 16:38:26 +03:30
9150cfdcdc recive new data and remove conflicts 2023-07-15 16:27:57 +03:30
83dad6f040 debug datatable structure 2023-07-15 16:26:35 +03:30
f2568ff74e interaction with back 2023-07-15 16:25:32 +03:30
ff110ad532 Merge branch 'feature/passenger_office_implement' into 'develop'
passenger office implement

See merge request witel3/loan-facilities-expert!25
2023-07-15 11:47:44 +00:00
d5de789dd9 passenger office implement 2023-07-15 15:14:16 +03:30
yasaman aliakbari
a8685e40e5 Merge branch 'feature/loading_logo' into 'develop'
loading page design

See merge request witel3/loan-facilities-expert!24
2023-07-15 07:42:57 +00:00
Yasiu1376
6b4a3e0c9b loading page design 2023-07-15 11:03:02 +03:30
Yasiu1376
76164ed9c4 fix app.json bug 2023-07-13 13:45:41 +03:30
yasaman aliakbari
e4cac76f06 Merge branch 'feature/passenger_office_design' into 'develop'
Feature/passenger office design

See merge request witel3/loan-facilities-expert!23
2023-07-13 09:41:49 +00:00
8b8f639a9c Merge branch 'develop' of https://gitlab.com/witel3/loan-facilities-expert into feature/passenger_office_design 2023-07-13 11:12:19 +03:30
yasaman aliakbari
135f6d1e2f Merge branch 'feature/debug_auth' into 'develop'
debug auth

See merge request witel3/loan-facilities-expert!22
2023-07-12 11:54:41 +00:00
Yasiu1376
9090da80d8 debug auth 2023-07-12 15:16:56 +03:30
yasaman aliakbari
a89df0ecb9 Merge branch 'feature/debug_header' into 'develop'
debug site headers

See merge request witel3/loan-facilities-expert!21
2023-07-12 11:14:09 +00:00
Yasiu1376
3ef3cd063e debug site headers 2023-07-12 14:40:02 +03:30
yasaman aliakbari
f690a4767b Merge branch 'feature/notification_components' into 'develop'
notifications transalte

See merge request witel3/loan-facilities-expert!20
2023-07-12 10:58:41 +00:00