Eileen McNaughton [Tue, 21 Oct 2014 22:01:45 +0000 (11:01 +1300)]
CRM-15510 param retrieval issue
Conflicts:
CRM/Event/Page/AJAX.php
Dave Greenberg [Mon, 20 Oct 2014 18:05:59 +0000 (11:05 -0700)]
Merge pull request #4406 from rohankatkar/CRM-15473
Fix for CRM-15473
Yashodha Chaku [Mon, 20 Oct 2014 11:16:14 +0000 (16:46 +0530)]
Merge pull request #4407 from rohankatkar/Webtests
Webtest fix
Rohan Katkar [Mon, 20 Oct 2014 11:00:06 +0000 (16:30 +0530)]
Webtest fix
Rohan Katkar [Mon, 20 Oct 2014 10:55:29 +0000 (16:25 +0530)]
Fix for CRM-15473
Eileen McNaughton [Mon, 20 Oct 2014 08:22:17 +0000 (21:22 +1300)]
Merge pull request #4398 from kenwest/CRM-15492-4.5
CRM-15492 / 4.5 branch
Eileen McNaughton [Mon, 20 Oct 2014 06:32:18 +0000 (19:32 +1300)]
Merge pull request #4399 from eileenmcnaughton/CRM-15496
CRM-15496 api contribution.complete_transaction improve recurring handli...
Eileen McNaughton [Mon, 20 Oct 2014 02:37:59 +0000 (15:37 +1300)]
api contribution.completetransaction fix misname of _spec function
Conflicts:
api/v3/Contribution.php
Eileen McNaughton [Mon, 20 Oct 2014 02:21:06 +0000 (15:21 +1300)]
CRM-15496 api contribution.complete_transaction improve recurring handling
colemanw [Mon, 20 Oct 2014 00:17:01 +0000 (20:17 -0400)]
Merge pull request #4397 from crusonweb/CRM-15494
CRM-15494 Fix label display for Joomla 3.x
Ken West [Sun, 19 Oct 2014 23:56:53 +0000 (10:56 +1100)]
CRM-15492 / 4.5 branch / Notice: Undefined index: include in CRM_Mailing_Form_Group->setDefaultValues()
Dan Cruson [Sun, 19 Oct 2014 23:55:36 +0000 (19:55 -0400)]
CRM-15494 Fix label display for Joomla 3.x
Fix the display of the labels so they are readable in the default
template in Joomla 3.
colemanw [Sun, 19 Oct 2014 23:51:33 +0000 (19:51 -0400)]
Merge pull request #4396 from colemanw/CRM-15493
CRM-15493 - Ensure quickSearch uses a fresh qfKey every time
Coleman Watts [Sun, 19 Oct 2014 22:00:24 +0000 (18:00 -0400)]
CRM-15493 - Ensure quickSearch uses a fresh qfKey every time
Kurund Jalmi [Sun, 19 Oct 2014 05:18:10 +0000 (22:18 -0700)]
Merge pull request #4314 from cividesk/CRM-13227
CRM-13227, CRM-14744: full fix
colemanw [Sat, 18 Oct 2014 23:34:43 +0000 (19:34 -0400)]
Merge pull request #4388 from colemanw/CRM-15486
CRM-15486 - Fix pager js for non-form pages
Coleman Watts [Sat, 18 Oct 2014 23:28:49 +0000 (19:28 -0400)]
CRM-15486 - Fix pager js for non-form pages
colemanw [Sat, 18 Oct 2014 21:41:35 +0000 (17:41 -0400)]
Merge pull request #4386 from colemanw/CRM-15471
CRM-15471 - Clear search checkboxes when choosing 'select all' radio
Coleman Watts [Sat, 18 Oct 2014 21:40:44 +0000 (17:40 -0400)]
CRM-15471 - Clear search checkboxes when choosing 'select all' radio
colemanw [Sat, 18 Oct 2014 19:52:56 +0000 (15:52 -0400)]
Merge pull request #4385 from colemanw/CRM-15484
CRM-15484 - Ensure event edit links go to backend
Coleman Watts [Sat, 18 Oct 2014 19:47:29 +0000 (15:47 -0400)]
CRM-15484 - Event edit links tpl cleanup
Coleman Watts [Sat, 18 Oct 2014 19:21:17 +0000 (15:21 -0400)]
CRM-15484 - Ensure event edit links go to backend
Dave Greenberg [Fri, 17 Oct 2014 22:50:28 +0000 (15:50 -0700)]
Merge pull request #4359 from jmcclelland/duplicate-registration-take-two
CRM-15452 - ensure dupes not added when no event fee is used.
Dave Greenberg [Fri, 17 Oct 2014 22:21:40 +0000 (15:21 -0700)]
Merge pull request #4361 from jmcclelland/civimail-test-duplicate
CRM-15455 - avoid creating dupes and using deleted contacts in test
Dave Greenberg [Fri, 17 Oct 2014 19:28:46 +0000 (12:28 -0700)]
Merge pull request #4379 from jitendrapurohit/CRM-14968
CRM-14968
Yashodha Chaku [Fri, 17 Oct 2014 15:41:51 +0000 (21:11 +0530)]
Merge pull request #4329 from davecivicrm/CRM-15376
CRM-15376 - Porting fixes from https://github.com/civicrm/civicrm-core/p...
Monish Deb [Fri, 17 Oct 2014 14:10:45 +0000 (19:40 +0530)]
Merge pull request #4383 from monishdeb/CRM-15328
CRM-15328 fix - Api ContactType Create Fails for Update
monishdeb [Fri, 17 Oct 2014 10:42:14 +0000 (16:12 +0530)]
CRM-15328 fix - Api ContactType Create Fails for Update
https://issues.civicrm.org/jira/browse/CRM-15328
Monish Deb [Fri, 17 Oct 2014 10:31:19 +0000 (16:01 +0530)]
Merge pull request #4382 from rohankatkar/CRM-15458
Fix for CRM-15458
Monish Deb [Fri, 17 Oct 2014 08:36:56 +0000 (14:06 +0530)]
Merge pull request #4380 from atif-shaikh/CRM-15301
CRM-15301 - Sorted order is not respected in 'Export Contacts' csv
Monish Deb [Fri, 17 Oct 2014 06:43:56 +0000 (12:13 +0530)]
Merge pull request #4378 from jitendrapurohit/CRM-15447
Related test build failure is not related to current PR changes, also tested(follow issue link), hence merging
jitendrapurohit [Fri, 17 Oct 2014 06:29:03 +0000 (11:59 +0530)]
Additional Fixes
jitendrapurohit [Thu, 16 Oct 2014 12:05:15 +0000 (17:35 +0530)]
CRM-14968
Rohan Katkar [Fri, 17 Oct 2014 05:33:25 +0000 (11:03 +0530)]
Fix for CRM-15458
colemanw [Thu, 16 Oct 2014 21:40:49 +0000 (17:40 -0400)]
Merge pull request #4381 from colemanw/strikethrough
Remove redundant css class
Coleman Watts [Thu, 16 Oct 2014 21:32:49 +0000 (17:32 -0400)]
Remove redundant css class
Dave Greenberg [Thu, 16 Oct 2014 20:14:32 +0000 (13:14 -0700)]
Merge pull request #4377 from monishdeb/CRM-15439
CRM-15439 fix - Regression of CRM-15121 - searching on reciprocal relationships
atif-shaikh [Thu, 16 Oct 2014 14:05:35 +0000 (19:35 +0530)]
CRM-15301 - Sorted order is not respected in 'Export Contacts' csv
https://issues.civicrm.org/jira/browse/CRM-15301
jitendrapurohit [Thu, 16 Oct 2014 09:51:29 +0000 (15:21 +0530)]
CRM-15447
monishdeb [Thu, 16 Oct 2014 06:57:33 +0000 (12:27 +0530)]
CRM-15439 fix - Regression of CRM-13149 - searching on reciprocal relationships
https://issues.civicrm.org/jira/browse/CRM-15439
Dave Greenberg [Wed, 15 Oct 2014 20:50:27 +0000 (13:50 -0700)]
Merge pull request #4372 from davecivicrm/CRM-15467
CRM-15467 - Set location type to is_default and fix group_type in uf_gro...
Dave Greenberg [Wed, 15 Oct 2014 20:00:17 +0000 (13:00 -0700)]
CRM-15467 - Set location type to is_default and fix group_type in uf_group insert.
----------------------------------------
* CRM-15467:
https://issues.civicrm.org/jira/browse/CRM-15467
Dave Greenberg [Wed, 15 Oct 2014 19:13:22 +0000 (12:13 -0700)]
Merge pull request #4371 from colemanw/CRM-15438
CRM-15438 - Fix search component_mode selections
Coleman Watts [Wed, 15 Oct 2014 18:29:09 +0000 (14:29 -0400)]
CRM-15438 - Fix search component_mode selections
colemanw [Wed, 15 Oct 2014 02:39:58 +0000 (22:39 -0400)]
Merge pull request #4366 from colemanw/CRM-15442
CRM-15442 - Change spaces to wildcards in contact.getlist api
Coleman Watts [Wed, 15 Oct 2014 02:33:28 +0000 (22:33 -0400)]
CRM-15442 - Change spaces to wildcards in contact.getlist api
colemanw [Wed, 15 Oct 2014 01:55:40 +0000 (21:55 -0400)]
Merge pull request #4365 from colemanw/CRM-15451
CRM-15451 - Fix api.getlist handling of deceased contacts
colemanw [Wed, 15 Oct 2014 01:50:15 +0000 (21:50 -0400)]
Merge pull request #4363 from colemanw/CRM-15456
CRM-15456 - Add safety checks to avoid errors when updating tabs
Tim Otten [Tue, 14 Oct 2014 23:05:07 +0000 (16:05 -0700)]
Merge pull request #4362 from kurund/CRM-15436
CRM-15436: "Download and Install" action for extension does not create menu entries
Coleman Watts [Tue, 14 Oct 2014 21:35:22 +0000 (17:35 -0400)]
CRM-15456 - Add safety checks to avoid errors when updating tabs
Coleman Watts [Tue, 14 Oct 2014 22:13:05 +0000 (18:13 -0400)]
CRM-15451 - Fix api.getlist handling of deceased contacts
colemanw [Tue, 14 Oct 2014 21:50:36 +0000 (17:50 -0400)]
Merge pull request #4364 from colemanw/static
Fix PHP static context error
Coleman Watts [Tue, 14 Oct 2014 21:49:01 +0000 (17:49 -0400)]
Fix PHP static context error
kurund [Tue, 14 Oct 2014 21:28:04 +0000 (02:58 +0530)]
CRM-15436, undo not a typo fix
kurund [Tue, 14 Oct 2014 21:14:36 +0000 (02:44 +0530)]
CRM-15436, because of caching of xml items, xml menu items defined by extension are not resolved during 'download and install' process, hence force computing menu items from xml during hard reset, i.e when we truncate civicrm_menu
kurund [Tue, 14 Oct 2014 20:23:34 +0000 (01:53 +0530)]
CRM-15436, fixed typo
colemanw [Tue, 14 Oct 2014 19:32:08 +0000 (15:32 -0400)]
Merge pull request #4354 from colemanw/CRM-14949
CRM-14949 Fix access_callback for l10n-js
Jamie McClelland [Tue, 14 Oct 2014 17:09:08 +0000 (13:09 -0400)]
CRM-15455 - avoid creating dupes and using deleted contacts in test
mailings.
----------------------------------------
* CRM-15455: email tests do not properly replace tokens
https://issues.civicrm.org/jira/browse/CRM-15455
Jamie McClelland [Tue, 14 Oct 2014 14:53:01 +0000 (10:53 -0400)]
CRM-15452 - ensure dupes not added when no event fee is used.
----------------------------------------
* CRM-15452: When no registration fee is involved, duplicate registration still created for event
https://issues.civicrm.org/jira/browse/CRM-15452
Monish Deb [Tue, 14 Oct 2014 12:00:09 +0000 (17:30 +0530)]
Merge pull request #4358 from monishdeb/CRM-15430
CRM-15430 indentation fixes
monishdeb [Tue, 14 Oct 2014 11:54:15 +0000 (17:24 +0530)]
CRM-15430 indentation fixes
----------------------------------------
* CRM-15430: clarify code and functionality for hook_civicrm_dashboard_defaults
https://issues.civicrm.org/jira/browse/CRM-15430
Monish Deb [Tue, 14 Oct 2014 11:44:34 +0000 (17:14 +0530)]
Merge pull request #4327 from jmcclelland/default-dashlets
Default dashlets
Yashodha Chaku [Tue, 14 Oct 2014 07:59:25 +0000 (13:29 +0530)]
Merge pull request #4357 from rohankatkar/Webtests
Webtest fix
Yashodha Chaku [Tue, 14 Oct 2014 07:58:23 +0000 (13:28 +0530)]
Merge pull request #4355 from rohankatkar/CRM-15420
Fix for CRM-15420
Rohan Katkar [Tue, 14 Oct 2014 07:12:47 +0000 (12:42 +0530)]
Webtest fix
kurund [Tue, 14 Oct 2014 05:52:18 +0000 (11:22 +0530)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-4.5-2014-10-14-11-16-10
Conflicts:
api/v3/System.php
tests/phpunit/api/v3/SystemTest.php
Rohan Katkar [Tue, 14 Oct 2014 05:02:14 +0000 (10:32 +0530)]
Fix for CRM-15420
Coleman Watts [Tue, 14 Oct 2014 01:26:18 +0000 (21:26 -0400)]
CRM-14949 Fix access_callback for l10n-js
Dave Greenberg [Tue, 14 Oct 2014 00:34:28 +0000 (17:34 -0700)]
Merge pull request #4353 from davecivicrm/CRM-15432
CRM-15432 - hide payment options block along with billing info when pric...
Dave Greenberg [Tue, 14 Oct 2014 00:33:14 +0000 (17:33 -0700)]
CRM-15432 - hide payment options block along with billing info when price set value total is zero.
----------------------------------------
* CRM-15432:
https://issues.civicrm.org/jira/browse/CRM-15432
colemanw [Mon, 13 Oct 2014 23:41:31 +0000 (19:41 -0400)]
Merge pull request #4340 from colemanw/deprecatedApi
Display deprecation notices in api output and api explorer
Coleman Watts [Mon, 13 Oct 2014 20:59:51 +0000 (16:59 -0400)]
CRM-15417 - Add unit test for getactions
Coleman Watts [Mon, 13 Oct 2014 19:17:53 +0000 (15:17 -0400)]
CRM-15417 - fix getfields output
Coleman Watts [Fri, 10 Oct 2014 19:59:34 +0000 (15:59 -0400)]
CRM-15417 - Show api deprecation warnings in console
Coleman Watts [Fri, 10 Oct 2014 18:23:03 +0000 (14:23 -0400)]
CRM-15417 - Add safety checks to api deprecation utils
Coleman Watts [Fri, 10 Oct 2014 02:52:14 +0000 (22:52 -0400)]
CRM-15417 - Display deprecation notices in api output and api explorer
colemanw [Mon, 13 Oct 2014 18:46:18 +0000 (14:46 -0400)]
Merge pull request #4352 from colemanw/CRM-15450
CRM-15450 - Fix D6 to render scripts in correct order
Coleman Watts [Mon, 13 Oct 2014 18:44:39 +0000 (14:44 -0400)]
CRM-15450 - Also disable D6 adding inline styles for good measure
Coleman Watts [Mon, 13 Oct 2014 18:37:50 +0000 (14:37 -0400)]
CRM-15450 - Fix D6 to render scripts in correct order
Yashodha Chaku [Mon, 13 Oct 2014 10:12:19 +0000 (15:42 +0530)]
Merge pull request #4349 from rohankatkar/CRM-15434
Changes for CRM-15434
Yashodha Chaku [Mon, 13 Oct 2014 10:09:48 +0000 (15:39 +0530)]
Merge pull request #4347 from colemanw/CRM-15443
CRM-15443 - add unit test to ensure getlist api does not return deleted or deceased contacts
Rohan Katkar [Mon, 13 Oct 2014 05:23:06 +0000 (10:53 +0530)]
Minor changes for CRM-15434
Coleman Watts [Sun, 12 Oct 2014 23:21:10 +0000 (19:21 -0400)]
CRM-15443 - add unit test to ensure getlist api does not return deleted or deceased contacts
Dave Greenberg [Sun, 12 Oct 2014 23:21:01 +0000 (16:21 -0700)]
Merge pull request #4346 from colemanw/CRM-15443
CRM-15443 - Exclude deceased contacts from EntityRef results
Eileen McNaughton [Sun, 12 Oct 2014 20:05:17 +0000 (09:05 +1300)]
Merge pull request #4344 from elcapo/CRM-15441
CRM-15441 - Add a few missing translation {ts} tags
Coleman Watts [Sat, 11 Oct 2014 19:16:55 +0000 (15:16 -0400)]
CRM-15443 - Exclude deceased contacts from EntityRef results
colemanw [Sat, 11 Oct 2014 18:06:30 +0000 (14:06 -0400)]
Merge pull request #4337 from colemanw/explorerEntityRef
API Explorer - use entityRef for FK fields
Dave Greenberg [Fri, 10 Oct 2014 21:19:41 +0000 (14:19 -0700)]
Merge pull request #4295 from eileenmcnaughton/CRM-15408
CRM-15280 - Advanced Search not working for deleted Contacts
colemanw [Fri, 10 Oct 2014 15:43:52 +0000 (11:43 -0400)]
Merge pull request #4343 from jitendrapurohit/webtestfixes
webtest fix
colemanw [Fri, 10 Oct 2014 15:43:15 +0000 (11:43 -0400)]
Merge pull request #4342 from rohankatkar/webtest-4.5.0
webtest fix
colemanw [Fri, 10 Oct 2014 14:49:29 +0000 (10:49 -0400)]
Merge pull request #4345 from colemanw/Document
Document deprecation of AdvMultiSelect widget
Coleman Watts [Fri, 10 Oct 2014 14:45:46 +0000 (10:45 -0400)]
Add missing ts
Coleman Watts [Fri, 10 Oct 2014 14:44:55 +0000 (10:44 -0400)]
Document deprecation of AdvMultiSelect widget
elcapo [Fri, 10 Oct 2014 13:57:23 +0000 (15:57 +0200)]
CRM-15441 - Add a few missing translation (TS) tags
colemanw [Fri, 10 Oct 2014 13:29:31 +0000 (09:29 -0400)]
Merge pull request #4339 from colemanw/genericApiActions
Fix api getActions to also load generic actions
jitendrapurohit [Fri, 10 Oct 2014 13:28:26 +0000 (18:58 +0530)]
webtest fix
Rohan Katkar [Fri, 10 Oct 2014 13:01:30 +0000 (18:31 +0530)]
webtest fix
Kurund Jalmi [Fri, 10 Oct 2014 07:39:14 +0000 (13:09 +0530)]
Merge pull request #4117 from totten/4.4-system-get
api/v3/System - Add a "get" operation to return basic system info
Kurund Jalmi [Fri, 10 Oct 2014 07:35:18 +0000 (13:05 +0530)]
Merge pull request #4335 from elcapo/CRM-15434
CRM-15434 - Fix mailing search doesn't work in non-English languages
Yashodha Chaku [Fri, 10 Oct 2014 06:13:34 +0000 (11:43 +0530)]
Merge pull request #4341 from yashodha/version-fix
version fixes
projects / civicrm-core.git / log