Tim Otten [Sun, 27 Sep 2015 18:17:13 +0000 (14:17 -0400)]
CRM-16373 - Fix error on $fiscalYearStart
Error: "Indirect modification of overloaded property CRM_Core_Config::$fiscalYearStart has no effect"
Tim Otten [Sun, 27 Sep 2015 17:49:10 +0000 (13:49 -0400)]
CRM-16373 - CRM_Core_BAO_ConfigSetting - Fix enableComponent
Dave Greenberg [Sat, 26 Sep 2015 22:22:26 +0000 (18:22 -0400)]
Merge pull request #6789 from jdax/fixing_drupal_text_confusion
CRM-17264 Profile: Duplicate User Notice Text Is Confusing
Coleman Watts [Sat, 26 Sep 2015 16:16:57 +0000 (12:16 -0400)]
Merge branch '4.6' into master
Conflicts:
CRM/Upgrade/Incremental/sql/4.6.9.mysql.tpl
colemanw [Sat, 26 Sep 2015 15:53:31 +0000 (11:53 -0400)]
Merge pull request #6805 from colemanw/case
Fix submitting multiple addRole popups on caseView
Coleman Watts [Sat, 26 Sep 2015 15:53:05 +0000 (11:53 -0400)]
Fix submitting multiple addRole popups on caseView
Kurund Jalmi [Fri, 25 Sep 2015 19:00:11 +0000 (00:30 +0530)]
Merge pull request #6799 from yashodha/CRM-17221
CRM-17221: Phuket spelt incorrectly as Phaket in states/counties table
Monish Deb [Fri, 25 Sep 2015 15:53:27 +0000 (21:23 +0530)]
Merge pull request #6801 from jitendrapurohit/casefix
CRM-17282 -- Fix DB error on Add/Manage Case
jitendrapurohit [Fri, 25 Sep 2015 11:38:33 +0000 (17:08 +0530)]
Fix DB error on Add/Manage Case
Monish Deb [Fri, 25 Sep 2015 07:18:55 +0000 (12:48 +0530)]
Merge pull request #6796 from monishdeb/CRM-17270
CRM-17270 fix - Custom country multi-select fields used in a Drupal V…
yashodha [Fri, 25 Sep 2015 04:12:47 +0000 (09:42 +0530)]
CRM-17221: Phuket spelt incorrectly as Phaket in states/counties table
----------------------------------------
* CRM-17221: Phuket spelt incorrectly as Phaket in states/counties table
https://issues.civicrm.org/jira/browse/CRM-17221
Eileen McNaughton [Fri, 25 Sep 2015 02:18:43 +0000 (14:18 +1200)]
Merge pull request #6752 from TobiasLounsbury/UFJoin_Delete
Added api UFJoin::delete
Eileen McNaughton [Fri, 25 Sep 2015 02:16:19 +0000 (14:16 +1200)]
Merge pull request #6798 from eileenmcnaughton/master
API tests: add test to see if preferred language works
eileen [Thu, 24 Sep 2015 21:34:17 +0000 (09:34 +1200)]
API tests: add test to see if preferred language works
Dave Greenberg [Thu, 24 Sep 2015 14:20:04 +0000 (10:20 -0400)]
Merge pull request #6780 from pradpnayak/CRM-17240
--CRM-17240, made financial type mandatory on create of price field v…
monishdeb [Thu, 24 Sep 2015 13:18:18 +0000 (18:48 +0530)]
CRM-17270 fix - Custom country multi-select fields used in a Drupal View display the four digit ID number instead of the name of the country
https://issues.civicrm.org/jira/browse/CRM-17270
Pradeep Nayak [Thu, 24 Sep 2015 11:01:06 +0000 (16:31 +0530)]
--CRM-17240, fixed tests
Yashodha Chaku [Thu, 24 Sep 2015 07:52:35 +0000 (13:22 +0530)]
Merge pull request #6777 from yashodha/CRM-17237
CRM-17237: Add Dedupe Rule allows user to save invalid (empty) RESERV…
colemanw [Wed, 23 Sep 2015 21:09:45 +0000 (17:09 -0400)]
Merge pull request #6792 from colemanw/multisite
Remove multisite extension
Coleman Watts [Wed, 23 Sep 2015 19:57:26 +0000 (15:57 -0400)]
Remove multisite extension
Coleman Watts [Wed, 23 Sep 2015 19:54:03 +0000 (15:54 -0400)]
Add icon to profile form button
CiviCRM [Wed, 23 Sep 2015 18:05:23 +0000 (11:05 -0700)]
Update version to 4.7.alpha2
Kurund Jalmi [Wed, 23 Sep 2015 17:35:48 +0000 (23:05 +0530)]
removed unwanted files
Kurund Jalmi [Wed, 23 Sep 2015 16:17:31 +0000 (21:47 +0530)]
inlclude localization file
Nikki Murray [Wed, 23 Sep 2015 14:30:39 +0000 (10:30 -0400)]
CRM-17264: Profile: Duplicate User Notice Text Is Confusing
Monish Deb [Wed, 23 Sep 2015 14:20:03 +0000 (19:50 +0530)]
Merge pull request #6791 from monishdeb/47alpha1-upgrade-fix
4.7.alpha1 upgrade fixes
monishdeb [Wed, 23 Sep 2015 14:09:16 +0000 (19:39 +0530)]
CRM-16873: OnBehalf fix for multilingual
----------------------------------------
* CRM-16873: Migrating OnBehalf to ProfileContact
https://issues.civicrm.org/jira/browse/CRM-16873
jitendrapurohit [Wed, 23 Sep 2015 11:30:20 +0000 (17:00 +0530)]
4.7.alpha1 upgrade fix
jitendrapurohit [Wed, 23 Sep 2015 09:58:53 +0000 (15:28 +0530)]
include civi.php in distmaker
monishdeb [Wed, 23 Sep 2015 10:06:53 +0000 (15:36 +0530)]
47alpha1 upgrade fix
colemanw [Wed, 23 Sep 2015 01:02:32 +0000 (21:02 -0400)]
Merge pull request #6790 from totten/master-fys
CRM-16373 - Fix default for fiscalYearStart
Tim Otten [Wed, 23 Sep 2015 00:50:52 +0000 (17:50 -0700)]
CRM-16373 - Fix default for fiscalYearStart
Dave Greenberg [Tue, 22 Sep 2015 23:26:28 +0000 (16:26 -0700)]
Merge pull request #6788 from joannechester/crm-16195-rename-and-reorder
CRM-16195-rename-and-reorder
Dave Greenberg [Tue, 22 Sep 2015 23:05:01 +0000 (16:05 -0700)]
Merge pull request #6520 from mlutfy/4.6-crm17034
CRM-17034 : PriceField tax_amount should not be rounded
joannechester [Tue, 22 Sep 2015 22:59:02 +0000 (08:59 +1000)]
CRM-16195-after-regen.sh
Dave Greenberg [Tue, 22 Sep 2015 22:48:01 +0000 (15:48 -0700)]
Merge pull request #6787 from jitendrapurohit/CRM-17204
CRM-17204 - Empty Current Employer profile field disables employer re…
Eileen McNaughton [Tue, 22 Sep 2015 22:37:35 +0000 (10:37 +1200)]
Merge pull request #6783 from eileenmcnaughton/CRM-17258
CRM-17258 add created_id, owner_id to report_instances
Nikki Murray [Tue, 22 Sep 2015 21:24:07 +0000 (17:24 -0400)]
CRM-17264: Profile: Duplicate User Notice Text Is Confusing
Nikki Murray [Tue, 22 Sep 2015 21:17:01 +0000 (17:17 -0400)]
Fixing text to make it more clear that the user has an account but is not registered for an event
Dave Greenberg [Tue, 22 Sep 2015 18:27:35 +0000 (11:27 -0700)]
Merge pull request #6778 from eileenmcnaughton/CRM-17255
CRM-17255 group.api ACLS : do not exclude hidden groups for ACL users
Dave Greenberg [Tue, 22 Sep 2015 16:27:16 +0000 (09:27 -0700)]
Merge pull request #6759 from davecivicrm/CRM-16029
CRM-16029 - fix for create new financial type in when account relatio…
Monish Deb [Tue, 22 Sep 2015 14:36:45 +0000 (20:06 +0530)]
Merge pull request #6786 from monishdeb/CRM-17247
CRM-17247 fix - Vaildation fails silently on required fields (Drupal …
Monish Deb [Tue, 22 Sep 2015 13:04:58 +0000 (18:34 +0530)]
Merge pull request #6782 from monishdeb/CRM-17252
CRM-17252 fix - Advanced Search by Group broken
joannechester [Tue, 22 Sep 2015 12:32:56 +0000 (22:32 +1000)]
CRM-16195-rename-and-reorder
jitendrapurohit [Tue, 22 Sep 2015 12:32:52 +0000 (18:02 +0530)]
CRM-17204 - Empty Current Employer profile field disables employer relationship
monishdeb [Tue, 22 Sep 2015 09:46:20 +0000 (15:16 +0530)]
CRM-17247 fix - Vaildation fails silently on required fields (Drupal user editing)
https://issues.civicrm.org/jira/browse/CRM-17247
yashodha [Tue, 22 Sep 2015 05:35:23 +0000 (11:05 +0530)]
notice fix
eileen [Mon, 21 Sep 2015 22:51:15 +0000 (10:51 +1200)]
CRM-17258 add created_id, owner_id to report_instances
monishdeb [Mon, 21 Sep 2015 20:57:16 +0000 (02:27 +0530)]
CRM-17252 fix - Advanced Search by Group broken
https://issues.civicrm.org/jira/browse/CRM-17252
Dave Greenberg [Mon, 21 Sep 2015 17:53:02 +0000 (10:53 -0700)]
Merge pull request #6779 from JKingsnorth/patch-1
Version fix
Monish Deb [Mon, 21 Sep 2015 14:19:34 +0000 (19:49 +0530)]
Merge pull request #6767 from colemanw/CRM-17131
CRM-17131 - Fix where clause
John Kingsnorth [Mon, 21 Sep 2015 13:52:35 +0000 (14:52 +0100)]
Version fix
Pradeep Nayak [Mon, 21 Sep 2015 13:34:42 +0000 (19:04 +0530)]
--CRM-17240, made financial type mandatory on create of price field value through api
yashodha [Mon, 21 Sep 2015 13:31:28 +0000 (19:01 +0530)]
minor fixes
yashodha [Mon, 21 Sep 2015 11:38:19 +0000 (17:08 +0530)]
CRM-17237: more fixes
----------------------------------------
* CRM-17237: Add Dedupe Rule allows user to save invalid (empty) RESERVED rule
https://issues.civicrm.org/jira/browse/CRM-17237
Kurund Jalmi [Mon, 21 Sep 2015 10:34:02 +0000 (16:04 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-09-21-15-52-41
Conflicts:
CRM/Contribute/BAO/ContributionPage.php
CRM/Core/Resources.php
Yashodha Chaku [Mon, 21 Sep 2015 09:34:52 +0000 (15:04 +0530)]
Merge pull request #6712 from jitendrapurohit/CRM-17146-tests
Test to check CRM-17146 - include trxn_date in completetransaction API
eileenmcnaugton [Mon, 21 Sep 2015 08:25:37 +0000 (20:25 +1200)]
CRM-17255 group.api ACLS : do not exclude hidden groups for ACL users
This commit prevents hidden groups from being filtered out of api results by the check
permission function. The api permission check is fairly new so this only hones the check
yashodha [Mon, 21 Sep 2015 08:05:09 +0000 (13:35 +0530)]
CRM-17237: Add Dedupe Rule allows user to save invalid (empty) RESERVED rule
----------------------------------------
* CRM-17237: Add Dedupe Rule allows user to save invalid (empty) RESERVED rule
https://issues.civicrm.org/jira/browse/CRM-17237
Tim Otten [Mon, 21 Sep 2015 07:46:00 +0000 (00:46 -0700)]
Merge pull request #6776 from totten/master-setting-redux
CRM-16373 - $config - Separate runtime and boot services
Tim Otten [Mon, 21 Sep 2015 06:50:02 +0000 (23:50 -0700)]
Fix api_v3_ContactTest.testContactGetBy*Username
Tim Otten [Sun, 20 Sep 2015 23:17:06 +0000 (16:17 -0700)]
Construct runtime+extensions+container through boot services
Tim Otten [Sat, 19 Sep 2015 08:33:57 +0000 (01:33 -0700)]
Convert $config->userSystem to boot service
Tim Otten [Sat, 19 Sep 2015 05:09:01 +0000 (22:09 -0700)]
CRM-16373 - Bootstrap subsystems in more predictable order
Several subsystems were initialized on-demand. This had a weird side-effect
where the container would start initializing and call another service, which
would then (indirectly) try to initialize another container. The two container
instances would not be the same.
This revision enforces a more carefully considered sequence of events (which
will be documented in the wiki page, "Bootstrap Reference").
Tim Otten [Sat, 19 Sep 2015 05:03:20 +0000 (22:03 -0700)]
CRM_Core_Error - Don't display HTML crash when running tests
Tim Otten [Sat, 19 Sep 2015 01:00:30 +0000 (18:00 -0700)]
CRM-16373 - MagicMerge - Improve comments/readability.
Tim Otten [Mon, 21 Sep 2015 03:54:45 +0000 (20:54 -0700)]
Merge pull request #6774 from totten/master-fs25
composer.json - Use symfony/filesystem circa 2.5
Tim Otten [Mon, 21 Sep 2015 03:00:00 +0000 (20:00 -0700)]
composer.json - Use symfony/filesystem circa 2.5
The rest of the Symfony components are targetting ~2.5, but some reason
we're autoselecting `symfony/filesystem` ~2.7. That produces errors on
`test-debian6-1`.
Eileen McNaughton [Mon, 21 Sep 2015 02:24:27 +0000 (14:24 +1200)]
Merge pull request #6773 from civicrm/eileenmcnaughton-patch-1
CRM-16555 add code-comments
Eileen McNaughton [Mon, 21 Sep 2015 02:01:34 +0000 (14:01 +1200)]
CRM-16555 add code-comments
The patch added for CRM-16555 should not have been needed as the intention was that the function to getValidProcessors handling for mode would have worked. Adding some comments to indicate this for next time someone looks at it.
Dave Greenberg [Fri, 18 Sep 2015 23:55:35 +0000 (16:55 -0700)]
Merge pull request #6771 from seamuslee001/CRM-17231-Master
CRM-17231 Allow for Multipart Report to be included in the Email Processor
Monish Deb [Fri, 18 Sep 2015 22:22:29 +0000 (03:52 +0530)]
Merge pull request #6769 from monishdeb/CRM-17191
CRM-17246 fix - Contact name showing in Contribution summary report
Seamus Lee [Fri, 18 Sep 2015 04:43:38 +0000 (04:43 +0000)]
PHPCS fixes
Seamus Lee [Fri, 18 Sep 2015 04:34:20 +0000 (04:34 +0000)]
Further tweeks following testing
Seamus Lee [Wed, 16 Sep 2015 23:45:37 +0000 (23:45 +0000)]
PHPCS fixes
Seamus Lee [Wed, 16 Sep 2015 23:36:45 +0000 (23:36 +0000)]
CRM-17231 Allow for Multipart Report to be included in the Email Processor
Monish Deb [Fri, 18 Sep 2015 21:45:52 +0000 (03:15 +0530)]
Merge pull request #6755 from agileware/master-crm-17055
CRM-17055: Confirmation email on unpaid events produces syntax error …
Monish Deb [Fri, 18 Sep 2015 21:36:17 +0000 (03:06 +0530)]
Merge pull request #6770 from monishdeb/CRM16920
CRM-16920 - When coding a report template, can specify a default 'fro…
monishdeb [Fri, 18 Sep 2015 20:39:45 +0000 (02:09 +0530)]
CRM-16920 - When coding a report template, can specify a default 'from' and 'to' for date ranges, but not for integer ranges
https://issues.civicrm.org/jira/browse/CRM-16920
monishdeb [Fri, 18 Sep 2015 20:08:55 +0000 (01:38 +0530)]
format fix
monishdeb [Fri, 18 Sep 2015 19:53:49 +0000 (01:23 +0530)]
CRM-17246 fix - Contact name showing in Contribution summary report
https://issues.civicrm.org/jira/browse/CRM-17246
Tim Otten [Fri, 18 Sep 2015 19:51:47 +0000 (12:51 -0700)]
Merge pull request #6768 from totten/master-composer-lock
composer.lock - update
Tim Otten [Fri, 18 Sep 2015 19:37:50 +0000 (12:37 -0700)]
composer.lock - update
Previous merges left composer.lock with incorrect hash
Coleman Watts [Fri, 18 Sep 2015 18:09:49 +0000 (14:09 -0400)]
CRM-17131 - Fix where clause
Monish Deb [Fri, 18 Sep 2015 17:41:29 +0000 (23:11 +0530)]
Merge pull request #6766 from monishdeb/CRM-17191
Crm 17191
Dave Greenberg [Fri, 18 Sep 2015 17:07:38 +0000 (10:07 -0700)]
Merge pull request #6764 from davecivicrm/CRM-15378
CRM-15378 - Add max participants and count to price option browse page.
monishdeb [Fri, 18 Sep 2015 13:44:57 +0000 (19:14 +0530)]
notice and format fixes
Jamie McClelland [Thu, 10 Sep 2015 12:45:33 +0000 (08:45 -0400)]
CRM-17191 - removing redundant if clause.
Jamie McClelland [Thu, 10 Sep 2015 12:38:48 +0000 (08:38 -0400)]
CRM-17191 - ensure Participant list report works with custom Grouping
Previously, we got a trace back if a user defined a group by clause.
I've removed what appears to be crufty code that tries to add the
group by fields to an ORDER BY statement - which conflicts with the
existing ORDER BY statement and seems unnecessary. Also, if the user
wants to group by another field, we should not group by the participant
id.
Yashodha Chaku [Fri, 18 Sep 2015 10:19:44 +0000 (15:49 +0530)]
Merge pull request #6756 from agileware/4.6-crm-17055
CRM-17055: Confirmation email on unpaid events produces syntax error …
Monish Deb [Fri, 18 Sep 2015 09:45:44 +0000 (15:15 +0530)]
Merge pull request #6757 from yashodha/CRM-17227
CRM-17227: Error thrown while saving profile in Contribution page
Tim Otten [Fri, 18 Sep 2015 08:14:47 +0000 (01:14 -0700)]
Merge pull request #6765 from totten/master-cdl
CRM-14232, CRM-16373 - Fix saving of contact_default_language
Tim Otten [Fri, 18 Sep 2015 04:34:12 +0000 (21:34 -0700)]
CRM-14232, CRM-16373 - Fix saving of contact_default_language
Tim Otten [Fri, 18 Sep 2015 00:49:14 +0000 (17:49 -0700)]
Merge pull request #6542 from totten/master-setting-helper
CRM-16373 - $config based on settings (no config_backend). Use Civi:: helper.
Dave Greenberg [Fri, 18 Sep 2015 00:32:44 +0000 (17:32 -0700)]
Merge pull request #6761 from eileenmcnaughton/CRM-17233
CRM-17233 payment block showing in edit mode on contribution page
Dave Greenberg [Fri, 18 Sep 2015 00:27:34 +0000 (17:27 -0700)]
CRM-15378 - Add max participants and count to price option browse page.
----------------------------------------
* CRM-15378: Include Max Participants and Participant Count columns when viewing price field options
https://issues.civicrm.org/jira/browse/CRM-15378
Tim Otten [Thu, 17 Sep 2015 05:14:28 +0000 (22:14 -0700)]
civicrm_generated.mysql - regen
Tim Otten [Thu, 17 Sep 2015 07:51:02 +0000 (00:51 -0700)]
CRM-16373 - Path, URL Admin - Explain variables
Tim Otten [Thu, 17 Sep 2015 05:59:05 +0000 (22:59 -0700)]
SettingsManager::getSystemDefaults() - Return defaults even for critical boot settings
This fixes some issues in tests involving enableComponents.
Upshot: The UI for setting URLs/directories now displays the default values properly.
Tim Otten [Thu, 17 Sep 2015 04:49:57 +0000 (21:49 -0700)]
CRM_Core_BAO_Setting - Don't prefill settings
It's no longer necessary to prefill settings because defaults are loaded in
real(ish) time.
Removing this because it depends on ConfigSetting functions which I'd
like to also remove.
projects / civicrm-core.git / log