civicrm-core.git
8 years agoCRM-17695: ts() fixes.
Mathieu Lutfy [Fri, 11 Dec 2015 16:27:30 +0000 (11:27 -0500)]
CRM-17695: ts() fixes.

8 years agoMerge pull request #7433 from colemanw/CRM_Utils_Check
colemanw [Fri, 11 Dec 2015 14:24:12 +0000 (09:24 -0500)]
Merge pull request #7433 from colemanw/CRM_Utils_Check

CRM_Utils_Check Fixes

8 years agoMerge pull request #7428 from colemanw/config
colemanw [Fri, 11 Dec 2015 13:26:11 +0000 (08:26 -0500)]
Merge pull request #7428 from colemanw/config

Add some @property annotations to CRM_Core_Config

8 years agoMake assertValid do what it says it does
Coleman Watts [Fri, 11 Dec 2015 13:15:35 +0000 (08:15 -0500)]
Make assertValid do what it says it does

8 years agoUpdate test with renamed class
Coleman Watts [Fri, 11 Dec 2015 13:02:01 +0000 (08:02 -0500)]
Update test with renamed class

8 years agoAdd some @property annotations to CRM_Core_Config
Coleman Watts [Fri, 11 Dec 2015 02:56:15 +0000 (21:56 -0500)]
Add some @property annotations to CRM_Core_Config

8 years agoCleanup CRM_Utils_Check classes
Coleman Watts [Fri, 11 Dec 2015 02:32:59 +0000 (21:32 -0500)]
Cleanup CRM_Utils_Check classes

8 years agoMerge pull request #7000 from eileenmcnaughton/CRM-17275-import
Eileen McNaughton [Fri, 11 Dec 2015 02:14:12 +0000 (15:14 +1300)]
Merge pull request #7000 from eileenmcnaughton/CRM-17275-import

Crm 17275 import

8 years agopreliminary tidy up
eileenmcnaughton [Fri, 11 Dec 2015 01:10:55 +0000 (01:10 +0000)]
preliminary tidy up

8 years agoMerge pull request #7422 from colemanw/CRM-17637
colemanw [Thu, 10 Dec 2015 21:43:16 +0000 (16:43 -0500)]
Merge pull request #7422 from colemanw/CRM-17637

CRM-17637 - Add poor man's cron fallback for VersionCheck

8 years agoCRM-17637 - Ensure files directory is writeable
Coleman Watts [Thu, 10 Dec 2015 17:31:30 +0000 (12:31 -0500)]
CRM-17637 - Ensure files directory is writeable

8 years agoCRM-17637 - Add unit test for cron fallback
Coleman Watts [Thu, 10 Dec 2015 16:22:40 +0000 (11:22 -0500)]
CRM-17637 - Add unit test for cron fallback

8 years agoMerge pull request #7426 from jitendrapurohit/webtest47
Monish Deb [Thu, 10 Dec 2015 16:35:29 +0000 (22:05 +0530)]
Merge pull request #7426 from jitendrapurohit/webtest47

webtest fixes

8 years agoMerge pull request #6189 from sudhabisht/crm-16769
Monish Deb [Thu, 10 Dec 2015 13:20:31 +0000 (18:50 +0530)]
Merge pull request #6189 from sudhabisht/crm-16769

Add field mapping api

8 years agowebtest fixes
jitendrapurohit [Thu, 10 Dec 2015 13:16:11 +0000 (18:46 +0530)]
webtest fixes

8 years agoMerge pull request #7425 from yashodha/CRM-17682
Yashodha Chaku [Thu, 10 Dec 2015 12:33:05 +0000 (18:03 +0530)]
Merge pull request #7425 from yashodha/CRM-17682

CRM-17682: Membership status rule edit form won't save removal of 'ad…

8 years agoMerge pull request #7420 from davecivicrm/CRM-16526
Monish Deb [Thu, 10 Dec 2015 08:25:05 +0000 (13:55 +0530)]
Merge pull request #7420 from davecivicrm/CRM-16526

CRM-16525 - Remove $finType var assign since it throws an eNotice if …

