projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b90e843
ce287b8
)
Merge pull request #11197 from agileware/CRM-21104
author
colemanw
<coleman@civicrm.org>
Wed, 18 Jul 2018 16:17:25 +0000
(12:17 -0400)
committer
GitHub
<noreply@github.com>
Wed, 18 Jul 2018 16:17:25 +0000
(12:17 -0400)
CRM-21104: Forcing reCaptcha on Contribution pages(with online payments) which have no Profile associated with them.
1
2
CRM/Admin/Form/Setting/Miscellaneous.php
patch
|
diff1
|
diff2
|
blob
|
history
CRM/Contribute/Form/Contribution/Main.php
patch
|
diff1
|
diff2
|
blob
|
history
CRM/Contribute/Form/ContributionBase.php
patch
|
diff1
|
diff2
|
blob
|
history
CRM/Core/Config/MagicMerge.php
patch
|
diff1
|
diff2
|
blob
|
history
CRM/Utils/ReCAPTCHA.php
patch
|
diff1
|
diff2
|
blob
|
history
settings/Core.setting.php
patch
|
diff1
|
diff2
|
blob
|
history
templates/CRM/Admin/Form/Setting/Miscellaneous.tpl
patch
|
diff1
|
diff2
|
blob
|
history
templates/CRM/Contribute/Form/Contribution/Main.tpl
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
CRM/Admin/Form/Setting/Miscellaneous.php
Simple merge
diff --cc
CRM/Contribute/Form/Contribution/Main.php
Simple merge
diff --cc
CRM/Contribute/Form/ContributionBase.php
Simple merge
diff --cc
CRM/Core/Config/MagicMerge.php
Simple merge
diff --cc
CRM/Utils/ReCAPTCHA.php
Simple merge
diff --cc
settings/Core.setting.php
Simple merge
diff --cc
templates/CRM/Admin/Form/Setting/Miscellaneous.tpl
Simple merge
diff --cc
templates/CRM/Contribute/Form/Contribution/Main.tpl
Simple merge