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

Jump to bottom

Fix spec issues, resolve merge conflicts for reshare feature #636

Merged
merged 32 commits into from
Jul 31, 2023
Merged

Fix spec issues, resolve merge conflicts for reshare feature #636

merged 32 commits into from
Jul 31, 2023

Commits on Jun 5, 2023

  1. Switches thumbnail method for gallery view partial

    @labradford
    labradford committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    87eca49 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of github.com:scientist-softserv/palni-palci

    @labradford
    labradford committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    10e601a View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2023

  1. Merge branch 'main' of github.com:scientist-softserv/palni-palci

    @labradford
    labradford committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    53cc539 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of github.com:scientist-softserv/palni-palci

    @labradford
    labradford committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    1e0a6c1 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2023

  1. Merge branch 'main' of github.com:scientist-softserv/palni-palci

    @labradford
    labradford committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    31f404e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of github.com:scientist-softserv/palni-palci

    @labradford
    labradford committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    f240a62 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' of github.com:scientist-softserv/palni-palci

    @labradford
    labradford committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    faf4cd7 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' of github.com:scientist-softserv/palni-palci

    @labradford
    labradford committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    fa833bb View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2023

  1. Merge branch 'main' of github.com:scientist-softserv/palni-palci

    @labradford
    labradford committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    3a0c6c8 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of github.com:scientist-softserv/palni-palci

    @labradford
    labradford committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    43595f6 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2023

  1. Merge branch 'main' of github.com:scientist-softserv/palni-palci

    @labradford
    labradford committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    aab075f View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2023

  1. Merge branch 'main' of github.com:scientist-softserv/palni-palci

    @labradford
    labradford committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    dea52a8 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2023

  1. Allow selenium specs to run on m1 (#551) 

    * Switches thumbnail method for gallery view partial

* allow selenium specs to run on m1

* fix so we can view selenium in browser

* temporary commit for docs?

---------

Co-authored-by: leaannbradford <[email protected]>
    @summer-cook @labradford
    summer-cook and labradford authored Jun 14, 2023
    Configuration menu
    Copy the full SHA
    3511c59 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of github.com:scientist-softserv/palni-palci

    @labradford
    labradford committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    4857db4 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2023

  1. Add depositor name to published tab (#577)

    @labradford
    labradford authored Jun 15, 2023
    Configuration menu
    Copy the full SHA
    43c01c6 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2023

  1. fix some margins in the dashboard

    @summer-cook
    summer-cook committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    d828877 View commit details
    Browse the repository at this point in the history

  2. hide-per-tenant-analytics-on-prod (#579) 

    * use the default analytics as a default on prod only.

the per tenant analytics work was already merged to main and the defaults were hidden on staging. however, pals wants to hold off on deploying that code to production until the ga4 switch has happened so both major changes can happen at the same time.

putting the analytics defaults in a conditional ensures that we can still deploy to production from main.

related to: #569

* rubocop fix
    @alishaevn
    alishaevn authored Jun 22, 2023
    Configuration menu
    Copy the full SHA
    4b75f3a View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2023

  1. default the env variables in analytics.yml to be empty strings so the… 

    …y do not fail when the env variable is not present (#580)
    @alishaevn
    alishaevn authored Jun 23, 2023
    Configuration menu
    Copy the full SHA
    a240236 View commit details
    Browse the repository at this point in the history

  2. Advanced Search (#578) 

    * initial generate command

* get advanced search working! woooo!

* remove facets

* remove extra place where things were being added to search builder, update spec

* unskip tests

* fix button style and location

* rubocop

* fix test so advanced search params are included

* add back range limit helper!

* remove unnecessary comment
    @summer-cook
    summer-cook authored Jun 23, 2023
    Configuration menu
    Copy the full SHA
    b773e2c View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2023

  1. Advanced search rework (#581) 

    * refactor and start adding missing properties

* update so it includes all fields

* add descriptionn & abstract

* remove based near

* rubocop

* remove format- it should not be included in advanced search due to conflicts with Blacklight proper

* add comments, add back format but do not include in advanced search
    @summer-cook
    summer-cook authored Jun 27, 2023
    Configuration menu
    Copy the full SHA
    79d5b39 View commit details
    Browse the repository at this point in the history

  2. add advanced to the themes (#587)

    @summer-cook
    summer-cook authored Jun 27, 2023
    Configuration menu
    Copy the full SHA
    d198139 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2023

  1. 530 - Bring Back Based Near (#591) 

    * re-enable based_near everywhere

* remove location.rb since we now have a working decorator

* update help text/locales

* update comments

* update comments

* rubocop

* fix comment!

* more specific decorator
    @summer-cook
    summer-cook authored Jun 29, 2023
    Configuration menu
    Copy the full SHA
    6827213 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2023

  1. enable deleting, make sure location is bold (#596)

    @summer-cook
    summer-cook authored Jun 30, 2023
    Configuration menu
    Copy the full SHA
    bc5cd0b View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2023

  1. Hyrax 2.6 upgrade for GA4 and Workflow bug fixes into main branch (#611) 

    * upgrade to hyrax 3.6 for new analytics

* fix depenency upgrade issue

* working on getting a version to pass specs

* fix bug with workflow pagination - updates overridden hyrax files

* rubocop

---------

Co-authored-by: Rob Kaufman <[email protected]>
    @labradford @orangewolf
    labradford and orangewolf authored Jul 7, 2023
    Configuration menu
    Copy the full SHA
    984004d View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2023

  1. reverts change that was doing nothing (#613)

    @summer-cook
    summer-cook authored Jul 11, 2023
    Configuration menu
    Copy the full SHA
    3544bab View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2023

  1. resolve merge conflicts

    @summer-cook
    summer-cook committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    02d9789 View commit details
    Browse the repository at this point in the history

  2. update dockerfile to be the same as main, rubocop, and fix sidekiq wa… 

    …rning
    @summer-cook
    summer-cook committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    a78437a View commit details
    Browse the repository at this point in the history

  3. skip remaining specs to get reshare feature merged

    @summer-cook
    summer-cook committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    6d67190 View commit details
    Browse the repository at this point in the history

  4. skip one more

    @summer-cook
    summer-cook committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    a7ca126 View commit details
    Browse the repository at this point in the history

  5. rubocop

    @summer-cook
    summer-cook committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    a4a8cee View commit details
    Browse the repository at this point in the history

  6. skip the 2 that i forgot to skip

    @summer-cook
    summer-cook committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    0b8ae85 View commit details
    Browse the repository at this point in the history

  7. fix reshare specs (#638) 

    * fix oer_presenter_spec

* fix 2 advanced search builder specs

* fix auth provider spec
    @summer-cook
    summer-cook authored Jul 31, 2023
    Configuration menu
    Copy the full SHA
    e906eb1 View commit details
    Browse the repository at this point in the history