civicrm-core.git
7 years agoCRM-20590. moved entity batch function to entityBatch file
Pradeep Nayak [Tue, 23 May 2017 11:03:55 +0000 (16:33 +0530)]
CRM-20590. moved entity batch function to entityBatch file

----------------------------------------
* CRM-20590: Add pre and post hook for EntityBatch
  https://issues.civicrm.org/jira/browse/CRM-20590

7 years agoCRM-20590, add pre and post hook invocation for delete and create/edit option
Pradeep Nayak [Tue, 16 May 2017 23:04:38 +0000 (04:34 +0530)]
CRM-20590, add pre and post hook invocation for delete and create/edit option

----------------------------------------
* CRM-20590: Add pre and post hook for EntityBatch
  https://issues.civicrm.org/jira/browse/CRM-20590

7 years agoMerge pull request #10288 from colemanw/CRM-20097
Tim Otten [Tue, 23 May 2017 02:44:24 +0000 (19:44 -0700)]
Merge pull request #10288 from colemanw/CRM-20097

CRM-20097 - Tweaks and fixes

7 years agoMerge pull request #10400 from civicrm/4.7.20-rc
Eileen McNaughton [Tue, 23 May 2017 02:17:19 +0000 (14:17 +1200)]
Merge pull request #10400 from civicrm/4.7.20-rc

4.7.20 rc

7 years agoMerge pull request #10399 from seamuslee001/multilingual_fix
Eileen McNaughton [Tue, 23 May 2017 02:11:55 +0000 (14:11 +1200)]
Merge pull request #10399 from seamuslee001/multilingual_fix

CRM-20623 Ensure that after using the Add Column method that Multilin…

7 years agoCRM-20263 Ensure that after using the Add Column method that Multilingual schema...
Seamus Lee [Tue, 23 May 2017 00:00:56 +0000 (10:00 +1000)]
CRM-20263 Ensure that after using the Add Column method that Multilingual schema is rebuilt properly

7 years agoMerge pull request #10396 from JMAConsulting/CRM-20618
Eileen McNaughton [Mon, 22 May 2017 19:58:10 +0000 (07:58 +1200)]
Merge pull request #10396 from JMAConsulting/CRM-20618

CRM-20618, build image and url if contact id is present

7 years agoMerge pull request #10364 from JMAConsulting/CRM-20588
colemanw [Mon, 22 May 2017 14:52:11 +0000 (09:52 -0500)]
Merge pull request #10364 from JMAConsulting/CRM-20588

CRM-20588, Add Pre and Post hook for Batch

7 years agoMerge pull request #10391 from systopia/CRM-20606
colemanw [Mon, 22 May 2017 13:18:15 +0000 (08:18 -0500)]
Merge pull request #10391 from systopia/CRM-20606

corrected Austrian province names (CRM-20606)

7 years agoMerge pull request #10367 from JMAConsulting/CRM-20585
colemanw [Mon, 22 May 2017 12:59:09 +0000 (07:59 -0500)]
Merge pull request #10367 from JMAConsulting/CRM-20585

CRM-20585 -Correct the from and to accounts for deferred revenue transactions

7 years agoMerge pull request #10392 from JMAConsulting/CRM-20613
colemanw [Mon, 22 May 2017 12:15:22 +0000 (07:15 -0500)]
Merge pull request #10392 from JMAConsulting/CRM-20613

CRM-20613, fixed notice error by using getKey method

7 years agoCRM-20618, build image and url if contact id is present
Pradeep Nayak [Mon, 22 May 2017 12:12:37 +0000 (17:42 +0530)]
CRM-20618, build image and url if contact id is present

----------------------------------------
* CRM-20618: Generate contact image if contact id is present
  https://issues.civicrm.org/jira/browse/CRM-20618

7 years agoincremental script for CRM-20606
systopia [Mon, 22 May 2017 12:10:47 +0000 (14:10 +0200)]
incremental script for CRM-20606

7 years agoCRM-20613, fixed notice error by using getKey method
Pradeep Nayak [Mon, 22 May 2017 11:21:38 +0000 (16:51 +0530)]
CRM-20613, fixed notice error by using getKey method

----------------------------------------
* CRM-20613: User deprecated function: Deprecated function for New Participant
  https://issues.civicrm.org/jira/browse/CRM-20613

