Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] develop from ushahidi:develop #44

Open
wants to merge 1,134 commits into
base: develop
Choose a base branch
from
Open

[pull] develop from ushahidi:develop #44

Changes from 2 commits
Commits
Show all changes
1134 commits
Select commit Hold shift + click to select a range
e43baaa
fix admin user permission
Mh-Asmi May 9, 2023
81b8643
Merge branch 'project-mzima' into v5-fix-permissions-issues
Mh-Asmi May 9, 2023
00d870e
Merge pull request #4577 from ushahidi/v5-fix-permissions-issues
Mh-Asmi May 9, 2023
14d584e
remove duplicate permissions for admin
Mh-Asmi May 10, 2023
7cc7bb5
Merge branch 'v5-fix-permissions-issues' of https://github.com/ushahi…
Mh-Asmi May 10, 2023
8a8526f
Merge branch 'project-mzima' into v5-fix-permissions-issues
Mh-Asmi May 10, 2023
6eadd6e
Merge pull request #4579 from ushahidi/v5-fix-permissions-issues
Mh-Asmi May 10, 2023
206344d
fix some v5 issues
Mh-Asmi May 11, 2023
fce8c31
Merge branch 'v5-fix-permissions-issues' of https://github.com/ushahi…
Mh-Asmi May 11, 2023
fa3d309
Merge branch 'project-mzima' into v5-fix-permissions-issues
Mh-Asmi May 11, 2023
a4d9243
Merge pull request #4580 from ushahidi/v5-fix-permissions-issues
Mh-Asmi May 11, 2023
5eedc94
fix issues in APIs
Mh-Asmi May 15, 2023
1bd3c5b
fix line length
Mh-Asmi May 15, 2023
de0efde
fix point zoom
Mh-Asmi May 15, 2023
da8455e
Merge branch 'project-mzima' into v5-fix-permissions-issues
Mh-Asmi May 15, 2023
f0e0d83
Merge pull request #4581 from ushahidi/v5-fix-permissions-issues
Mh-Asmi May 15, 2023
2b2bdb5
fix collection post permission for user
Mh-Asmi May 18, 2023
4a2e0f2
fix category validation
Mh-Asmi May 24, 2023
9e43d43
Merge branch 'v5-fix-permissions-issues' of https://github.com/ushahi…
Mh-Asmi May 24, 2023
3264d5c
fix category role validation
Mh-Asmi May 24, 2023
00ba6ae
fix post update created value
Mh-Asmi May 24, 2023
3e56fbe
fix user can't edit his collection
Mh-Asmi May 24, 2023
6bb14d6
fix create after filter in survey state
Mh-Asmi May 24, 2023
5ec7eab
fix level filter in category
Mh-Asmi May 25, 2023
99e6885
fix the issue with collection role filter
Mh-Asmi May 25, 2023
2bed581
fix only me in category and collection
Mh-Asmi May 25, 2023
9d6509a
Merge branch 'project-mzima' into v5-fix-permissions-issues
Mh-Asmi May 25, 2023
4ad2b2b
add missing visibility to function
Mh-Asmi May 25, 2023
3fc67d3
Merge branch 'v5-fix-permissions-issues' of https://github.com/ushahi…
Mh-Asmi May 25, 2023
8c5f1f6
Merge pull request #4582 from ushahidi/v5-fix-permissions-issues
Mh-Asmi May 25, 2023
98b249a
Fix showing post draft to unauthorized users
Mh-Asmi May 31, 2023
1c3b14a
fix line length
Mh-Asmi May 31, 2023
a5f8f31
Merge pull request #4583 from ushahidi/v5-fix-permissions-issues
Mh-Asmi May 31, 2023
521b833
chore: add docker image tagging by git tag
tuxpiper Jun 1, 2023
c07548b
add Contact queries
Mh-Asmi Jun 5, 2023
9ca82aa
contact command and handlers
Mh-Asmi Jun 8, 2023
6843dda
Merge remote-tracking branch 'origin/project-mzima' into v5/config
Mh-Asmi Jun 8, 2023
ef0fe31
contact commands and permissions
Mh-Asmi Jun 12, 2023
f359c40
Layer and Notification and Messages V5
Mh-Asmi Jun 13, 2023
df3923b
fix line length
Mh-Asmi Jun 13, 2023
4309f6c
fix layer test
Mh-Asmi Jun 13, 2023
dd43de1
Merge pull request #4585 from ushahidi/v5/config
Mh-Asmi Jun 13, 2023
5a5a770
chore: composer update
Jun 14, 2023
97b7835
chore: take out not useful code
Jun 14, 2023
8081b3e
fix: issue with passport not getting correct database connection for …
Jun 14, 2023
1c435d7
chore: update v5 post based controllers
Jun 14, 2023
3d76d8d
Merge pull request #4586 from ushahidi/hotfix/passport
tuxpiper Jun 14, 2023
d91c1b0
Merge branch 'project-mzima' into chore/s3-config
tuxpiper Jun 14, 2023
a634017
Merge pull request #4572 from ushahidi/chore/s3-config
tuxpiper Jun 14, 2023
fe924fa
fix message foe integration tests
Mh-Asmi Jun 19, 2023
0cdf1a6
Merge branch 'project-mzima' into v5/config
Mh-Asmi Jun 19, 2023
e1772e6
Merge pull request #4587 from ushahidi/v5/config
Mh-Asmi Jun 19, 2023
8e7f122
layer tests
Mh-Asmi Jun 19, 2023
9cba0d9
Merge remote-tracking branch 'origin/v5/config' into v5/config
Mh-Asmi Jun 20, 2023
e009586
Merge branch 'project-mzima' into v5/config
Mh-Asmi Jun 20, 2023
3d63e1a
Merge pull request #4589 from ushahidi/v5/config
Mh-Asmi Jun 20, 2023
36f490c
add post details
Mh-Asmi Jun 21, 2023
9820514
Update MessageController.php
Mh-Asmi Jun 21, 2023
e72c223
Merge branch 'project-mzima' into v5/config
Mh-Asmi Jun 21, 2023
508d0ab
Merge pull request #4590 from ushahidi/v5/config
Mh-Asmi Jun 21, 2023
47ab732
Merge branch 'develop' into project-mzima
Mh-Asmi Jul 6, 2023
0629904
Merge pull request #4592 from ushahidi/project-mzima
Mh-Asmi Jul 6, 2023
a8e9404
chore: upload image to github packages
tuxpiper Jul 9, 2023
7313ec3
chore: fix wrong command result in util script
tuxpiper Jul 9, 2023
c728c39
chore: improvements to resolve client url in single or multi site mode
Jul 10, 2023
a5f8a62
chore: Dockerfile add default service startup command
tuxpiper Jul 10, 2023
611e1f5
add post color
Mh-Asmi Jul 10, 2023
d0659e4
add count of posts in set
Mh-Asmi Jul 10, 2023
4844fb1
fix message foe integration tests
Mh-Asmi Jun 19, 2023
c365cbf
layer tests
Mh-Asmi Jun 19, 2023
a63297a
add post details
Mh-Asmi Jun 21, 2023
e49af0b
Update MessageController.php
Mh-Asmi Jun 21, 2023
8d3009f
chore: upload image to github packages
tuxpiper Jul 9, 2023
235c134
chore: fix wrong command result in util script
tuxpiper Jul 9, 2023
166981a
chore: improvements to resolve client url in single or multi site mode
Jul 10, 2023
3d8077f
chore: Dockerfile add default service startup command
tuxpiper Jul 10, 2023
40e6233
add post color
Mh-Asmi Jul 10, 2023
85bc51b
add count of posts in set
Mh-Asmi Jul 10, 2023
dec8b6f
add config update
Mh-Asmi Jul 11, 2023
d400e28
fix config permissions
Mh-Asmi Jul 12, 2023
c0e2930
fix parent parameter in list messages API
Mh-Asmi Jul 12, 2023
0ce9493
config by key
Mh-Asmi Jul 13, 2023
d7282a2
styles for forgot password email
miraxes Jul 12, 2023
de8895a
simplify reset code implemented
Jul 17, 2023
9c2adc8
style: fix lint issues
Jul 17, 2023
a376eb0
test: fix failing test
Jul 17, 2023
1b3a618
test: fix mailer test
Jul 17, 2023
fc26fb3
test: fix mailer test
Jul 17, 2023
71670b2
chore: made some modifications and fixed mailer tests
Jul 17, 2023
7c8d703
test: fix mailer test
Jul 17, 2023
a11efbb
test: fix mailer test
Jul 17, 2023
0d954cc
test: fix mailer test
Jul 18, 2023
2b60375
styles for forgot password email
miraxes Jul 12, 2023
58829f1
simplify reset code implemented
Jul 17, 2023
637c89c
chore: update forgot-password email template
Jul 18, 2023
3ccb47d
chore: fix forgot-password template
Jul 18, 2023
6f80b3c
fix charts case when compare role permissions
Mh-Asmi Jul 19, 2023
208bee4
user fix q filter to search in email
Mh-Asmi Jul 19, 2023
cfba3be
fix scop for collection posts
Mh-Asmi Jul 19, 2023
7ad1dba
v5 confid and v5 export
Mh-Asmi Jul 20, 2023
8c8fbe3
chore: update forgot password template
Jul 20, 2023
1db5d0d
Merge remote-tracking branch 'origin/main' into merge/main-to-develop
Jul 20, 2023
4b8bf69
Merge pull request #4611 from ushahidi/merge/main-to-develop
webong Jul 20, 2023
543debe
Merge pull request #4607 from ushahidi/develop
tuxpiper Jul 20, 2023
1f3142f
chore: update forgot-password email template
Jul 21, 2023
92dfd4e
pre-release fixes Release/2023.30 (#4615)
tuxpiper Jul 26, 2023
b2573c1
v5/register v5/passwordreset v5/media v5/apikey
Mh-Asmi Aug 1, 2023
2ec0399
fix apikey entity name
Mh-Asmi Aug 1, 2023
4ee0554
fix import
Mh-Asmi Aug 2, 2023
85c0b99
return 403 for unauthorized users in private
Mh-Asmi Aug 6, 2023
d54e853
v5/HXL
Mh-Asmi Aug 7, 2023
4bcb3d8
fix length of line
Mh-Asmi Aug 7, 2023
69830e7
add create HXLMetadata
Mh-Asmi Aug 7, 2023
b1a2e1f
add webhook tests
Mh-Asmi Aug 7, 2023
02b7b11
add role to register user
Mh-Asmi Aug 7, 2023
12e3142
fix update media with unexiste user
Mh-Asmi Aug 7, 2023
0692b06
fix tag filter for posts
Mh-Asmi Aug 7, 2023
04c6ac0
prevent regiter in private deployments
Mh-Asmi Aug 10, 2023
4823ae7
add api version to site config
Mh-Asmi Aug 10, 2023
97708ba
stop post title text validation
Mh-Asmi Aug 11, 2023
8aa7da9
fix registration disable
Mh-Asmi Aug 11, 2023
52a9a1b
fix line length
Mh-Asmi Aug 11, 2023
f206a3b
change function name
Mh-Asmi Aug 11, 2023
6515e86
fix update can-notify for contact
Mh-Asmi Aug 16, 2023
e7e635e
fix update parent in category with null
Mh-Asmi Aug 17, 2023
2f73677
fix access guest without token
Mh-Asmi Aug 17, 2023
25ebad3
fix update post fields with null
Mh-Asmi Aug 17, 2023
f8f23f8
fix created date in update
Mh-Asmi Aug 18, 2023
8089b4e
use has to check if fields in request body
Mh-Asmi Aug 18, 2023
c1e158f
fix post lock permission for member
Mh-Asmi Aug 18, 2023
c2b9339
change api confif to accept guest
Mh-Asmi Aug 18, 2023
c0fce37
fix the user in post update
Mh-Asmi Aug 18, 2023
e3512d7
guest for user setting
Mh-Asmi Aug 21, 2023
26fe81f
Fix update post with all task not completed
Mh-Asmi Aug 21, 2023
c4e5d66
add missing max validations
Mh-Asmi Aug 21, 2023
7a52906
Put ASC as the default categories order
Mh-Asmi Aug 21, 2023
845f626
set all task not completed for post
Mh-Asmi Aug 22, 2023
2dff8d3
update data-provider
Mh-Asmi Aug 23, 2023
a57c2cc
fix: auto detect the encoding of string during conversion
Sep 12, 2023
0ce1ff5
add max image size to enviroment
Mh-Asmi Sep 14, 2023
c707531
replace space with underscore in name of image
Mh-Asmi Sep 14, 2023
cdf7ac1
not return posts from survey has private location
Mh-Asmi Sep 21, 2023
2133294
chore: enabled user setting entity to accept json value
Sep 11, 2023
0ba48c5
admin can see posts with private location
Mh-Asmi Sep 22, 2023
f4ac81d
Update CollectionResource.php
webong Sep 22, 2023
f361e34
chore: Fix N+1 query with eager loading and counting result in one query
Sep 22, 2023
921f822
Update RackspaceAdapter.php
webong Sep 26, 2023
109d075
Update Mailbox Datasource
webong Oct 18, 2023
2b29d39
fix: syntax error
webong Oct 18, 2023
0ecf467
test: fix email datasource test
webong Oct 18, 2023
a1a01a1
chore: fix syntax error
webong Oct 18, 2023
69197b5
fix: issue with when storing a message fails, causes other messages n…
webong Oct 19, 2023
92c7359
chore: only_me & everyone privileges added to sets and tags entity
Oct 17, 2023
12ee9f3
fix: lint issues
Oct 17, 2023
58ea094
fix: lint issues
Oct 17, 2023
606cd16
fix: issues with set entity access control system
Oct 17, 2023
2aa652a
fix: category update without correct role
Oct 17, 2023
ae561d0
chore: fix authorizer during update action for sets related resources
Oct 18, 2023
971b257
chore: fix lint
Oct 18, 2023
8149545
chore: fix phpcs issue
Oct 18, 2023
7d0831d
chore: fix policy issues in sets and tags for update action
Oct 18, 2023
a569210
Release/2023.39 (#4657)
webong Oct 25, 2023
5f0ef32
chore: register data source routes after application has booted (#4658)
webong Oct 25, 2023
140f49c
chore(docker): add timeout parameter to wait_bootstrap util function
tuxpiper Oct 31, 2023
8126c02
Hotfix: USH 955 (#4661)
webong Nov 1, 2023
5c21626
Add SMS channel support via Infobip and HttpSMS addons (#4637)
webong Nov 1, 2023
ae24ae8
filter unstructured posts (#4663)
Mh-Asmi Nov 13, 2023
7ec7f9d
Hotfix/release 2023.42-patch 1 : Update V3 Module ServiceProvider & A…
webong Nov 13, 2023
5920fe2
hide contact info for unauthorized users
Mh-Asmi Nov 13, 2023
723aeef
PR #4672 (#4673)
webong Nov 21, 2023
12ab730
chore: use laravel config to retrieve settings in V5 config handler
Nov 30, 2023
e047b57
refactor: update eloquent repo for category
Nov 27, 2023
271dceb
Changes
ushahidlee Dec 13, 2023
9f3e368
Update README.md
CeciliaHinga Dec 2, 2023
92c485f
Backport hot fixes to develop branch (#4684)
tuxpiper Jan 8, 2024
8c53ba5
Edit post: Unable to specifically remove "Add caption" field for imag…
ushahidlee Jan 10, 2024
7615477
fix contact filter for v5 get messages (#4702)
Mh-Asmi Jan 16, 2024
7755162
fix post filter for get messages
Mh-Asmi Jan 18, 2024
99c4ede
fix the dublicated returned posts
Mh-Asmi Jan 18, 2024
55e9902
Ush 1134 (#4714)
ushahidlee Feb 12, 2024
f6ff481
return all permissions for admin role
Mh-Asmi Feb 13, 2024
87a1886
accept call put role without name
Mh-Asmi Feb 13, 2024
d056fab
Allow user to delete their own contact (#4716)
ushahidlee Feb 15, 2024
d67c002
remove min and max validation of config value
Mh-Asmi Feb 13, 2024
fffe36e
Bundle version github action (#4708)
tuxpiper Jan 21, 2024
4277b87
fix: release script leaves out vendor files
tuxpiper Jan 21, 2024
9ee26b1
fix: release files lack vendor/autoload
tuxpiper Jan 21, 2024
2db70c7
USH-1125: update arbitrary limitation on CSV import file data size (#…
tuxpiper Mar 12, 2024
fcb334d
Update features.php (#4824)
webong Mar 13, 2024
5daeeef
USH-1216: switch db engine to MariaDB 10.11 (#4836)
tuxpiper Mar 18, 2024
5b947fd
fix "mobile" source condition
Mh-Asmi Mar 18, 2024
911338e
Fix Mteja Addon to handle HTTP request from callback service (#4844)
webong Mar 18, 2024
85a7a5f
Email Issues (#4827)
ushahidlee Mar 20, 2024
4512745
fix null value for array map
Mh-Asmi Mar 27, 2024
c7030b8
fix lint
Mh-Asmi Mar 27, 2024
fd2c38b
USH-684: add HttpSMS data-provider entry , other clean-up
tuxpiper Mar 30, 2024
f590773
USH-686: add Infobip data-provider entry
tuxpiper Mar 30, 2024
ee7f1d8
Ush 1164 - Gmail settings (#4918)
ushahidlee Apr 17, 2024
1c68a4a
hide the exact location of geoposts
Mh-Asmi Apr 22, 2024
8712d86
remove order of posts/geojson
Mh-Asmi Apr 19, 2024
00359e1
fix include_unstructured_posts to accept false value
Mh-Asmi Apr 24, 2024
7e6960f
remove extra form initialization
Mh-Asmi Apr 25, 2024
14c2dbd
exclude posts of survey with private locations
Mh-Asmi Apr 22, 2024
2325082
Update PostController.php
Mh-Asmi Apr 25, 2024
cb369dd
fix the count of unstructured posts in source
Mh-Asmi Apr 29, 2024
463e2e4
return just one pin for post
Mh-Asmi May 7, 2024
2fae381
join post with only incoming messages
Mh-Asmi May 17, 2024
1d754e1
fix condition of source filter
Mh-Asmi May 17, 2024
fcc3a16
fix web source filter to avoid mobile posts
Mh-Asmi May 17, 2024
9f53d33
fix db overloading
Mh-Asmi May 23, 2024
f4198a3
update poste create to accept whatsapp posts
Mh-Asmi May 30, 2024
0f7a351
fix function name
Mh-Asmi May 30, 2024
223814b
fix v3 tests
Mh-Asmi May 31, 2024
df8cd66
USH-1331: upgrade to php 7.4 and composer dependencies update
tuxpiper Jun 5, 2024
1e85d97
stop using SerializeModels
Mh-Asmi Aug 6, 2024
31d3923
Updated Redis to 7.2
ushahidlee Sep 5, 2024
c40b7c2
abstract the only parameter
Mh-Asmi Sep 3, 2024
8060251
fix test
Mh-Asmi Sep 3, 2024
2f64bca
keep the source when update post
Mh-Asmi Sep 19, 2024
ace4450
delete all locks for post for delete by post id
Mh-Asmi Sep 19, 2024
2a40f05
dix get post in post lock functions
Mh-Asmi Sep 19, 2024
06bab6a
add only for survey relations
Mh-Asmi Oct 3, 2024
52f1246
add sislog sms provider
Mh-Asmi Oct 4, 2024
d2107d2
fix error
Mh-Asmi Oct 4, 2024
8ca74a1
fix send sislogsms
Mh-Asmi Oct 7, 2024
5273991
remove api url
Mh-Asmi Oct 7, 2024
159a6e4
fix lint
Mh-Asmi Oct 7, 2024
a440fd3
chore(docker): allow composer to run as root
tuxpiper Oct 1, 2024
eea8a8e
add showUnknownForm to new survey paginate
Mh-Asmi Oct 8, 2024
54d057f
fix issue when query filter has empty array
Mh-Asmi Oct 8, 2024
6556659
Ush 1587 - Add 3 new media types on the backend (#5004)
ushahidlee Oct 29, 2024
4766396
add post media
Mh-Asmi Oct 29, 2024
9376f6f
fix issue of not cleare table of order column
Mh-Asmi Oct 29, 2024
b83cb07
return post media as one field
Mh-Asmi Nov 1, 2024
1fb3d92
add only parameter for collection and save search
Mh-Asmi Nov 1, 2024
e3fe0cd
field config and db table (#5010)
ushahidlee Nov 6, 2024
250a12f
chore: set collation specific to mariadb and fix phinx configuration
tuxpiper Nov 11, 2024
a3097f0
only parameter for category
Mh-Asmi Nov 19, 2024
a5c5296
fix category resource
Mh-Asmi Nov 25, 2024
4b6f005
fix category translations
Mh-Asmi Nov 26, 2024
667c2b1
fixlint
Mh-Asmi Nov 26, 2024
316727f
fix lint for catevory update
Mh-Asmi Nov 26, 2024
514d5ca
fis translations update
Mh-Asmi Nov 19, 2024
b9ad839
fix post color in only parameter
Mh-Asmi Nov 26, 2024
220529f
change category limit
Mh-Asmi Dec 18, 2024
46e3f75
fix add post to collection
Mh-Asmi Jan 15, 2025
ef480c7
add base language to post entity
Mh-Asmi Jan 20, 2025
e838a53
fix base language in unit test
Mh-Asmi Jan 21, 2025
9d34dc6
exclude post list from the default of saved search query
Mh-Asmi Jan 21, 2025
4d133a5
chore: update nexmo namespace to vonage
Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

These merge commits were added into this branch cleanly.

There are no new changes to show.