Commit Graph

87 Commits

Author SHA1 Message Date
Hamidreza Ranjbarpour
aa2db2f145 Merge remote-tracking branch 'origin/develop' into develop 2024-09-29 11:00:52 +00:00
Hamidreza Ranjbarpour
d915c54e09 Merge remote-tracking branch 'origin' into develop 2024-09-29 10:57:50 +00:00
Hamidreza Ranjbarpour
0b8bb97626 Merge branch 'feature/NominatimFunctionAdjustment' into 'develop'
Feature/nominatim function adjustment

See merge request witelgroup/rms_v2!25
2024-09-29 10:54:35 +00:00
365b7ec644 Feature/nominatim function adjustment 2024-09-29 10:54:35 +00:00
9c4086d186 Merge branch 'feature/split_frontend_from_project' into 'develop'
Feature/split frontend from project

See merge request witelgroup/rms_v2!24
2024-09-29 07:36:08 +00:00
b458d0d884 split frontend from project and Implement ci/cd 2024-09-29 07:36:08 +00:00
Hamidreza Ranjbarpour
6fd9aa680d Merge branch 'develop' into 'main'
Develop

See merge request witelgroup/rms_v2!21
2024-09-17 12:28:33 +00:00
880afdcdef create essential seeders to begin 2024-09-17 10:41:39 +00:00
Hamidreza Ranjbarpour
278994c9f6 Merge branch 'feature/EditProfileBugFix' into 'develop'
return the full path of avatar

See merge request witelgroup/rms_v2!16
2024-09-16 06:33:59 +00:00
Hamidreza Ranjbarpour
a78e0c863e Merge branch 'develop' into 'main'
IMPORTANT: upgraded framework. refactored to make things work.

See merge request witelgroup/rms_v2!19
2024-09-15 06:58:07 +00:00
cad7d63409 return the full path of avatar 2024-08-28 10:54:00 +03:30
1c14828c50 added .env.testing to gitignore | modified phpunit 2024-08-21 10:57:09 +00:00
Hamidreza Ranjbarpour
34358105da Merge remote-tracking branch 'origin/develop' into develop 2024-08-20 13:53:57 +03:30
Hamidreza Ranjbarpour
9fecec08cc added Dockerfile| removed db connection from phpunit 2024-08-20 13:50:03 +03:30
Hamidreza Ranjbarpour
fa9ad4b215 Merge branch 'feature/UserInfo' into 'develop'
create profile api's with tests

See merge request witelgroup/rms_v2!15
2024-08-20 08:04:33 +00:00
c710183aa9 create profile api's with tests 2024-08-20 08:04:33 +00:00
f1626a9d67 change the inside texts of frontend files 2024-08-18 10:53:02 +00:00
b0a4bd2151 change the test case to adopt two path of migrations 2024-08-18 10:49:26 +00:00
2246f18d07 refactored some routes 2024-07-14 10:58:05 +00:00
e482a700f4 new routes for v3 2024-07-14 10:50:34 +00:00
5afc3c916b configured cors for local development 2024-07-14 10:50:02 +00:00
18c711686c Added Datatable package 2024-07-14 10:44:55 +00:00
1242051379 ignored csrf token for development env 2024-07-14 10:42:31 +00:00
c1149517d3 moved old migrations to somewhere else. 2024-07-14 10:30:30 +00:00
ad828517b2 removed credentials | modified test db username 2024-07-10 06:50:41 +00:00
f2e6e47034 changed cors to use laravel built in package 2024-07-09 10:13:43 +00:00
be1654aace added gitignore file for laravel-excel temporary files. 2024-07-09 10:13:02 +00:00
f8c7233427 modified session attributes for Dev env| added login dev route for local development 2024-07-09 09:58:14 +00:00
2640a7354f Merge branch 'feature/fixBugs' into 'develop'
fix the fms service return value

See merge request witelgroup/rms_v2!13
2024-04-27 09:51:00 +00:00
5f5c08fb67 fix the fms service return value 2024-04-27 13:19:41 +03:30
54408759d8 Merge branch 'feature/FMSService' into 'develop'
create FMS service with test

See merge request witelgroup/rms_v2!12
2024-04-22 07:59:49 +00:00
acd7c496b5 create FMS service with test 2024-04-22 11:28:19 +03:30
5f839385f8 Merge branch 'feature/bugFixes' into 'develop'
remove nikarayan service provider

See merge request witelgroup/rms_v2!11
2024-04-20 07:37:54 +00:00
3fe1ed3746 remove nikarayan service provider 2024-04-20 11:05:12 +03:30
bc47eeafd5 Merge branch 'feature/prepair_to_merge' into 'develop'
remove extra lines

See merge request witelgroup/rms_v2!10
2024-04-17 11:47:45 +00:00
7d5c4cca8f remove extra lines 2024-04-17 14:25:04 +03:30
54c3cc421b Merge branch 'feature/change_transaction_method' into 'develop'
use RefreshDataBase and DB::transaction

See merge request witelgroup/rms_v2!9
2024-04-16 11:51:42 +00:00
1509012898 create a test db 2024-04-16 15:05:50 +03:30
f9d842b6f4 use DB::transaction 2024-04-16 14:58:23 +03:30
4b4f621b34 Revert "use RefreshDataBase and DB::transaction"
This reverts commit 9f8855e836.
2024-04-16 13:17:58 +03:30
9f8855e836 use RefreshDataBase and DB::transaction 2024-04-16 13:15:46 +03:30
da8af2f931 Merge branch 'feature/NikarayanService' into 'develop'
Feature/nikarayan service

See merge request witelgroup/rms_v2!8
2024-04-15 06:08:56 +00:00
7e63c3eda0 use DataBaseTruncation instead of RefreshDataBase 2024-04-14 14:13:16 +03:30
8a87c201f6 resolve the dependency injection 2024-04-08 14:44:00 +03:30
92c50280fc nikarayan and payment service 2024-04-08 12:59:01 +03:30
942a9737b6 Merge branch 'feature/RoadPatrolTests' into 'develop'
write test for store road patrol

See merge request witelgroup/rms_v2!6
2024-04-07 10:41:17 +00:00
08445ae219 add permission to the db 2024-04-07 14:09:36 +03:30
99b21c16f4 write test for map 2024-04-07 11:45:03 +03:30
10c21d065c Merge branch 'develop' of https://gitlab.com/witelgroup/rms_v2 into feature/RoadPatrolTests 2024-04-07 10:16:56 +03:30
1c7e518165 Merge branch 'feature/RoadObservation' into 'develop'
write test for Road Observation

See merge request witelgroup/rms_v2!7
2024-04-07 06:46:06 +00:00