7 years agocorrected Austrian province names (CRM-20606)
systopia [Mon, 22 May 2017 09:34:19 +0000 (11:34 +0200)]
corrected Austrian province names (CRM-20606)

7 years agoMerge pull request #10357 from JMAConsulting/CRM-20574
Eileen McNaughton [Mon, 22 May 2017 05:19:02 +0000 (17:19 +1200)]
Merge pull request #10357 from JMAConsulting/CRM-20574

CRM-20574, fixed notice error

7 years agoMerge pull request #10365 from JMAConsulting/CRM-20589
Eileen McNaughton [Mon, 22 May 2017 05:17:14 +0000 (17:17 +1200)]
Merge pull request #10365 from JMAConsulting/CRM-20589

CRM-20589, fixed strict warning: Non-static method

7 years agoMerge pull request #10371 from MiyaNoctem/CRM-20594-optimize-relationship-count
Eileen McNaughton [Mon, 22 May 2017 05:05:59 +0000 (17:05 +1200)]
Merge pull request #10371 from MiyaNoctem/CRM-20594-optimize-relationship-count

CRM-20594: Optimize Counting of Reltionships on Contact Summary

7 years agoMerge pull request #10382 from herbdool/Redis-fix
Eileen McNaughton [Mon, 22 May 2017 05:04:12 +0000 (17:04 +1200)]
Merge pull request #10382 from herbdool/Redis-fix

Remove call to nonexistent method

7 years agoMerge pull request #9854 from adixon/CRM-20040
Eileen McNaughton [Sun, 21 May 2017 21:58:00 +0000 (09:58 +1200)]
Merge pull request #9854 from adixon/CRM-20040

CRM-20040 Handle apostrophes and double double quotes in on behalf of Org fields

7 years agoMerge pull request #10389 from herbdool/crm20612
colemanw [Sun, 21 May 2017 21:29:19 +0000 (16:29 -0500)]
Merge pull request #10389 from herbdool/crm20612

CRM-20612 fix undefined function when installing on Backdrop

7 years agoMerge pull request #10347 from seamuslee001/CRM-20238
Eileen McNaughton [Sun, 21 May 2017 20:49:56 +0000 (08:49 +1200)]
Merge pull request #10347 from seamuslee001/CRM-20238

CRM-20238 - Create hook for inbound SMS

7 years agoCRM-20612 fix undefined function when installing on Backdrop
Herb vd Dool [Sun, 21 May 2017 18:16:26 +0000 (14:16 -0400)]
CRM-20612 fix undefined function when installing on Backdrop

7 years agoCRM-20585, changed query since to financial accoun holds deferred revenue now
Pradeep Nayak [Sat, 20 May 2017 18:44:06 +0000 (00:14 +0530)]
CRM-20585, changed query since to financial accoun holds deferred revenue now

----------------------------------------
* CRM-20585: Correct the from and to accounts for deferred revenue transactions
  https://issues.civicrm.org/jira/browse/CRM-20585

7 years ago--CRM-20585, fixed financial trxn entry for deferred revenue
Pradeep Nayak [Wed, 17 May 2017 01:23:52 +0000 (06:53 +0530)]
--CRM-20585, fixed financial trxn entry for deferred revenue

CRM-20585, fixed jenkins style

----------------------------------------
* CRM-20585: Correct the from and to accounts for deferred revenue transactions
  https://issues.civicrm.org/jira/browse/CRM-20585

7 years agoCRM-20585, Added unit test to check to and from entries in financial trxn table for...
Pradeep Nayak [Wed, 17 May 2017 00:47:27 +0000 (06:17 +0530)]
CRM-20585, Added unit test to check to and from entries in financial trxn table for deferred revenue

----------------------------------------
* CRM-20585: Correct the from and to accounts for deferred revenue transactions
  https://issues.civicrm.org/jira/browse/CRM-20585

7 years agoMerge pull request #10380 from fuzionnz/CRM-20602-surface_status_api_errors
colemanw [Sat, 20 May 2017 01:19:39 +0000 (20:19 -0500)]
Merge pull request #10380 from fuzionnz/CRM-20602-surface_status_api_errors

Surface errors from API calls to user on status page.

