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.

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

update to 5.13 #1

Merged
merged 9,795 commits into from
Sep 11, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9795 commits
Select commit Hold shift + click to select a range
64d3e76
Merge pull request #13899 from eileenmcnaughton/line_item
eileenmcnaughton Apr 4, 2019
a076875
Merge pull request #13957 from mattwire/extract_assignpaymentfields
eileenmcnaughton Apr 4, 2019
353263b
Merge pull request #13960 from eileenmcnaughton/master
eileenmcnaughton Apr 4, 2019
e4d61a8
Merge pull request #13699 from mattwire/contributionrecur_report_by_p…
eileenmcnaughton Apr 4, 2019
d7d7dde
Allow payment processors to enable validate.tpl
eileenmcnaughton Apr 4, 2019
45cf788
Merge pull request #13935 from eileenmcnaughton/recur_cancel_load
mattwire Apr 4, 2019
b04bcc4
Flush ContributionRecur static cache when flushing processors
eileenmcnaughton Apr 5, 2019
350f28f
Improve data when known time-dependent-failing test fails
eileenmcnaughton Apr 5, 2019
2d590b4
Merge pull request #13962 from eileenmcnaughton/test_fix_recur
eileenmcnaughton Apr 5, 2019
912924a
Merge pull request #13961 from eileenmcnaughton/validate
colemanw Apr 5, 2019
8b40844
Remove reference to non-iso date format from membership form tests
eileenmcnaughton Apr 5, 2019
8642001
[REF] extract token functions
eileenmcnaughton Apr 5, 2019
0a4a07b
Merge pull request #13965 from eileenmcnaughton/member_test
eileenmcnaughton Apr 5, 2019
353f9bd
Merge pull request #13964 from eileenmcnaughton/test
eileenmcnaughton Apr 5, 2019
c2be63a
Merge pull request #13967 from eileenmcnaughton/activity_token
eileenmcnaughton Apr 5, 2019
cf0d1c0
Autoformat - just CRM/ACL dir
eileenmcnaughton Apr 5, 2019
96f9469
Array syntax reformat on activity files
eileenmcnaughton Apr 5, 2019
9f46227
[NFC] array format tricksie file
eileenmcnaughton Apr 5, 2019
b332533
[NFC] array formatting tricksy tricksie file
eileenmcnaughton Apr 5, 2019
927f595
[NFC] array formatting tricksy tricksie file (another)
eileenmcnaughton Apr 5, 2019
be2fb01
Short array syntax - auto-format CRM directory
colemanw Mar 29, 2019
fddf612
Merge pull request #13915 from colemanw/shortCRM
eileenmcnaughton Apr 5, 2019
d48669c
Merge pull request #13968 from eileenmcnaughton/array_format
colemanw Apr 5, 2019
01f7363
Merge pull request #13972 from eileenmcnaughton/array_format_5
colemanw Apr 5, 2019
3b1e452
Merge pull request #13971 from eileenmcnaughton/array_format_4
colemanw Apr 5, 2019
eeca796
Merge pull request #13970 from eileenmcnaughton/array_format_3
colemanw Apr 5, 2019
5ee1bf7
Merge pull request #13969 from eileenmcnaughton/array_format2
colemanw Apr 5, 2019
98ca76d
[NFC] Reformat tricksy file CRM/Contribute/Import/Form/MapField
eileenmcnaughton Apr 5, 2019
758eba6
Merge pull request #13974 from eileenmcnaughton/array_format7
colemanw Apr 5, 2019
7265b08
[NFC] Reformat tricksy file CRM_Mailing_BAO_Mailing
eileenmcnaughton Apr 5, 2019
21f8fcf
(NFC) Civi/ - Update to pass new phpcs
totten Apr 5, 2019
e122e55
(NFC) CRM/ - Update to pass new phpcs
totten Apr 5, 2019
e29f351
(NFC) api/v3 - Update to pass new phpcs
totten Apr 5, 2019
420384a
(NFC) tests/ - Update to pass new phpcs
totten Apr 5, 2019
7237222
(NFC) Update to pass new phpcs
totten Apr 5, 2019
cf9ccf9
(NFC) Various updates for future version of civicrm/coder
totten Apr 5, 2019
0d48f1c
(NFC) Apply upcoming civicrm/coder policies (batch 1)
totten Apr 5, 2019
a6491ce
Merge pull request #13973 from eileenmcnaughton/array_format6
totten Apr 5, 2019
5d4fcf5
(NFC) Apply upcoming civicrm/coder policies (batch 2)
totten Apr 5, 2019
1060aa8
Merge pull request #13978 from totten/master-phpcbf
totten Apr 6, 2019
b9e9e8d
Merge pull request #13979 from totten/master-phpcbf-2
seamuslee001 Apr 6, 2019
34f3bbd
(NFC) Upgrade Civi Folder to the new coder version
seamuslee001 Apr 6, 2019
08eba29
Encourage developers to use .then instead of .done
colemanw Apr 6, 2019
7c31ae5
(NFC) Bring up API folder to style of future coder checker
seamuslee001 Apr 6, 2019
5126ca7
Merge pull request #13981 from seamuslee001/new_coder_civi
colemanw Apr 6, 2019
e4a739c
Merge pull request #13982 from colemanw/then
totten Apr 6, 2019
a3b9a8e
Merge pull request #13980 from seamuslee001/new_coder_style_check_api
eileenmcnaughton Apr 6, 2019
52929a9
Fix location of comment to match future coder version
seamuslee001 Apr 6, 2019
068fdda
Merge pull request #13984 from seamuslee001/nfc_comment_fix_ang
seamuslee001 Apr 7, 2019
39b959d
Update Unit test styling to cover the future coder version
seamuslee001 Apr 6, 2019
3655bea
(NFC) Update CRM/SMS/ CRM/UF/ CRM/Upgrade/ CRM/Tag/ to be up to speed…
seamuslee001 Apr 7, 2019
fa45b5b
(NFC) Set _log and _table_name variables to be public
seamuslee001 Apr 7, 2019
39b9dbb
(NFC) tests/ - Cleanup phpcbf oddities
totten Apr 6, 2019
73e968a
Merge pull request #13983 from seamuslee001/new_coder_tests
seamuslee001 Apr 7, 2019
6714d8d
(NFC) Bring CRM/Utils folder up to future coder standards
seamuslee001 Apr 7, 2019
c86d4e7
(NFC) Update coding style in PCP, Pledge, Profile, Queue, Report folders
seamuslee001 Apr 7, 2019
5a25f6f
Merge pull request #13988 from seamuslee001/coder_upgrade_dao_files
eileenmcnaughton Apr 7, 2019
de0e753
Merge pull request #13985 from seamuslee001/new_coder_crm_utils
eileenmcnaughton Apr 7, 2019
358a186
Merge pull request #13986 from seamuslee001/coder_upgrade_uf_tag_sms
eileenmcnaughton Apr 7, 2019
b18ac85
Merge pull request #13987 from seamuslee001/new_coder_pcp_pledge_prof…
eileenmcnaughton Apr 7, 2019
62d3ee2
(NFC) Update CRM/Activity CRM/Admin and CRM/Batch folders to be the f…
seamuslee001 Apr 7, 2019
32e1f6c
Fix guzzle noisiness
eileenmcnaughton Apr 7, 2019
971e129
(NFC) Update CRM/Member CRM/Note CRM/Logging CRM/Import and CRM/Price…
seamuslee001 Apr 7, 2019
f7f5b43
Merge pull request #13990 from seamuslee001/admin_activity_batch_new_…
seamuslee001 Apr 7, 2019
6c6743d
Merge pull request #13991 from eileenmcnaughton/noisy_guzzle
seamuslee001 Apr 7, 2019
45bd474
Merge pull request #13992 from seamuslee001/member_node_import_loggin…
seamuslee001 Apr 7, 2019
24fbfa8
fix formRule signature
demeritcowboy Apr 8, 2019
9cfc631
Add unit test for api ContributionRecur.cancel, add support for cance…
eileenmcnaughton Apr 8, 2019
327ff4e
Merge pull request #13999 from eileenmcnaughton/recur_fn
colemanw Apr 8, 2019
1889d80
Use asset-builder to render menubar css
colemanw Apr 7, 2019
1a4911e
Merge pull request #13998 from demeritcowboy/fix-formRule
seamuslee001 Apr 8, 2019
11b9f28
Navigation admin - fix icon picker & use select2
colemanw Apr 8, 2019
5e69f42
Navigation admin - live refresh and links to related settings
colemanw Apr 8, 2019
8a52ae3
Configurable menubar color
colemanw Apr 8, 2019
76ee148
Fix 4.7.31 Upgrade in multilingual mode
seamuslee001 Apr 8, 2019
3d3449c
Add unit testing for activity creation when cancelling a recurring, r…
eileenmcnaughton Apr 8, 2019
ddbda54
Merge pull request #14003 from seamuslee001/sl_fix_4_7_31_upgrade
seamuslee001 Apr 8, 2019
08a3a51
Pass menubar preference as a param. Simplify cache mechanics. (#8)
totten Apr 8, 2019
f15d3f2
Include lower level data when throwing an exception on payment proces…
eileenmcnaughton Apr 9, 2019
f9e118b
Merge pull request #13996 from colemanw/menuColor
totten Apr 9, 2019
f22fb45
(REF) CRM_Core_Resources - Move hook declaration from addCoreResource…
totten Apr 8, 2019
dfc29fb
colorTest
colemanw Apr 9, 2019
4c257e1
Update new payment_processor.title field to be localisable
eileenmcnaughton Apr 7, 2019
dfe1f88
Short array syntax - auto convert settings dir
colemanw Apr 9, 2019
882688a
Merge pull request #14000 from eileenmcnaughton/recur_fn
seamuslee001 Apr 9, 2019
576c8a8
Improve flushing after creating a processor so it can be used for a r…
eileenmcnaughton Apr 9, 2019
fd790e1
Merge pull request #14002 from colemanw/menuConfig
eileenmcnaughton Apr 9, 2019
97fb7e4
Merge pull request #14006 from eileenmcnaughton/payment_pay
eileenmcnaughton Apr 9, 2019
90b5e0c
Merge pull request #14008 from totten/master-hook
eileenmcnaughton Apr 9, 2019
a2a6fcc
Merge pull request #14009 from eileenmcnaughton/recur_flush
eileenmcnaughton Apr 9, 2019
377cbe1
Merge pull request #14007 from colemanw/colorTest
eileenmcnaughton Apr 9, 2019
824c92c
Merge pull request #13995 from eileenmcnaughton/loc_title
eileenmcnaughton Apr 9, 2019
476cc43
Merge pull request #14005 from colemanw/shortSettings
eileenmcnaughton Apr 9, 2019
62f662b
Load hooks during upgrade mode
eileenmcnaughton Feb 6, 2019
b2a2920
Added myself
JoeMurray Apr 9, 2019
22e7056
Merge pull request #13551 from eileenmcnaughton/ext_up
totten Apr 9, 2019
fb1a4c6
Set version to 5.13.beta1
Apr 9, 2019
f157740
(NFC) Update CRM/Badge CRM/Campaign CRM/Case to be up to date with a …
seamuslee001 Apr 10, 2019
90b461f
(NFC) Update CRM/Event folder for the new coder style
seamuslee001 Apr 10, 2019
7b96696
(NFC) Update CRM/Cxn CRM/Dashlet CRM/Export CRM/Extension and CRM/Fin…
seamuslee001 Apr 10, 2019
7e8c831
(NFC) Update CRM/Friend CRM/Grant CRM/Group CRM/Mailing to be up to d…
seamuslee001 Apr 10, 2019
1330f57
(NFC) update CRM/Contribute to be the new coder standard
seamuslee001 Apr 10, 2019
4e556b1
Merge pull request #14018 from seamuslee001/financial_extension_expor…
colemanw Apr 10, 2019
c224ee3
Merge pull request #14017 from seamuslee001/batch_campaign_case_new_s…
colemanw Apr 10, 2019
3e313be
Merge pull request #14016 from seamuslee001/mailing_group_grant_frien…
colemanw Apr 10, 2019
518fa0e
(NFC) Update CRM/Core CRM/Custom CRM/Dedupe to match the new coder style
seamuslee001 Apr 10, 2019
fd26f5c
Merge pull request #14021 from seamuslee001/contribute_new_coder
seamuslee001 Apr 10, 2019
3265343
Merge pull request #14019 from seamuslee001/event_new_style
seamuslee001 Apr 10, 2019
401bf6e
Merge pull request #14023 from seamuslee001/core_dedupe_custom
colemanw Apr 10, 2019
9cd3992
(NFC) Update CRM/Contact to match new coder style
seamuslee001 Apr 10, 2019
669c9ff
(NFC) Minor code style fixes
seamuslee001 Apr 9, 2019
33484eb
Merge pull request #14026 from seamuslee001/5.13
totten Apr 11, 2019
683bf89
(NFC) Lint additional php files up to the new coder standard
seamuslee001 Apr 11, 2019
e9978cf
Merge pull request #14025 from seamuslee001/coder_lint_alt_php
seamuslee001 Apr 11, 2019
db0e155
Disable phpcs checking in the Crypt files where mcrypt functions are
seamuslee001 Apr 11, 2019
7aca9a1
(NFC) Ensure phpcs ignores eval notice in these files as it is required
seamuslee001 Apr 11, 2019
2984eeb
fix array and notice
demeritcowboy Apr 10, 2019
92eadb3
add test
demeritcowboy Apr 10, 2019
a72ce81
Merge pull request #14032 from seamuslee001/ingore_eval
eileenmcnaughton Apr 11, 2019
0a0fd8a
Merge pull request #14031 from seamuslee001/phpcs_disable_mcrypt
eileenmcnaughton Apr 11, 2019
c364957
Merge pull request #14036 from eileenmcnaughton/5.13
eileenmcnaughton Apr 11, 2019
3eb2aab
(NFC) SchemaStructure.php - Fix up mismatch between stored+generated …
totten Apr 13, 2019
4270418
Merge pull request #14046 from totten/5.13-schema-fmt
seamuslee001 Apr 14, 2019
10f949e
dev/core#534 Re-instate pay-now button
eileenmcnaughton Apr 15, 2019
3495cc6
Merge pull request #14051 from eileenmcnaughton/inv
seamuslee001 Apr 15, 2019
f6fabed
Add release-notes/5.12.1.md
totten Apr 16, 2019
8279ecf
Merge pull request #14061 from totten/5.13-port-notes
seamuslee001 Apr 16, 2019
9e50980
5.12.1.md - Fix attribution
totten Apr 16, 2019
89696a2
Add body class when dialog is open
colemanw Apr 16, 2019
5900703
Correctly size UI dialog accounting for height of menubar
colemanw Apr 16, 2019
9bc5866
Lower z-index of menubar in body
colemanw Apr 16, 2019
de8d1a8
Remove unnecessary d7 script
colemanw Apr 16, 2019
64d7b73
dev/mail#41 Do not generate tracking urls if no mailing id has been p…
seamuslee001 Apr 4, 2019
b74e118
Drupal#56 - fix quicksearch text color on D8
MegaphoneJon Apr 17, 2019
d1c5a34
Merge pull request #13956 from seamuslee001/dev_mail_41
eileenmcnaughton Apr 18, 2019
b02b8e4
Simplify hiding CMS elements behind modal dialogs
colemanw Apr 16, 2019
44d369d
Better variable name
colemanw Apr 16, 2019
67dd8c7
Merge pull request #14067 from colemanw/menuZindex
colemanw Apr 18, 2019
cf65141
Add release-notes/5.12.2.md
totten Apr 19, 2019
dc67314
Merge pull request #14090 from seamuslee001/5.13
totten Apr 19, 2019
b9c9094
dev/core#887 Fix fatal error on pledge search
eileenmcnaughton Apr 20, 2019
c0da18f
Merge pull request #14092 from eileenmcnaughton/search_513
seamuslee001 Apr 20, 2019
ec64d3e
Add release-notes/5.12.3.md
totten Apr 20, 2019
8c7e1d4
Merge pull request #14100 from seamuslee001/5.13
seamuslee001 Apr 22, 2019
70d870d
dev/core#891 condition on id existenced when retrieving mailing hash
lcdservices Apr 23, 2019
e941ee8
Merge pull request #14114 from lcdservices/5.13
seamuslee001 Apr 23, 2019
5589ec7
Fix typo in DROP table query.
mfb Apr 24, 2019
f98ebee
Merge pull request #14126 from seamuslee001/dev_core_880
seamuslee001 Apr 25, 2019
25ce0b7
Add 5.12.4 release notes
seamuslee001 Apr 25, 2019
70c861b
Update release notes
seamuslee001 Apr 25, 2019
7898ac7
Update 5.12.4.md
totten Apr 25, 2019
3de07ed
Update 5.12.4.md
totten Apr 25, 2019
f35bf33
Merge pull request #14132 from seamuslee001/5.13
seamuslee001 Apr 26, 2019
16f1c97
fix save and new
demeritcowboy Apr 27, 2019
d3fb65a
Merge pull request #14145 from demeritcowboy/submitOften
mattwire Apr 29, 2019
94b8a9c
dev/core#907 Fix Deprecation notice for PHP7.2 in bin/cli.class.php
seamuslee001 Apr 29, 2019
e026b9e
CiviMail - Restore support for previewing action-tokens via TokenProc…
totten Apr 29, 2019
fa373ca
CiviMail - Restore support for previewing mailing-tokens via TokenPro…
totten Apr 29, 2019
dab9c39
Merge pull request #14155 from seamuslee001/php_7_2_bin_cli_class
eileenmcnaughton Apr 30, 2019
d02df73
CRM_Mailing_TokensTest - Update spec to match expected behavior
totten Apr 30, 2019
9d6c8f8
Merge pull request #14156 from totten/5.13-mail-tokens
totten Apr 30, 2019
c3d0650
Fix deprecation handling
eileenmcnaughton Apr 30, 2019
f437797
flexmailer#26 Fix Flexmailer handling of annonmous user access to vie…
seamuslee001 Apr 30, 2019
85c64c5
(flexmailer#29) Mailing.preview API - Add unit-test for call without …
totten Apr 30, 2019
1246fd4
(flexmailer#29) Mailing.preview API - Fix array access warning. Make …
totten Apr 30, 2019
640d3ea
(flexmailer#29) civicrm/mailing/view - Generate content via Mailing.p…
totten Apr 30, 2019
3d8aa9b
Return MailingID rather than ['id'] as id may not always be supplied
seamuslee001 Apr 30, 2019
f77a81c
Merge pull request #14164 from eileenmcnaughton/in_fix
eileenmcnaughton Apr 30, 2019
7f1ac1a
Merge pull request #14163 from seamuslee001/flexmailer_26
seamuslee001 May 1, 2019
70fa768
5.13.0 release notes: raw from script
agh1 Apr 15, 2019
2db0b85
5.13.0 release notes: added boilerplate
agh1 Apr 15, 2019
cc7fb0e
5.13.0 release notes: bulk of edits
alifrumin Apr 16, 2019
e340eeb
moving gitlab issues to the end
alifrumin Apr 25, 2019
00deb7b
uppercase if work is continued or begun
alifrumin Apr 25, 2019
084cd13
5.13.0 release notes: late changes
agh1 May 1, 2019
839e46e
Update 5.13.0.md
totten May 1, 2019
aaf49a6
Merge pull request #14056 from agh1/5.13.0-releasenotes
totten May 2, 2019
35f9da7
Set version to 5.13.0
May 2, 2019
db81692
wordpress#26 - fix REST
MegaphoneJon May 2, 2019
e00be4f
Resolve dev/core#931 by not doing translation on the query if field e…
seamuslee001 May 2, 2019
74ac8d7
Add in release notes for 5.13.1 drop
seamuslee001 May 2, 2019
38dc813
Set version 5.13.1
seamuslee001 May 2, 2019
9633590
Merge pull request #14187 from seamuslee001/dev_core_931
seamuslee001 May 2, 2019
38b55fc
Update 5.13.1.md
totten May 2, 2019
6eec8b6
Merge pull request #14186 from MegaphoneJon/wordpress-26
seamuslee001 May 2, 2019
4427a93
Merge pull request #14190 from seamuslee001/5_13_1_drop_notes
totten May 2, 2019
ffa04b1
dev/core#934 Fix regression on sorting activity tab by 'Added by'
eileenmcnaughton May 3, 2019
e51604e
(dev/core#934; followup) Fix escaping on new query code
totten May 6, 2019
97394d1
Set version to 5.13.2
totten May 6, 2019
248ae42
Add 5.13.2 release notes
totten May 6, 2019
30b0c4f
Fix Regression in Email Processor filing all emails as .unknown attac…
seamuslee001 May 6, 2019
6644c9f
Update Release notes for dev/core#940
seamuslee001 May 6, 2019
c33bf60
Update 5.13.2.md
totten May 6, 2019
c2a5259
Merge pull request #14207 from seamuslee001/dev_core_940
seamuslee001 May 6, 2019
99de093
Merge pull request #14209 from seamuslee001/release_notes_update_dev_…
totten May 7, 2019
a9b33e8
Remove deprecated :hover jQuery selector
colemanw May 9, 2019
0cf3294
Add select2 to input field of datepicker
May 8, 2019
e768d02
Merge pull request #14228 from eileenmcnaughton/5.13
seamuslee001 May 10, 2019
0032e7a
Add in Wrapper template around DatePickerRange template to have bette…
seamuslee001 May 10, 2019
04ed668
core/issues/923, Fixed notice error when creating/editing profile
pradpnayak May 9, 2019
a005a80
Add in Release notes for 5.13.3 Drop
seamuslee001 May 10, 2019
c5a6f3a
Set version to 5.13.3
seamuslee001 May 10, 2019
6d3a046
dev/core#956 Fix hard breakage in find participants form when you do …
seamuslee001 May 10, 2019
2c3458f
Merge pull request #14229 from seamuslee001/5.13
seamuslee001 May 10, 2019
f017ce8
Merge pull request #14230 from eileenmcnaughton/5.13
seamuslee001 May 10, 2019
ebe2ace
Update release notes
seamuslee001 May 11, 2019
7e324b8
dev/core#942 fix failure to render names for some activities
eileenmcnaughton May 10, 2019
8003b0b
Update 5.13.3.md
totten May 11, 2019
7326c22
Update 5.13.3.md
totten May 11, 2019
b2cfc4b
Fix Failing Activity Test
seamuslee001 May 11, 2019
0ed4b1e
Merge pull request #14234 from seamuslee001/participant_count_search_…
seamuslee001 May 11, 2019
cdd5f82
Proper fix tests
seamuslee001 May 11, 2019
8762c31
Merge pull request #14231 from eileenmcnaughton/513-3
seamuslee001 May 12, 2019
b7bdffa
Merge pull request #14232 from seamuslee001/release_notes_5_13_4
eileenmcnaughton May 12, 2019
a31969f
contributor-key.yml, 5.13.13.md - Fix typo in credit
totten May 14, 2019
08f0664
Harden against serialization vulnerabilities (#46)
totten Mar 5, 2019
ec42134
Don't expose condition to api.getoptions
colemanw Mar 26, 2019
51b92e9
(security/core#50) Update jQuery to address prototype pollution
totten Apr 23, 2019
87efe48
Resolve security/core#53 by updating tcpdf to latest version of 6.2.x
seamuslee001 Apr 24, 2019
7175292
escape alphanumeric/checkbox custom data
jmcclelland Feb 20, 2019
3e91f6c
Fix security/core#51 by paramatising the Event Type part of the wuere…
seamuslee001 Apr 22, 2019
fa7ac2f
Also escape subtype to fix POC#2 found by Patrick
seamuslee001 Apr 28, 2019
50ed845
security/core#49 Ensure that only intergers are passed to the IN buil…
seamuslee001 Mar 30, 2019
04b2591
Resolve security/core#52 by validating that an installtype is sensible
seamuslee001 Apr 29, 2019
377dc72
Resolve security/core#45 by validating the mimeType of the file with …
seamuslee001 Mar 3, 2019
0c522e7
Strength mime checking by comparing mime-type to the file path mime-t…
seamuslee001 Mar 29, 2019
af92cb6
Add whitelist back in and validate extension of file is permtted for …
seamuslee001 May 3, 2019
2051296
civicrm/file - Be forgiving about old image hyperlinks
totten May 8, 2019
211e7fc
WIP Release Notes for security release
seamuslee001 May 1, 2019
946013b
Update 5.13.4.md
totten May 14, 2019
cdbbe85
Update date of 5.13.3 release and add in APIv4 SA into 5.13.4
seamuslee001 May 14, 2019
be4c67d
Update 5.13.4.md
totten May 15, 2019
c39c5e9
Merge branch '5_13_1_release_notes' into 'security-fixes'
totten May 15, 2019
c7e9ace
Set version to 5.13.4
May 15, 2019
1a0b24a
Remove htmlpurifier from composer and move it back to within IDS to f…
seamuslee001 May 21, 2019
70137b4
change is_override logic
Stoob Apr 15, 2019
a0bdded
whhops this is more like it
Stoob Apr 15, 2019
6c63544
Merge pull request #14287 from eileenmcnaughton/stoob
seamuslee001 May 21, 2019
ccc691b
Merge pull request #14284 from seamuslee001/dev_core_976_5_13
eileenmcnaughton May 22, 2019
e6a8540
dev/core#975 Fix url for new activity in breadcrumbs in find activity…
seamuslee001 May 21, 2019
dcc723e
dev/core#968 Fix javascript error on public pages
colemanw May 25, 2019
eea7f89
fixes issue #981: sort participants did not remember search criteria
AlainBenbassat May 24, 2019
c9d60e4
Merge pull request #14366 from eileenmcnaughton/513
seamuslee001 May 30, 2019
b42d616
Update bower.json to target fixed jquery branch for dev/core#969
seamuslee001 May 30, 2019
8bfd523
Merge pull request #14379 from seamuslee001/dev_core_969_5_13
eileenmcnaughton May 30, 2019
1ece8ed
Add in 5.13.5 Release notes
seamuslee001 May 30, 2019
dc9b6ca
Set version to 5.13.5
seamuslee001 May 30, 2019
451ca2f
Update 5.13.5.md
totten May 30, 2019
d492293
Update 5.13.5.md
totten May 30, 2019
b0cd861
Merge pull request #14381 from seamuslee001/release_notes_version_bump
totten May 30, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
14 changes: 14 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# CiviCRM editor configuration normalization
# @see http://editorconfig.org/

# This is the top-most .editorconfig file; do not search in parent directories.
root = true

# All files.
[*]
end_of_line = LF
indent_style = space
indent_size = 2
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
90 changes: 20 additions & 70 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,70 +1,20 @@
CiviCRM is a community-driven open-source project. It has a small,
full-time "core team" which facilitates development and works on critical
issues. However, many improvements are driven by the active contributors.

This document provides important information about how to contribute.

## Review/Release Process

Releases are developed on a monthly cycle. At the start of the month, the
release-manager will send an invitation to developers who have open PRs,
encouraging them to participate in the release-cycle. Participation
provides a way to exchange feedback with other developers, get PRs merged,
and ensure the next release works -- all with a predictable timeline.

* For a high-level summary of the release process, see the
[Release Management README](https://github.com/civicrm/release-management/blob/master/README.md).
* For an example invitation, see the previous [invitation for the April-May 2016](https://github.com/civicrm/release-management/issues/1).

## Pull-Request Subject

When filing a pull-request, use a descriptive subject. These are good examples:

* `CRM-12345 - Fix Paypal IPNs when moon is at half-crescent (waxing)`
* `(WIP) CRM-67890 - Refactor SMS callback endpoint`
* `(NFC) CRM_Utils_PDF - Improve docblocks`

A few elements to include:

* **CRM-_XXXXX_** - This is a reference to the [CiviCRM issue tracker](http://issues.civicrm.org/)
(JIRA). A bot will setup crosslinks between JIRA and GitHub.
* **Description** - Provide a brief description of what the pull-request does.
* **(WIP)** - "Work in Progress" - If you are still developing a set of
changes, it may be useful to submit a pull-request and flag it as
`(WIP)`. This allows you to have discussion with other developers and
check test results. Once the change is ready, update the subject line
to remove `(WIP)`.
* **(NFC)** - "Non-Functional Change" - Most patches are designed to
change functionality (e.g. fix an error message or add a new button).
However, some changes are non-functional -- e.g. they cleanup the
code-style, improve the comments, or improve the test-suite.

## Testing

Pull-requests are tested automatically by a build-bot. Key things to know:

* If you are a new contributor, the tests may be placed on hold pending a
cursory review. One of the administrators will post a comment like
`jenkins, ok to test` or `jenkins, add to whitelist`.
* The pull-request will have a colored dot indicating its status:
* **Yellow**: The automated tests are running.
* **Red**: The automated tests have failed.
* **Green**: The automated tests have passed.
* If the automated test fails, click on the red dot to investigate details. Check for information in:
* The initial summary. Ordinarily, this will list test failures and error messages.
* The console output. If the test-suite encountered a significant error (such as a PHP crash),
the key details will only appear in the console.
* Code-style tests are executed first. If the code-style in this patch is inconsistent, the remaining tests will be skipped.
* The primary tests may take 20-120 min to execute. This includes the following suites: `api_v3_AllTests`, `CRM_AllTests`, `Civi\AllTests`, `civicrm-upgrade-test`, and `karma`
* There are a handful of unit tests which are time-sensitive and which fail sporadically. See: https://forum.civicrm.org/index.php?topic=36964.0
* The web test suite (`WebTest_AllTests`) takes several hours to execute. [It runs separately -- after the PR has been merged.](https://test.civicrm.org/job/CiviCRM-WebTest-Matrix/)

For detailed discussion about automated tests, see http://wiki.civicrm.org/confluence/display/CRMDOC/Testing

## Updating a pull-request

During review, there may be some feedback about problems or additional
changes required for acceptance. If you've never updated a pull-request
before, see [Stackoverflow: How to update a pull request](http://stackoverflow.com/questions/9790448/how-to-update-a-pull-request).

When you push the update to the pull-request, the test suite will re-execute.
CiviCRM is a community-driven open-source project. It has a small, full-time
[core team](https://civicrm.org/core-team)
which facilitates development and works on critical issues.
Additionally, a large community of active contributors and
[partner organizations](https://civicrm.org/partners-contributors)
drive much of the development work.

For developers, CiviCRM maintains a comprehensive
[Developer Guide](https://docs.civicrm.org/dev/en/latest).
Topics of particular importance while submitting pull requests include:

* [Contributing to CiviCRM core](https://docs.civicrm.org/dev/en/latest/core/contributing/)
* [Pull requests](https://docs.civicrm.org/dev/en/latest/tools/git/#pr)
* [Git workflow overview](https://docs.civicrm.org/dev/en/latest/tools/git/#contributing)
* [Writing automated tests](https://docs.civicrm.org/dev/en/latest/testing/setup/)
* [Jenkins continuous integration](https://docs.civicrm.org/dev/en/latest/tools/jenkins/)
* [Release Process](https://docs.civicrm.org/dev/en/latest/core/release-process/)
* [Developer Community](https://docs.civicrm.org/dev/en/latest/basics/community/)

CiviCRM thanks you for your contributions and invites you to [log your time spent](https://civicrm.org/contributor-log) so that you (or your organization) may receive public recognition and promotion for your efforts.
19 changes: 19 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
Overview
----------------------------------------
_A brief description of the pull request. Try to keep it non-technical._

Before
----------------------------------------
_The current status. Please provide screenshots or gifs ([LICEcap](http://www.cockos.com/licecap/), [SilentCast](https://github.com/colinkeenan/silentcast)) where appropriate._

After
----------------------------------------
_What has been changed. Please provide screenshots or gifs ([LICEcap](http://www.cockos.com/licecap/), [SilentCast](https://github.com/colinkeenan/silentcast)) where appropriate._

Technical Details
----------------------------------------
_If the PR introduces noteworthy technical changes, please describe them here. Provide code snippets if necessary_

Comments
----------------------------------------
_Anything else you would like the reviewer to note_
17 changes: 3 additions & 14 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,27 +1,16 @@
*~
*.bak
.use-civicrm-setup
/ext/
backdrop/
bower_components
CRM/Case/xml/configuration
CRM/Core/DAO/.listAll.php
CRM/Core/DAO/listAll.php
CRM/Core/I18n/SchemaStructure.php
bin/setup.conf
civicrm-version.php
civicrm-version.txt
civicrm.config.php
install/langs.php
node_modules
packages/.channels
packages/.depdb
packages/.depdblock
packages/.filemap
packages/.lock
packages/.registry
packages/cache
packages/doc
packages/temp
packages/test
settings_location.php
sql/case_sample.mysql
sql/civicrm.mysql
Expand All @@ -32,7 +21,6 @@ sql/civicrm_data.mysql
sql/civicrm_drop.mysql
sql/civicrm_navigation.mysql
sql/civicrm_sample.mysql
templates/CRM/common/version.tpl
tests/phpunit/CiviTest/CiviSeleniumSettings.php
tests/phpunit/CiviTest/civicrm.settings.php
tools/stats/config.php
Expand All @@ -54,3 +42,4 @@ civicrm.settings.php
sql/dummy_processor.mysql
distmaker/distmaker.conf
distmaker/out
/tmp
79 changes: 71 additions & 8 deletions .toxic.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,79 @@
"toxicAlert": "<img alt=\"Please: Help save the fish from toxic code\" src=\"https://civicrm.org/sites/civicrm.org/files/HazCode-Please.png\">\n\n(Automated notice) This pull-request modifies {SYMBOLS}. That code has been previously identified as hazardous. For advice on dealing with it, please review [Toxic Code Protocol](http://wiki.civicrm.org/confluence/display/CRM/Toxic+Code+Protocol)."
},
"checks": {
"CRM_Contact_Import_Parser_Contact::import()": "toxicAlert",
"CRM_Core_BAO_Mapping::buildMappingForm()": "toxicAlert",
"CRM_Event_Form_Participant::postProcess()": "toxicAlert",
"CRM_Export_BAO_Export::exportComponents()": "toxicAlert",
"CRM_Member_Form_Membership::postProcess()": "toxicAlert",
"CRM_Contribute_Form_Contribution::postProcess()": "toxicAlert",
"CRM_Activity_BAO_Activity::create()": "toxicAlert",
"CRM_Activity_Form_Activity::preProcess()": "toxicAlert",
"CRM_Case_BAO_Case::getCaseActivity()": "toxicAlert",
"CRM_Case_BAO_Case::mergeCases()": "toxicAlert",
"CRM_Contact_BAO_Contact::formatProfileContactParams()": "toxicAlert",
"CRM_Contact_BAO_ContactTest::testCreateProfileContact()": "toxicAlert",
"CRM_Contact_BAO_Individual::format()": "toxicAlert",
"CRM_Contact_BAO_Query::addHierarchicalElements()": "toxicAlert",
"CRM_Contact_BAO_Relationship::relatedMemberships()": "toxicAlert",
"CRM_Contact_Form_Contact::postProcess()": "toxicAlert",
"CRM_Contact_Import_Form_MapField::buildQuickForm()": "toxicAlert",
"CRM_Contact_Import_Parser::formatCommonData()": "toxicAlert",
"CRM_Contact_Import_Parser::formatContactParameters()": "toxicAlert",
"CRM_Contact_Import_Parser::run()": "toxicAlert",
"CRM_Contact_Import_Parser_Contact::import()": "toxicAlert",
"CRM_Contribute_BAO_Contribution::recordFinancialAccounts()": "toxicAlert",
"CRM_Contribute_BAO_Contribution::transitionComponents()": "toxicAlert",
"CRM_Contribute_BAO_ContributionPage::sendMail()": "toxicAlert",
"CRM_Contribute_BAO_Query::whereClauseSingle()": "toxicAlert",
"CRM_Contribute_Form_Contribution::buildQuickForm()": "toxicAlert",
"CRM_Contribute_Form_Contribution::submit()": "toxicAlert",
"CRM_Contribute_Form_ContributionBase::preProcess()": "toxicAlert",
"CRM_Contribute_Form_ContributionPage_Amount::postProcess()": "toxicAlert",
"CRM_Contribute_Form_Contribution_Confirm::postProcessMembership()": "toxicAlert",
"CRM_Contribute_Form_Contribution_Confirm::processFormSubmission()": "toxicAlert",
"CRM_Contribute_Form_Contribution_Main::buildQuickForm()": "toxicAlert",
"CRM_Contribute_Form_Contribution_Main::formRule()": "toxicAlert",
"CRM_Contribute_Form_Contribution_Main::submit()": "toxicAlert",
"CRM_Contribute_Form_Task_Invoice::printPDF()": "toxicAlert",
"CRM_Contribute_Import_Parser::run()": "toxicAlert",
"CRM_Core_BAO_ActionScheduleTest::setUp()": "toxicAlert",
"CRM_Core_BAO_CustomField::formatCustomField()": "toxicAlert",
"CRM_Core_BAO_CustomGroup::getTree()": "toxicAlert",
"CRM_Core_BAO_Mapping::buildMappingForm()": "toxicAlert",
"CRM_Core_BAO_UFGroup::buildProfile()": "toxicAlert",
"CRM_Core_BAO_UFGroup::getValues()": "toxicAlert",
"CRM_Core_I18n_SchemaStructure::widgets()": "toxicAlert",
"CRM_Core_Permission::getEntityActionPermissions()": "toxicAlert",
"CRM_Core_PseudoConstantTest::testOptionValues()": "toxicAlert",
"CRM_Custom_Form_Field::formRule()": "toxicAlert",
"CRM_Dedupe_Merger::getRowsElementsAndInfo()": "toxicAlert",
"CRM_Dedupe_Merger::moveAllBelongings()": "toxicAlert",
"CRM_Event_Form_ManageEvent_Fee::formRule()": "toxicAlert",
"CRM_Event_Form_Participant::submit()": "toxicAlert",
"CRM_Event_Form_Registration_Confirm::postProcess()": "toxicAlert",
"CRM_Event_BAO_Event::displayProfile()": "toxicAlert",
"CRM_Contribute_Form_Contribution_Confirm::postProcess()": "toxicAlert"
"CRM_Event_Form_Registration_Register::buildQuickForm()": "toxicAlert",
"CRM_Event_Form_Registration_Register::postProcess()": "toxicAlert",
"CRM_Export_BAO_Export::exportComponents()": "toxicAlert",
"CRM_Mailing_BAO_Mailing::compose()": "toxicAlert",
"CRM_Mailing_BAO_Mailing::getRecipients()": "toxicAlert",
"CRM_Mailing_BAO_Mailing::report()": "toxicAlert",
"CRM_Member_Form_Membership::formRule()": "toxicAlert",
"CRM_Member_Form_Membership::submit()": "toxicAlert",
"CRM_PCP_Page_PCPInfo::run()": "toxicAlert",
"CRM_Price_BAO_PriceField::addQuickFormElement()": "toxicAlert",
"CRM_Price_Form_Field::formRule()": "toxicAlert",
"CRM_Profile_Form::buildQuickForm()": "toxicAlert",
"CRM_Profile_Form::postProcess()": "toxicAlert",
"CRM_Profile_Form::preProcess()": "toxicAlert",
"CRM_Profile_Page_Dynamic::run()": "toxicAlert",
"CRM_Report_Form_Contact_Detail::__construct()": "toxicAlert",
"CRM_Report_Form_Contribute_Bookkeeping::__construct()": "toxicAlert",
"CRM_Report_Form_Contribute_Detail::__construct()": "toxicAlert",
"CRM_Report_Form_Event_ParticipantListing::__construct()": "toxicAlert",
"CRM_Report_Form_Member_ContributionDetail::__construct()": "toxicAlert",
"CRM_UF_Form_Field::buildQuickForm()": "toxicAlert",
"CRM_Upgrade_Incremental_php_FourThree::createFinancialRecords()": "toxicAlert",
"CRM_Utils_Date::relativeToAbsolute()": "toxicAlert",
"CRM_Utils_Mail_EmailProcessor::_process()": "toxicAlert",
"ImportCiviSeleniumTestCase::importContacts()": "toxicAlert",
"WebTest_Contribute_OnBehalfOfOrganization::_testUserWithMoreThanOneRelationship()": "toxicAlert",
"WebTest_Profile_BatchUpdateTest::testBatchUpdate()": "toxicAlert",
"api_v3_JobTest::getMergeLocations()": "toxicAlert",
"api_v3_JobTest::getMergeSets()": "toxicAlert"
}
}
Loading