Eileen McNaughton [Sun, 19 Oct 2014 08:15:53 +0000 (21:15 +1300)]
minor tidy ups
Eileen McNaughton [Sun, 19 Oct 2014 08:11:38 +0000 (21:11 +1300)]
to get tests to pass add a hack-around to allow us to clear static var
Eileen McNaughton [Sun, 19 Oct 2014 07:31:39 +0000 (20:31 +1300)]
fix membership_type to be editable within tests so we can address test failure
Eileen McNaughton [Sun, 19 Oct 2014 06:21:23 +0000 (19:21 +1300)]
remove unused parameter (no other calls to this fn)
eileenmcnaughton [Sat, 18 Oct 2014 11:04:02 +0000 (11:04 +0000)]
CRM-15446 fix test to reflect actual returned value
eileenmcnaughton [Sat, 18 Oct 2014 10:52:22 +0000 (10:52 +0000)]
api example updates
Eileen McNaughton [Mon, 13 Oct 2014 08:08:51 +0000 (21:08 +1300)]
CRM-15446 additional test to check minor restructure of defaults
Eileen McNaughton [Mon, 13 Oct 2014 07:55:43 +0000 (20:55 +1300)]
CRM-15446 fix for net_amount not being set
Eileen McNaughton [Mon, 13 Oct 2014 07:55:05 +0000 (20:55 +1300)]
CRM-15466 add test to ensure net_amount is set correctly
colemanw [Wed, 15 Oct 2014 22:50:45 +0000 (18:50 -0400)]
Merge pull request #4373 from civicrm/4.5
Merge branch 4.5 into master
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
Tim Otten [Wed, 15 Oct 2014 17:47:34 +0000 (10:47 -0700)]
Merge pull request #4368 from deepak-srivastava/CRM-15457
CRM-15457
deepak-srivastava [Wed, 15 Oct 2014 13:25:17 +0000 (14:25 +0100)]
take care of empty entity-id or table, in parent methods
deepak-srivastava [Wed, 15 Oct 2014 13:15:03 +0000 (14:15 +0100)]
don't bother processing records with entity-id or table as NULL
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
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:59:50 +0000 (11:29 +0530)]
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-10-14-11-24-52
Conflicts:
CRM/Core/xml/Menu/Misc.xml
CRM/Upgrade/Page/Upgrade.php
sql/civicrm_generated.mysql
xml/version.xml
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
Eileen McNaughton [Mon, 13 Oct 2014 07:56:27 +0000 (20:56 +1300)]
Merge pull request #4350 from eileenmcnaughton/CRM-15446
CRM-15446 preliminary tidyup
Eileen McNaughton [Mon, 13 Oct 2014 06:52:06 +0000 (19:52 +1300)]
preliminary clean up - improve tear down function
Rohan Katkar [Mon, 13 Oct 2014 05:23:06 +0000 (10:53 +0530)]
Minor changes for CRM-15434
Eileen McNaughton [Mon, 13 Oct 2014 04:39:38 +0000 (17:39 +1300)]
preliminary tidy up - trailing spaces & comments
Eileen McNaughton [Mon, 13 Oct 2014 04:27:35 +0000 (17:27 +1300)]
preliminary tidy up - mostly removing unused params
Eileen McNaughton [Mon, 13 Oct 2014 04:14:10 +0000 (17:14 +1300)]
preliminary tidy up - remove redundant refs to __LINE__
Eileen McNaughton [Mon, 13 Oct 2014 03:40:05 +0000 (16:40 +1300)]
Merge pull request #4348 from eileenmcnaughton/CRM-15444
CRM-15444 bring AuthorizenetIPN into line with PaypalIPN
Eileen McNaughton [Mon, 13 Oct 2014 02:25:57 +0000 (15:25 +1300)]
CRM-15444 bring AuthorizenetIPN into line with PaypalIPN
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
CiviCRM [Fri, 10 Oct 2014 06:32:39 +0000 (12:02 +0530)]
version fixes
Coleman Watts [Fri, 10 Oct 2014 02:50:20 +0000 (22:50 -0400)]
Fix api getActions to also load generic actions
colemanw [Thu, 9 Oct 2014 22:56:44 +0000 (18:56 -0400)]
Merge pull request #4338 from mlutfy/4.5-crm15435
CRM-15435: Fix custom group weights (mostly for Case ActivityView).
Mathieu Lutfy [Thu, 9 Oct 2014 18:20:48 +0000 (14:20 -0400)]
CRM-15435: Fix custom group weights (mostly for Case ActivityView).
Coleman Watts [Thu, 9 Oct 2014 18:17:55 +0000 (14:17 -0400)]
Fix contact entityRef placeholder text
Coleman Watts [Thu, 9 Oct 2014 18:17:30 +0000 (14:17 -0400)]
Normalize translated string
Coleman Watts [Thu, 9 Oct 2014 18:16:49 +0000 (14:16 -0400)]
Add basic entityRef support for activities
Coleman Watts [Thu, 9 Oct 2014 18:16:00 +0000 (14:16 -0400)]
API Explorer - use entityRef for FK fields
Yashodha Chaku [Thu, 9 Oct 2014 14:20:45 +0000 (19:50 +0530)]
Merge pull request #4336 from jitendrapurohit/webtestfixes
Webtest fixes
jitendrapurohit [Thu, 9 Oct 2014 14:19:30 +0000 (19:49 +0530)]
Webtest fixes
elcapo [Thu, 9 Oct 2014 13:45:31 +0000 (15:45 +0200)]
CRM-15434 - Fix mailing search doesn't work in non-English languages
Kurund Jalmi [Thu, 9 Oct 2014 12:38:45 +0000 (18:08 +0530)]
Merge pull request #4334 from atif-shaikh/CRM-15343
CRM-15343 - 4.5.0 corrupts soft references to case-types
Yashodha Chaku [Thu, 9 Oct 2014 12:08:42 +0000 (17:38 +0530)]
Merge pull request #4223 from atif-shaikh/CRM-15366
CRM-15366 - Gift Membership Bug Fixes
atif-shaikh [Thu, 9 Oct 2014 10:31:01 +0000 (16:01 +0530)]
CRM-15343 - 4.5.0 corrupts soft references to case-types
https://issues.civicrm.org/jira/browse/CRM-15343
Yashodha Chaku [Thu, 9 Oct 2014 10:13:24 +0000 (15:43 +0530)]
Merge pull request #4332 from rohankatkar/webtest-4.5.0
webtest fixes
Yashodha Chaku [Thu, 9 Oct 2014 10:12:55 +0000 (15:42 +0530)]
Merge pull request #4333 from jitendrapurohit/webtestfixes
js break after editing Notes on Contact Summary Page
jitendrapurohit [Thu, 9 Oct 2014 09:26:52 +0000 (14:56 +0530)]
js break after editing Notes on Contact Summary Page
Rohan Katkar [Thu, 9 Oct 2014 08:41:21 +0000 (14:11 +0530)]
webtest fixes
colemanw [Thu, 9 Oct 2014 05:54:33 +0000 (01:54 -0400)]
Merge pull request #4331 from colemanw/explorer
Improve API explorer handling of operators
Coleman Watts [Thu, 9 Oct 2014 05:53:54 +0000 (01:53 -0400)]
API explorer - fix getfields action select
Coleman Watts [Thu, 9 Oct 2014 05:45:14 +0000 (01:45 -0400)]
Improve API explorer handling of operators
projects / civicrm-core.git / log