7 years agoLabel an untitled operation as such.
Chris Burgess [Fri, 19 May 2017 21:19:45 +0000 (09:19 +1200)]
Label an untitled operation as such.

CRM-20602

7 years agoPass title of action(s) to refresh(), to make errors more informative.
Chris Burgess [Fri, 19 May 2017 21:16:01 +0000 (09:16 +1200)]
Pass title of action(s) to refresh(), to make errors more informative.

CRM-20602

7 years agoTranslation for user messages.
Chris Burgess [Fri, 19 May 2017 20:28:09 +0000 (08:28 +1200)]
Translation for user messages.

CRM-20602

7 years agoRemove call to nonexistent method
Herb [Fri, 19 May 2017 16:04:27 +0000 (12:04 -0400)]
Remove call to nonexistent method

7 years agoMerge pull request #10375 from JMAConsulting/CRM-20516
Monish Deb [Fri, 19 May 2017 09:20:43 +0000 (14:50 +0530)]
Merge pull request #10375 from JMAConsulting/CRM-20516

CRM-20516: Card type widget appears on front end when a different processor selected

7 years agoMerge pull request #10362 from jitendrapurohit/CRM-20562
Monish Deb [Fri, 19 May 2017 07:36:43 +0000 (13:06 +0530)]
Merge pull request #10362 from jitendrapurohit/CRM-20562

CRM-20562: Duplicate Activities created during participant registration v…

7 years agoadd comments
Monish Deb [Fri, 19 May 2017 07:35:51 +0000 (13:05 +0530)]
add comments

7 years agoSurface errors from API calls to user on status page.
Chris Burgess [Fri, 19 May 2017 05:09:04 +0000 (17:09 +1200)]
Surface errors from API calls to user on status page.

CRM-20602

7 years agoMerge pull request #10378 from totten/master-create-filter
Eileen McNaughton [Fri, 19 May 2017 03:41:38 +0000 (15:41 +1200)]
Merge pull request #10378 from totten/master-create-filter

CRM-20159 - Contact API - Refine & test return values

7 years agoMerge pull request #10379 from seanmadsen/CRM-20301
Eileen McNaughton [Fri, 19 May 2017 02:46:48 +0000 (14:46 +1200)]
Merge pull request #10379 from seanmadsen/CRM-20301

CRM-20301 - better output in search results

7 years agoMerge pull request #10009 from seanmadsen/CRM-20046
Eileen McNaughton [Thu, 18 May 2017 23:14:12 +0000 (11:14 +1200)]
Merge pull request #10009 from seanmadsen/CRM-20046

CRM-20046 - better output for recently viewed list

7 years agoCRM-20159 - Contact.create API - Filter output
Tim Otten [Wed, 22 Feb 2017 21:03:48 +0000 (13:03 -0800)]
CRM-20159 - Contact.create API - Filter output

7 years agoCRM-20159 - Add test case for permissions in CRM-18112
Tim Otten [Wed, 22 Feb 2017 21:03:03 +0000 (13:03 -0800)]
CRM-20159 - Add test case for permissions in CRM-18112

There are a few different edge-cases for the "edit api keys" permission used
in CRM-18112.  This improves test coverage.

7 years agoCRM-20516: Card type widget appears on front end when a different processor selected
deb.monish [Thu, 18 May 2017 08:47:01 +0000 (14:17 +0530)]
CRM-20516: Card type widget appears on front end when a different processor selected

7 years agoMerge pull request #10361 from jitendrapurohit/CRM-20578
Eileen McNaughton [Thu, 18 May 2017 04:14:42 +0000 (16:14 +1200)]
Merge pull request #10361 from jitendrapurohit/CRM-20578

CRM-20578: Empty update of Activity assignee/target results into DB e…

7 years agoMerge pull request #10373 from seamuslee001/CRM-20487
Eileen McNaughton [Wed, 17 May 2017 22:07:05 +0000 (10:07 +1200)]
Merge pull request #10373 from seamuslee001/CRM-20487

CRM-20487 have pingback url use https

7 years agoCRM-20487 have pingback url use https
Seamus Lee [Wed, 17 May 2017 22:04:32 +0000 (08:04 +1000)]
CRM-20487 have pingback url use https

