civicrm-core.git
8 years agoMerge pull request #8534 from agh1/CRM-18778-2
Yashodha Chaku [Wed, 8 Jun 2016 06:03:43 +0000 (11:33 +0530)]
Merge pull request #8534 from agh1/CRM-18778-2

CRM-18778 i18n petition: thank-you page title translation to wrong table

8 years agoMerge pull request #8524 from yashodha/CRM-18554
Yashodha Chaku [Wed, 8 Jun 2016 05:14:33 +0000 (10:44 +0530)]
Merge pull request #8524 from yashodha/CRM-18554

CRM-18554: Using IS EMPTY operator for some date fields crashes 4.7.7

8 years agoCRM-18778 i18n petition: thank-you page title translation to wrong table
Andrew Hunt [Wed, 8 Jun 2016 03:36:33 +0000 (23:36 -0400)]
CRM-18778 i18n petition: thank-you page title translation to wrong table

----------------------------------------
* CRM-18778: Petition thank-you fields translatable to wrong table
  https://issues.civicrm.org/jira/browse/CRM-18778

8 years agoMerge pull request #8347 from eileenmcnaughton/tidy-up
colemanw [Wed, 8 Jun 2016 01:33:29 +0000 (19:33 -0600)]
Merge pull request #8347 from eileenmcnaughton/tidy-up

CRM-17335 reduce use of nullArray

8 years agoMerge pull request #8528 from eileenmcnaughton/membership_form
Eileen McNaughton [Wed, 8 Jun 2016 00:32:28 +0000 (18:32 -0600)]
Merge pull request #8528 from eileenmcnaughton/membership_form

CRM-18701 remove inappropriate actions from processAmount

8 years agoMerge pull request #8531 from PalanteJon/CRM-16888
Eileen McNaughton [Wed, 8 Jun 2016 00:26:50 +0000 (18:26 -0600)]
Merge pull request #8531 from PalanteJon/CRM-16888

CRM-16888 - CiviSMS - fix templates not working with CiviSMS

8 years agoMerge pull request #8532 from xurizaemon/patch-1
Eileen McNaughton [Wed, 8 Jun 2016 00:09:17 +0000 (18:09 -0600)]
Merge pull request #8532 from xurizaemon/patch-1

Correct typo

8 years agoCRM-18701 first round refactor towards removing amount_priceset_level_radio from...
eileen [Mon, 6 Jun 2016 23:57:37 +0000 (17:57 -0600)]
CRM-18701 first round refactor towards removing amount_priceset_level_radio from processPriceSet

Looking to determine the values in a more approprite place & also removing the select one that is NOT used

Change-Id: I0e2087ebbc2f0d8e6b06cec00415c77b9ef44da9

8 years agoCorrect typo
Chris Burgess [Tue, 7 Jun 2016 23:27:06 +0000 (17:27 -0600)]
Correct typo

Random period placed outside XML tags, removing.

8 years agoMerge pull request #8506 from eileenmcnaughton/eileenmcnaughton-my_reports
Eileen McNaughton [Tue, 7 Jun 2016 19:29:38 +0000 (13:29 -0600)]
Merge pull request #8506 from eileenmcnaughton/eileenmcnaughton-my_reports

Eileenmcnaughton my reports

8 years agoMerge pull request #8520 from hkillam/patch-4
Eileen McNaughton [Tue, 7 Jun 2016 19:29:08 +0000 (13:29 -0600)]
Merge pull request #8520 from hkillam/patch-4

CRM-17619 add space before numeric suffix

8 years agoCRM-18701 minor, tangental tidy up
eileen [Mon, 6 Jun 2016 21:55:44 +0000 (15:55 -0600)]
CRM-18701 minor, tangental tidy up

8 years agoCRM-17310 add reports to menu when rebuilding nav from civicrm/admin/menu?reset=1
eileen [Mon, 6 Jun 2016 19:48:42 +0000 (13:48 -0600)]
CRM-17310 add reports to menu when rebuilding nav from civicrm/admin/menu?reset=1

