feature/ForgotPassword #29

Closed
faezeh wants to merge 91 commits from feature/ForgotPassword into main

91 Commits

Author SHA1 Message Date
99d24c38c7 create forgote password 2026-06-01 13:43:16 +03:30
9a01a83370 Merge pull request 'feature/payment_creation_phase_1' (#28) from feature/payment_creation_phase_1 into develop
Reviewed-on: #28
2026-05-28 13:30:34 +00:00
8438655f8c Merge pull request 'feature/FixLogin' (#27) from feature/FixLogin into develop
Reviewed-on: #27
2026-05-25 12:48:50 +00:00
5040299efc fix user resource and profil 2026-05-25 16:18:08 +03:30
26a0f79a6d fix enum for gateway managment 2026-05-25 16:12:14 +03:30
1b5d339a53 fix login code in3 point 2026-05-25 15:00:44 +03:30
c73d50d096 Merge pull request 'change show province' (#26) from feature/GetCity into develop
Reviewed-on: #26
2026-05-23 13:08:23 +00:00
8be89d350f change show province 2026-05-23 16:36:40 +03:30
d31c641216 Merge pull request 'create seeder for city and province' (#25) from feature/ProvinceAndCitySeeder into develop
Reviewed-on: #25
2026-05-23 11:54:56 +00:00
aa363d1695 Merge pull request 'feature/CreateSeedrStatus' (#24) from feature/CreateSeedrStatus into develop
Reviewed-on: #24
2026-05-23 11:51:20 +00:00
ca2ec66fb5 resolve the conflicts 2026-05-23 15:21:15 +03:30
5c757e1823 create seeder for city and province 2026-05-23 15:13:12 +03:30
d9f895c382 create seeder for city and province 2026-05-23 14:55:00 +03:30
9ad3d6cea0 create show for city and province 2026-05-23 14:03:10 +03:30
8554f4cc55 create list for city and province 2026-05-23 13:49:09 +03:30
5e48777e1c create list for city and province 2026-05-23 13:45:05 +03:30
738b21e182 just shape sth stage1 2026-05-22 19:18:11 +03:30
77a4e98058 stage things 2026-05-22 16:28:10 +03:30
01bae8474b Merge pull request 'add id card to profile' (#23) from feature/TransactionServices into develop
Reviewed-on: #23
2026-05-20 11:52:39 +00:00
463ca3f006 add id card to profile 2026-05-20 15:22:13 +03:30
1ba141e715 Merge pull request 'change edit method' (#22) from feature/EditUserProfile into develop
Reviewed-on: #22
2026-05-20 06:23:34 +00:00
76e6ab4e0c change edit method 2026-05-20 09:53:05 +03:30
fb35ed58b1 Merge pull request 'feature/EditProfile' (#18) from feature/EditProfile into develop
Reviewed-on: #18
2026-05-20 05:50:25 +00:00
ffb4179e0d Merge pull request 'create user gateway controller' (#21) from feature/GatewayManagement into develop
Reviewed-on: #21
2026-05-20 05:44:09 +00:00
a7fa1097b7 create user gateway controller 2026-05-20 09:14:06 +03:30
f2f9d38907 Merge pull request 'create Enum and seeder for BusinessType and payment_statuses' (#20) from feature/CreateSeedrStatus into develop
Reviewed-on: #20
2026-05-19 10:49:50 +00:00
5b79cefe28 create Enum and seeder for BusinessType and payment_statuses 2026-05-18 16:28:58 +03:30
41b7ead69e Merge pull request 'separate any gateways' (#19) from feature/PaymentModel into develop
Reviewed-on: #19
2026-05-18 11:10:23 +00:00
5ea986db40 separate any gateways 2026-05-18 14:34:28 +03:30
d04637b1ef fix code 2026-05-18 14:10:45 +03:30
3c61e279ec create profile for expert 2026-05-18 13:59:05 +03:30
e9f6ee71fa create profile for expert 2026-05-18 13:58:20 +03:30
60129f5abb create profile for expert 2026-05-18 13:57:03 +03:30
2d8f2dbcc5 create profile for expert 2026-05-18 13:50:37 +03:30
86e353749a create profile for expert 2026-05-18 13:49:33 +03:30
f3a9b5e788 Merge pull request 'create payment and gateway resources' (#17) from feature/PaymentModel into develop
Reviewed-on: #17
2026-05-17 10:31:08 +00:00
d04277ece5 add gaurded values 2026-05-17 14:00:33 +03:30
e53a89016f create payment and gateway resources 2026-05-17 13:57:39 +03:30
53f2303253 Merge pull request 'upload files' (#16) from feature/UploadDoc into develop
Reviewed-on: #16
2026-05-17 05:26:22 +00:00
c6dc5256e6 resolve the conflicts 2026-05-17 08:56:02 +03:30
19abb28acf upload files 2026-05-17 08:49:28 +03:30
431acd9279 Merge pull request 'feature/FixManagment' (#14) from feature/FixManagment into develop
Reviewed-on: #14
2026-05-16 11:31:59 +00:00
9fcd8045db fix code3 2026-05-16 14:57:34 +03:30
7c82556d93 fix code2 2026-05-16 14:38:39 +03:30
581e7af1fd fix code 2026-05-16 14:36:09 +03:30
b433d2ff52 Merge pull request 'create expert login resources' (#13) from feature/ExpertLogin into develop
Reviewed-on: #13
2026-05-13 10:16:51 +00:00
6f06218cb2 Merge pull request 'feature/CreateDocumention' (#12) from feature/CreateDocumention into develop
Reviewed-on: #12
Reviewed-by: amirghasempoor <amirghasempoor79@gmail.com>
2026-05-13 10:16:38 +00:00
af23df5527 fix routs 2026-05-13 13:45:58 +03:30
1a2077a164 create expert login resources 2026-05-13 13:41:12 +03:30
e33aac7eed fix code 2026-05-13 13:33:58 +03:30
7b0507bdda fix code 2026-05-13 10:33:59 +03:30
ae8ca057fd change some item in controller and request 2026-05-13 09:27:03 +03:30
32c14bd6c4 save for get develop 2026-05-13 08:56:02 +03:30
363c7005d0 Merge pull request 'add level to users table' (#11) from feature/docConfirm into develop
Reviewed-on: #11
2026-05-12 11:03:44 +00:00
f29510d76e add level to users table 2026-05-12 14:32:18 +03:30
5596943b70 Merge branch 'develop' into feature/CreateDocumention
# Conflicts:
#	backend/app/User/Controllers/Dashboard/ConfirmController.php
#	backend/app/User/Controllers/Dashboard/DocumentationController.php
2026-05-12 14:05:15 +03:30
5831a5594a Merge remote-tracking branch 'origin' into feature/CreateDocumention 2026-05-12 14:02:17 +03:30
12736d53c5 create base thing such as Roler permission Expert and user Management and their dependency for Admin 2026-05-12 13:58:40 +03:30
fda129875e Merge pull request 'create new route for expert' (#10) from feature/docConfirm into develop
Reviewed-on: #10
2026-05-12 10:23:05 +00:00
ca71547657 create new route for expert 2026-05-12 13:50:48 +03:30
2d31eccc4a Merge pull request 'create user documents' (#9) from feature/docConfirm into develop
Reviewed-on: #9
2026-05-12 09:35:37 +00:00
abb92b4e22 create user documents 2026-05-12 13:04:15 +03:30
ea68943354 Merge pull request 'create city and province resources' (#8) from feature/docConfirm into develop
Reviewed-on: #8
2026-05-12 07:39:30 +00:00
e3831e98c9 create city and province resources 2026-05-12 11:08:47 +03:30
9794aa1f54 Merge pull request 'create EmailEvent for login' (#7) from feature/UploadData into develop
Reviewed-on: #7
2026-05-10 11:01:41 +00:00
4afcd5c81e create EmailEvent for login 2026-05-10 14:29:52 +03:30
74bc255d82 Merge pull request 'make auth service global' (#6) from feature/expertPage into develop
Reviewed-on: #6
2026-05-10 10:56:03 +00:00
ca094cff9f prevent request forgery 2026-05-10 14:25:12 +03:30
c2328ec666 make auth service global 2026-05-09 09:09:49 +03:30
e4f7b96b92 Merge pull request 'create loggin and register whit their form requst' (#4) from feature/AuthPasport into develop
Reviewed-on: #4
2026-05-06 05:51:11 +00:00
f072bd1ee8 delete lan 2026-05-06 09:16:35 +03:30
f01992368e create user info 2026-05-06 09:12:29 +03:30
161fa3ae1e Merge pull request 'add languages files' (#5) from feature/MultiLang into develop
Reviewed-on: #5
2026-05-06 05:21:31 +00:00
05c54fb2d7 add languages files 2026-05-06 08:49:57 +03:30
b32ee444ca write for user 2026-05-05 17:33:34 +03:30
264ed1ecb9 install data table 2026-05-04 14:52:54 +03:30
cee480fff5 improve the code in some part of the project 2026-05-03 15:29:57 +03:30
5024a242d2 fix code 2026-05-03 15:28:50 +03:30
0bba710b7d fix code 2026-05-03 15:11:29 +03:30
f788f9a7ea improve code and fix their bugs 2026-05-02 17:07:40 +03:30
e74619d0ab reviwe my form request in login 2026-05-02 15:29:09 +03:30
5b42e23afc improve form requst 2026-05-02 09:09:34 +03:30
51aa3b157c create loggin and register whit their form requst 2026-04-29 16:52:18 +03:30
b24b61c754 Merge pull request 'feature/AuthorizationFIB' (#3) from feature/AuthorizationFIB into develop
Reviewed-on: #3
2026-04-29 11:12:59 +00:00
5d2501c71c create config file for service 2026-04-29 14:42:02 +03:30
7fb9e345a2 create all FTB services 2026-04-29 14:34:01 +03:30
9d86e329fb Merge pull request 'use nginx and php-fpm for docker' (#2) from feature/Dockerize into develop
Reviewed-on: #2
2026-04-27 12:48:55 +00:00
4596025ba3 install passport 2026-04-27 16:12:08 +03:30
1dbd816da2 add dockerfile for production 2026-04-27 15:18:35 +03:30
52ed10f831 remove production yaml files 2026-04-27 14:35:04 +03:30
e99aa9b8f1 use nginx and php-fpm for docker 2026-04-26 16:25:59 +03:30