7 years agoMerge pull request #10372 from eileenmcnaughton/custom_date
Eileen McNaughton [Wed, 17 May 2017 21:23:48 +0000 (09:23 +1200)]
Merge pull request #10372 from eileenmcnaughton/custom_date

CRM-20564 custom date fields in on-behalf-of forms broken

7 years agoMerge pull request #10354 from eileenmcnaughton/custom_date
Eileen McNaughton [Wed, 17 May 2017 21:21:57 +0000 (09:21 +1200)]
Merge pull request #10354 from eileenmcnaughton/custom_date

CRM-20564 custom date fields in on-behalf-of forms broken

7 years agoMerge pull request #10358 from JMAConsulting/CRM-20575
colemanw [Wed, 17 May 2017 17:23:41 +0000 (12:23 -0500)]
Merge pull request #10358 from JMAConsulting/CRM-20575

CRM-20575, allow custom code to set created_id

7 years agoCRM-20594: Optimze Counting of Reltionships on Contact Summary
Camilo Rodriguez [Wed, 17 May 2017 16:00:47 +0000 (16:00 +0000)]
CRM-20594: Optimze Counting of Reltionships on Contact Summary

Contacts with a lot of relationships (over 5000) were taking a lot of time to
load.  This was because the count of relationships was being done by fetching
ALL records of relationships associated to the contact, and then counting the
number of elements in the resulting array.

Fixed by changing the call to CRM_Contact_BAO_Relationship::getRelationship()
being used in CRM_Contact_BAO_Contact::getCountComponent(), passing the
$count parameter as 1 instead of 0, so counting is done by the database by
building a 'SELECT COUNT(*)' type of query.

Also, removed some unnecessary joins when counting records in DB, ie. when
$count flag is 1.

7 years agomove contact id validation to wrapper
Jitendra Purohit [Wed, 17 May 2017 10:39:35 +0000 (16:09 +0530)]
move contact id validation to wrapper

7 years agoMerge pull request #10363 from PalanteJon/CRM-20581
Eileen McNaughton [Wed, 17 May 2017 06:56:45 +0000 (18:56 +1200)]
Merge pull request #10363 from PalanteJon/CRM-20581

CRM-20581 - Allow access to 'get' on StateProvince API with 'Access C…

7 years agoSet version to 4.7.21
CiviCRM [Tue, 16 May 2017 23:54:23 +0000 (23:54 +0000)]
Set version to 4.7.21

7 years agoCRM-20589, fixed strict warning: Non-static method
Pradeep Nayak [Tue, 16 May 2017 22:49:47 +0000 (04:19 +0530)]
CRM-20589, fixed strict warning: Non-static method

----------------------------------------
* CRM-20589: Warning on Batch listing page
  https://issues.civicrm.org/jira/browse/CRM-20589

--Fixed notice

7 years agoCRM-20588, add pre and post hook invocation for delete option
Pradeep Nayak [Tue, 16 May 2017 23:02:53 +0000 (04:32 +0530)]
CRM-20588, add pre and post hook invocation for delete option

----------------------------------------
* CRM-20588: Pre and Post hook for Batch
  https://issues.civicrm.org/jira/browse/CRM-20588

7 years agoCRM-20588, added pre and post hook invocation
Pradeep Nayak [Tue, 16 May 2017 22:29:56 +0000 (03:59 +0530)]
CRM-20588, added pre and post hook invocation

----------------------------------------
* CRM-20588: Pre and Post hook for Batch
  https://issues.civicrm.org/jira/browse/CRM-20588

7 years agoCRM-20588, code cleanup
Pradeep Nayak [Tue, 16 May 2017 22:25:14 +0000 (03:55 +0530)]
CRM-20588, code cleanup

----------------------------------------
* CRM-20588: Pre and Post hook for Batch
  https://issues.civicrm.org/jira/browse/CRM-20588

7 years agoMerge pull request #10272 from eileenmcnaughton/search_contacts
Eileen McNaughton [Tue, 16 May 2017 21:57:37 +0000 (09:57 +1200)]
Merge pull request #10272 from eileenmcnaughton/search_contacts

CRM-19643 Remove unused reference to 'selectedSearchContactIds

7 years agoMerge pull request #10284 from eileenmcnaughton/group_api
Eileen McNaughton [Tue, 16 May 2017 21:48:23 +0000 (09:48 +1200)]
Merge pull request #10284 from eileenmcnaughton/group_api