8 years agoMerge pull request #7424 from jitendrapurohit/CRM-17692
Monish Deb [Thu, 10 Dec 2015 08:19:10 +0000 (13:49 +0530)]
Merge pull request #7424 from jitendrapurohit/CRM-17692

CRM-17692 - Improper advance search result for multiple tag set

8 years agoTest Fix
Sudha Bisht [Thu, 10 Dec 2015 08:09:46 +0000 (13:39 +0530)]
Test Fix

8 years agoRemoved api skipped part
Sudha Bisht [Fri, 7 Aug 2015 14:00:00 +0000 (19:30 +0530)]
Removed api skipped part

8 years agoTest Fix
Sudha Bisht [Thu, 6 Aug 2015 08:12:37 +0000 (13:42 +0530)]
Test Fix

8 years agoOperator related fix
Sudha Bisht [Wed, 15 Jul 2015 10:49:17 +0000 (16:19 +0530)]
Operator related fix

8 years agoFix for test failure
Sudha Bisht [Mon, 13 Jul 2015 09:33:49 +0000 (15:03 +0530)]
Fix for test failure

8 years agoFix for test failure
Sudha Bisht [Fri, 10 Jul 2015 13:02:23 +0000 (18:32 +0530)]
Fix for test failure

8 years agoremove contact_type field constraint
Tim Mallezie [Mon, 29 Jun 2015 13:01:33 +0000 (15:01 +0200)]
remove contact_type field constraint

8 years agoAdd Mapping and mappingfield API
Tim Mallezie [Mon, 29 Jun 2015 10:36:32 +0000 (12:36 +0200)]
Add Mapping and mappingfield API

8 years agoCRM-17692 - Improper advance search result for multiple tag set
jitendrapurohit [Thu, 10 Dec 2015 07:26:50 +0000 (12:56 +0530)]
CRM-17692 - Improper advance search result for multiple tag set

8 years agoCRM-17682: Membership status rule edit form won't save removal of 'admin only' attribute
yashodha [Thu, 10 Dec 2015 07:08:03 +0000 (12:38 +0530)]
CRM-17682: Membership status rule edit form won't save removal of 'admin only' attribute

----------------------------------------
* CRM-17682: Membership status rule edit form won't save removal of 'admin only' attribute
  https://issues.civicrm.org/jira/browse/CRM-17682

8 years agoMerge pull request #7416 from saurabhbatra96/CRM-17660
Yashodha Chaku [Thu, 10 Dec 2015 06:24:13 +0000 (11:54 +0530)]
Merge pull request #7416 from saurabhbatra96/CRM-17660

CRM-17660 - Missin "Littoral" and "Nord-Ouest" provinces in Cameroon

8 years agoCRM-17637 - Add poor man's cron fallback for VersionCheck
Coleman Watts [Thu, 10 Dec 2015 02:13:29 +0000 (21:13 -0500)]
CRM-17637 - Add poor man's cron fallback for VersionCheck

8 years agoCRM-17637 - VersionCheck - refactor & centralize lookup of scheduled job
Coleman Watts [Thu, 10 Dec 2015 01:12:05 +0000 (20:12 -0500)]
CRM-17637 - VersionCheck - refactor & centralize lookup of scheduled job

8 years agoCRM-16525 - Remove $finType var assign since it throws an eNotice if Financial Type...
Dave Greenberg [Thu, 10 Dec 2015 00:04:55 +0000 (16:04 -0800)]
CRM-16525 - Remove $finType var assign since it throws an eNotice if Financial Type ACLs are not enabled AND it does not appear to be used in any tpl file.

----------------------------------------
* CRM-16525: Add the possibility to enable/disable membership status for certain membership types
  https://issues.civicrm.org/jira/browse/CRM-16525

8 years agoMerge pull request #7419 from colemanw/help
colemanw [Wed, 9 Dec 2015 23:23:00 +0000 (18:23 -0500)]
Merge pull request #7419 from colemanw/help

SystemCheck help improvements

8 years agoSystemCheck help improvements
Coleman Watts [Wed, 9 Dec 2015 21:34:48 +0000 (16:34 -0500)]
SystemCheck help improvements