CRM-17310 add reports to menu when rebuilding nav from civicrm/admin/menu?reset=1

8 years ago This is a combination of 2 commits.
eileen [Tue, 6 Oct 2015 02:48:23 +0000 (15:48 +1300)]
 This is a combination of 2 commits.

CRM-17310 add My Reports to initial navigation

typo fx

8 years agoReport test fix
eileen [Mon, 6 Jun 2016 14:45:05 +0000 (08:45 -0600)]
Report test fix

8 years agoCRM-17310 - simplification
Samuel Vanhove [Mon, 6 Jun 2016 00:07:38 +0000 (20:07 -0400)]
CRM-17310 - simplification

8 years agoCRM-17310 Add my reports functionality
eileenmcnaugton [Wed, 30 Sep 2015 07:11:19 +0000 (20:11 +1300)]
CRM-17310 Add my reports functionality

This includes a new my reports menu & the ability to save reports as 'my report' to show on there

8 years agoMerge pull request #8522 from seamuslee001/CRM-18772
Yashodha Chaku [Tue, 7 Jun 2016 10:46:56 +0000 (16:16 +0530)]
Merge pull request #8522 from seamuslee001/CRM-18772

CRM-18772 Create function to check if column already exists in the da…

8 years agoCRM-18554: Using IS EMPTY operator for some date fields crashes 4.7.7
yashodha [Tue, 7 Jun 2016 09:56:48 +0000 (15:26 +0530)]
CRM-18554: Using IS EMPTY operator for some date fields crashes 4.7.7

----------------------------------------
* CRM-18554: Using IS EMPTY operator for some date fields crashes 4.7.7
  https://issues.civicrm.org/jira/browse/CRM-18554

8 years agoCRM-18554: Using IS EMPTY operator for some date fields crashes 4.7.7
yashodha [Tue, 7 Jun 2016 06:56:20 +0000 (12:26 +0530)]
CRM-18554: Using IS EMPTY operator for some date fields crashes 4.7.7

----------------------------------------
* CRM-18554: Using IS EMPTY operator for some date fields crashes 4.7.7
  https://issues.civicrm.org/jira/browse/CRM-18554

8 years agoMerge pull request #8422 from colemanw/CRM-18586
colemanw [Tue, 7 Jun 2016 05:14:31 +0000 (23:14 -0600)]
Merge pull request #8422 from colemanw/CRM-18586

CRM-18586 - Fix race condition when loading custom data forms

8 years agoMerge pull request #8450 from jitendrapurohit/CRM-18586-additional
colemanw [Tue, 7 Jun 2016 05:14:20 +0000 (23:14 -0600)]
Merge pull request #8450 from jitendrapurohit/CRM-18586-additional

CRM-18586 - add delete link and fix add more button

8 years agoMerge pull request #8507 from josephlacey/CRM-18116
Yashodha Chaku [Tue, 7 Jun 2016 05:07:45 +0000 (10:37 +0530)]
Merge pull request #8507 from josephlacey/CRM-18116

CRM-18116 Fixing bug with editing assigned activities within case.

8 years agoMerge pull request #8518 from twomice/CRM-18770
colemanw [Tue, 7 Jun 2016 05:06:21 +0000 (23:06 -0600)]
Merge pull request #8518 from twomice/CRM-18770

Fix for CRM-18770.

8 years agoUpdate Address.php
Heather Killam [Tue, 7 Jun 2016 02:24:28 +0000 (20:24 -0600)]
Update Address.php

8 years agoUpdate Address.php
Heather Killam [Tue, 7 Jun 2016 02:12:09 +0000 (20:12 -0600)]
Update Address.php

8 years agoMerge pull request #2 from hkillam/patch-3
Heather Killam [Mon, 6 Jun 2016 22:50:31 +0000 (18:50 -0400)]
Merge pull request #2 from hkillam/patch-3

Merge two patches into single patch.

8 years agoMerge pull request #8519 from eileenmcnaughton/membership_form
Eileen McNaughton [Mon, 6 Jun 2016 21:45:45 +0000 (15:45 -0600)]
Merge pull request #8519 from eileenmcnaughton/membership_form