CRM-19246 acl test for group.get api

7 years agostyle fix
Jon goldberg [Tue, 16 May 2017 17:59:38 +0000 (13:59 -0400)]
style fix

7 years agoCRM-20581 - Allow access to 'get' on StateProvince API with 'Access CiviCRM', not...
Jon goldberg [Tue, 16 May 2017 16:59:05 +0000 (12:59 -0400)]
CRM-20581 - Allow access to 'get' on StateProvince API with 'Access CiviCRM', not 'Administer CiviCRM'

7 years agoCRM-20562: Wrong Activities created during participant registration via completetrans...
Jitendra Purohit [Mon, 15 May 2017 14:00:04 +0000 (19:30 +0530)]
CRM-20562: Wrong Activities created during participant registration via completetransaction

7 years agoMerge pull request #10339 from jitendrapurohit/CRM-20558
Eileen McNaughton [Tue, 16 May 2017 05:20:36 +0000 (17:20 +1200)]
Merge pull request #10339 from jitendrapurohit/CRM-20558

CRM-20558: Fix groupby initialisation issue

7 years agoCRM-20578: Empty update of Activity assignee/target results into DB error
Jitendra Purohit [Mon, 15 May 2017 13:54:08 +0000 (19:24 +0530)]
CRM-20578: Empty update of Activity assignee/target results into DB error

7 years agoMerge pull request #10359 from JMAConsulting/CRM-20576
Monish Deb [Mon, 15 May 2017 10:58:41 +0000 (16:28 +0530)]
Merge pull request #10359 from JMAConsulting/CRM-20576

CRM-20576, changed length of civicrm_batch.title to 255

7 years agoMerge pull request #10356 from JMAConsulting/CRM-20573
Eileen McNaughton [Mon, 15 May 2017 07:43:37 +0000 (19:43 +1200)]
Merge pull request #10356 from JMAConsulting/CRM-20573

CRM-20573, fixed notice error

7 years agoCRM-20575, allow custom code to set created_id
Pradeep Nayak [Mon, 15 May 2017 01:10:01 +0000 (06:40 +0530)]
CRM-20575, allow custom code to set created_id

----------------------------------------
* CRM-20575: Allow user to set created_id field for batch
  https://issues.civicrm.org/jira/browse/CRM-20575

CRM-20575, removed white space

----------------------------------------
* CRM-20575: Allow user to set created_id field for batch
  https://issues.civicrm.org/jira/browse/CRM-20575

7 years agoMerge pull request #10330 from colemanw/CRM-20540
colemanw [Mon, 15 May 2017 04:11:11 +0000 (23:11 -0500)]
Merge pull request #10330 from colemanw/CRM-20540

CRM-20540 - Add widcard setting to entityRef fields

7 years agoCRM-20576, changed length of civicrm_batch.title to 255
Pradeep Nayak [Mon, 15 May 2017 01:25:11 +0000 (06:55 +0530)]
CRM-20576, changed length of civicrm_batch.title to 255

----------------------------------------
* CRM-20576: Increase length of civicrm_batch.title
  https://issues.civicrm.org/jira/browse/CRM-20576

7 years agoCRM-20574, fixed notice error
Pradeep Nayak [Mon, 15 May 2017 01:03:53 +0000 (06:33 +0530)]
CRM-20574, fixed notice error

----------------------------------------
* CRM-20574:  Deprecated: Group=''. Name='cvv_backoffice_required'.
  https://issues.civicrm.org/jira/browse/CRM-20574

7 years agoCRM-20573, fixed notice error
Pradeep Nayak [Mon, 15 May 2017 00:59:42 +0000 (06:29 +0530)]
CRM-20573, fixed notice error

----------------------------------------
* CRM-20573: User deprecated function: Deprecated function on View Participabt form
  https://issues.civicrm.org/jira/browse/CRM-20573

7 years agoAdd Tests of processInbound function with hook
Seamus Lee [Sat, 13 May 2017 02:28:14 +0000 (12:28 +1000)]
Add Tests of processInbound function with hook

