Commit Graph

180 Commits

Author SHA1 Message Date
Amirhossein Mahmoodi
b85a4c03c1 add editor config file 2023-07-31 09:35:34 +03:30
Amirhossein Mahmoodi
51b21957b9 recode and add editor config file 2023-07-31 09:34:59 +03:30
AmirHossein Mahmoodi
ba91b97e7c Merge branch 'feature/debug_upload_file' into 'develop'
Feature/debug upload file

See merge request witel3/loan-facilities-expert!57
2023-07-30 10:08:46 +00:00
Amirhossein Mahmoodi
3a14df43a5 add .idea to .gitignore 2023-07-25 14:39:48 +03:30
Amirhossein Mahmoodi
298ca1d96f fixed bug 2023-07-24 17:33:35 +03:30
61d2088a8e Merge branch 'feature/debug_app_layout' into 'develop'
Feature/debug app layout

See merge request witel3/loan-facilities-expert!59
2023-07-24 13:55:03 +00:00
70451c3545 debug 2023-07-24 17:26:04 +03:30
644deb4e48 debug 2023-07-24 17:25:17 +03:30
c4a268b524 debug 2023-07-24 17:21:52 +03:30
1cd8cc8004 Merge branch 'feature/debug_app_layout' into 'develop'
debug

See merge request witel3/loan-facilities-expert!58
2023-07-24 13:51:29 +00:00
53e03e0e45 change cartables 2023-07-24 16:18:05 +03:30
30395b649f Merge branch 'develop' of https://gitlab.com/witel3/loan-facilities-expert into feature/debug_upload_file 2023-07-24 16:06:47 +03:30
f2b3d532ae confirm form handle change 2023-07-24 16:06:23 +03:30
yasaman aliakbari
e605a47737 Merge branch 'feature/role_middleware' into 'develop'
role_middleware

See merge request witel3/loan-facilities-expert!56
2023-07-24 11:09:55 +00:00
Yasiu1376
87023c0edc role_middleware 2023-07-24 14:37:43 +03:30
yasaman aliakbari
c149c697ea Merge branch 'feature/debug_upload_file' into 'develop'
Feature/debug upload file

See merge request witel3/loan-facilities-expert!55
2023-07-24 09:25:05 +00:00
8afbcdf19a publish 3002 2023-07-24 12:52:08 +03:30
cd407e5f17 add delete value in handleDeleteImage 2023-07-24 11:21:40 +03:30
2590c9e4cd Merge branch 'develop' of https://gitlab.com/witel3/loan-facilities-expert into feature/debug_upload_file 2023-07-24 10:55:02 +03:30
yasaman aliakbari
4c547b201d Merge branch 'feature/fix_upload' into 'develop'
fix_upload

See merge request witel3/loan-facilities-expert!54
2023-07-24 07:24:18 +00:00
Yasiu1376
4f43d60285 fix_upload 2023-07-24 10:51:58 +03:30
a97cbf1426 Merge branch 'develop' of https://gitlab.com/witel3/loan-facilities-expert into feature/debug_upload_file 2023-07-24 09:43:43 +03:30
9f4d8697f5 Merge branch 'feature/debug_app_layout' into 'develop'
ampm false

See merge request witel3/loan-facilities-expert!53
2023-07-23 13:23:07 +00:00
459ee099c7 ampm false 2023-07-23 16:53:08 +03:30
85e9d21983 Merge branch 'develop' of https://gitlab.com/witel3/loan-facilities-expert into feature/debug_upload_file 2023-07-23 16:48:05 +03:30
3021bde999 app layout change 2023-07-23 16:47:49 +03:30
24f28f637d Merge branch 'feature/debug_upload_file' into 'develop'
upload system

See merge request witel3/loan-facilities-expert!51
2023-07-23 13:17:19 +00:00
a2947b9375 Merge branch 'feature/debug_app_layout' into 'develop'
Feature/debug app layout

See merge request witel3/loan-facilities-expert!52
2023-07-23 13:17:08 +00:00
d3f58660e0 Merge branch 'develop' of https://gitlab.com/witel3/loan-facilities-expert into feature/debug_upload_file 2023-07-23 16:28:17 +03:30
37a108ce0e app layout chewcking bot and language app 2023-07-23 16:28:04 +03:30
cbe1efc11a app layout chewcking bot and language app 2023-07-23 16:27:46 +03:30
c6ee24f6a0 upload system 2023-07-23 16:25:02 +03:30
9aaf52c8d1 Merge branch 'feature/datatable_last_changes' into 'develop'
Feature/datatable last changes

See merge request witel3/loan-facilities-expert!50
2023-07-23 12:45:28 +00:00
1d55033df1 remove conflicts 2023-07-23 16:15:19 +03:30
1a6c13d769 completing filtering of search and translation of that and styling 2023-07-23 16:10:20 +03:30
yasaman aliakbari
49227e0084 Merge branch 'feature/debug_profile' into 'develop'
debug_profile

See merge request witel3/loan-facilities-expert!49
2023-07-23 12:30:32 +00:00
Yasiu1376
3c3a575ba5 debug_profile 2023-07-23 15:58:28 +03:30
yasaman aliakbari
ed84ce2c0d Merge branch 'feature/debug_notification' into 'develop'
Feature/debug notification

See merge request witel3/loan-facilities-expert!48
2023-07-23 12:04:27 +00:00
2879881d55 debug errors 2023-07-23 15:28:11 +03:30
e4043344fb add warning notification text 2023-07-23 15:22:14 +03:30
yasaman aliakbari
f0c68c77fa Merge branch 'feature/debug_userinfo' into 'develop'
debug warning notification

See merge request witel3/loan-facilities-expert!47
2023-07-23 11:28:57 +00:00
c2019c04b4 debug warning notification 2023-07-23 14:55:48 +03:30
yasaman aliakbari
3899101259 Merge branch 'feature/debug_translat' into 'develop'
Feature/debug translat

See merge request witel3/loan-facilities-expert!46
2023-07-23 10:58:02 +00:00
Yasiu1376
de4b2dac9c Merge branch 'develop' of https://gitlab.com/witel3/loan-facilities-expert into feature/debug_translat 2023-07-23 14:26:26 +03:30
Yasiu1376
f006d7fa2c debug_translate 2023-07-23 14:26:11 +03:30
yasaman aliakbari
c0113fdd0e Merge branch 'feature/debug_userinfo' into 'develop'
user info

See merge request witel3/loan-facilities-expert!45
2023-07-23 10:52:53 +00:00
20c8420859 Merge branch 'develop' of https://gitlab.com/witel3/loan-facilities-expert into feature/debug_userinfo 2023-07-23 14:16:29 +03:30
yasaman aliakbari
5677914f0a Merge branch 'feature/blink_sidebar' into 'develop'
blink

See merge request witel3/loan-facilities-expert!44
2023-07-23 10:41:02 +00:00
Yasiu1376
ddf5fc7f7f blink 2023-07-23 14:08:38 +03:30
yasaman aliakbari
ed3a933980 Merge branch 'feature/upload_file' into 'develop'
Feature/upload file

See merge request witel3/loan-facilities-expert!43
2023-07-22 13:59:35 +00:00