Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: witch-team/witchplot
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: witch-team/witchplot
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: UI_improvements
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 10 commits
  • 15 files changed
  • 2 contributors

Commits on Feb 17, 2026

  1. Show variable and country names in the UI

    frederikho committed Feb 17, 2026
    Configuration menu
    Copy the full SHA
    c84b3ad View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2026

  1. Add index to the title above the plot (e.g. ch4 to E)

    frederikho committed Feb 20, 2026
    Configuration menu
    Copy the full SHA
    b393dd6 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2026

  1. Add Data Browser module to UI

    frederikho committed Feb 23, 2026
    Configuration menu
    Copy the full SHA
    9918e15 View commit details
    Browse the repository at this point in the history
  2. Accept var names without underscores in UI and add refresh data file …

    …button
    frederikho committed Feb 23, 2026
    Configuration menu
    Copy the full SHA
    29d4b33 View commit details
    Browse the repository at this point in the history
  3. Load GDX files from /results and subfolders

    frederikho committed Feb 23, 2026
    Configuration menu
    Copy the full SHA
    a82e667 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2026

  1. Configuration menu
    Copy the full SHA
    bbbba41 View commit details
    Browse the repository at this point in the history
  2. Resolve merge conflicts from master into UI_improvements

    fidelio/server.R: use master's has_time check with DT::datatable for
    non-time variables; fix list_of_variables_reactive() reference.
    
    rice/ui.R: use master's simple uiOutput for gdxcompaR tab; remove
    the HEAD-only Table tab (output$results_data_table).
    
    rice/server.R: resolve three conflict blocks —
    - gdxcompaRplot: master's DT/has_time structure + HEAD's index
      selector description labels + HEAD's second set (additional_set_id2)
      + tlen-aware year pre-computation + scale_x_continuous pretty breaks
    - gdxcompaRstackedplot year filter: HEAD's second set handling +
      master's pathdir ordering + master's tlen-aware year column
    - gdxcompaRstackedplot x-axis: aes(year,...) + pretty breaks
    
    Also remove dead HEAD-only code: plot_data_rv, has_time_dim_rv,
    hover_info, non_time_table, results_data_table, has_time_dim,
    outputOptions.
    
    Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
    frederikho and claude committed Feb 25, 2026
    Configuration menu
    Copy the full SHA
    50a3452 View commit details
    Browse the repository at this point in the history
  3. Use results_dir basename instead of (root) in scenario selector

    Root-level scenarios were labeled with the cryptic "(root)" optgroup
    header in the scenario selector. Now uses basename(results_dir) for a
    meaningful folder name.
    
    Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
    frederikho and claude committed Feb 25, 2026
    Configuration menu
    Copy the full SHA
    2fc3b92 View commit details
    Browse the repository at this point in the history
  4. Fix display of scenario list for those in root dir

    frederikho committed Feb 25, 2026
    Configuration menu
    Copy the full SHA
    a808e3f View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2026

  1. Fix warning on startup

    frederikho committed Feb 26, 2026
    Configuration menu
    Copy the full SHA
    561ba49 View commit details
    Browse the repository at this point in the history
Loading