7 years agoCRM-20238 Switch to using an Object based style as suggested by Tim and Paramatise...
Seamus Lee [Fri, 12 May 2017 22:42:00 +0000 (08:42 +1000)]
CRM-20238 Switch to using an Object based style as suggested by Tim and Paramatise a little

Further use of new Message object

7 years agoCRM-20238 - Create hook for inbound SMS
Effy Elden [Fri, 10 Mar 2017 09:53:00 +0000 (20:53 +1100)]
CRM-20238 - Create hook for inbound SMS

7 years agoCRM-20564 custom date fields in on-behalf-of forms broken
eileen [Sun, 14 May 2017 22:31:35 +0000 (10:31 +1200)]
CRM-20564 custom date fields in on-behalf-of forms broken

7 years agoMerge pull request #10353 from seamuslee001/CRM-20238-tests
Eileen McNaughton [Sun, 14 May 2017 22:28:01 +0000 (10:28 +1200)]
Merge pull request #10353 from seamuslee001/CRM-20238-tests

CRM-20238 (NFC) Add in tests of the ProcessInbound function for SMS a…

7 years ago(NFC) CRM-20238 Add in tests of the ProcessInbound function for SMS and replace depri...
Seamus Lee [Sun, 14 May 2017 21:31:43 +0000 (07:31 +1000)]
(NFC) CRM-20238 Add in tests of the ProcessInbound function for SMS and replace depricated getValue function with the getKey as recommended

Rename test functions and extend the NoTo test

7 years agoMerge pull request #10320 from eileenmcnaughton/dao
Eileen McNaughton [Sun, 14 May 2017 21:37:03 +0000 (09:37 +1200)]
Merge pull request #10320 from eileenmcnaughton/dao

CRM-20541 force connection to be populated when overcome by caching

7 years agoMerge pull request #10350 from seanmadsen/CRM-20570
Eileen McNaughton [Sun, 14 May 2017 20:54:00 +0000 (08:54 +1200)]
Merge pull request #10350 from seanmadsen/CRM-20570

CRM-20570 Add unit test for disabling of PCP

7 years agoMerge pull request #10173 from jitendrapurohit/CRM-18177
Eileen McNaughton [Sun, 14 May 2017 20:44:01 +0000 (08:44 +1200)]
Merge pull request #10173 from jitendrapurohit/CRM-18177

CRM-18177 - Do not update existing membership status if renewal payme…

7 years agominor fixes
Jitendra Purohit [Sun, 14 May 2017 06:49:15 +0000 (12:19 +0530)]
minor fixes

7 years agoCRM-18177 - Do not update existing membership status if renewal payment is failed
Jitendra Purohit [Mon, 17 Apr 2017 14:00:37 +0000 (19:30 +0530)]
CRM-18177 - Do not update existing membership status if renewal payment is failed

7 years agoCRM-20570 Add unit test for disabling of PCP
Sean Madsen [Sat, 13 May 2017 18:42:57 +0000 (13:42 -0500)]
CRM-20570 Add unit test for disabling of PCP

7 years agoMerge pull request #10349 from kcristiano/15067
colemanw [Sat, 13 May 2017 14:19:55 +0000 (09:19 -0500)]
Merge pull request #10349 from kcristiano/15067

CRM-15067 use email addresses in profile if present Rebase PR#10079

7 years agoCRM-15067 fix formatting issues
Kevin Cristiano [Sat, 13 May 2017 13:15:22 +0000 (08:15 -0500)]
CRM-15067 fix formatting issues

----------------------------------------
* CRM-15067: Email should appear in the profile in which it is included, rather than always at the top of contribution page
  https://issues.civicrm.org/jira/browse/CRM-15067

7 years agoCRM-15067 use email addresses in profile if present Rebase PR#10079
Kevin Cristiano [Sat, 13 May 2017 12:58:52 +0000 (07:58 -0500)]
CRM-15067 use email addresses in profile if present Rebase PR#10079

----------------------------------------
* CRM-15067: Email should appear in the profile in which it is included, rather than always at the top of contribution page
  https://issues.civicrm.org/jira/browse/CRM-15067

7 years agoMerge pull request #10342 from highfalutin/patch-1
Eileen McNaughton [Fri, 12 May 2017 20:57:44 +0000 (08:57 +1200)]
Merge pull request #10342 from highfalutin/patch-1