8 years agoMerge pull request #7408 from seamuslee001/CRM-17307
Dave Greenberg [Wed, 9 Dec 2015 21:06:15 +0000 (13:06 -0800)]
Merge pull request #7408 from seamuslee001/CRM-17307

CRM-17650 ensure that replyto_email is updated when re-using a previo…

8 years agoMerge pull request #7371 from eileenmcnaughton/CRM-17655
Eileen McNaughton [Wed, 9 Dec 2015 20:00:15 +0000 (09:00 +1300)]
Merge pull request #7371 from eileenmcnaughton/CRM-17655

CRM-17655 Adding a payment to a recurring contribution sequence shoul…

8 years agoMerge pull request #7417 from rohankatkar/Webtests-master-fix
Kurund Jalmi [Wed, 9 Dec 2015 15:18:08 +0000 (20:48 +0530)]
Merge pull request #7417 from rohankatkar/Webtests-master-fix

Webtests Fix

8 years agoCRM-17660 - Missin "Littoral" and "Nord-Ouest" provinces in Cameroon
Saurabh Batra [Wed, 9 Dec 2015 14:07:58 +0000 (19:37 +0530)]
CRM-17660 - Missin "Littoral" and "Nord-Ouest" provinces in Cameroon

https://issues.civicrm.org/jira/browse/CRM-17660

8 years agoWebtests Fix
Web Access [Wed, 9 Dec 2015 13:18:31 +0000 (18:48 +0530)]
Webtests Fix

8 years agoUpdate version to 4.7.beta3
CiviCRM [Wed, 9 Dec 2015 08:42:57 +0000 (00:42 -0800)]
Update version to 4.7.beta3

8 years agoadd code to help track down intermittant test fail
eileenmcnaugton [Wed, 9 Dec 2015 03:47:28 +0000 (16:47 +1300)]
add code to help track down intermittant test fail

8 years agoCRM-17655 Adding a payment to a recurring contribution sequence should update the...
eileenmcnaughton [Thu, 3 Dec 2015 09:32:03 +0000 (09:32 +0000)]
CRM-17655 Adding a payment to a recurring contribution sequence should update the contribution_recur table

8 years agoMerge pull request #7414 from davecivicrm/CRM-17656
Dave Greenberg [Tue, 8 Dec 2015 23:50:51 +0000 (15:50 -0800)]
Merge pull request #7414 from davecivicrm/CRM-17656

CRM-17656 - forward port web test for activity custom data.

8 years agoCRM-17656 - forward port web test for activity custom data.
Dave Greenberg [Tue, 8 Dec 2015 23:48:56 +0000 (15:48 -0800)]
CRM-17656 - forward port web test for activity custom data.

----------------------------------------
* CRM-17656: Cannot edit activities with custom fields in popup from a search results screen
  https://issues.civicrm.org/jira/browse/CRM-17656

8 years agoMerge pull request #7411 from jitendrapurohit/webtest
Dave Greenberg [Tue, 8 Dec 2015 17:25:50 +0000 (09:25 -0800)]
Merge pull request #7411 from jitendrapurohit/webtest

47 webtest fixes

8 years agoMerge pull request #7412 from colemanw/UpgradeCleanup
colemanw [Tue, 8 Dec 2015 17:22:06 +0000 (12:22 -0500)]
Merge pull request #7412 from colemanw/UpgradeCleanup

Upgrade cleanup

8 years agoRemove redundant fn
Coleman Watts [Mon, 7 Dec 2015 02:38:43 +0000 (21:38 -0500)]
Remove redundant fn

8 years agoArray cleanup
Coleman Watts [Sun, 6 Dec 2015 02:40:13 +0000 (21:40 -0500)]
Array cleanup

8 years agoRemove unnecessarily translated strings
Coleman Watts [Sat, 5 Dec 2015 18:08:38 +0000 (13:08 -0500)]
Remove unnecessarily translated strings

8 years agowebtest fixes
jitendrapurohit [Tue, 8 Dec 2015 13:25:19 +0000 (18:55 +0530)]
webtest fixes

8 years agoMerge pull request #7410 from jitendrapurohit/CRM-17679
Yashodha Chaku [Tue, 8 Dec 2015 12:40:12 +0000 (18:10 +0530)]
Merge pull request #7410 from jitendrapurohit/CRM-17679

