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

Update from upstream #2

Merged
merged 34 commits into from
Mar 4, 2020
Merged

Update from upstream #2

merged 34 commits into from
Mar 4, 2020

Conversation

herbdool
Copy link
Owner

@herbdool herbdool commented Mar 4, 2020

.

seamuslee001 and others added 30 commits April 11, 2019 15:54
@seamuslee001
Fix up to newer coder style
4f26213
@totten
Merge pull request #69 from seamuslee001/code_style_fix
7503d85 
Fix up to newer coder style
@totten
Merge pull request #70 from civicrm/1.x-5.13
903a15d 
1.x 5.13
@seamuslee001
(NFC) Lint .inc files and ensure that the eval usage in tests/phpunit…
1d67226 
…/bootstrap.php is ignored by phpcs as per drupal module change
@totten
Merge pull request #71 from seamuslee001/lint_inc
b4e0c25 
(NFC) Lint .inc files and ensure that the eval usage in tests/phpunit…
@totten
(NFC) Update for compliance with next phpcs standard
e5018c9
@totten
Merge pull request #72 from totten/1.x-5.13-phpcs
d3534ae 
(NFC) Update for compliance with next phpcs standard
@seamuslee001
Merge pull request #73 from civicrm/1.x-5.13
48a7af7 
1.x 5.13
@laryn @herbdool
Issue #68: Allow formatting created date in Views by @laryn
02874fd
@herbdool
Issue 75: Drupal Views CiviCRM: Allow Participant record to be used f…
d169ee8 
…rom Event. And linting.

* civicrm/civicrm-drupal@7fcce8b
* Code linting
@herbdool
Issue 64: use new field type = number by @herbdool
b8cd151
@seamuslee001 @herbdool
Port fix for dev/drupal#48 to fix column name for next_sched_contribu…
c611862 
…tion_date (#78)
@seamuslee001 @herbdool
Bump Minimum PHP Version to match what is required as per core install (
444f11f 
#79)
@herbdool
Fix civicrm_rules.info
4ab2564
@tabroughton @herbdool
Issue #90 Ensure Civicrmtheme enabled when drush install by @tabroughton
8527aa1
@tabroughton @herbdool
Issue #89 default user permissions should be set when using drush ins…
808d24c 
…tall
@tabroughton @herbdool
Issue #86: Fixed errors when loading generated data
1523d50
@tabroughton @herbdool
Update bootstrap constant name to match that in BackdropBoot (#96) by @…
c3f1fd7 
…tabroughton
@seamuslee001
Fail more gracefully when upgrading on PHP5.x
c800c62 
Update function names to be about backdrop
@totten
(NFC) civicrm.drush.inc - Cleanup style
afb13d2 
Some bits of whitespace snuck in recently and now produce errors on
un-related PRs.  So...  clean it up.  :)
@totten
Merge pull request #99 from totten/1.x-master-style
bfb0c1f 
(NFC) civicrm.drush.inc - Cleanup style
@totten
Merge pull request #98 from seamuslee001/php-min
f72573e 
Fail more gracefully when upgrading on PHP5.x
@seamuslee001
Update copyright date for 2020
66035cb
@seamuslee001
[NFC] Style fixes
976c027
@eileenmcnaughton
Merge pull request #102 from seamuslee001/copywrite_date_update
ce9a58a 
Update copyright date for 2020
@laryn @herbdool
#84: Backdrop CSS needed on all pages
103a74f
@totten
(NFC) (dev/core#878) Simplify copyright header
633d6d3 
https://lab.civicrm.org/dev/core/issues/878
@totten
Merge pull request #104 from totten/1.x-simplehead
f9e8f32 
(NFC) (dev/core#878) Simplify copyright header
@seamuslee001
Merge pull request #105 from civicrm/1.x-5.17
9164d7c 
1.x 5.17
@seamuslee001
Merge pull request #106 from civicrm/1.x-5.19
68ce4f7 
1.x 5.19
@herbdool herbdool merged commit d47225d into herbdool:1.x-master Mar 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@herbdool @seamuslee001 @totten @laryn @tabroughton @eileenmcnaughton