Add me to contributor-key.yml

7 years agoMerge pull request #10345 from kngs/patch-1
Eileen McNaughton [Fri, 12 May 2017 20:56:56 +0000 (08:56 +1200)]
Merge pull request #10345 from kngs/patch-1

Add Karen Stevenson to contributor-key.yml

7 years agoMerge pull request #10343 from JMAConsulting/CRM-20566
Eileen McNaughton [Fri, 12 May 2017 20:52:41 +0000 (08:52 +1200)]
Merge pull request #10343 from JMAConsulting/CRM-20566

CRM-20566: Fatal error on submit of 'Edit Contribution'

7 years agoAdd Karen Stevenson to contributor-key.yml
kngs [Fri, 12 May 2017 20:01:47 +0000 (16:01 -0400)]
Add Karen Stevenson to contributor-key.yml

7 years agoCRM-20566: Fatal error on submit of 'Edit Contribution'
deb.monish [Fri, 12 May 2017 18:44:56 +0000 (00:14 +0530)]
CRM-20566: Fatal error on submit of 'Edit Contribution'

7 years agoUpdate contributor-key.yml
highfalutin [Fri, 12 May 2017 18:41:24 +0000 (13:41 -0500)]
Update contributor-key.yml

7 years agoMerge pull request #10204 from JMAConsulting/CRM-20037
Monish Deb [Fri, 12 May 2017 18:27:42 +0000 (23:57 +0530)]
Merge pull request #10204 from JMAConsulting/CRM-20037

CRM-20555: Incorrect balance amount is shown on participant view page if 'Deferred Revenue' is enabled

7 years agoMerge pull request #10332 from yashodha/CRM-20552
colemanw [Fri, 12 May 2017 16:30:03 +0000 (11:30 -0500)]
Merge pull request #10332 from yashodha/CRM-20552

CRM-20552 - Task for 'Add Relationship - to individual' is missing

7 years agoMerge pull request #10336 from highfalutin/CRM-20418-htmltokens
colemanw [Fri, 12 May 2017 16:10:26 +0000 (11:10 -0500)]
Merge pull request #10336 from highfalutin/CRM-20418-htmltokens

CRM 20418: Make token insertion work correctly when wysiwig is not loaded on Message Template edit

7 years agoFix groupby initialisation issue
Jitendra Purohit [Fri, 12 May 2017 11:22:54 +0000 (16:52 +0530)]
Fix groupby initialisation issue

7 years agoMerge pull request #7499 from seamuslee001/CRM-17754
Eileen McNaughton [Fri, 12 May 2017 04:24:57 +0000 (16:24 +1200)]
Merge pull request #7499 from seamuslee001/CRM-17754

CRM-17754 Include resent headers to ensure that SPF and probably DMAR…

7 years agoMerge pull request #10335 from jitendrapurohit/CRM-20508
Eileen McNaughton [Fri, 12 May 2017 01:41:14 +0000 (13:41 +1200)]
Merge pull request #10335 from jitendrapurohit/CRM-20508

CRM-20508: test fix for non-ascii chars in custom field

7 years agoMerge pull request #10338 from JMAConsulting/CRM-20560
Eileen McNaughton [Thu, 11 May 2017 22:19:50 +0000 (10:19 +1200)]
Merge pull request #10338 from JMAConsulting/CRM-20560

CRM-20560,  fixed join so that its pointed to correct financial type

7 years agoMerge pull request #10328 from arthuralmeidap/CRM-20508-fix-custom-field-label-non...
Eileen McNaughton [Thu, 11 May 2017 22:19:21 +0000 (10:19 +1200)]
Merge pull request #10328 from arthuralmeidap/CRM-20508-fix-custom-field-label-non-ascii

CRM-20508 - Civicrm_Core - create field with non-ascii chars only

7 years agoCombine jQuery selectors
colemanw [Thu, 11 May 2017 21:25:43 +0000 (16:25 -0500)]
Combine jQuery selectors

7 years agoMerge pull request #9864 from PalanteJon/CRM-19977
colemanw [Thu, 11 May 2017 21:19:55 +0000 (16:19 -0500)]
Merge pull request #9864 from PalanteJon/CRM-19977

CRM-19977 - Update all fields manipulated by geocoding hook during Ba…