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

Changes based on bad pull request update #2496

Merged
merged 3 commits into from
Feb 26, 2024
Merged

Changes based on bad pull request update #2496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe90c47
Revert ":wrench: chore(Responsive): Update dates of files ftl"
MetalPrime Feb 26, 2024
72bd416
Revert "Merge branch 'aiccra-dev' into aiccra-dev-responsive"
MetalPrime Feb 26, 2024
33dee55
Revert "Revert ":wrench: chore(Responsive): Update dates of files ftl""
MetalPrime Feb 26, 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
3 changes: 0 additions & 3 deletions marlo-data/src/main/java/org/cgiar/ccafs/marlo/config/APConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,6 @@ public final class APConstants {
public static final String HIGHLIGHT_COMMENTS_ACTIVE = "highlight_comments_active";
public static final String TIP_SECTION_ACTIVE = "tip_section_active";

public static final String SHFRM_CONTRIBUTION_ACTIVE = "shfrm_contribution_active";

public static final String IS_EXPECTED_DELIVERABLE_REPORT_All_YEARS_VISIBLE =
"is_expected_deliverable_report_all_years_visible";
Expand All @@ -176,8 +175,6 @@ public final class APConstants {
public static final String DELIVERABLE_FILE_LOCALLY_HOSTED_STR = "Locally";

public static final String DELIVERABLE_ID = "deliverableId";
public static final String PRIORITY_ACTION_ID = "priorityActionId";
public static final String SUB_ACTION_ID = "subActionId";
public static final int DELIVERABLE_QUALITY_ANSWER_NO = 3;
public static final int DELIVERABLE_QUALITY_ANSWER_YES = 2;
public static final int DELIVERABLE_QUALITY_ANSWER_YES_BUT_NO = 1;
Expand Down
75 changes: 0 additions & 75 deletions ...-data/src/main/java/org/cgiar/ccafs/marlo/data/dao/DeliverableShfrmPriorityActionDAO.java
View file
Open in desktop

This file was deleted.

75 changes: 0 additions & 75 deletions marlo-data/src/main/java/org/cgiar/ccafs/marlo/data/dao/DeliverableShfrmSubActionDAO.java
View file
Open in desktop

This file was deleted.

67 changes: 0 additions & 67 deletions marlo-data/src/main/java/org/cgiar/ccafs/marlo/data/dao/ShfrmPriorityActionDAO.java
View file
Open in desktop

This file was deleted.

67 changes: 0 additions & 67 deletions marlo-data/src/main/java/org/cgiar/ccafs/marlo/data/dao/ShfrmSubActionDAO.java
View file
Open in desktop

This file was deleted.

67 changes: 0 additions & 67 deletions marlo-data/src/main/java/org/cgiar/ccafs/marlo/data/dao/SoilIndicatorDAO.java
View file
Open in desktop

This file was deleted.

Loading
Loading