|
|
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 |
|
|
|
fba65ed030
|
Merge branch 'develop' of https://gitlab.com/witel3/loan-facilities-expert into feature/passenger_boss_design
|
2023-07-13 10:55:02 +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 |
|
Yasiu1376
|
f4bdf27098
|
notifications transalte
|
2023-07-12 14:27:31 +03:30 |
|
yasaman aliakbari
|
7af8ccbe4b
|
Merge branch 'feature/show_profile' into 'develop'
Feature/show profile
See merge request witel3/loan-facilities-expert!19
|
2023-07-12 10:42:49 +00:00 |
|
Yasiu1376
|
a2f4c24a7f
|
update profile
|
2023-07-12 14:07:29 +03:30 |
|
Yasiu1376
|
444d4d3e6b
|
profile auth
|
2023-07-12 12:26:50 +03:30 |
|
yasaman aliakbari
|
eb315c65b7
|
Merge branch 'feature/show_profile' into 'develop'
Feature/show profile
See merge request witel3/loan-facilities-expert!17
|
2023-07-12 08:53:36 +00:00 |
|
Yasiu1376
|
3bc9eb3467
|
Merge branch 'develop' of https://gitlab.com/witel3/loan-facilities-expert into feature/show_profile
|
2023-07-12 12:19:54 +03:30 |
|
yasaman aliakbari
|
59d54bcff6
|
Merge branch 'feature/change_password' into 'develop'
change password auth
See merge request witel3/loan-facilities-expert!16
|
2023-07-12 08:48:29 +00:00 |
|
Yasiu1376
|
4f4873d7bb
|
change password auth
|
2023-07-12 11:59:28 +03:30 |
|
yasaman aliakbari
|
3afac6eb51
|
Merge branch 'feature/user_token' into 'develop'
user implementt
See merge request witel3/loan-facilities-expert!15
|
2023-07-12 08:20:49 +00:00 |
|
Yasiu1376
|
22317fe901
|
user implementt
|
2023-07-12 11:47:23 +03:30 |
|
Yasiu1376
|
08672c0a1e
|
implement user profile
|
2023-07-12 11:01:07 +03:30 |
|
Yasiu1376
|
a2b8920466
|
implrement profile
|
2023-07-12 10:18:36 +03:30 |
|
yasaman aliakbari
|
b207adffe8
|
Merge branch 'feature/login_implement' into 'develop'
Feature/login implement
See merge request witel3/loan-facilities-expert!14
|
2023-07-12 06:48:07 +00:00 |
|
|
|
58f97ea509
|
Merge branch 'develop' of https://gitlab.com/witel3/loan-facilities-expert into feature/passenger_boss_design
|
2023-07-11 17:37:42 +03:30 |
|
|
|
c43d355565
|
conflict
|
2023-07-11 17:29:52 +03:30 |
|
|
|
c0220a114f
|
interaction with back
|
2023-07-11 17:17:45 +03:30 |
|
yasaman aliakbari
|
93148b0609
|
Merge branch 'feature/change_password' into 'develop'
implement change passwo
See merge request witel3/loan-facilities-expert!12
|
2023-07-11 11:32:44 +00:00 |
|
Yasiu1376
|
a3e7bc7237
|
implement change passwo
|
2023-07-11 14:58:44 +03:30 |
|
|
|
96f19568da
|
Merge branch 'develop' of https://gitlab.com/witel3/loan-facilities-expert into feature/passenger_boss_design
|
2023-07-11 12:06:20 +03:30 |
|
yasaman aliakbari
|
936740cad4
|
Merge branch 'feature/edit_sidebar_data' into 'develop'
edit side bar data
See merge request witel3/loan-facilities-expert!11
|
2023-07-11 08:34:31 +00:00 |
|
Yasiu1376
|
8419294277
|
edit side bar data
|
2023-07-11 12:02:44 +03:30 |
|
yasaman aliakbari
|
bed0e622cd
|
Merge branch 'feature/edit_sidebar_data' into 'develop'
edit_sidebar
See merge request witel3/loan-facilities-expert!10
|
2023-07-11 08:23:16 +00:00 |
|
|
|
6a3735982a
|
initialize first demo of passenger boss page
|
2023-07-11 11:52:56 +03:30 |
|