Membership form

8 years agoCRM-18701 remove unused variables
eileen [Mon, 6 Jun 2016 21:08:13 +0000 (15:08 -0600)]
CRM-18701 remove unused variables

8 years agoCRM-18701 tidy up, do not pass variables around as a reference when they are not...
eileen [Mon, 6 Jun 2016 20:37:09 +0000 (14:37 -0600)]
CRM-18701 tidy up, do not pass variables around as a reference when they are not being altered

8 years agoCRM-18701 tidy up, stop setting an array key & use a variable.
eileen [Mon, 6 Jun 2016 20:20:50 +0000 (14:20 -0600)]
CRM-18701 tidy up, stop setting an array key & use a variable.

The array key is returned to the calling function but grepping did not find any more instances of it so we should limit it's scope to the function that uses it.

Really we want to pass in  as a non-reference or else it's too unpredictable but this is just a small step

8 years agoFix for CRM-18770.
Allen Shaw [Mon, 6 Jun 2016 19:39:06 +0000 (14:39 -0500)]
Fix for CRM-18770.

8 years agoMerge pull request #8513 from eileenmcnaughton/dash
Eileen McNaughton [Mon, 6 Jun 2016 19:37:45 +0000 (13:37 -0600)]
Merge pull request #8513 from eileenmcnaughton/dash

CRM-18675 do extra check before trying to create dashlets to avoid un…

8 years agoMerge pull request #8497 from colemanw/CRM-18652
colemanw [Mon, 6 Jun 2016 19:30:28 +0000 (13:30 -0600)]
Merge pull request #8497 from colemanw/CRM-18652

CRM-18652 - Improve style of no-results item

8 years agoIncluding all users for case permission check
Joseph Lacey [Mon, 6 Jun 2016 17:00:49 +0000 (11:00 -0600)]
Including all users for case permission check

8 years agoCRM-18675 do extra check before trying to create dashlets to avoid unexpected message
eileen [Mon, 6 Jun 2016 14:45:51 +0000 (08:45 -0600)]
CRM-18675 do extra check before trying to create dashlets to avoid unexpected message

8 years agoUpdate Contact.php
Heather Killam [Mon, 6 Jun 2016 14:33:06 +0000 (08:33 -0600)]
Update Contact.php

8 years agoMerge pull request #8426 from Anjali2906/crm_18560_validation
Yashodha Chaku [Mon, 6 Jun 2016 08:49:39 +0000 (14:19 +0530)]
Merge pull request #8426 from Anjali2906/crm_18560_validation

CRM-18560 - Validate either body text or body html

8 years agoMerge pull request #8490 from eileenmcnaughton/trans
Eileen McNaughton [Mon, 6 Jun 2016 03:27:18 +0000 (21:27 -0600)]
Merge pull request #8490 from eileenmcnaughton/trans

CRM-18661 Fix & add test for financial rows created by repeattransaction

8 years agoMerge pull request #8504 from rollox/patch-2
colemanw [Mon, 6 Jun 2016 02:57:10 +0000 (20:57 -0600)]
Merge pull request #8504 from rollox/patch-2

CRM-18743 - Undefined variable $order

8 years agoCRM-18116 Fixing bug with editing assigned activities within case.
Joseph Lacey [Mon, 6 Jun 2016 02:34:52 +0000 (20:34 -0600)]
CRM-18116 Fixing bug with editing assigned activities within case.

----------------------------------------
* CRM-18116: CiviCase Users Unable to Edit & Add Activities on Cases They've Been Assigned
  https://issues.civicrm.org/jira/browse/CRM-18116

8 years agoremove whitespace
Heather Killam [Mon, 6 Jun 2016 01:39:13 +0000 (19:39 -0600)]
remove whitespace

8 years agoCheck for null value
Heather Killam [Mon, 6 Jun 2016 01:17:37 +0000 (19:17 -0600)]
Check for null value

8 years agoCRM-18661 further fix to ensure payment processor account is used
eileen [Mon, 6 Jun 2016 00:53:03 +0000 (18:53 -0600)]
CRM-18661 further fix to ensure payment processor account is used