generated sql changes for CRM-17679

8 years agogenerated sql changes for CRM-17679
jitendrapurohit [Tue, 8 Dec 2015 12:18:52 +0000 (17:48 +0530)]
generated sql changes for CRM-17679

8 years agoMerge pull request #7409 from yashodha/CRM-17679.fix
Yashodha Chaku [Tue, 8 Dec 2015 11:23:09 +0000 (16:53 +0530)]
Merge pull request #7409 from yashodha/CRM-17679.fix

CRM-17679: Mismatch between financial transactions & contributions

8 years agoCRM-17679: Mismatch between financial transactions & contributions
yashodha [Tue, 8 Dec 2015 09:13:53 +0000 (14:43 +0530)]
CRM-17679: Mismatch between financial transactions & contributions

----------------------------------------
* CRM-17679: Mismatch between financial transactions & contributions
  https://issues.civicrm.org/jira/browse/CRM-17679

8 years agoCRM-17307 ensure that replyto_email is updated when re-using a previous mailing and...
Seamus Lee [Tue, 8 Dec 2015 06:14:39 +0000 (06:14 +0000)]
CRM-17307 ensure that replyto_email is updated when re-using a previous mailing and changing the from address

8 years agoMerge pull request #7403 from monishdeb/CRM-17308
Dave Greenberg [Tue, 8 Dec 2015 00:55:40 +0000 (16:55 -0800)]
Merge pull request #7403 from monishdeb/CRM-17308

CRM-17308 fix - Location type 'select' (for all entities) AND Phone t…

8 years agoMerge pull request #7402 from rohankatkar/webtestmaster_4.7
Dave Greenberg [Tue, 8 Dec 2015 00:33:52 +0000 (16:33 -0800)]
Merge pull request #7402 from rohankatkar/webtestmaster_4.7

Webtests fix

8 years agoMerge pull request #7406 from eileenmcnaughton/CRM-16259
Eileen McNaughton [Tue, 8 Dec 2015 00:23:27 +0000 (13:23 +1300)]
Merge pull request #7406 from eileenmcnaughton/CRM-16259

CRM-16259 exclude payment from syntax conformance tests

8 years agoCRM-16259 exclude payment from syntax conformance tests
eileenmcnaugton [Mon, 7 Dec 2015 22:11:32 +0000 (11:11 +1300)]
CRM-16259 exclude payment from syntax conformance tests

8 years agoMerge pull request #7387 from colemanw/versionCheck
colemanw [Mon, 7 Dec 2015 21:39:14 +0000 (16:39 -0500)]
Merge pull request #7387 from colemanw/versionCheck

CRM-17637 - Refactor versionCheck into a scheduled job

8 years agoMerge pull request #7405 from laryn/patch-4
Dave Greenberg [Mon, 7 Dec 2015 20:58:21 +0000 (12:58 -0800)]
Merge pull request #7405 from laryn/patch-4

Change Dutch word to English

8 years agoChange Dutch word to English
Laryn [Mon, 7 Dec 2015 20:53:20 +0000 (14:53 -0600)]
Change Dutch word to English

8 years agoCRM-17637 - Don't show up-to-date status if scheduled job is disabled
Coleman Watts [Mon, 7 Dec 2015 20:12:59 +0000 (15:12 -0500)]
CRM-17637 - Don't show up-to-date status if scheduled job is disabled

8 years agoMerge pull request #7401 from sudhabisht/WebtesFix
Dave Greenberg [Mon, 7 Dec 2015 18:56:40 +0000 (10:56 -0800)]
Merge pull request #7401 from sudhabisht/WebtesFix

Fixed test failure

8 years agoMerge pull request #7398 from eileenmcnaughton/CRM-17628
colemanw [Mon, 7 Dec 2015 18:46:00 +0000 (13:46 -0500)]
Merge pull request #7398 from eileenmcnaughton/CRM-17628

CRM-17628 add qfKey to contribution search links

8 years agoMerge pull request #7397 from colemanw/CRM-17507
colemanw [Mon, 7 Dec 2015 17:56:18 +0000 (12:56 -0500)]
Merge pull request #7397 from colemanw/CRM-17507

