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

GGW JAN RELEASE #4202

Open
wants to merge 474 commits into
base: future/v4.0
Choose a base branch
from
Open

GGW JAN RELEASE #4202

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
474 commits
Select commit Hold shift + click to select a range
47a1ac7
Merge pull request #4237 from devgateway/task/GGW-242-delete-activiti…
jdeanquin-dg Feb 26, 2024
68557f4
GGW-198 updated to select multi country
dynamodenis Feb 27, 2024
61b9200
GGW-277 add default indicator values
dynamodenis Feb 27, 2024
4dbb34d
Merge branch 'task/GGW-198-filter-indicators-by-country' into task/GG…
dynamodenis Feb 28, 2024
79ee6f3
GGW-277 merged with GGW-198
dynamodenis Feb 28, 2024
b5b7da8
GGW-277 added indicators from indicator location
dynamodenis Feb 28, 2024
336aeb5
GGW-277 activate filter by indicator location in admin
dynamodenis Feb 28, 2024
6c484e3
GGW-277
timothygachengo Feb 28, 2024
881d2c2
GGW-277 added filter indicator location to module
dynamodenis Feb 28, 2024
5ec7b89
GGW-234 update submodules
timothygachengo Mar 3, 2024
4f1569f
GGW-198 fixed individual countries
dynamodenis Mar 4, 2024
51f4ea0
GGW-234 update submodules
timothygachengo Mar 4, 2024
c4e8655
Merge pull request #4243 from devgateway/task/GGW-198-filter-indicato…
dynamodenis Mar 5, 2024
f602678
Merge branch 'future/GGW' into task/GGW-277-add-default-indicator-val…
dynamodenis Mar 5, 2024
01c271c
Merge pull request #4244 from devgateway/task/GGW-277-add-default-ind…
jdeanquin-dg Mar 5, 2024
e1705ad
update submodules
timothygachengo Mar 5, 2024
a4166ec
Merge branch 'future/GGW' into task/GGW-234/fix-dashboard-issue
timothygachengo Mar 5, 2024
60e5830
GGW-244 updated v reporting system xml schema
dynamodenis Mar 7, 2024
12ef510
GGW-244 updated reporting system in import job
dynamodenis Mar 11, 2024
c4cb01d
GGW-244 added amp settings to create view xml
dynamodenis Mar 11, 2024
1d0df87
Merge branch 'future/v4.0' into future/GGW
jdeanquin-dg Mar 11, 2024
f3e5863
Merge pull request #4242 from devgateway/task/GGW-244/add-forum(repor…
jdeanquin-dg Mar 12, 2024
dc60bdc
GGW-245 funding dates fixed
dynamodenis Mar 13, 2024
b818032
Merge pull request #4259 from devgateway/task/GGW-245/funding-end-and…
dynamodenis Mar 14, 2024
36d2adf
GGW-246 fix program and sector columns csv download
timothygachengo Mar 14, 2024
84b6958
GGW-246 fix program and sector columns csv download
timothygachengo Mar 14, 2024
92abdf5
Merge pull request #4260 from devgateway/task/GGW-246/fix-download-cs…
lilitk Mar 15, 2024
d7bebb8
Merge pull request #4209 from devgateway/task/GGW-199/order-pillars-b…
lilitk Apr 1, 2024
50b184e
Merge remote-tracking branch 'origin/future/GGW' into future/GGW
jdeanquin-dg Apr 3, 2024
c22edfc
GGW-288 configure job
jdeanquin-dg Apr 3, 2024
7dad6bb
Merge pull request #4273 from devgateway/task/GGW-288/configure-job
jdeanquin-dg Apr 3, 2024
77230d0
GGW-288 merge future 4.0
jdeanquin-dg Apr 3, 2024
e607ea0
Merge remote-tracking branch 'origin/future/GGW' into future/GGW
jdeanquin-dg Apr 3, 2024
9241753
GGW-234 merge future 4.0
jdeanquin-dg Apr 3, 2024
2f03c26
Merge pull request #4249 from devgateway/task/GGW-234/fix-dashboard-i…
jdeanquin-dg Apr 3, 2024
e89ae3f
GGW-234 fix filter version
jdeanquin-dg Apr 3, 2024
8297f93
Merge pull request #4274 from devgateway/task/GGW-234/fix-dashboard-i…
jdeanquin-dg Apr 3, 2024
b99cd9e
force build
jdeanquin-dg Apr 3, 2024
cdb10e9
Merge branch 'future/v4.0' into future/GGW
jdeanquin-dg Apr 8, 2024
d2e0001
GGW-302 fix activity save. throw error if cannot save
jdeanquin-dg Apr 8, 2024
c280df9
Merge pull request #4279 from devgateway/bug/GGW-302/internal-error
jdeanquin-dg Apr 8, 2024
e19b629
GGW-302 fix activity save. throw error if cannot save
jdeanquin-dg Apr 8, 2024
3bc9530
Merge pull request #4280 from devgateway/bug/GGW-302/internal-error
jdeanquin-dg Apr 8, 2024
46b6973
GGW-297 filter fails to load in management workspace
brianbrix Apr 8, 2024
594baee
GGW-297 filter fails to load in management workspace
brianbrix Apr 8, 2024
adb8837
GGW-297 filter fails to load in management workspace
brianbrix Apr 8, 2024
141242a
GGW-297 filter fails to load in management workspace
brianbrix Apr 8, 2024
9540f87
GGW-297 filter fails to load in management workspace
brianbrix Apr 8, 2024
521a732
GGW-297 filter fails to load in management workspace
brianbrix Apr 9, 2024
1be7205
GGW-297 filter fails to load in management workspace
brianbrix Apr 9, 2024
6770fe2
GGW-297 filter fails to load in management workspace
brianbrix Apr 9, 2024
a56c060
Fix web.xml failing to load
brianbrix Apr 9, 2024
4c5bc62
Merge pull request #4285 from devgateway/fix/GGW-4202-Timeout
jdeanquin-dg Apr 9, 2024
9e1b4ea
GGW-297 filter fails to load in management workspace
brianbrix Apr 9, 2024
38e2523
GGW-297 filter fails to load in management workspace
brianbrix Apr 9, 2024
80a6320
GGW-297 filter fails to load in management workspace
brianbrix Apr 9, 2024
a29b838
GGW-297 filter fails to load in management workspace
brianbrix Apr 9, 2024
154a945
GGW-297 filter fails to load in management workspace
brianbrix Apr 9, 2024
45fc4ca
GGW-297 filter fails to load in management workspace
brianbrix Apr 9, 2024
20fc82d
GGW-297 filter fails to load in management workspace
brianbrix Apr 9, 2024
5ab4d8c
GGW-297 filter fails to load in management workspace
brianbrix Apr 9, 2024
e8bc7bb
GGW-297 filter fails to load in management workspace
brianbrix Apr 9, 2024
8bbc0c3
GGW-297 filter fails to load in management workspace
brianbrix Apr 9, 2024
d8c480f
GGW-297 filter fails to load in management workspace
brianbrix Apr 9, 2024
d93aa09
GGW-297 filter fails to load in management workspace
brianbrix Apr 9, 2024
c195173
GGW-297 filter fails to load in management workspace
brianbrix Apr 9, 2024
ffbc812
GGW-297 filter fails to load in management workspace
brianbrix Apr 9, 2024
47ba359
GGW-297 filter fails to load in management workspace
brianbrix Apr 9, 2024
d03f246
GGW-297 filter fails to load in management workspace
brianbrix Apr 9, 2024
bf69314
GGW-297 filter fails to load in management workspace
brianbrix Apr 9, 2024
02a1512
GGW-297 filter fails to load in management workspace
brianbrix Apr 9, 2024
b7cc127
GGW-297 filter fails to load in management workspace
brianbrix Apr 9, 2024
a3d43df
GGW-297 filter fails to load in management workspace
brianbrix Apr 9, 2024
ac9b7e2
GGW-297 filter fails to load in management workspace
brianbrix Apr 9, 2024
0936c57
GGW-297 filter fails to load in management workspace
brianbrix Apr 9, 2024
2218a11
GGW-297 filter fails to load in management workspace
brianbrix Apr 9, 2024
adadc7e
Merge pull request #4289 from devgateway/fix/GGW-297/filter-fails-to-…
jdeanquin-dg Apr 9, 2024
e131b5e
Merge branch 'fix/GGW-297-filter-fails-to-load-in-management-workspac…
brianbrix Apr 9, 2024
16dcea3
GGW-297 filter fails to load in management workspace
brianbrix Apr 9, 2024
eaa14cd
GGW-297 filter fails to load in management workspace
brianbrix Apr 9, 2024
9843ad5
GGW-297 filter fails to load in management workspace
brianbrix Apr 10, 2024
fde65b1
GGW-297 filter fails to load in management workspace
brianbrix Apr 10, 2024
002e44e
GGW-297 filter fails to load in management workspace
brianbrix Apr 10, 2024
9a132ab
GGW-297-Remove script include from basefooter layout
brianbrix Apr 10, 2024
106ddd9
Merge pull request #4290 from devgateway/fix/GGW-297/filter-fails-to-…
jdeanquin-dg Apr 10, 2024
ae5a44f
GGW-294 updated funding job to add XDR currency
dynamodenis Apr 15, 2024
7ec3c7a
GGW-204 Programs and Sectors switch in GIS
jdeanquin-dg Apr 15, 2024
02720d8
GGW-204- Move GIS switch to feature manager
brianbrix Apr 18, 2024
c4fba99
GGW-204- Move GIS switch to feature manager
brianbrix Apr 18, 2024
d76a1cd
AMP-204-Move programs and sectors switch to festure template
brianbrix Apr 18, 2024
e98ac9f
AMP-204-Move programs and sectors switch to festure template
brianbrix Apr 18, 2024
830f31e
AMP-204-Move programs and sectors switch to festure template
brianbrix Apr 18, 2024
b3e26bf
AMP-204-Move programs and sectors switch to festure template
brianbrix Apr 18, 2024
54a7d9a
Merge remote-tracking branch 'origin/feature/GGW-204-Programs-and-Sec…
brianbrix Apr 18, 2024
e395805
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 18, 2024
47b6ce9
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 18, 2024
6c1727f
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 18, 2024
9af11fc
Merge pull request #4296 from devgateway/task/GGW-294-add-XDR-currenc…
jdeanquin-dg Apr 18, 2024
4d5b5d8
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 18, 2024
8dc472e
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 18, 2024
be0175d
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 18, 2024
f273472
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 18, 2024
94cc1af
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 18, 2024
451e218
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 18, 2024
89275bb
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 18, 2024
83107d2
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 18, 2024
6583dc1
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 18, 2024
365cc14
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 18, 2024
956bff0
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 18, 2024
a8eea04
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 18, 2024
7720d7b
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 18, 2024
425f6a9
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 18, 2024
9d49319
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 19, 2024
27486a8
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 19, 2024
a30bd5f
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 19, 2024
7b8e314
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 19, 2024
ceff29a
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 19, 2024
5c64012
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 19, 2024
413a49d
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 19, 2024
1e0222a
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 19, 2024
843ad3f
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 19, 2024
725a0ad
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 19, 2024
de51180
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 19, 2024
b9b5a9e
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 19, 2024
89d6708
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 19, 2024
94ccc33
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 19, 2024
6b58646
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 19, 2024
13ba8f3
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 19, 2024
52157d8
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 19, 2024
bf78a53
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 19, 2024
fb4e662
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 19, 2024
d5498e3
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 19, 2024
acc4017
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 19, 2024
799daa1
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 19, 2024
a0f7607
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 19, 2024
6204ccf
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 19, 2024
60c2f8c
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 19, 2024
efbe9bb
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 19, 2024
242a188
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 19, 2024
1e364bd
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 19, 2024
fe12991
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 19, 2024
a107d43
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 19, 2024
2e66655
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 19, 2024
905393a
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 19, 2024
127b5e7
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 19, 2024
47138d4
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 19, 2024
af648cd
AMP-204-Move programs and sectors switch to feature template
brianbrix Apr 19, 2024
0c50fd1
GGW-294 added XDR data in job data
dynamodenis Apr 23, 2024
506244e
Merge pull request #4299 from devgateway/task/GGW-294-add-XDR-currenc…
jdeanquin-dg Apr 23, 2024
a18c3f4
AMP-30874 decrease session lifetime
jdeanquin-dg Apr 23, 2024
cc6a0a0
GGW-204- Reomve settings from Global settings
brianbrix Apr 24, 2024
ab7a140
Merge pull request #4300 from devgateway/task/AMP-30874/memory-issues
jdeanquin-dg Apr 25, 2024
6c8a14e
AMP-30874 increase memory for docker stg ggw
jdeanquin-dg Apr 26, 2024
e1ab8ad
Merge pull request #4305 from devgateway/task/AMP-30874/memory-issues
jdeanquin-dg Apr 26, 2024
7428ba1
GGW-210 updated the code to use pillars instead of objectives
dynamodenis May 1, 2024
804d432
GGW-210 code clean up
dynamodenis May 1, 2024
4abed33
GGW-309 core indicator model
dynamodenis May 2, 2024
8d28324
GGW-210 check only to return data for pillars and not objectives
dynamodenis May 2, 2024
6c5e044
GGW-204-Programs Sectors Switch
brianbrix May 6, 2024
524e3c7
GGW-204-Add-setting-for-programs-2.xml
brianbrix May 6, 2024
b3ba389
GGW-207-Add-setting-for-Login
brianbrix May 6, 2024
974b94b
GGW-207-Add-setting-for-Login
brianbrix May 6, 2024
22a2c91
GGW-207-Add-setting-for-Login
brianbrix May 6, 2024
ccd2d77
GGW-207-Add-setting-for-Login
brianbrix May 6, 2024
fdf219d
GGW-207-Add-setting-for-Login
brianbrix May 7, 2024
80da14e
GGW-309 logic to get indicators
dynamodenis May 7, 2024
26ba590
GGW-309 added values to core indicators
dynamodenis May 8, 2024
f97febd
GGW-320 add-type-of-assistance
jdeanquin-dg May 8, 2024
3e3edb5
Merge pull request #4311 from devgateway/task/GGW-320-/add-type-of-as…
jdeanquin-dg May 8, 2024
0465140
GGW-309 added target value as meassure
dynamodenis May 9, 2024
853027e
GGW-210 Make translatable
dynamodenis May 9, 2024
8503ef6
GGW-309 added category value type
dynamodenis May 9, 2024
180f1dc
GGW-309 hard coded indicator type fields
dynamodenis May 10, 2024
cf3fccb
GGW-309 add xml for core idncator endpoint
dynamodenis May 12, 2024
112dfa9
Merge pull request #4294 from devgateway/feature/GGW-204-Programs-and…
jdeanquin-dg May 16, 2024
94dd26c
GGW-309 moved loginc to jobs folder
dynamodenis May 16, 2024
fd7fc27
GGW-309 moved username and password to settings
dynamodenis May 17, 2024
6ee57d4
Merge pull request #4314 from devgateway/task/GGW-309-core-indicator-…
jdeanquin-dg May 20, 2024
d7a50f3
GGW-309 fix ulr. change name
jdeanquin-dg May 20, 2024
ddcb533
GGW-309 fix ulr. change name
jdeanquin-dg May 20, 2024
eecd5c4
GGW-309 server url from settings
dynamodenis May 21, 2024
e123e4f
Revert "GGW-309 server url from settings"
dynamodenis May 21, 2024
e9512a1
GGW-342 enable deselection of core type
jdeanquin-dg May 21, 2024
f968123
Merge pull request #4316 from devgateway/bug/GGW-342/enable-deselection
jdeanquin-dg May 21, 2024
2433ffc
GGW-207- Fixing project sites loading
brianbrix May 23, 2024
b28cb25
GGW-207- Fixing project sites loading
brianbrix May 23, 2024
b67018a
GGW-207- Fixing project sites loading
brianbrix May 23, 2024
9ed9e56
GGW-207- Fixing project sites loading
brianbrix May 23, 2024
80e3bf9
Merge pull request #4319 from devgateway/fix/GGW/fix-project-sites
jdeanquin-dg May 23, 2024
079c00a
GGW-207- Fixing project sites loading
brianbrix May 27, 2024
f85a395
GGW-207- Fixing project sites loading
brianbrix May 28, 2024
6dcb018
Merge pull request #4321 from devgateway/fix/GGW/fix-project-sites-lo…
jdeanquin-dg May 28, 2024
4efe270
GGW-309 add donor agency
dynamodenis May 29, 2024
b05e726
GGW-309 set server name
dynamodenis May 29, 2024
6b1c02c
Merge branch 'future/GGW' into task/GGW-309-core-indicator-data
dynamodenis May 29, 2024
3f7a69b
GGW-309 add fields to feature
dynamodenis May 29, 2024
26f2827
Merge branch 'task/GGW-309-core-indicator-data' of https://github.com…
dynamodenis May 29, 2024
0774322
GGW-309 add donor agency to hierarchy
dynamodenis May 30, 2024
6f6750b
GGW-309 added indicator type report
dynamodenis Jun 4, 2024
4cec1ce
GGW-309 add indicator type to js
dynamodenis Jun 4, 2024
f7248a2
Merge pull request #4312 from devgateway/task/GGW-210-filter-report-i…
jdeanquin-dg Jun 11, 2024
80ccd6b
Merge branch 'future/GGW' into task/GGW-239/newly-deleted-pillars-are…
jdeanquin-dg Jun 11, 2024
690862c
Merge pull request #4229 from devgateway/task/GGW-239/newly-deleted-p…
jdeanquin-dg Jun 11, 2024
7fd8dfc
Merge branch 'future/GGW' into task/GGW-309-core-indicator-data
jdeanquin-dg Jun 11, 2024
b6eb8e7
Merge pull request #4205 from devgateway/feat/GGW-160-update-activity…
jdeanquin-dg Jun 11, 2024
9a55a74
Merge branch 'refs/heads/future/GGW' into task/GGW-309-core-indicator…
jdeanquin-dg Jun 12, 2024
dc9788b
GGW-309 fix pillar indicator actual values
jdeanquin-dg Jul 5, 2024
49b5631
Merge pull request #4324 from devgateway/task/GGW-309-core-indicator-…
jdeanquin-dg Jul 5, 2024
81f8f3a
GGW-309- Resolve merge conflict
brianbrix Jul 8, 2024
81967f3
GGW-309- Resolve merge conflict
brianbrix Jul 8, 2024
9ecd185
GGW-309 - Merge conflicts
brianbrix Jul 9, 2024
b43e800
GGW-309 - Merge conflicts
brianbrix Jul 9, 2024
0236c78
GGW-309 - Merge conflicts
brianbrix Jul 9, 2024
4727129
GGW-309 - Merge conflicts
brianbrix Jul 9, 2024
3cc473d
GGW-309 - Merge conflicts
brianbrix Jul 9, 2024
74e972a
GGW-309 - Merge conflicts
brianbrix Jul 9, 2024
126ecdf
GGW-309 - Merge conflicts
brianbrix Jul 9, 2024
656715e
Merge pull request #4333 from devgateway/fix/GGW-309/Resolve-merge-co…
jdeanquin-dg Jul 9, 2024
a77b731
GGW-309 fix pillar indicator target and base values
jdeanquin-dg Jul 12, 2024
3d3b3bf
Merge pull request #4335 from devgateway/task/GGW-309-fix-target-base…
jdeanquin-dg Jul 12, 2024
bd07b57
GGW-309 fix pillar indicator target and base values
jdeanquin-dg Jul 15, 2024
55d27be
Merge pull request #4336 from devgateway/task/GGW-309-fix-target-base…
jdeanquin-dg Jul 15, 2024
2bda924
GGW-358 remove filter by location
jdeanquin-dg Jul 26, 2024
7b7baf4
Merge pull request #4337 from devgateway/task/GGW-358/remove-location…
jdeanquin-dg Jul 29, 2024
8c96a06
GGW-358 remove filter by location
jdeanquin-dg Jul 29, 2024
ff0ab27
GGW-358 remove filter by location
jdeanquin-dg Jul 29, 2024
60f33e4
GGW-360 Fix activity preview. add lat and long validator. show point …
jdeanquin-dg Jul 31, 2024
8be91a8
Merge pull request #4338 from devgateway/bug/GGW-360/show-structures
jdeanquin-dg Jul 31, 2024
dba6ab3
GGW-362 add legend html alternative to the map and wmst layers
jdeanquin-dg Aug 12, 2024
28a2301
GGW-362 add legend html alternative to the map and wmst layers
jdeanquin-dg Aug 12, 2024
498ecbd
Merge pull request #4340 from devgateway/task/GGW-362/show-wmst-layers
jdeanquin-dg Aug 13, 2024
618ac77
GGW-309 fix implementation
jdeanquin-dg Aug 27, 2024
9add4f5
Merge pull request #4341 from devgateway/task/GGW-309/fix
jdeanquin-dg Aug 27, 2024
a3868ba
GGW-309 fix implementation
jdeanquin-dg Aug 28, 2024
62b0c61
Merge pull request #4342 from devgateway/task/GGW-309/fix
jdeanquin-dg Aug 28, 2024
f29f76f
GGW-309 fix implementation
jdeanquin-dg Aug 28, 2024
807b740
Merge pull request #4343 from devgateway/task/GGW-309/fix
jdeanquin-dg Aug 28, 2024
3fdc0d9
GGW-309 fix implementation
jdeanquin-dg Aug 28, 2024
01cf1f2
GGW-309 fix implementation
jdeanquin-dg Aug 29, 2024
18fe45d
Merge pull request #4344 from devgateway/task/GGW-309/fix
jdeanquin-dg Aug 29, 2024
9f6646b
GGw TranslationManager English Text
brianbrix Sep 17, 2024
0c5c79c
Merge pull request #4345 from devgateway/fix/GGW-TranslationManager-E…
jdeanquin-dg Sep 19, 2024
476e61d
GGW-309 fix implementation
jdeanquin-dg Nov 7, 2024
e16976c
Merge pull request #4353 from devgateway/task/GGW-309/fix
jdeanquin-dg Nov 7, 2024
4c892be
GGW-364 Simple indicator output (#4354)
brianbrix Nov 20, 2024
235f29d
GGW-310 fix number divider, change to units in 1000
jdeanquin-dg Nov 21, 2024
bdc6d10
Merge pull request #4359 from devgateway/GGW-310-fix-number-divider
jdeanquin-dg Nov 21, 2024
21c52fc
GGW-368:Add wocat initiatives to GGW map cluster (#4360)
brianbrix Nov 25, 2024
faf9623
GGW-310 fix core indicator progress
jdeanquin-dg Nov 25, 2024
8435408
Merge pull request #4361 from devgateway/GGW-310-fix-number-divider
jdeanquin-dg Nov 25, 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
Prev Previous commit
Next Next commit
GGW-309 - Merge conflicts
  • Loading branch information
@brianbrix
brianbrix committed Jul 9, 2024
commit 3cc473d3dceafcfdd14b6402ee789a0030ba713a
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[submodule "amp/TEMPLATE/ampTemplate/node_modules/amp-settings"]
path = amp/TEMPLATE/ampTemplate/node_modules/amp-settings
url = "https://github.com/devgateway/amp-settings.git"
url = https://github.com/devgateway/amp-settings.git

[submodule "amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate"]
path = amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate
Expand Down
1 change: 1 addition & 0 deletions amp/TEMPLATE/ampTemplate/node_modules/amp-settings
Open in desktop
Submodule amp-settings added at 106e29
3 changes: 0 additions & 3 deletions amp/TEMPLATE/ampTemplate/node_modules/amp-settings/.npmignore
View file
Open in desktop

This file was deleted.

Loading