8 years agoMerge pull request #8312 from colemanw/CRM-18344
colemanw [Mon, 6 Jun 2016 00:41:07 +0000 (18:41 -0600)]
Merge pull request #8312 from colemanw/CRM-18344

CRM-18344 - Show attachments on CiviMail review panel

8 years agoMerge pull request #8342 from rohankatkar/CRM18472NoticeFix
Eileen McNaughton [Mon, 6 Jun 2016 00:33:42 +0000 (18:33 -0600)]
Merge pull request #8342 from rohankatkar/CRM18472NoticeFix

CRM-18472: Notice fix

8 years agoFix syntax and tests
Seamus Lee [Mon, 6 Jun 2016 00:26:30 +0000 (10:26 +1000)]
Fix syntax and tests

8 years agoCRM-18743 - Undefined variable $order
rollox [Mon, 6 Jun 2016 00:18:09 +0000 (01:18 +0100)]
CRM-18743 - Undefined variable $order

Fixes 3 notice/errors stating "Undefined variable: order in CRM_Contact_BAO_Query->prepareOrderBy()" on Drupal user page when the user record is linked to a Civi contact record. eg at path: user/1

8 years agoMerge pull request #8499 from eileenmcnaughton/strings
Eileen McNaughton [Mon, 6 Jun 2016 00:15:08 +0000 (18:15 -0600)]
Merge pull request #8499 from eileenmcnaughton/strings

CRM-10210 add test for international strings

8 years agoFix validation
Seamus Lee [Mon, 6 Jun 2016 00:12:36 +0000 (10:12 +1000)]
Fix validation

8 years agoMerge pull request #8475 from johanv/CRM-18696-addresses_in_reports_without_address_p...
colemanw [Sun, 5 Jun 2016 23:54:48 +0000 (17:54 -0600)]
Merge pull request #8475 from johanv/CRM-18696-addresses_in_reports_without_address_parsing

CRM-18696 - Street address filtering in reports for sites w/o address parsing

8 years agoCRM-18772 Create function to check if column already exists in the database
Seamus Lee [Sun, 5 Jun 2016 23:36:07 +0000 (09:36 +1000)]
CRM-18772 Create function to check if column already exists in the database

8 years agoCRM-17619 add space before numeric suffix
Heather Killam [Sun, 5 Jun 2016 23:26:28 +0000 (17:26 -0600)]
CRM-17619 add space before numeric suffix

A third place with the same problem.

8 years agoMerge pull request #8318 from AdamHillier/CRM-17657
Eileen McNaughton [Sun, 5 Jun 2016 23:19:11 +0000 (17:19 -0600)]
Merge pull request #8318 from AdamHillier/CRM-17657

CRM-17657 - Update ReCAPCHA validation text to reflect new style of captcha.

8 years agoCRM-10210 add test for international strings
eileen [Sun, 5 Jun 2016 22:27:51 +0000 (16:27 -0600)]
CRM-10210 add test for international strings

8 years agoCRM-18652 - Improve style of no-results item
Coleman Watts [Sun, 5 Jun 2016 21:54:33 +0000 (15:54 -0600)]
CRM-18652 - Improve style of no-results item

8 years agoFix wide date input in CiviMail
Coleman Watts [Sat, 7 May 2016 21:02:11 +0000 (17:02 -0400)]
Fix wide date input in CiviMail

8 years agoCRM-18344 - Show attachments on CiviMail review panel
Coleman Watts [Sat, 7 May 2016 20:59:06 +0000 (16:59 -0400)]
CRM-18344 - Show attachments on CiviMail review panel

8 years agoMerge pull request #8408 from AdamHillier/bug-fix
Eileen McNaughton [Sun, 5 Jun 2016 20:00:32 +0000 (14:00 -0600)]
Merge pull request #8408 from AdamHillier/bug-fix

Typo fix: remove space before question mark.

