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.

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

Shiwani Make permission for "Total Valid Weekly Summaries" number editable #588

Closed
Changes from 1 commit
Commits
Show all changes
549 commits
Select commit Hold shift + click to select a range
4a096df
merge development
abdel-lall Dec 8, 2023
e799a5e
Fix: Assigned badges have no earned date
ptrpengdev Dec 8, 2023
07835ed
Update: Modified date format function
ptrpengdev Dec 8, 2023
1e08bdb
Fix: Added format MMM-DD-YY for moment format function
ptrpengdev Dec 8, 2023
a63f976
Added a logger for the function responsible for filling mismatched ba…
ptrpengdev Dec 8, 2023
b2608a8
Update minimum permissions
nathanah Dec 8, 2023
7782176
add single inventory file to hold base and extended schemas
tdkent Dec 8, 2023
386dd8a
Merge pull request #605 from OneCommunityGlobal/Aish_create_buildingT…
tdkent Dec 8, 2023
9a25aac
Merge branch 'development' into Tim_add_building_reusable_schema
tdkent Dec 8, 2023
282b72b
updating controller
RheaWu1212 Dec 9, 2023
5dd37d8
add building tool inv to schema file
tdkent Dec 9, 2023
6f36edd
Update error handling in badge assginment feature
ptrpengdev Dec 10, 2023
305d569
Merge branch 'development' of github.com:OneCommunityGlobal/HGNRest i…
ptrpengdev Dec 10, 2023
4a9deec
integrate ownerMessage and ownerStandardMessage, simplify route and c…
wang9hu Dec 10, 2023
a185364
Merge pull request #642 from OneCommunityGlobal/shengwei_fix_badge_ea…
one-community Dec 10, 2023
1128f89
remove unused files and codes related to ownerStandardMessage
wang9hu Dec 10, 2023
7626e29
Merge branch 'development' into yihan-add-lost-time
AriaYu927 Dec 11, 2023
e51d0b4
Merge branch 'development' into xiaow_hotfix_and_refactor_of_ownermes…
wang9hu Dec 11, 2023
80c5f81
Merge pull request #645 from OneCommunityGlobal/xiaow_hotfix_and_refa…
one-community Dec 11, 2023
7895974
add teamcode
wantingxu7 Dec 11, 2023
4cef847
make update standard message to empty message
wang9hu Dec 11, 2023
a8f1366
Merge pull request #647 from OneCommunityGlobal/xiaow_hotfix_and_refa…
one-community Dec 11, 2023
acefbbb
Leaderboard api fix
Vishala09 Dec 12, 2023
2a1ef65
add tool and equipment discriminators
tdkent Dec 12, 2023
ef31db0
delete redundant files. add basic equipment schema
tdkent Dec 12, 2023
6cc5807
experimenting with new schema varient
tdkent Dec 12, 2023
f05b97a
Merge branch 'development' into Tim_add_building_reusable_schema
tdkent Dec 12, 2023
c8b97d1
merged development
cvtqx Dec 12, 2023
f92d833
refactor file
tdkent Dec 12, 2023
bae46b1
undo changes to current material routes to avoid breaking things
tdkent Dec 12, 2023
da3a2ce
Merge pull request #652 from OneCommunityGlobal/development
one-community Dec 13, 2023
bf9e73d
Update package-lock.json
lacnoskillz Dec 13, 2023
18da208
updated toolcontroller query
cvtqx Dec 13, 2023
60c1082
Merge pull request #653 from OneCommunityGlobal/Tim_add_building_reus…
tdkent Dec 13, 2023
230cedc
added the replyTo feature
beblicarl Dec 15, 2023
69af85d
Merge pull request #657 from OneCommunityGlobal/Carl-hotfix
one-community Dec 15, 2023
92a1d71
new lesson controller part 1
RheaWu1212 Dec 16, 2023
4f6e7a6
Merge pull request #658 from OneCommunityGlobal/development
one-community Dec 16, 2023
2df3865
added TimeOffFrom and TimeOffTill to dashboardhelper leaderboard pipe…
Shiwani99 Dec 17, 2023
2ecf74d
added pst time instead of est for current date
Shiwani99 Dec 17, 2023
511062f
removed current date from leaderboard aggregation pipeline
Shiwani99 Dec 17, 2023
ecc27d3
added timeOffFrom and timeOffTill to taskHelper
Shiwani99 Dec 17, 2023
7de8947
added timeOffFrom and timeOffTill to reportHelper
Shiwani99 Dec 17, 2023
8bf159d
get function using find() return empty array
RheaWu1212 Dec 18, 2023
33a0546
updated dashboardhelper and taskHelper to add timeOffFrom anf timeOff…
Shiwani99 Dec 18, 2023
367abce
modified the array representation for timeOffFrom and TimeOffTill to …
Shiwani99 Dec 18, 2023
676ab6d
Added comments to reasonSchedulingController.js
Shiwani99 Dec 18, 2023
4e54a12
Merge branch 'development' of github.com:OneCommunityGlobal/HGNRest i…
lacnoskillz Dec 19, 2023
7b35501
Add material dev merge
Vishala09 Dec 19, 2023
775265b
added sanitizer
StrawberryCalpico Dec 20, 2023
8748bde
merge development
AriaYu927 Dec 20, 2023
2d22e9a
Merge pull request #611 from OneCommunityGlobal/yihan-add-lost-time
one-community Dec 20, 2023
5c7cc8c
Refactor of timeentry controller, wbs controller, task controller and…
wang9hu Dec 20, 2023
395ea4a
Merge branch 'development' into xiaow_TimeEntryForm_refactor
wang9hu Dec 20, 2023
8e575c6
Merge pull request #662 from OneCommunityGlobal/development
one-community Dec 20, 2023
84f43af
Merge pull request #643 from OneCommunityGlobal/Nathan-separate-repor…
one-community Dec 21, 2023
1f2d4be
Update for adminLinks
StrawberryCalpico Dec 21, 2023
01e386b
fix issue that logged time reset on leaderboard
AriaYu927 Dec 21, 2023
485f3ce
Merge pull request #664 from OneCommunityGlobal/yihan-add-lost-time
one-community Dec 21, 2023
62b4ff3
fixed error
abdel-lall Dec 21, 2023
5b8c91b
add equip controller, add equip func, update package-lock
tdkent Dec 21, 2023
b8996e9
add equipment router
tdkent Dec 21, 2023
08c45bb
add equipment endpoint to routes
tdkent Dec 21, 2023
d911d14
move api to invtype. delete redundant files.
tdkent Dec 21, 2023
a503971
add invtype create method
tdkent Dec 22, 2023
80d45f1
Update modifiedDatetime when team member added or removed from a team
tsunami776 Dec 22, 2023
081acf8
Merge pull request #628 from OneCommunityGlobal/Abdel_add_home_countr…
one-community Dec 22, 2023
4acbedb
add discriminators to inv type model
tdkent Dec 22, 2023
b4e0584
add inv type models to routing. update controller func for new model.
tdkent Dec 23, 2023
e812126
add validation error handling to create op
tdkent Dec 23, 2023
cadada2
add materials
Vishala09 Dec 23, 2023
9d3dda9
finish TimeEntryForm, TimeLog, TimeEntry refactor
wang9hu Dec 23, 2023
7ac9040
Merge branch 'development' into xiaow_TimeEntryForm_refactor
wang9hu Dec 23, 2023
0818af5
Merge pull request #661 from OneCommunityGlobal/ruike_sanitize_url_new
one-community Dec 23, 2023
cb3e28f
Merge branch 'development' of github.com:OneCommunityGlobal/HGNRest i…
lacnoskillz Dec 23, 2023
c1328bb
add task handle for project or task change when editing time entry
wang9hu Dec 23, 2023
5659686
Merge pull request #669 from OneCommunityGlobal/development
one-community Dec 24, 2023
e079093
fix conflicts
tdkent Dec 27, 2023
dbf8843
fix userHelper crash
tdkent Dec 27, 2023
7e054ed
update new lesson schema. update endpoint strings.
tdkent Dec 27, 2023
cdbcaf8
Merge branch 'development' into Xiao-F-update-teams-page-sorting-part-b
tsunami776 Dec 29, 2023
55baf7c
Removed console logs
Dec 29, 2023
6953ec3
add createdBy field to base inv type model
tdkent Dec 30, 2023
0888853
Consumables first commit
Vishala09 Dec 30, 2023
25595a5
Fix badge update feature
ptrpengdev Dec 30, 2023
a538fd1
fix bug in changeBadgeCount
ptrpengdev Dec 30, 2023
af91cad
Remove testing code
ptrpengdev Dec 30, 2023
639204b
rhea edit newlesson controller, GET function working, POST function w…
RheaWu1212 Dec 30, 2023
35c3a61
update
abdel-lall Dec 31, 2023
04cbd64
fix editTimeEntry
wang9hu Dec 31, 2023
57c0267
Update the scheduler to run every Sunday at midnight
ptrpengdev Jan 2, 2024
0d805bc
Update cron config to run at 1 minute past midnight every Sunday in PST
ptrpengdev Jan 2, 2024
e587b6a
add char limit to desc
tdkent Jan 2, 2024
bda1712
change request body format for adding and deleting team member, refac…
wang9hu Jan 3, 2024
b83b1b5
add duplicate name check
tdkent Jan 3, 2024
b36808c
Merge pull request #676 from OneCommunityGlobal/xiaow_hotfix_of_activ…
one-community Jan 3, 2024
42e6c3d
Merge pull request #668 from OneCommunityGlobal/xiaow_TimeEntryForm_r…
one-community Jan 3, 2024
331ef89
Merge branch 'development' of github.com:OneCommunityGlobal/HGNRest i…
lacnoskillz Jan 3, 2024
b40f8df
Merge branch 'development' of github.com:OneCommunityGlobal/HGNRest i…
ptrpengdev Jan 3, 2024
3dd1671
Update cache removal after badge awarding
ptrpengdev Jan 3, 2024
00c9387
merge w dev branch
tdkent Jan 3, 2024
fdbbd1d
Remove log statement from changeBadgeCount
ptrpengdev Jan 3, 2024
8c077b0
Leaderboard api and task api fix
Vishala09 Jan 3, 2024
dd7c19a
resolved conflicts
Vishala09 Jan 3, 2024
dbf96a7
Merge pull request #651 from OneCommunityGlobal/vishala_leaderboard_a…
one-community Jan 3, 2024
b84184f
Merge pull request #675 from OneCommunityGlobal/shengwei_fix_task_sch…
one-community Jan 3, 2024
9e65896
merged with dev bracnh
Vishala09 Jan 4, 2024
d3c2dae
api fix
Vishala09 Jan 4, 2024
c448852
Merge pull request #678 from OneCommunityGlobal/vishala_leaderboard_t…
one-community Jan 4, 2024
0051d81
updated controller with 201 status code and tested tags array for POS…
RheaWu1212 Jan 4, 2024
1e8f5e4
Revert "Vishala LB and Task api fix"
Vishala09 Jan 4, 2024
63ea485
Merge pull request #680 from OneCommunityGlobal/revert-678-vishala_le…
one-community Jan 4, 2024
9c913c7
Revert "Vishala Leaderboard and Team Member Tasks Api Fix"
Vishala09 Jan 4, 2024
c7a6bef
Merge pull request #681 from OneCommunityGlobal/revert-651-vishala_le…
one-community Jan 4, 2024
e214e9c
task api
Vishala09 Jan 4, 2024
e263be1
Merge branch 'development' into vishala_leaderboard_api_fix
Vishala09 Jan 4, 2024
38ffc5f
leaderboard ,task api fix
Vishala09 Jan 4, 2024
3784309
fix imports
Vishala09 Jan 4, 2024
f5fae20
Merge pull request #679 from OneCommunityGlobal/vishala_leaderboard_a…
one-community Jan 4, 2024
b54ee16
Merge branch 'development' of github.com:OneCommunityGlobal/HGNRest i…
ptrpengdev Jan 4, 2024
ce31c28
Merge pull request #674 from OneCommunityGlobal/shengwei_fix_bug_week…
one-community Jan 4, 2024
037cc6f
took out the cc for review requests
beblicarl Jan 4, 2024
fcf86f5
Merge pull request #683 from OneCommunityGlobal/Carl-review-request-bug
one-community Jan 4, 2024
6a1c45c
fix duplicate id error
this-journey Jan 4, 2024
dcd2ac5
fix duplicate id error
this-journey Jan 4, 2024
8c8bed2
Merge branch 'development' of github.com:OneCommunityGlobal/HGNRest i…
lacnoskillz Jan 5, 2024
ce8d244
Merge branch 'development' into Xiao-F-Create-way-for-owner-to-edit-u…
tsunami776 Jan 5, 2024
7fd4fb5
Merge branch 'development' of https://github.com/OneCommunityGlobal/H…
abdel-lall Jan 5, 2024
27c2361
Merge pull request #684 from OneCommunityGlobal/Olga_tools_controller…
tdkent Jan 5, 2024
3b2a144
Merge branch 'development' into Bailey-new-personalMax-backend
BaileyM96 Jan 6, 2024
3003610
Merge pull request #630 from OneCommunityGlobal/kaikane-updateNameAnd…
tdkent Jan 6, 2024
cfbacf4
Merge branch 'development' into Xiao-F-update-teams-page-sorting-part-b
tsunami776 Jan 6, 2024
ae8bb2b
revert lint
tsunami776 Jan 6, 2024
33f99ab
revert changes
tsunami776 Jan 6, 2024
4923dea
fix conflicts, add base type to invtype model export
tdkent Jan 6, 2024
f939225
revert lint
tsunami776 Jan 6, 2024
7010154
Merge pull request #677 from OneCommunityGlobal/Tim_add_equip_api
tdkent Jan 6, 2024
15af5fc
Merge pull request #671 from OneCommunityGlobal/Xiao-F-update-teams-p…
one-community Jan 6, 2024
e19256d
git conflicts , type-item mongoose key name changes
Vishala09 Jan 6, 2024
13e5c48
Merge pull request #603 from OneCommunityGlobal/Xiao-F-Create-way-for…
one-community Jan 6, 2024
f11870d
Merge branch 'development' of github.com:OneCommunityGlobal/HGNRest i…
lacnoskillz Jan 6, 2024
82b95b2
added endpoint for map country count
abdel-lall Jan 7, 2024
7148218
Merge pull request #672 from OneCommunityGlobal/vishala_comsumables_view
tdkent Jan 7, 2024
f08d2d5
update mats route, controller to use updated model. isolate populate …
tdkent Jan 7, 2024
273fa00
update populate ref string
tdkent Jan 7, 2024
66d3814
update brand to brandPref
tdkent Jan 7, 2024
7b4f543
update lookup func in BuildingProject aggregator to fetch from correc…
tdkent Jan 8, 2024
9069214
update itemType ref in large item schema
tdkent Jan 8, 2024
37ba941
added timeOffFrom and timeOffTill fields to new aggregation in taskHe…
Shiwani99 Jan 8, 2024
9e5f9fb
Merge branch 'shiwani_create_wayforteams_when_off_fortheweek' of http…
Shiwani99 Jan 8, 2024
65149a6
Merge branch 'development' into shiwani_create_wayforteams_when_off_f…
Shiwani99 Jan 8, 2024
b81b0a1
added timeOffFrom and timeOffTill fields to mongoDB
Shiwani99 Dec 6, 2023
02ba986
added timeOffFrom and timeOffTill to taskHelper
Shiwani99 Dec 17, 2023
c26046e
added timeOffFrom and timeOffTill to reportHelper
Shiwani99 Dec 17, 2023
a153942
updated dashboardhelper and taskHelper to add timeOffFrom anf timeOff…
Shiwani99 Dec 18, 2023
f484767
modified the array representation for timeOffFrom and TimeOffTill to …
Shiwani99 Dec 18, 2023
a956753
Added comments to reasonSchedulingController.js
Shiwani99 Dec 18, 2023
6346f4a
fixed issues with rebasing current branch with development and added …
Shiwani99 Jan 8, 2024
2913a44
resolved conflicts and rebased current branch with development
Shiwani99 Jan 8, 2024
2f36291
resolved errors after merge conflicts
Shiwani99 Jan 8, 2024
bd9a150
resolved errors in userProfile.js after conflicts
Shiwani99 Jan 8, 2024
8150d0d
fix conflicts in routes.js
tdkent Jan 9, 2024
4da0d46
update pr template to match dev branch
tdkent Jan 9, 2024
6fc4379
Merge pull request #660 from OneCommunityGlobal/shiwani_create_wayfor…
one-community Jan 9, 2024
107dc6c
Merge pull request #648 from OneCommunityGlobal/Wanting-Updated-make-…
one-community Jan 9, 2024
ddf71c3
"adds function to modify wbs and projects when task is added or updat…
sucheta90 Jan 9, 2024
03070cb
adds function to modify wbs and projects when task is added or update…
sucheta90 Jan 9, 2024
0d9e52a
Merge pull request #689 from OneCommunityGlobal/Tim_fix_mat_view_crash
tdkent Jan 9, 2024
339d094
now the default sorting of the project page will be based on modified…
sucheta90 Jan 9, 2024
ea24846
api to fetch inv types by type
Vishala09 Jan 10, 2024
d54e518
Merge branch 'development' into vishala_check_types_modal
Vishala09 Jan 10, 2024
75198d9
adds modifiedDateTime to Project when new wbs is added
sucheta90 Jan 10, 2024
dd15b84
adds modifiedDateTime to Project when new wbs is added
sucheta90 Jan 10, 2024
62163b6
moved the code block that modifies the Project after the wbs creation
sucheta90 Jan 10, 2024
bb8a926
Merge branch 'development' of github.com:OneCommunityGlobal/HGNRest i…
sucheta90 Jan 10, 2024
9393310
Bailey add link to submit review
Jan 10, 2024
b03f597
Lb view hier. for Admins
Vishala09 Jan 11, 2024
52cb753
Merge pull request #697 from OneCommunityGlobal/vishala_lb_view_hotfix
one-community Jan 11, 2024
14bb61f
Merge branch 'development' of github.com:OneCommunityGlobal/HGNRest i…
lacnoskillz Jan 11, 2024
cb7c057
update buildingTool import in routes.js
tdkent Jan 11, 2024
765451b
populate project field
tdkent Jan 11, 2024
2831bf9
address lint issues
this-journey Jan 11, 2024
edf4ed1
resolved conflicts coming from the development branch src/helpers/das…
sucheta90 Jan 11, 2024
03b6cd9
merge with dev
Vishala09 Jan 12, 2024
cefaeed
merge to development
abdel-lall Jan 12, 2024
5224fd8
Json file for units
Vishala09 Jan 12, 2024
22401e6
refactor time entry handlers, fix bugs
wang9hu Jan 12, 2024
aafe985
Merge branch 'development' into xiaow_teammembertasks_timeentry_refactor
wang9hu Jan 12, 2024
d2080bd
Merge branch 'development' into jerry_track_who_changes_permissions
jerryren527 Jan 12, 2024
0e0b411
Merge pull request #700 from OneCommunityGlobal/Abdel_Fix_Home_Countr…
one-community Jan 13, 2024
497800e
Merge branch 'development' into jerry_email_verification_admin_accounts
jerryren527 Jan 13, 2024
ad98001
Merge pull request #582 from OneCommunityGlobal/jerry_email_verificat…
one-community Jan 13, 2024
a1e2024
Merge pull request #699 from OneCommunityGlobal/xiaow_teammembertasks…
one-community Jan 14, 2024
cea5f4a
Merge branch 'development' into jerry_track_who_changes_permissions
jerryren527 Jan 16, 2024
396aa63
add teamcode check in putUserProfile
wang9hu Jan 18, 2024
ac674f2
Merge pull request #706 from OneCommunityGlobal/xiaow_hotfix_of_volun…
one-community Jan 18, 2024
7be6b64
fix conflict in routes.js
tdkent Jan 18, 2024
0c4f24a
Merge pull request #613 from OneCommunityGlobal/rhea/newlesson_backend
tdkent Jan 18, 2024
dbe7c31
revert bmConsumableController.js
tdkent Jan 18, 2024
4818e63
revert reasonSchedulingController.js
tdkent Jan 18, 2024
88d03d9
revert dashboardHelper.js to current dev
tdkent Jan 18, 2024
b2c14a5
revert reporthelper.js to current dev
tdkent Jan 18, 2024
931535a
revert taskHelper.js to current dev
tdkent Jan 18, 2024
3082f6d
revert buidlingInventoryType.js, routes.js to current dev
tdkent Jan 18, 2024
96692c7
revert userProfile.js to current dev
tdkent Jan 18, 2024
116237c
Merge branch 'development' into demi_fix_duplicate_key_prop_errors
tdkent Jan 18, 2024
1bbf707
remove _id: false from schema
tdkent Jan 18, 2024
7da94c9
revert package-lock to current dev
tdkent Jan 18, 2024
e6c6620
Merge pull request #686 from OneCommunityGlobal/demi_fix_duplicate_ke…
tdkent Jan 18, 2024
556f90a
Merge pull request #530 from OneCommunityGlobal/jerry_track_who_chang…
one-community Jan 18, 2024
0233016
Merge branch 'development' into vishala_check_types_modal
Vishala09 Jan 19, 2024
42f8e95
Merge pull request #695 from OneCommunityGlobal/vishala_check_types_m…
tdkent Jan 19, 2024
ebe02b7
fix conflicts
tdkent Jan 19, 2024
9f91587
remove duplicate route
tdkent Jan 19, 2024
dafadd9
Merge pull request #667 from OneCommunityGlobal/vishala_ph2_add_material
tdkent Jan 19, 2024
97076bd
Merge pull request #698 from OneCommunityGlobal/Tim_fix_tool_detail_api
tdkent Jan 19, 2024
6cd8efb
Merge branch 'development' of github.com:OneCommunityGlobal/HGNRest i…
lacnoskillz Jan 20, 2024
96bfe64
remake branch with model update and variable updates
lacnoskillz Jan 23, 2024
8678ee0
changed package-lock.json back to whats on dev
lacnoskillz Jan 23, 2024
8014a97
changed package-lock.json again back to whats on dev
lacnoskillz Jan 23, 2024
01ffb55
remade branch with updated lesson model and variable names.
lacnoskillz Jan 23, 2024
d1a02f3
Merge pull request #696 from OneCommunityGlobal/Bailey-add-link-to-su…
one-community Jan 24, 2024
abb740b
typo with tag. should be tags. can now update tags in put route
lacnoskillz Jan 24, 2024
2d7a770
json file fix
Vishala09 Jan 24, 2024
3ae2c52
added middleware to mapLocation, udpated locationData for initialSetu…
abdel-lall Jan 25, 2024
e946236
Merge remote-tracking branch 'origin' into Fix_New_Active_People_Not_…
abdel-lall Jan 25, 2024
5b3bb76
Merge pull request #720 from OneCommunityGlobal/Fix_New_Active_People…
one-community Jan 25, 2024
33fb5de
merge to development
abdel-lall Jan 25, 2024
7e079c2
resolve conflict
abdel-lall Jan 25, 2024
cab6ce8
remove getAllHoursLoggedForSpecifiedTask, fix minor bugs in taskHelper
wang9hu Jan 26, 2024
2b3c1db
Merge pull request #719 from OneCommunityGlobal/vishala_types_json_fix
one-community Jan 26, 2024
6886d40
Merge pull request #722 from OneCommunityGlobal/xiaow_hotfix_of_logge…
one-community Jan 26, 2024
1f51ad1
updated Lesson schema to hold files and allowedRoles also added them …
lacnoskillz Jan 27, 2024
b323f32
reverted package.lock.json
lacnoskillz Jan 27, 2024
d567f2e
Update package-lock.json
lacnoskillz Jan 27, 2024
9db11df
Merge remote-tracking branch 'origin' into Abdel_log_requested_time_o…
abdel-lall Jan 27, 2024
830d23b
Bailey fixed failed build errors
Jan 27, 2024
d297ca6
json file path fix
Vishala09 Jan 27, 2024
ea53862
filepath fix
Vishala09 Jan 27, 2024
f379f27
Merge pull request #724 from OneCommunityGlobal/vishala_BuildingTypes…
one-community Jan 27, 2024
560c57a
Merge pull request #619 from OneCommunityGlobal/Bailey-new-personalMa…
one-community Jan 27, 2024
6ab1216
Merge pull request #592 from OneCommunityGlobal/Abdel_log_requested_t…
one-community Jan 29, 2024
be1ae07
Merge pull request #716 from OneCommunityGlobal/kaikanes-lessonLike-R…
one-community Jan 31, 2024
e2f6ac1
use comma as sperator for profile pic base64 data
wang9hu Feb 1, 2024
51c4704
Merge pull request #730 from OneCommunityGlobal/xiaow_optimize_profil…
one-community Feb 1, 2024
3042c9a
merged conflicts in src/controllers/taskController.js src/helpers/das…
sucheta90 Feb 3, 2024
825470b
Merge pull request #693 from OneCommunityGlobal/Sucheta_Update_Projec…
one-community Feb 3, 2024
a74cda2
added totalValidWeeklySummaries permission
Shiwani99 Oct 26, 2023
29c185b
rebased changes with development to resolve conflicts
Shiwani99 Feb 13, 2024
c758a58
resolved merge conflicts after rebasing with development
Shiwani99 Feb 13, 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
Loading