Kurund Jalmi [Thu, 18 Dec 2014 16:30:48 +0000 (22:00 +0530)]
Merge pull request #4748 from rohankatkar/Webtests
Webtests Fix
Rohan Katkar [Thu, 18 Dec 2014 13:30:35 +0000 (19:00 +0530)]
Webtests Fix
Monish Deb [Thu, 18 Dec 2014 13:21:15 +0000 (18:51 +0530)]
Merge pull request #4734 from jitendrapurohit/CRM-15694
Activities Report - sort by Activity Type does not work and throws fatal...
Yashodha Chaku [Thu, 18 Dec 2014 10:05:03 +0000 (15:35 +0530)]
Merge pull request #4733 from rohankatkar/Tests
Fix for Webtest
Yashodha Chaku [Thu, 18 Dec 2014 05:40:18 +0000 (11:10 +0530)]
Merge pull request #4739 from PalanteJon/CRM-15741
CRM-15741 - CiviContribute - Don't crash when an ACL-limited user runs C...
Coleman Watts [Thu, 18 Dec 2014 03:09:15 +0000 (22:09 -0500)]
Merge branch '4.5' of https://github.com/civicrm/civicrm-core
Conflicts:
CRM/Case/BAO/Case.php
sql/civicrm_generated.mysql
xml/version.xml
Dave Greenberg [Thu, 18 Dec 2014 01:06:46 +0000 (17:06 -0800)]
Merge pull request #4743 from davecivicrm/CRM-14696a
CRM-14696 - Fixes for text input price field sold out display. Also spac...
Dave Greenberg [Thu, 18 Dec 2014 01:05:37 +0000 (17:05 -0800)]
CRM-14696 - Fixes for text input price field sold out display. Also spacing and font size improvements.
----------------------------------------
* CRM-14696:
https://issues.civicrm.org/jira/browse/CRM-14696
Jon goldberg [Thu, 18 Dec 2014 00:34:02 +0000 (19:34 -0500)]
CRM-15741 - CiviContribute - Don't crash when an ACL-limited user runs Contribution Summary Report
Dave Greenberg [Thu, 18 Dec 2014 00:02:59 +0000 (16:02 -0800)]
Merge pull request #4738 from davecivicrm/CRM-14696a
CRM-14696 - make sold out options a bit easier to see by making the enti...
Dave Greenberg [Thu, 18 Dec 2014 00:02:18 +0000 (16:02 -0800)]
CRM-14696 - make sold out options a bit easier to see by making the entire option italic and grey.
----------------------------------------
* CRM-14696:
https://issues.civicrm.org/jira/browse/CRM-14696
Dave Greenberg [Wed, 17 Dec 2014 23:59:33 +0000 (15:59 -0800)]
CRM-14696 - make sold out options a bit easier to see by making the entire option italic and grey.
----------------------------------------
* CRM-14696:
https://issues.civicrm.org/jira/browse/CRM-14696
CiviCRM [Wed, 17 Dec 2014 19:30:46 +0000 (11:30 -0800)]
Update version to 4.5.6
colemanw [Wed, 17 Dec 2014 15:28:35 +0000 (10:28 -0500)]
Merge pull request #4729 from totten/colemanw-CRM-15713
CRM-15713 - Case ajax fixes
Yashodha Chaku [Wed, 17 Dec 2014 14:07:21 +0000 (19:37 +0530)]
Merge pull request #4732 from yashodha/phpunit-ob-fix
Phpunit ob fix
Rohan Katkar [Wed, 17 Dec 2014 13:31:55 +0000 (19:01 +0530)]
Fix for Webtest
CiviCRM [Wed, 17 Dec 2014 09:58:34 +0000 (15:28 +0530)]
Merge branch 'phpunit-ob-fix' of https://github.com/giant-rabbit/civicrm-core into phpunit-ob-fix
Conflicts:
tests/phpunit/CiviTest/CiviUnitTestCase.php
Kurund Jalmi [Wed, 17 Dec 2014 07:28:49 +0000 (12:58 +0530)]
Merge pull request #4728 from davecivicrm/CRM-15701
CRM-15701 - Change label on batch type, title and column header. Also ne...
Kurund Jalmi [Wed, 17 Dec 2014 07:27:17 +0000 (12:57 +0530)]
Merge pull request #4725 from rohankatkar/Tests
Webtest Fixes
Tim Otten [Wed, 17 Dec 2014 06:25:58 +0000 (22:25 -0800)]
CRM-15713 - CRM_Case_BAO_Case::accessCase - Split off from getCases().
This allows us to explicit control over more parameters (eg case_status_id)
and to improve performance (by focusing on the specific $caseId).
Dave Greenberg [Wed, 17 Dec 2014 00:23:38 +0000 (16:23 -0800)]
CRM-15701 - Change label on batch type, title and column header. Also new generated.mysql.
----------------------------------------
* CRM-15701:
https://issues.civicrm.org/jira/browse/CRM-15701
Dave Greenberg [Tue, 16 Dec 2014 19:00:43 +0000 (11:00 -0800)]
Merge pull request #4691 from webaccess/pledge-batchentry
CRM-15701: Pledge payment batch entry
Rohan Katkar [Tue, 16 Dec 2014 13:21:56 +0000 (18:51 +0530)]
Webtest Fixes
Kurund Jalmi [Tue, 16 Dec 2014 13:01:03 +0000 (18:31 +0530)]
Merge pull request #2 from manishmore/QA-fixes
CRM-15701 QA-fixes
moremanish [Tue, 16 Dec 2014 12:52:05 +0000 (18:22 +0530)]
CRM-15701 QA-fixes
jitendrapurohit [Tue, 16 Dec 2014 12:49:53 +0000 (18:19 +0530)]
Activities Report - sort by Activity Type does not work and throws fatal if Section Header checked
Yashodha Chaku [Tue, 16 Dec 2014 10:09:09 +0000 (15:39 +0530)]
Merge pull request #4700 from monishdeb/CRM-15709
CRM-15709 fix - Searchbuilder contactsubtype ≠ 'value' fails
Dave Greenberg [Mon, 15 Dec 2014 23:38:16 +0000 (15:38 -0800)]
Merge pull request #4722 from davecivicrm/CRM-15688
CRM-15688 - Fix price field form display for consistent layout between w...
Dave Greenberg [Mon, 15 Dec 2014 22:49:18 +0000 (14:49 -0800)]
Merge pull request #4723 from davecivicrm/CRM-15361
CRM-15361 - default location_type label should be Automatic.
Dave Greenberg [Mon, 15 Dec 2014 22:48:29 +0000 (14:48 -0800)]
CRM-15361 - default location_type label should be Automatic.
----------------------------------------
* CRM-15361:
https://issues.civicrm.org/jira/browse/CRM-15361
Dave Greenberg [Mon, 15 Dec 2014 22:08:42 +0000 (14:08 -0800)]
CRM-15688 - Fix price field form display for consistent layout between widgets.
----------------------------------------
* CRM-15688:
https://issues.civicrm.org/jira/browse/CRM-15688
kurund [Mon, 15 Dec 2014 19:38:16 +0000 (01:08 +0530)]
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-12-16-01-08-03
Kurund Jalmi [Mon, 15 Dec 2014 17:33:41 +0000 (23:03 +0530)]
Merge pull request #4720 from rohankatkar/Tests
Webtest Fix
Rohan Katkar [Mon, 15 Dec 2014 13:32:43 +0000 (19:02 +0530)]
Webtest Fix
Coleman Watts [Sun, 14 Dec 2014 02:28:30 +0000 (21:28 -0500)]
Move pingback code to separate repo
Coleman Watts [Sat, 13 Dec 2014 23:28:04 +0000 (18:28 -0500)]
CRM-15713 - Case ajax fixes
colemanw [Sat, 13 Dec 2014 22:26:00 +0000 (17:26 -0500)]
Merge pull request #4718 from crusonweb/CRM-15723
CRM-15723 Joomla 3 Admin Footer Overlays Action Buttons
Dan Cruson [Sat, 13 Dec 2014 20:26:06 +0000 (15:26 -0500)]
More changes
Changes I missed the first time because of cut and paste.
Dan Cruson [Sat, 13 Dec 2014 20:24:23 +0000 (15:24 -0500)]
File adjustments per Coleman
Make changes to the file based on feedback from Coleman
Dan Cruson [Sat, 13 Dec 2014 20:09:17 +0000 (15:09 -0500)]
CRM-15723 Joomla 3 Footer Bar Overlay
Fix issue with the Joomla 3 admin footer overlaying the action buttons
Kurund Jalmi [Sat, 13 Dec 2014 14:11:41 +0000 (19:41 +0530)]
Merge pull request #4717 from kurund/ui-fixes
minor fixes
kurund [Sat, 13 Dec 2014 14:11:07 +0000 (19:41 +0530)]
minor fixes
Dave Greenberg [Sat, 13 Dec 2014 01:11:51 +0000 (17:11 -0800)]
Merge pull request #4715 from davecivicrm/CRM-14696
CRM-14696 - tweaks to styling for Sold Out indicator
Dave Greenberg [Sat, 13 Dec 2014 00:11:06 +0000 (16:11 -0800)]
CRM-14696 - tweaks to styling for Sold Out indicator
----------------------------------------
* CRM-14696:
https://issues.civicrm.org/jira/browse/CRM-14696
Dave Greenberg [Fri, 12 Dec 2014 23:45:59 +0000 (15:45 -0800)]
Merge pull request #4692 from kurund/CRM-14696
CRM-14696
Dave Greenberg [Fri, 12 Dec 2014 23:34:23 +0000 (15:34 -0800)]
Merge pull request #4714 from davecivicrm/CRM-13984
CRM-13984 - also move most intro text to a help pop-up.
Dave Greenberg [Fri, 12 Dec 2014 23:22:30 +0000 (15:22 -0800)]
CRM-13984 - also move most intro text to a help pop-up.
----------------------------------------
* CRM-13984:
https://issues.civicrm.org/jira/browse/CRM-13984
Dave Greenberg [Fri, 12 Dec 2014 23:14:07 +0000 (15:14 -0800)]
Merge pull request #4713 from colemanw/CRM-15710
CRM-15710 - Fix access to contact dashboard relationships
Dave Greenberg [Fri, 12 Dec 2014 17:44:02 +0000 (09:44 -0800)]
Merge pull request #4707 from davecivicrm/CRM-13984
CRM-13984 - Add help regarding use of receipt message, AND cleanup the T...
Coleman Watts [Fri, 12 Dec 2014 15:37:15 +0000 (10:37 -0500)]
Fix contact dashboard link
Coleman Watts [Fri, 12 Dec 2014 15:37:04 +0000 (10:37 -0500)]
CRM-15710 - Fix access to contact dashboard relationships
Kurund Jalmi [Fri, 12 Dec 2014 14:46:30 +0000 (20:16 +0530)]
Merge pull request #4710 from rohankatkar/Tests
Fix for Webtest
colemanw [Fri, 12 Dec 2014 14:35:01 +0000 (09:35 -0500)]
Merge pull request #4712 from colemanw/CRM-15679
CRM-15679 - Fix translation popup for price set option form
Coleman Watts [Fri, 12 Dec 2014 14:31:42 +0000 (09:31 -0500)]
CRM-15679 - Fix translation popup for price set option form
colemanw [Fri, 12 Dec 2014 14:13:02 +0000 (09:13 -0500)]
Merge pull request #4711 from colemanw/CRM-15720
CRM-15720 - Update help text for locked options
Coleman Watts [Fri, 12 Dec 2014 14:12:27 +0000 (09:12 -0500)]
CRM-15720 - Update help text for locked options
Rohan Katkar [Fri, 12 Dec 2014 13:30:19 +0000 (19:00 +0530)]
Removed spaces
Monish Deb [Fri, 12 Dec 2014 13:21:06 +0000 (18:51 +0530)]
Merge pull request #4709 from jitendrapurohit/webtestforCRM-15662
webtest to check for CRM-15662
Monish Deb [Fri, 12 Dec 2014 13:18:36 +0000 (18:48 +0530)]
Merge pull request #4708 from jitendrapurohit/CRM-15662
CRM-15662 fix for ACL's do not work when target is a smart group
Rohan Katkar [Fri, 12 Dec 2014 12:58:50 +0000 (18:28 +0530)]
Fix for Webtest
jitendrapurohit [Fri, 12 Dec 2014 12:43:47 +0000 (18:13 +0530)]
webtest to check for CRM-15662
jitendrapurohit [Fri, 12 Dec 2014 09:05:03 +0000 (14:35 +0530)]
CRM-15662 fix for ACL's do not work when target is a smart group
Yashodha Chaku [Fri, 12 Dec 2014 06:18:18 +0000 (11:48 +0530)]
Merge pull request #4693 from jaapjansma/CRM-15702
fix for issue CRM-15702 sending bulk smses to contacts without e-mail ad...
Dave Greenberg [Fri, 12 Dec 2014 01:37:00 +0000 (17:37 -0800)]
CRM-13984 - Add help regarding use of receipt message, AND cleanup the Thank-you and Receipting form (move inline help strings to help pop-ups).
----------------------------------------
* CRM-13984:
https://issues.civicrm.org/jira/browse/CRM-13984
colemanw [Fri, 12 Dec 2014 01:09:13 +0000 (20:09 -0500)]
Merge pull request #4706 from colemanw/ajaxFail
Provide more descriptive ajax error messages
Coleman Watts [Fri, 12 Dec 2014 01:07:51 +0000 (20:07 -0500)]
Provide more descriptive ajax error messages
colemanw [Thu, 11 Dec 2014 21:08:05 +0000 (16:08 -0500)]
Merge pull request #4703 from colemanw/CRM-13611
CRM-13611 - Fix create/copy report form errors
Eileen McNaughton [Thu, 11 Dec 2014 20:29:39 +0000 (09:29 +1300)]
Merge pull request #4646 from eileenmcnaughton/action-test
CRM-15550 test + test error fix
colemanw [Thu, 11 Dec 2014 19:52:18 +0000 (14:52 -0500)]
Merge pull request #4698 from colemanw/CRM-15711
CRM-15711 - Improve efficiency of deleting a contact
Coleman Watts [Thu, 11 Dec 2014 19:47:14 +0000 (14:47 -0500)]
CRM-13611 - Improve report UI when saving a new report
Coleman Watts [Thu, 11 Dec 2014 18:43:15 +0000 (13:43 -0500)]
Remove unused legacy report list
Coleman Watts [Thu, 11 Dec 2014 18:32:44 +0000 (13:32 -0500)]
Report tpl whitespace cleanup
Coleman Watts [Thu, 11 Dec 2014 18:20:18 +0000 (13:20 -0500)]
CRM.utils.renderOptions - make escapeHtml optional
Coleman Watts [Thu, 11 Dec 2014 17:58:10 +0000 (12:58 -0500)]
CRM-15495 - Fix CRM.utils.renderOptions to handle optgroups correctly
Coleman Watts [Thu, 11 Dec 2014 16:28:13 +0000 (11:28 -0500)]
CRM-13611 - Fix create/copy report form errors
Monish Deb [Thu, 11 Dec 2014 15:44:49 +0000 (21:14 +0530)]
Merge pull request #4701 from rohankatkar/Tests
Webtest Fixes
Rohan Katkar [Thu, 11 Dec 2014 13:24:46 +0000 (18:54 +0530)]
Webtest Fix
monishdeb [Thu, 11 Dec 2014 13:02:08 +0000 (18:32 +0530)]
QA fixes
monishdeb [Thu, 11 Dec 2014 10:44:52 +0000 (16:14 +0530)]
CRM-15709 fix - Searchbuilder contactsubtype ≠ 'value' fails
https://issues.civicrm.org/jira/browse/CRM-15709
Coleman Watts [Wed, 10 Dec 2014 22:30:37 +0000 (17:30 -0500)]
CRM-15711 - Improve efficiency of deleting a contact
Dave Greenberg [Thu, 11 Dec 2014 00:49:44 +0000 (16:49 -0800)]
Merge pull request #4694 from monishdeb/CRM-15626
CRM-15626 fix - Relationship Create Widget Not always showing the correc...
Monish Deb [Wed, 10 Dec 2014 18:30:06 +0000 (00:00 +0530)]
Merge pull request #4690 from jitendrapurohit/CRM-15559
Additional fix for Cannot register lifetime membership for someone else ...
monishdeb [Wed, 10 Dec 2014 14:38:09 +0000 (20:08 +0530)]
CRM-15626 fixes - Relationship Create Widget Not always showing the correct available relationships in select tool
https://issues.civicrm.org/jira/browse/CRM-15626
colemanw [Tue, 9 Dec 2014 21:35:42 +0000 (16:35 -0500)]
Merge pull request #4695 from colemanw/CRM-15550
CRM-15550 - Fix relationship id passed to postprocess hook
Dave Greenberg [Tue, 9 Dec 2014 21:07:24 +0000 (13:07 -0800)]
Merge pull request #4686 from lcdservices/CRM-15698-b
CRM-15698 participant report price level query
colemanw [Tue, 9 Dec 2014 19:42:34 +0000 (14:42 -0500)]
Merge pull request #4664 from aydun/CRM-15681-master
CRM-15681 Merge sub-types
Eileen McNaughton [Tue, 9 Dec 2014 19:31:19 +0000 (08:31 +1300)]
Merge pull request #4687 from eileenmcnaughton/CRM-15699-master
CRM-15699 add create/edit hook for ContributionPage
Coleman Watts [Tue, 9 Dec 2014 19:22:00 +0000 (14:22 -0500)]
CRM-15550 - Fix relationship id passed to postprocess hook
colemanw [Tue, 9 Dec 2014 13:55:45 +0000 (08:55 -0500)]
Merge pull request #4689 from colemanw/CRM-13611
CRM-13611 - Report fixes
colemanw [Tue, 9 Dec 2014 13:53:32 +0000 (08:53 -0500)]
Merge pull request #4688 from colemanw/CRM-15495
CRM-15495 - Support complex api filters in EntityRef
monishdeb [Tue, 9 Dec 2014 13:49:18 +0000 (19:19 +0530)]
CRM-15626 fix - Relationship Create Widget Not always showing the correct available relationships in select tool
https://issues.civicrm.org/jira/browse/CRM-15626
Jaap Jansma [Tue, 9 Dec 2014 11:15:44 +0000 (12:15 +0100)]
fix for issue CRM-15702 sending bulk smses to contacts without e-mail address
kurund [Tue, 9 Dec 2014 10:48:45 +0000 (16:18 +0530)]
Merge branch 'CRM-14696-v2' of https://github.com/JKingsnorth/civicrm-core into CRM-14696
Conflicts:
CRM/Price/BAO/PriceField.php
----------------------------------------
* CRM-14696: Improve display for sold out price set options
https://issues.civicrm.org/jira/browse/CRM-14696
kurund [Tue, 9 Dec 2014 10:29:09 +0000 (15:59 +0530)]
Merge remote-tracking branch 'upstream/master' into pledge-batchentry
Conflicts:
CRM/Upgrade/Incremental/sql/4.6.alpha1.mysql.tpl
Kurund Jalmi [Tue, 9 Dec 2014 10:13:40 +0000 (15:43 +0530)]
Merge pull request #1 from manishmore/master
batch entry for pledges
Kurund Jalmi [Tue, 9 Dec 2014 10:10:40 +0000 (15:40 +0530)]
Merge pull request #4657 from monishdeb/CRM-14512
Crm 14512
jitendrapurohit [Tue, 9 Dec 2014 09:56:36 +0000 (15:26 +0530)]
Additional fix for Cannot register lifetime membership for someone else [cid=0] if already have lifetime membership
kurund [Tue, 9 Dec 2014 09:23:16 +0000 (14:53 +0530)]
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-12-09-14-48-51
Conflicts:
CRM/Core/BAO/ActionSchedule.php
templates/CRM/Core/BillingBlock.tpl
Coleman Watts [Tue, 9 Dec 2014 04:36:03 +0000 (23:36 -0500)]
CRM-13611 - Fix case detail report
Coleman Watts [Tue, 9 Dec 2014 04:19:32 +0000 (23:19 -0500)]
CRM-13611 - Report tab fixes
projects / civicrm-core.git / log