8 years agoMerge pull request #8435 from totten/master-regen-cms
Eileen McNaughton [Sun, 5 Jun 2016 19:25:14 +0000 (13:25 -0600)]
Merge pull request #8435 from totten/master-regen-cms

bin/regen.sh - Execute GenerateData.php after initializing other database structures

8 years agoMerge pull request #8495 from seamuslee001/CRM-18652
Eileen McNaughton [Sun, 5 Jun 2016 18:49:41 +0000 (12:49 -0600)]
Merge pull request #8495 from seamuslee001/CRM-18652

CRM-18652 Show no results label in quick search

8 years agoMerge pull request #8421 from ineffyble/correctly-update-test-payment-processor-urls
Eileen McNaughton [Sun, 5 Jun 2016 18:45:57 +0000 (12:45 -0600)]
Merge pull request #8421 from ineffyble/correctly-update-test-payment-processor-urls

CRM-18625 - payment processors - correctly set test URLs from edit form

8 years agoCRM-18751 - Add method for setting payment processor return URL (#8488)
colemanw [Sun, 5 Jun 2016 17:56:47 +0000 (11:56 -0600)]
CRM-18751 - Add method for setting payment processor return URL (#8488)

* CRM-18751 - Add method for setting payment processor return URL

* CRM-18751 - Restore protected visibility of functions

8 years agoMerge pull request #8491 from seamuslee001/CRM-18752
Eileen McNaughton [Sun, 5 Jun 2016 17:53:50 +0000 (11:53 -0600)]
Merge pull request #8491 from seamuslee001/CRM-18752

CRM-18752 Fix Custom multi value importer

8 years agoMerge pull request #8142 from monishdeb/CRM-17779
Eileen McNaughton [Sun, 5 Jun 2016 17:51:22 +0000 (11:51 -0600)]
Merge pull request #8142 from monishdeb/CRM-17779

CRM-17779: Authorize.Net payments held for fraud detection aren't logged in CiviCRM

8 years agoMerge pull request #7797 from JKingsnorth/CRM-17977
Mathieu Lutfy [Sun, 5 Jun 2016 16:59:18 +0000 (12:59 -0400)]
Merge pull request #7797 from JKingsnorth/CRM-17977

CRM-17977 Usability of allowed countries/states

8 years agoCRM-18661 Fix & add test for financial rows created by repeattransaction
eileen [Sun, 5 Jun 2016 06:36:11 +0000 (00:36 -0600)]
CRM-18661 Fix & add test for financial rows created by repeattransaction

8 years agoCRM-18652 fix bug found in testing
Seamus Lee [Sun, 5 Jun 2016 07:48:20 +0000 (17:48 +1000)]
CRM-18652 fix bug found in testing

8 years agoCRM-18652 - Localize label for no results
Effy Elden [Mon, 23 May 2016 14:32:17 +0000 (10:32 -0400)]
CRM-18652 - Localize label for no results

----------------------------------------
* CRM-18652: Quick search should provide feedback to user if no matches are found
  https://issues.civicrm.org/jira/browse/CRM-18652

8 years agoCRM-18652 - Show 'no matches' if quick search returns no results
Effy Elden [Sun, 22 May 2016 05:19:32 +0000 (01:19 -0400)]
CRM-18652 - Show 'no matches' if quick search returns no results

----------------------------------------
* CRM-18652: Quick search should provide feedback to user if no matches are found
  https://issues.civicrm.org/jira/browse/CRM-18652

8 years agoMerge pull request #8483 from colemanw/CRM-18742
colemanw [Sun, 5 Jun 2016 07:23:15 +0000 (01:23 -0600)]
Merge pull request #8483 from colemanw/CRM-18742

CRM-18742 - Focus first text field on search forms

8 years agoMerge pull request #8460 from colemanw/CRM-18660
colemanw [Sun, 5 Jun 2016 07:17:35 +0000 (01:17 -0600)]
Merge pull request #8460 from colemanw/CRM-18660

CRM-18660 - Fix custom field year range selection

8 years agoMerge pull request #8233 from PalanteJon/CRM-18468
Eileen McNaughton [Sun, 5 Jun 2016 06:45:48 +0000 (00:45 -0600)]
Merge pull request #8233 from PalanteJon/CRM-18468

CRM-18468 - Recurring Contributions - don't use mid for subscription …

8 years agoAdd in fixes for CRM-18708 as well as its needed on 4.7 and make minor fix as suggest...
Seamus Lee [Sun, 5 Jun 2016 06:09:10 +0000 (16:09 +1000)]
Add in fixes for CRM-18708 as well as its needed on 4.7 and make minor fix as suggested by Coleman

8 years agoCRM-18752 Fix Custom multi value importer
Seamus Lee [Sun, 5 Jun 2016 05:46:14 +0000 (15:46 +1000)]
CRM-18752 Fix Custom multi value importer

8 years agoMerge pull request #7728 from andrew-cormick-dockery/CRM-17959
Eileen McNaughton [Sun, 5 Jun 2016 02:23:56 +0000 (20:23 -0600)]
Merge pull request #7728 from andrew-cormick-dockery/CRM-17959

CRM-17959 - allow URL to be redirected if the queue ID is invalid but…

8 years agoMerge pull request #8485 from colemanw/CRM-18744
colemanw [Sun, 5 Jun 2016 01:52:02 +0000 (19:52 -0600)]
Merge pull request #8485 from colemanw/CRM-18744

CRM-18744 - Remember quicksearch field selection

8 years agoMerge pull request #8484 from colemanw/actCustomSearch
colemanw [Sun, 5 Jun 2016 01:44:02 +0000 (19:44 -0600)]
Merge pull request #8484 from colemanw/actCustomSearch

Fix undeclared variables in custom activity search

8 years agoRemove deprecated param
colemanw [Sun, 5 Jun 2016 00:12:58 +0000 (18:12 -0600)]
Remove deprecated param

8 years agoMerge pull request #8332 from TobiasLounsbury/CRM-17888-freq-unit
Eileen McNaughton [Sat, 4 Jun 2016 23:08:14 +0000 (17:08 -0600)]
Merge pull request #8332 from TobiasLounsbury/CRM-17888-freq-unit

CRM-17888: Updated frequency unit to type T_STRING

8 years agoMerge pull request #8472 from cividesk/CRM-10230-4.7
Tim Otten [Sat, 4 Jun 2016 21:42:37 +0000 (15:42 -0600)]
Merge pull request #8472 from cividesk/CRM-10230-4.7

CRM-10230 Custom fields text type with limited length not validated

8 years agoCRM-18744 - Remember quicksearch field selection
Coleman Watts [Fri, 3 Jun 2016 22:16:41 +0000 (16:16 -0600)]
CRM-18744 - Remember quicksearch field selection

8 years agoFix undeclared variables in custom activity search
Coleman Watts [Fri, 3 Jun 2016 21:28:37 +0000 (15:28 -0600)]
Fix undeclared variables in custom activity search

8 years agoCRM-18742 - Focus first text field on search forms
Coleman Watts [Fri, 3 Jun 2016 16:51:00 +0000 (10:51 -0600)]
CRM-18742 - Focus first text field on search forms

8 years agoMerge pull request #8482 from JKingsnorth/CRM-18739
Yashodha Chaku [Fri, 3 Jun 2016 11:39:57 +0000 (17:09 +0530)]
Merge pull request #8482 from JKingsnorth/CRM-18739

CRM-18739: Display currency for canceled contribution amount

8 years agoMerge pull request #8481 from yashodha/CRM-18699
Yashodha Chaku [Fri, 3 Jun 2016 11:17:19 +0000 (16:47 +0530)]
Merge pull request #8481 from yashodha/CRM-18699

CRM-18699: fix generated data for the typo

8 years agoMerge pull request #8430 from yashodha/CRM-18655
Yashodha Chaku [Fri, 3 Jun 2016 11:06:40 +0000 (16:36 +0530)]
Merge pull request #8430 from yashodha/CRM-18655

CRM-18655: Selected id's not escaped properly

8 years agoMerge pull request #8451 from yashodha/CRM-18139
Yashodha Chaku [Fri, 3 Jun 2016 10:51:04 +0000 (16:21 +0530)]
Merge pull request #8451 from yashodha/CRM-18139

CRM-18139: Notification needed when using Batch Update of Participant…

8 years agoCRM-18739: Display currency for canceled contribution amount
JKingsnorth [Fri, 3 Jun 2016 10:50:31 +0000 (11:50 +0100)]
CRM-18739: Display currency for canceled contribution amount

8 years agoCRM-18699: fix generated data for the typo
yashodha [Fri, 3 Jun 2016 08:36:58 +0000 (14:06 +0530)]
CRM-18699: fix generated data for the typo

----------------------------------------
* CRM-18699: Wake Island is misspelled
  https://issues.civicrm.org/jira/browse/CRM-18699

8 years agoMerge pull request #8477 from mpnordland/master
Yashodha Chaku [Fri, 3 Jun 2016 08:34:27 +0000 (14:04 +0530)]
Merge pull request #8477 from mpnordland/master

CRM-18699 Fixed Wake Island spelling

8 years agoCRM-18699 fix in 4.7.9 now, better where statment
Micah Nordland [Thu, 2 Jun 2016 15:25:50 +0000 (11:25 -0400)]
CRM-18699 fix in 4.7.9 now, better where statment

8 years agoMerge pull request #8328 from mlutfy/master-crm18524
Yashodha Chaku [Thu, 2 Jun 2016 13:05:24 +0000 (18:35 +0530)]
Merge pull request #8328 from mlutfy/master-crm18524

CRM-18524: Fix db error when exporting contributions (phone_type_id is not a real ID field).

8 years agoMerge remote-tracking branch 'origin/4.7.8-rc' into 4.7.8-rc-master-2016-06-02-00...
Tim Otten [Thu, 2 Jun 2016 06:34:46 +0000 (00:34 -0600)]
Merge remote-tracking branch 'origin/4.7.8-rc' into 4.7.8-rc-master-2016-06-02-00-34-42

8 years agoCRM-18699 Fixed Wake Island spelling
Micah Nordland [Wed, 1 Jun 2016 16:33:58 +0000 (12:33 -0400)]
CRM-18699 Fixed Wake Island spelling

8 years agoMerge pull request #8438 from yashodha/CRM-18659
Yashodha Chaku [Wed, 1 Jun 2016 12:52:09 +0000 (18:22 +0530)]
Merge pull request #8438 from yashodha/CRM-18659

CRM-18659: inappropriate place for upgrade script

8 years agoCRM-18696 - Street address filtering in reports for sites without address parsing.
Johan Vervloet [Mon, 30 May 2016 14:46:43 +0000 (16:46 +0200)]
CRM-18696 - Street address filtering in reports for sites without address parsing.

----------------------------------------
* CRM-18696: Street filter in Constituent Summary report broken without street address parsing
  https://issues.civicrm.org/jira/browse/CRM-18696

8 years agoCRM-10230 Custom fields text type with limited length not validated
sunil [Tue, 31 May 2016 06:27:14 +0000 (11:57 +0530)]
CRM-10230 Custom fields text type with limited length not validated

8 years agoTest formatting and changed to base_convert
Anjali Ujjainia [Mon, 30 May 2016 08:03:07 +0000 (13:33 +0530)]
Test formatting and changed to base_convert

8 years agobin/regen.sh - Run DatabaseInitializer (first boot) before GenerateData
Tim Otten [Sat, 28 May 2016 02:19:57 +0000 (19:19 -0700)]
bin/regen.sh - Run DatabaseInitializer (first boot) before GenerateData

The DatabaseInitializer is called during first boot
(`CRM_Core_Config::singleton()`) and runs `system.flush session=1
triggers=1` which (among other things) enumerates modules (including CMS
modules).  In standalone boot protocol, that means it runs before
`CRM_Utils_System::loadBootstrap()` (which means that CMS modules
cannot be enumerated yet).

A simple work-around is to always boot the CMS first (before
`CRM_Core_Config::singleton()` or `DatabaseInitializer` runs).