Eileen McNaughton [Mon, 27 Jul 2015 23:17:36 +0000 (11:17 +1200)]
Merge pull request #6312 from eileenmcnaughton/master
Master
Dave Greenberg [Mon, 27 Jul 2015 19:00:46 +0000 (12:00 -0700)]
Merge pull request #6296 from JMAConsulting/CRM-16187
Crm 16187
Coleman Watts [Mon, 27 Jul 2015 14:37:14 +0000 (10:37 -0400)]
Remove duplicate code (merge error)
Kurund Jalmi [Mon, 27 Jul 2015 06:45:26 +0000 (12:15 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-07-27-10-02-15
Conflicts:
CRM/Contribute/Form/Contribution.php
CRM/Core/Payment.php
CRM/Core/Payment/IATS.php
CRM/Core/Payment/PayPalImpl.php
Eileen McNaughton [Mon, 27 Jul 2015 04:34:09 +0000 (16:34 +1200)]
CRM-16919 add domain_id to cacheKey in 4.7
Eileen McNaughton [Mon, 27 Jul 2015 02:07:00 +0000 (14:07 +1200)]
CRM-16919 filter payment processor by domain
Kurund Jalmi [Mon, 27 Jul 2015 04:26:34 +0000 (09:56 +0530)]
Merge pull request #6311 from eileenmcnaughton/4.6
CRM-16919 filter payment processor by domain
Eileen McNaughton [Mon, 27 Jul 2015 02:07:00 +0000 (14:07 +1200)]
CRM-16919 filter payment processor by domain
Eileen McNaughton [Sun, 26 Jul 2015 21:00:12 +0000 (09:00 +1200)]
Merge pull request #6290 from eileenmcnaughton/CRM-16809
CRM-16809 paypal express button not always loading
colemanw [Sun, 26 Jul 2015 20:13:13 +0000 (16:13 -0400)]
Merge pull request #6305 from joannechester/patch-3
CRM-16492-Change help text for creating smart group
joannechester [Sun, 26 Jul 2015 13:07:36 +0000 (23:07 +1000)]
crm-16492-change-help-text-on-creating-smart-group
Kurund Jalmi [Sun, 26 Jul 2015 03:14:30 +0000 (08:44 +0530)]
Merge pull request #6303 from lcdservices/CRM-16916
CRM-16916 fix validation when formatting field present
Brian Shaughnessy [Sat, 25 Jul 2015 23:28:49 +0000 (19:28 -0400)]
CRM-16916 fix validation when formatting field present
colemanw [Sat, 25 Jul 2015 19:14:51 +0000 (15:14 -0400)]
Merge pull request #6300 from colemanw/CRM-16860
CRM-16860 - Upgrade code refactor/cleanup
Pradeep Nayak [Sat, 25 Jul 2015 05:20:28 +0000 (10:50 +0530)]
--CRM-16187, modified xml file for Entity financial trxn table to include Title for columns
Pradeep Nayak [Thu, 23 Jul 2015 20:13:07 +0000 (01:43 +0530)]
--CRM-16187, fixed code style
Pradeep Nayak [Thu, 23 Jul 2015 20:09:32 +0000 (01:39 +0530)]
--CRM-16187, fixed jenkin warnings
Pradeep Nayak [Thu, 23 Jul 2015 20:01:58 +0000 (01:31 +0530)]
--CRM-16187, restored deleted function
Pradeep Nayak [Thu, 23 Jul 2015 19:57:13 +0000 (01:27 +0530)]
--CRM-16187, Added create spec for financial trxn create
Pradeep Nayak [Thu, 28 May 2015 20:21:26 +0000 (01:51 +0530)]
--CRM-16187, Added warning for Code Docs
Pradeep Nayak [Thu, 28 May 2015 20:11:59 +0000 (01:41 +0530)]
--CRM-16187, added warning text in API explorer
Pradeep Nayak [Thu, 28 May 2015 20:05:45 +0000 (01:35 +0530)]
--CRM-16187, added CRUD api for entity_financial_trxn
Dave Greenberg [Fri, 24 Jul 2015 23:00:49 +0000 (16:00 -0700)]
Merge pull request #6298 from sudhabisht/CRM-16160
Fix the HTML markup / layout issue
Coleman Watts [Fri, 24 Jul 2015 15:15:51 +0000 (11:15 -0400)]
CRM-16860 - Cleanup & add base class for CRM_Upgrade_Incremental
Dave Greenberg [Fri, 24 Jul 2015 16:14:33 +0000 (09:14 -0700)]
Merge pull request #6259 from systopia/CRM-16871
Proposed changes for CRM-16871
Coleman Watts [Fri, 24 Jul 2015 02:05:41 +0000 (22:05 -0400)]
CRM-16860 - Enforce minimum upgradable version
Coleman Watts [Fri, 24 Jul 2015 01:46:36 +0000 (21:46 -0400)]
CRM-16860 - Refactor out CRM_Upgrade_Incremental_Legacy
Coleman Watts [Fri, 24 Jul 2015 01:28:37 +0000 (21:28 -0400)]
CRM-16860 - Remove upgrade code < 4.1
Sudha Bisht [Fri, 24 Jul 2015 14:08:41 +0000 (19:38 +0530)]
Fix the HTML markup / layout
Kurund Jalmi [Fri, 24 Jul 2015 10:56:59 +0000 (16:26 +0530)]
Merge pull request #5473 from aydun/CRM-16160
CRM-16160: Changes to add search by age to Advanced Search
Eileen McNaughton [Fri, 24 Jul 2015 01:05:25 +0000 (13:05 +1200)]
Merge pull request #6288 from eileenmcnaughton/CRM-16523
CRM-16523 relocate functions relating to completing contributions & s…
colemanw [Fri, 24 Jul 2015 00:42:17 +0000 (20:42 -0400)]
Merge pull request #6145 from colemanw/CRM-9386
CRM-9386 - Fix api saving inherited memberships
Dave Greenberg [Thu, 23 Jul 2015 21:23:59 +0000 (14:23 -0700)]
Merge pull request #6292 from colemanw/CRM-16872
CRM-16872 - Ensure errors are displayed from semi-ajax forms
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 04:50:02 +0000 (16:50 +1200)]
CRM-16524 relocate functions relating to completing contributions & sending receipts from baseIPN to ContributionBAO
These functions are not IPN specific & going off to the IPN for them has been a sore point that is worth resolved before fixing lack of hook calling
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
Coleman Watts [Thu, 23 Jul 2015 20:01:39 +0000 (16:01 -0400)]
Fix 'View Primary' membership button css
Coleman Watts [Sun, 5 Jul 2015 18:42:51 +0000 (14:42 -0400)]
CRM-9386 - Fix api saving inherited memberships
Coleman Watts [Thu, 23 Jul 2015 16:15:06 +0000 (12:15 -0400)]
CRM-16872 - Ensure errors are displayed from semi-ajax forms
eileenmcnaughton [Thu, 23 Jul 2015 09:36:27 +0000 (09:36 +0000)]
CRM-16809 paypal express button not always loading
The issue was that the button name was being overridden
systopia [Thu, 23 Jul 2015 09:34:30 +0000 (11:34 +0200)]
fixed style warnings
Yashodha Chaku [Thu, 23 Jul 2015 09:10:28 +0000 (14:40 +0530)]
Merge pull request #6289 from yashodha/CRM-16879
CRM-16879: Tab with table records showing duplicate data with date da…
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
Kurund Jalmi [Thu, 23 Jul 2015 07:05:09 +0000 (12:35 +0530)]
Merge pull request #6284 from LevityNL/4.6
Fix CRM-16866 for 4.6 branch
eileenmcnaughton [Thu, 23 Jul 2015 04:22:42 +0000 (04:22 +0000)]
test fix - clear static value caching
Eileen McNaughton [Thu, 23 Jul 2015 04:23:11 +0000 (16:23 +1200)]
Merge pull request #6285 from eileenmcnaughton/CRM-16890
CRM-16890 remove IATS
Eileen McNaughton [Wed, 22 Jul 2015 21:28:43 +0000 (09:28 +1200)]
CRM-16890 remove IATS
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
Kevin Levie [Wed, 22 Jul 2015 18:24:03 +0000 (20:24 +0200)]
Fix CRM-16866 for 4.6 branch
colemanw [Wed, 22 Jul 2015 17:56:12 +0000 (13:56 -0400)]
Merge pull request #6283 from colemanw/changelog
CRM-16889 - Don't force-refresh the changelog tab to avoid performance overhead
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…
Coleman Watts [Tue, 21 Jul 2015 20:07:13 +0000 (16:07 -0400)]
CRM-16889 - Don't force-refresh the changelog tab to avoid performance overhead
yashodha [Wed, 22 Jul 2015 13:16:04 +0000 (18:46 +0530)]
CRM-16879: Tab with table records showing duplicate data with date data type
----------------------------------------
* CRM-16879: Tab with table records showing duplicate data with date data type
https://issues.civicrm.org/jira/browse/CRM-16879
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
Monish Deb [Wed, 22 Jul 2015 07:24:22 +0000 (12:54 +0530)]
Merge pull request #6273 from rohankatkar/CRM-16857
CRM-16857: inherited membership through priceset creates multiple line items
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:23:39 +0000 (14:23 -0700)]
Merge pull request #6274 from civicrm/revert-6252-CRM-16867
Revert "CRM-16867 fix membership-renew check to get membership types …
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 18:52:47 +0000 (11:52 -0700)]
Merge pull request #6241 from jitendrapurohit/CRM-16776reg
CRM-16776 - additional bug fixes
Dave Greenberg [Tue, 21 Jul 2015 18:45:37 +0000 (11:45 -0700)]
Revert "CRM-16867 fix membership-renew check to get membership types from pri…"
Dave Greenberg [Tue, 21 Jul 2015 18:43:04 +0000 (11:43 -0700)]
Merge pull request #6252 from eileenmcnaughton/CRM-16867
CRM-16867 fix membership-renew check to get membership types from pri…
Dave Greenberg [Tue, 21 Jul 2015 18:41:22 +0000 (11:41 -0700)]
Merge pull request #6271 from monishdeb/4.6
CRM-16868 fix - Incorrect "Pending Refund Status" for Contribution af…
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 17:02:06 +0000 (10:02 -0700)]
Merge pull request #6266 from eileenmcnaughton/CRM-16559
CRM-16559 allow recurring contributions to go against pledges for supporting processors
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
monishdeb [Tue, 21 Jul 2015 14:41:38 +0000 (20:11 +0530)]
CRM-16868 fix - Incorrect "Pending Refund Status" for Contribution after Change Selections in Participation
https://issues.civicrm.org/jira/browse/CRM-16868
Web Access [Tue, 21 Jul 2015 14:25:36 +0000 (19:55 +0530)]
Fix for CRM-16857
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 [Tue, 21 Jul 2015 08:25:19 +0000 (20:25 +1200)]
Merge pull request #6263 from eileenmcnaughton/CRM-16867-extra-fn-46
CRM-16867 add function to determin combination of membership types in a priceset
Eileen McNaughton [Tue, 21 Jul 2015 07:29:06 +0000 (19:29 +1200)]
CRM-16559 allow recurring contributions to go against pledges for supporting processors
projects / civicrm-core.git / log