Coleman Watts [Fri, 24 Jul 2015 01:28:37 +0000 (21:28 -0400)]
CRM-16860 - Remove upgrade code < 4.1
Eileen McNaughton [Thu, 23 Jul 2015 20:46:16 +0000 (08:46 +1200)]
Merge pull request #6279 from eileenmcnaughton/d8
add d8 to candidtate - this might not be final plan, but gets setup.s…
Eileen McNaughton [Thu, 23 Jul 2015 20:18:22 +0000 (08:18 +1200)]
Merge pull request #6287 from eileenmcnaughton/tests
test fix - clear static value caching
Eileen McNaughton [Thu, 23 Jul 2015 08:52:01 +0000 (20:52 +1200)]
fix enotice when price_field is not passed in
Eileen McNaughton [Thu, 23 Jul 2015 08:50:57 +0000 (20:50 +1200)]
Update reset for update situation
eileenmcnaughton [Thu, 23 Jul 2015 04:22:42 +0000 (04:22 +0000)]
test fix - clear static value caching
Eileen McNaughton [Wed, 22 Jul 2015 21:00:01 +0000 (09:00 +1200)]
Merge pull request #6268 from eileenmcnaughton/CRM-16532
CRM-16532 first step towards fixing up BaseIPN to call hooks work tow…
Eileen McNaughton [Wed, 22 Jul 2015 20:37:35 +0000 (08:37 +1200)]
Merge pull request #6281 from eileenmcnaughton/CRM-16808-processors
Crm 16808 processors
Dave Greenberg [Wed, 22 Jul 2015 17:48:25 +0000 (10:48 -0700)]
Merge pull request #6282 from jitendrapurohit/CRM-14185fix
CRM-14185 - Searching for a group that doesn't match an existing grou…
jitendrapurohit [Wed, 22 Jul 2015 10:32:34 +0000 (16:02 +0530)]
CRM-14185 - Searching for a group that doesn't match an existing group gives a warning in the logs
Eileen McNaughton [Mon, 20 Jul 2015 11:12:49 +0000 (23:12 +1200)]
Fix ites into CRM-16850, CRM-16867, CRM-16808 lookup membership type to see if autorenew is compulsory
i
Currntly paypal express still giving errors per CRM-16850 when is_recur
box is not present & expect other issues as is_recur is implicit when
membership_type is_renew`
Eileen McNaughton [Mon, 20 Jul 2015 09:55:04 +0000 (21:55 +1200)]
CRM-16808 paypal refactoring, fix enotice on generating url
Fix misnamed var (from prev commit)
Eileen McNaughton [Wed, 22 Jul 2015 09:40:23 +0000 (21:40 +1200)]
CRM-16808 standardising of paypal behaviour
Eileen McNaughton [Wed, 22 Jul 2015 09:14:25 +0000 (21:14 +1200)]
Merge pull request #6280 from eileenmcnaughton/master
CRM-16867 use consolidated function to prevent code duplicateion
Eileen McNaughton [Tue, 21 Jul 2015 11:52:40 +0000 (23:52 +1200)]
CRM-16532 first step towards fixing up BaseIPN to call hooks work towards moving to more sensible location by moving recur functions
to recur BAO, goal is completetransaction should be a Contribute BAO action & we should stop calling the BaseIPN class for things unrelated to IPNs
Eileen McNaughton [Sun, 19 Jul 2015 09:54:02 +0000 (21:54 +1200)]
CRM-16867 use consolidated function to prevent code duplicateion
This patch keeps existing functionality working - but I believe existing functionality is wrong as the price set uses Radio buttons so it
is NOT possible to use both types of membership in 1 transaction
Eileen McNaughton [Wed, 22 Jul 2015 05:18:58 +0000 (17:18 +1200)]
phpcs fix
Eileen McNaughton [Wed, 22 Jul 2015 05:03:51 +0000 (17:03 +1200)]
add patch for drupal 8 install
This should not affect other drupal versions as they will have VERSION defined - reading the code shows that is implicit in existing assumptions
Eileen McNaughton [Wed, 22 Jul 2015 04:59:07 +0000 (16:59 +1200)]
drupal 8 template
Eileen [Fri, 10 Jul 2015 02:32:42 +0000 (14:32 +1200)]
add d8 to candidtate - this might not be final plan, but gets setup.sh to 'chug along'
Tim Otten [Wed, 22 Jul 2015 01:17:12 +0000 (18:17 -0700)]
Merge pull request #6247 from eileenmcnaughton/tests
enforce enotice compliance on remaining tests
Dave Greenberg [Tue, 21 Jul 2015 22:16:45 +0000 (15:16 -0700)]
Merge pull request #6277 from joemcl/master
Fixed spelling of 'memebership' in 117
Dave Greenberg [Tue, 21 Jul 2015 21:38:11 +0000 (14:38 -0700)]
Merge pull request #6251 from LevityNL/master
Fix: Modules permissions cleared on every rebuild
Eileen McNaughton [Tue, 21 Jul 2015 21:25:17 +0000 (09:25 +1200)]
Merge pull request #6265 from eileenmcnaughton/CRM-16874
CRM-16874 fix some of the paypal enotices
Dave Greenberg [Tue, 21 Jul 2015 21:20:14 +0000 (14:20 -0700)]
Merge pull request #6249 from eileenmcnaughton/CRM-16850-master
CRM-16850 master
Joe McLaughlin [Tue, 21 Jul 2015 20:58:03 +0000 (16:58 -0400)]
Merge pull request #3 from joemcl/joemcl-patch-3
Fixed spelling of 'memebership' in 117
Joe McLaughlin [Tue, 21 Jul 2015 20:57:38 +0000 (16:57 -0400)]
Fixed spelling of 'memebership' in 117
Dave Greenberg [Tue, 21 Jul 2015 20:53:52 +0000 (13:53 -0700)]
Merge pull request #6275 from joemcl/master
Fixed spelling of 'Memebership' in 219 and 394
Joe McLaughlin [Tue, 21 Jul 2015 20:49:44 +0000 (16:49 -0400)]
Merge pull request #2 from joemcl/joemcl-patch-2
Fixed spelling of 'memebership' in 625
Joe McLaughlin [Tue, 21 Jul 2015 20:49:19 +0000 (16:49 -0400)]
Fixed spelling of 'memebership' in 625
Dave Greenberg [Tue, 21 Jul 2015 20:08:11 +0000 (13:08 -0700)]
Merge pull request #6270 from systopia/CRM-16845
proposed fix for CRM-16845
Joe McLaughlin [Tue, 21 Jul 2015 19:45:41 +0000 (15:45 -0400)]
Merge pull request #1 from joemcl/joemcl-patch-1
Fixed spelling of 'Memebership' in 219 and 394
Joe McLaughlin [Tue, 21 Jul 2015 19:44:19 +0000 (15:44 -0400)]
Fixed spelling of 'Memebership' in 219 and 394
Dave Greenberg [Tue, 21 Jul 2015 17:32:29 +0000 (10:32 -0700)]
Merge pull request #6264 from eileenmcnaughton/CRM-16867-extra-fn
CRM-16867 add function to determin combination of membership types in a priceset
Dave Greenberg [Tue, 21 Jul 2015 15:57:18 +0000 (08:57 -0700)]
Merge pull request #6261 from civicrm/revert-5252-CRM-10551
Revert "CRM-10551: Allow deletion of blanked location-based fields ed…
Dave Greenberg [Tue, 21 Jul 2015 15:57:06 +0000 (08:57 -0700)]
Merge pull request #6262 from civicrm/revert-6186-CRM-16826
Revert "CRM-16826: Fix updating addresses via Profiles"
Monish Deb [Tue, 21 Jul 2015 15:24:12 +0000 (20:54 +0530)]
Merge pull request #6272 from sudhabisht/WebtestFix2
Removed testTinyMCE testcase and fix for other webtest failure
Sudha Bisht [Tue, 21 Jul 2015 13:58:57 +0000 (19:28 +0530)]
Removed testTinyMCE testcase and fix for webtest failure
Eileen McNaughton [Tue, 21 Jul 2015 06:28:54 +0000 (18:28 +1200)]
tCRM-16874 fix some of the paypal enotices
There are still a number left but I wondered if it was worth checking the result from paypal & seeing it they were even valid
possible return fields before hushing them
Eileen McNaughton [Tue, 21 Jul 2015 09:22:05 +0000 (21:22 +1200)]
test follow up fixes on payment processor instantiation
Eileen McNaughton [Tue, 21 Jul 2015 08:56:10 +0000 (20:56 +1200)]
further test fix - ensure test processors can be loaded by ID
Eileen McNaughton [Sat, 18 Jul 2015 06:12:41 +0000 (18:12 +1200)]
Fixes to extension class following on from removal of singleton function in CRM-16808 in favour of Civi\Payment\System
AND enforcing enotice compliance on this test class
Eileen McNaughton [Sat, 18 Jul 2015 05:08:34 +0000 (17:08 +1200)]
enforce enotice compliance on remaining tests
Eileen McNaughton [Sun, 19 Jul 2015 03:57:56 +0000 (15:57 +1200)]
CRM-16850 set membership-based recurring params before passing to payment express so it is approved as a recurring, where required
Conflicts:
CRM/Contribute/Form/Contribution/Main.php
CRM/Contribute/Form/ContributionBase.php
Eileen McNaughton [Tue, 21 Jul 2015 06:04:35 +0000 (18:04 +1200)]
CRM-16867 add function to determin combination of membership types in a priceset
This function is part of the fix towards CRM-16850 & CRM-16867 & a further commit causes the function it was copied off
to re-use rather than duplicate it, however, various aspects of QA still being undergone - this function addition only PR
allows the work on both those issues to continue without being interrelated
Kurund Jalmi [Tue, 21 Jul 2015 05:51:45 +0000 (11:21 +0530)]
Merge pull request #6260 from sudhabisht/masterQAonly
Webtest Fix
Yashodha Chaku [Tue, 21 Jul 2015 05:20:59 +0000 (10:50 +0530)]
Merge pull request #6254 from yashodha/CRM-16853.fixes
CRM-16853
Yashodha Chaku [Tue, 21 Jul 2015 05:17:42 +0000 (10:47 +0530)]
Merge pull request #6255 from yashodha/string-fixes
changes to description so that they make sense while translating
Dave Greenberg [Mon, 20 Jul 2015 18:53:39 +0000 (11:53 -0700)]
Revert "CRM-16826: Fix updating addresses via Profiles"
Dave Greenberg [Mon, 20 Jul 2015 18:51:41 +0000 (11:51 -0700)]
Revert "CRM-10551: Allow deletion of blanked location-based fields edited via a profile"
Coleman Watts [Mon, 20 Jul 2015 14:29:39 +0000 (10:29 -0400)]
CRM-16354 - Remove old wysiwyg reference
Coleman Watts [Mon, 20 Jul 2015 14:20:33 +0000 (10:20 -0400)]
Merge branch '4.6' into master
Sudha Bisht [Mon, 20 Jul 2015 14:02:20 +0000 (19:32 +0530)]
Webtest Fix
Eileen McNaughton [Mon, 20 Jul 2015 09:47:24 +0000 (21:47 +1200)]
Merge pull request #6248 from eileenmcnaughton/CRM-16808
CRM-16808 fix to preApproval processor_name
Yashodha Chaku [Mon, 20 Jul 2015 08:39:22 +0000 (14:09 +0530)]
Merge pull request #6243 from jmcclelland/CRM-16854
CRM-16854 - ensure open case activities can have notes changed.
Monish Deb [Mon, 20 Jul 2015 08:09:11 +0000 (13:39 +0530)]
Merge pull request #6256 from monishdeb/4.6
CRM-16858 custom field fix
monishdeb [Mon, 20 Jul 2015 07:45:33 +0000 (13:15 +0530)]
minor fix
monishdeb [Mon, 20 Jul 2015 07:43:13 +0000 (13:13 +0530)]
fix for custom fields
yashodha [Mon, 20 Jul 2015 04:11:31 +0000 (09:41 +0530)]
changes to description so that they make sense while translating
yashodha [Mon, 20 Jul 2015 03:12:25 +0000 (08:42 +0530)]
minor fix
Kurund Jalmi [Sun, 19 Jul 2015 13:09:39 +0000 (18:39 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-07-19-17-34-09
Conflicts:
CRM/Contribute/Form/Contribution.php
CRM/Contribute/Form/Contribution/Confirm.php
CRM/Core/BAO/CustomQuery.php
CRM/Core/BAO/Mapping.php
CRM/Member/Form/Membership.php
bower.json
sql/civicrm_generated.mysql
templates/CRM/Contribute/Form/Contribution/Main.tpl
xml/version.xml
Kevin Levie [Sun, 19 Jul 2015 07:05:53 +0000 (09:05 +0200)]
Fix: Modules permissions cleared on every rebuild
Monish Deb [Sat, 18 Jul 2015 09:57:38 +0000 (15:27 +0530)]
Merge pull request #6239 from eileenmcnaughton/4.6
event search breakage
Eileen McNaughton [Sat, 18 Jul 2015 09:39:25 +0000 (21:39 +1200)]
CRM-16808 fix to preApproval processor_name
Kurund Jalmi [Sat, 18 Jul 2015 05:20:59 +0000 (10:50 +0530)]
Merge pull request #6231 from rohankatkar/CRM-16833
CRM-16833: Tax applied to Membership contributions twice with Tax Invoice
Kurund Jalmi [Sat, 18 Jul 2015 05:11:48 +0000 (10:41 +0530)]
Merge pull request #6233 from rohankatkar/NoticeFix
Notice Fix on offline membership
Kurund Jalmi [Sat, 18 Jul 2015 05:10:58 +0000 (10:40 +0530)]
Merge pull request #6238 from monishdeb/4.6
CRM-16858 fix - Participant Status & ID error in adv.search builder
Eileen McNaughton [Fri, 17 Jul 2015 23:49:48 +0000 (11:49 +1200)]
Merge pull request #6246 from eileenmcnaughton/tests
test fix - another instance of old processor instantiation
Eileen McNaughton [Fri, 17 Jul 2015 23:48:30 +0000 (11:48 +1200)]
test fix - another instance of old processor instantiation
Eileen McNaughton [Fri, 17 Jul 2015 23:05:06 +0000 (11:05 +1200)]
Merge pull request #6245 from eileenmcnaughton/CRM-16813
CRM-16813 alter test to reflect true desired behaviour
Eileen McNaughton [Fri, 17 Jul 2015 23:04:41 +0000 (11:04 +1200)]
CRM-16813 alter test to reflect true desired behaviour
Dave Greenberg [Fri, 17 Jul 2015 20:38:50 +0000 (13:38 -0700)]
Merge pull request #6242 from kurund/set-membership-defaults
CRM-16862: Allow setting of default value for donation amount or membership fee via url for contribution/membership pages
Eileen McNaughton [Fri, 17 Jul 2015 18:07:16 +0000 (06:07 +1200)]
Merge pull request #6234 from eileenmcnaughton/CRM-16808
CRM-16808 remove refs to paypal & genericise processor code
Eileen McNaughton [Fri, 17 Jul 2015 18:01:29 +0000 (06:01 +1200)]
Merge pull request #6226 from eileenmcnaughton/CRM-16856
CRM-16856 put Set title function on extendable class
Eileen McNaughton [Fri, 17 Jul 2015 17:59:45 +0000 (05:59 +1200)]
test fixes
Dave Greenberg [Fri, 17 Jul 2015 17:57:07 +0000 (10:57 -0700)]
Merge pull request #6205 from Edzelopez/CRM-16835
CRM-16835 Added fix to allow contributions with Partially paid status…
Jamie McClelland [Fri, 17 Jul 2015 16:21:44 +0000 (12:21 -0400)]
CRM-16854 - ensure open case activities can have notes changed.
yashodha [Fri, 17 Jul 2015 14:51:38 +0000 (20:21 +0530)]
CRM-16853: Soft credit currency is ignored in PCP Owner Notification message
----------------------------------------
* CRM-16853: Soft credit currency is ignored in PCP Owner Notification message.
https://issues.civicrm.org/jira/browse/CRM-16853
Monish Deb [Fri, 17 Jul 2015 13:22:03 +0000 (18:52 +0530)]
Merge pull request #6240 from eileenmcnaughton/CRM-16527
CRM-16527 - Hide credit card section in membership contribution form
Eileen McNaughton [Fri, 17 Jul 2015 12:33:49 +0000 (00:33 +1200)]
phpcs fix
Kurund Jalmi [Fri, 17 Jul 2015 11:55:21 +0000 (17:25 +0530)]
code cleanup
Eileen McNaughton [Fri, 17 Jul 2015 11:53:29 +0000 (23:53 +1200)]
CRM-16808 follow up fixes
Kurund Jalmi [Fri, 17 Jul 2015 11:38:58 +0000 (17:08 +0530)]
fixes to allow overwriting of existing membership defaults via url and code cleanup
Kurund Jalmi [Fri, 17 Jul 2015 10:50:22 +0000 (16:20 +0530)]
allow setting of price set value via url for online membership pages
Eileen McNaughton [Fri, 17 Jul 2015 07:15:44 +0000 (19:15 +1200)]
add enotice on our belt & braces protection fn
Kajan [Wed, 20 May 2015 09:27:26 +0000 (10:27 +0100)]
CRM-16527 - Hide credit card section in membership contribution form
monishdeb [Fri, 17 Jul 2015 07:03:24 +0000 (12:33 +0530)]
CRM-16858 fix - Participant Status & ID error in adv.search builder
https://issues.civicrm.org/jira/browse/CRM-16858
systopia [Fri, 17 Jul 2015 06:42:27 +0000 (08:42 +0200)]
proposed fix for CRM-16845
Eileen McNaughton [Fri, 17 Jul 2015 04:53:58 +0000 (16:53 +1200)]
event search breakage
Eileen McNaughton [Fri, 17 Jul 2015 03:23:30 +0000 (15:23 +1200)]
phpcs fixes
Tim Otten [Fri, 17 Jul 2015 00:49:03 +0000 (17:49 -0700)]
Merge pull request #6216 from colemanw/CRM-16846
CRM-16846 - Fix upgrade sql file skippage
Eileen McNaughton [Thu, 16 Jul 2015 22:07:59 +0000 (10:07 +1200)]
CRM-16808 follow up - finally remove all references to calling doTransferPayment & doDirectPayment & only call doPayment
Eileen McNaughton [Thu, 16 Jul 2015 21:42:15 +0000 (09:42 +1200)]
Merge pull request #6230 from eileenmcnaughton/tests
test fix - instantiate processor in live mode
Eileen McNaughton [Thu, 16 Jul 2015 21:37:45 +0000 (09:37 +1200)]
CRM-16808 remove refs to paypal & genericise processor code
(This was in response to discovering e-notices on no $ but was always 'part-of-the-plan'
the form only calls doPayment now. We only have one concession left to it knowing about contributeMode - whether to call PostProcess hook
colemanw [Thu, 16 Jul 2015 18:20:12 +0000 (14:20 -0400)]
Remove stray merge msg
Coleman Watts [Tue, 14 Jul 2015 18:52:16 +0000 (14:52 -0400)]
CRM-16846 - Fix upgrade sql file skippage
colemanw [Thu, 16 Jul 2015 14:06:02 +0000 (10:06 -0400)]
Merge pull request #6232 from sudhabisht/WebtestFix1
Import and CKEditor webtest failure fix
Web Access [Thu, 16 Jul 2015 14:03:16 +0000 (19:33 +0530)]
Notice Fix on offline membership
Sudha Bisht [Thu, 16 Jul 2015 14:00:48 +0000 (19:30 +0530)]
Ckeditor and Import webtest related fix
Web Access [Thu, 16 Jul 2015 13:50:51 +0000 (19:20 +0530)]
CRM-16833: Tax applied to Membership contributions twice with Tax Invoice
projects / civicrm-core.git / log