CRM-17507 - Cleanup settings setItem calls

8 years agoCRM-17308 fix - Location type 'select' (for all entities) AND Phone type should be...
monishdeb [Mon, 7 Dec 2015 14:22:26 +0000 (19:52 +0530)]
CRM-17308 fix - Location type 'select' (for all entities) AND Phone type should be required

https://issues.civicrm.org/jira/browse/CRM-17308

8 years agoWebtests fix
Web Access [Mon, 7 Dec 2015 14:08:22 +0000 (19:38 +0530)]
Webtests fix

8 years agoFixed test failure
Sudha Bisht [Mon, 7 Dec 2015 14:03:26 +0000 (19:33 +0530)]
Fixed test failure

8 years agoMerge pull request #7399 from sudhabisht/CRM-16869
Yashodha Chaku [Mon, 7 Dec 2015 12:24:23 +0000 (17:54 +0530)]
Merge pull request #7399 from sudhabisht/CRM-16869

Fixed File upload issue

8 years agoMerge pull request #7392 from eileenmcnaughton/CRM-17675
Yashodha Chaku [Mon, 7 Dec 2015 06:01:57 +0000 (11:31 +0530)]
Merge pull request #7392 from eileenmcnaughton/CRM-17675

CRM-17675 set date AND time to 'now' when refunding contributions

8 years agoCRM-17628 add qfKey to contribution search links
eileen [Mon, 7 Dec 2015 03:51:33 +0000 (16:51 +1300)]
CRM-17628 add qfKey to contribution search links

Change-Id: Ib7f57cf764a8cf4b506f4453b90f9ce841d1419e

8 years agoMerge pull request #7389 from totten/master-cxn-proxy
Tim Otten [Mon, 7 Dec 2015 03:38:18 +0000 (19:38 -0800)]
Merge pull request #7389 from totten/master-cxn-proxy

CiviConnect - Proxy support; UI tweaks; System.get improvements

8 years agoMerge pull request #7390 from colemanw/CRM-16373
colemanw [Mon, 7 Dec 2015 03:36:47 +0000 (22:36 -0500)]
Merge pull request #7390 from colemanw/CRM-16373

CRM-16373 - Drop config_backend

8 years agoCRM-17507 - Cleanup settings setItem calls
Coleman Watts [Mon, 7 Dec 2015 03:29:07 +0000 (22:29 -0500)]
CRM-17507 - Cleanup settings setItem calls

8 years agoMerge pull request #7394 from eileenmcnaughton/CRM-17627
Eileen McNaughton [Mon, 7 Dec 2015 02:37:56 +0000 (15:37 +1300)]
Merge pull request #7394 from eileenmcnaughton/CRM-17627

CRM-17627 Set transaction date correctly for refunds

8 years agoCRM-17627 Set transaction date correctly for refunds
eileen [Mon, 7 Dec 2015 01:16:30 +0000 (14:16 +1300)]
CRM-17627 Set transaction date correctly for refunds

Change-Id: Ida11bb0dbb7febe256881c98afcae6542da2c235

8 years agoMerge pull request #7393 from eileenmcnaughton/a-net-tests
Eileen McNaughton [Mon, 7 Dec 2015 01:36:56 +0000 (14:36 +1300)]
Merge pull request #7393 from eileenmcnaughton/a-net-tests

Add some tolerance to Authorize.net test

8 years agoCRM-17627 test for ensuring correct refund transaction date
eileen [Mon, 7 Dec 2015 01:16:05 +0000 (14:16 +1300)]
CRM-17627 test for ensuring correct refund transaction date

Change-Id: If9276cd7d32bb7fef8071c07cb763dc4fe66da4e

8 years agoAdd some tolerance to Authorize.net test
eileen [Mon, 7 Dec 2015 01:01:39 +0000 (14:01 +1300)]
Add some tolerance to Authorize.net test

Change-Id: I0c00bd47294fb4be06d017b56e80dca7c87f4eea

8 years agoCRM-17675 set date AND time to 'now' when refunding contributions
eileen [Mon, 7 Dec 2015 00:06:09 +0000 (13:06 +1300)]
CRM-17675 set date AND time to 'now' when refunding contributions

