1. 12 Feb, 2020 1 commit
  2. 07 Feb, 2020 1 commit
  3. 06 Feb, 2020 4 commits
  4. 05 Feb, 2020 9 commits
    • Seamus Lee's avatar
      Merge pull request #16457 from colemanw/api4doc · 990a93e0
      Seamus Lee authored
      APIv4 documentation & code cleanup
      990a93e0
    • Seamus Lee's avatar
      Merge pull request #16472 from eileenmcnaughton/cn_for_now · 216a68f7
      Seamus Lee authored
      Revert "Remove unreachable code lines."
      216a68f7
    • Seamus Lee's avatar
      Merge pull request #16466 from mattwire/recurringentity_copy · ba93f2df
      Seamus Lee authored
      Call hook_civicrm_copy for RecurringEntity
      ba93f2df
    • Seamus Lee's avatar
      Merge pull request #16471 from totten/master-psr-log · e0b8aecc
      Seamus Lee authored
      composer.json - Relax psr/log constraint. Improve D8 compatibility.
      e0b8aecc
    • eileen's avatar
      Revert "Remove unreachable code lines." · 95f7b3ae
      eileen authored
      In the course of https://github.com/civicrm/civicrm-core/pull/16462
      I concluded that there might be (untested scenarios) where this would still be hit.
      
      In #16462 I adopted a cleaner (tested) approach. However, I think it's unlikely that
      will be merged before 5.23 is cut so I propose reverting this change & re-reverting it
      once the rc is cut as a more conservative approach. We can focus on getting #16462
      wrapped up for 5.24
      
      This reverts commit d7943ca7.
      95f7b3ae
    • Eileen McNaughton's avatar
      Merge pull request #16460 from colemanw/noInclude · 6bcc2d21
      Eileen McNaughton authored
      APIv3 - Only scan files for deprecation checks in Entity.get
      6bcc2d21
    • totten's avatar
      composer.json - Relax psr/log constraint. Improve D8 compatibility. · 0a5cc337
      totten authored
      Overview
      --------
      
      This addresses a composer conflict that's reported when trying to install
      on Drupal 8.7. For example, run these commands:
      
      ```
      drush8 dl drupal-8.7.x
      cd drupal-8*
      composer require civicrm/civicrm-core:5.22.x-dev
      ```
      
      This is a port of #16470 for `master`.
      
      Before
      ------
      
      The install fails because `civicrm-core` requires `psr/log:~1.1`, and something else
      is prodding us to use `psr/log:1.0.2`.
      
      ```
      ./composer.json has been updated
      Loading composer repositories with package information
      Updating dependencies (including require-dev)
      Your requirements could not be resolved to an installable set of packages.
      
        Problem 1
          - Installation request for civicrm/civicrm-core 5.22.x-dev -> satisfiable by civicrm/civicrm-core[5.22.x-dev].
          - Conclusion: remove psr/log 1.0.2
          - Conclusion: don't install psr/log 1.0.2
          - civicrm/civicrm-core 5.22.x-dev requires psr/log ~1.1 -> satisfiable by psr/log[1.1.0, 1.1.1, 1.1.2, 1.1.x-dev].
          - Can only install one of: psr/log[1.1.0, 1.0.2].
          - Can only install one of: psr/log[1.1.1, 1.0.2].
          - Can only install one of: psr/log[1.1.2, 1.0.2].
          - Can only install one of: psr/log[1.1.x-dev, 1.0.2].
          - Installation request for psr/log (locked at 1.0.2) -> satisfiable by psr/log[1.0.2].
      
      Installation failed, reverting ./composer.json to its original content.
      ```
      
      After
      -----
      
      It should work.  However, this is hard to demonstrate via `r-run` without merging.
      
      Comments
      --------
      
      The substantive differences between `psr/log` in v1.0 and v1.1 relate to `LoggerInterfaceTest` and `TestLogger`:
      
      https://github.com/php-fig/log/compare/1.0.2...1.1.2
      
      However, `civicrm-core` does not use `LoggerInterfaceTest` or `TestLogger`, so it shouldn't matter.
      
      For the standard tarballs which use `composer.lock`, this does have the side-effect of bumping up from 1.1.0 to 1.1.2.
      0a5cc337
    • Eileen McNaughton's avatar
      Merge pull request #16458 from twomice/1573_extra_columns_contribution_detail_report · 3f4b536a
      Eileen McNaughton authored
      Fix for #1573: Extra columns for Contribution Detail report.
      3f4b536a
    • colemanw's avatar
      APIv4 Organize debug sql into a single array · 0f7babcc
      colemanw authored
      0f7babcc
  5. 04 Feb, 2020 10 commits
  6. 03 Feb, 2020 7 commits
  7. 02 Feb, 2020 5 commits
  8. 01 Feb, 2020 3 commits