Change-Id: Icca2230993e73e9ff10d115d13fc0539b5e8a234

8 years agoCRM-16373 - Drop config_backend
Coleman Watts [Sun, 6 Dec 2015 02:14:35 +0000 (21:14 -0500)]
CRM-16373 - Drop config_backend

8 years agoSystem.get API - Return current PHP + MySQL time
Tim Otten [Sat, 5 Dec 2015 23:56:53 +0000 (15:56 -0800)]
System.get API - Return current PHP + MySQL time

8 years agoSystem.get API - Return MySQL settings
Tim Otten [Sat, 5 Dec 2015 23:50:52 +0000 (15:50 -0800)]
System.get API - Return MySQL settings

8 years agoSystem.get API - Return CMS version
Tim Otten [Sat, 5 Dec 2015 22:09:43 +0000 (14:09 -0800)]
System.get API - Return CMS version

8 years agocrmCxnManageCtrl - Style rows
Tim Otten [Sat, 5 Dec 2015 23:51:29 +0000 (15:51 -0800)]
crmCxnManageCtrl - Style rows

8 years agocrmCxnManageCtrl - Consistently show app name in dialog titles
Tim Otten [Sat, 5 Dec 2015 22:05:01 +0000 (14:05 -0800)]
crmCxnManageCtrl - Consistently show app name in dialog titles

8 years agocrmCxnManageCtrl - Provide informational dialog
Tim Otten [Sat, 5 Dec 2015 22:00:52 +0000 (14:00 -0800)]
crmCxnManageCtrl - Provide informational dialog

8 years agocrmCxnManageCtrl - Display appId and appUrl
Tim Otten [Sat, 5 Dec 2015 21:43:36 +0000 (13:43 -0800)]
crmCxnManageCtrl - Display appId and appUrl

8 years agocrmCxn - Add "Reconnect" option
Tim Otten [Sat, 5 Dec 2015 21:31:49 +0000 (13:31 -0800)]
crmCxn - Add "Reconnect" option

8 years agocrmCxnManageCtrl - Style rows. Move links into dropdown.
Tim Otten [Sat, 5 Dec 2015 21:13:38 +0000 (13:13 -0800)]
crmCxnManageCtrl - Style rows. Move links into dropdown.

8 years agoCRM_Cxn_BAO_Cxn::createRegistrationClient - Support proxies
Tim Otten [Sat, 5 Dec 2015 04:58:34 +0000 (20:58 -0800)]
CRM_Cxn_BAO_Cxn::createRegistrationClient - Support proxies

8 years agocomposer.json - Update civicrm/civicrm-cxn-rpc
Tim Otten [Sat, 5 Dec 2015 04:57:19 +0000 (20:57 -0800)]
composer.json - Update civicrm/civicrm-cxn-rpc

8 years agoAdd newline
Coleman Watts [Sat, 5 Dec 2015 16:26:22 +0000 (11:26 -0500)]
Add newline

8 years agoComment fix
Coleman Watts [Sat, 5 Dec 2015 16:24:55 +0000 (11:24 -0500)]
Comment fix

8 years agoCRM-17637 - Delete unused file
Coleman Watts [Sat, 5 Dec 2015 16:20:16 +0000 (11:20 -0500)]
CRM-17637 - Delete unused file

8 years agoCRM-17637 - Suppress version status if not available
Coleman Watts [Sat, 5 Dec 2015 15:25:54 +0000 (10:25 -0500)]
CRM-17637 - Suppress version status if not available

8 years agoCRM-17637 - Refactor out versionCheck setting
Coleman Watts [Sat, 5 Dec 2015 03:17:29 +0000 (22:17 -0500)]
CRM-17637 - Refactor out versionCheck setting

8 years agoCRM-17637 - Add scheduled job
Coleman Watts [Sat, 5 Dec 2015 02:57:16 +0000 (21:57 -0500)]
CRM-17637 - Add scheduled job

8 years agoCRM-17637 - Move shared constant
Coleman Watts [Sat, 5 Dec 2015 02:52:11 +0000 (21:52 -0500)]
CRM-17637 - Move shared constant