colemanw [Thu, 26 Mar 2015 14:18:26 +0000 (10:18 -0400)]
Merge pull request #5491 from colemanw/CRM-16186
CRM-16186 - Fix checkbox values
Coleman Watts [Thu, 26 Mar 2015 14:16:39 +0000 (10:16 -0400)]
CRM-16186 - Fix checkbox values
Coleman Watts [Thu, 26 Mar 2015 14:12:44 +0000 (10:12 -0400)]
CRM-16141 - String fix
colemanw [Thu, 26 Mar 2015 13:56:17 +0000 (09:56 -0400)]
Merge pull request #5486 from colemanw/CRM-16141
CRM-16141 - Fix untranslated strings in CaseType UI
Kurund Jalmi [Thu, 26 Mar 2015 10:38:14 +0000 (16:08 +0530)]
Merge pull request #5485 from eileenmcnaughton/4.6
CRM-16182 strip with rollup from sql in add2group function
Kurund Jalmi [Thu, 26 Mar 2015 10:37:15 +0000 (16:07 +0530)]
Merge pull request #5487 from eileenmcnaughton/CRM-16165
CRM-16183 only format dates as dates and allow datetime fields (& presum...
Eileen McNaughton [Thu, 26 Mar 2015 02:49:04 +0000 (15:49 +1300)]
CRM-16183 Report datetime fields: display as datetime if specified as datetime (not date)
Coleman Watts [Thu, 26 Mar 2015 01:49:15 +0000 (21:49 -0400)]
CRM-16141 - Fix untranslated strings in CaseType UI
Eileen McNaughton [Thu, 26 Mar 2015 00:47:44 +0000 (13:47 +1300)]
a couple of comment fixes
Eileen McNaughton [Thu, 26 Mar 2015 00:45:05 +0000 (13:45 +1300)]
CRM-16182 strip with rollup from sql in add2group function
colemanw [Wed, 25 Mar 2015 19:42:15 +0000 (15:42 -0400)]
Merge pull request #5403 from eileenmcnaughton/CRM-16055-task-fixes
CRM-16055 fixes from broken relationship form
Monish Deb [Wed, 25 Mar 2015 13:21:49 +0000 (18:51 +0530)]
Merge pull request #5480 from jitendrapurohit/CRM-16152
CRM-16152 - County is Not Saved When Sharing an Address the First Time
Monish Deb [Wed, 25 Mar 2015 13:21:03 +0000 (18:51 +0530)]
Merge pull request #5481 from jitendrapurohit/webtest46
webtest fixes
jitendrapurohit [Wed, 25 Mar 2015 13:03:55 +0000 (18:33 +0530)]
webtest fixes
jitendrapurohit [Wed, 25 Mar 2015 11:57:03 +0000 (17:27 +0530)]
CRM-16152 - County is Not Saved When Sharing an Address the First Time
CiviCRM [Wed, 25 Mar 2015 11:37:41 +0000 (04:37 -0700)]
Update version to 4.6.0
Eileen McNaughton [Wed, 25 Mar 2015 09:06:21 +0000 (22:06 +1300)]
Merge pull request #5479 from eileenmcnaughton/4.6
phpcs formatting & comments
Eileen McNaughton [Wed, 25 Mar 2015 06:59:15 +0000 (19:59 +1300)]
phpcs formatting & comments
Monish Deb [Wed, 25 Mar 2015 06:38:53 +0000 (12:08 +0530)]
Merge pull request #5474 from rohankatkar/CRM-16157
Option Group - Paper Size Options lost edit ability
Web Access [Wed, 25 Mar 2015 06:37:34 +0000 (12:07 +0530)]
Minor changes to CRM-16157
Web Access [Tue, 24 Mar 2015 12:37:22 +0000 (18:07 +0530)]
Fix for CRM-16157
Monish Deb [Wed, 25 Mar 2015 05:26:22 +0000 (10:56 +0530)]
Merge pull request #5475 from rohankatkar/CRM-16162
drupal-notices when geocoding addresses
Dave Greenberg [Tue, 24 Mar 2015 22:57:40 +0000 (15:57 -0700)]
Merge pull request #5477 from monishdeb/4.6
CRM-15605 minor fix
monishdeb [Tue, 24 Mar 2015 14:49:10 +0000 (20:19 +0530)]
minor fix
colemanw [Tue, 24 Mar 2015 14:02:13 +0000 (10:02 -0400)]
Merge pull request #5476 from colemanw/Api
Api explorer options improvements
Coleman Watts [Tue, 24 Mar 2015 13:56:16 +0000 (09:56 -0400)]
Api explorer options improvements
Web Access [Tue, 24 Mar 2015 13:45:12 +0000 (19:15 +0530)]
Fix for CRM-16162
Eileen McNaughton [Tue, 24 Mar 2015 07:24:07 +0000 (20:24 +1300)]
Merge pull request #5415 from eileenmcnaughton/4.6
CRM-16124, CRM-16125 fixes to support api complete_transaction
Kurund Jalmi [Tue, 24 Mar 2015 05:46:28 +0000 (11:16 +0530)]
Merge pull request #5466 from colemanw/Use
Use minified select2 css
Kurund Jalmi [Tue, 24 Mar 2015 05:46:11 +0000 (11:16 +0530)]
Merge pull request #5469 from colemanw/explorer
API Explorer - fix metadata lookup problem caused by unique names
Eileen McNaughton [Tue, 24 Mar 2015 05:34:34 +0000 (18:34 +1300)]
whitespace fix
Eileen McNaughton [Tue, 24 Mar 2015 04:47:16 +0000 (17:47 +1300)]
CRM-16167 fix up cache clear to include report temp tables from all paths
Eileen McNaughton [Tue, 24 Mar 2015 04:18:18 +0000 (17:18 +1300)]
phpcs code cleanup
Coleman Watts [Tue, 24 Mar 2015 02:21:07 +0000 (22:21 -0400)]
API Explorer - fix metadata lookup problem caused by unique names
colemanw [Tue, 24 Mar 2015 01:39:05 +0000 (21:39 -0400)]
Merge pull request #5467 from colemanw/pseudoconstant
Fix pseudoconstants in RelationshipType schema
Coleman Watts [Mon, 23 Mar 2015 22:23:53 +0000 (18:23 -0400)]
Fix pseudoconstants in RelationshipType schema
Coleman Watts [Mon, 23 Mar 2015 22:09:22 +0000 (18:09 -0400)]
Use minified select2 css
Coleman Watts [Mon, 23 Mar 2015 20:29:31 +0000 (16:29 -0400)]
Merge branch '4.5' of https://github.com/civicrm/civicrm-core into 4.6
Conflicts:
js/Common.js
colemanw [Mon, 23 Mar 2015 19:53:49 +0000 (15:53 -0400)]
Merge pull request #5465 from colemanw/CRM-16163
CRM-16163 - Set dialog height of 'new contact' popup
Coleman Watts [Mon, 23 Mar 2015 19:53:27 +0000 (15:53 -0400)]
CRM-16163 - Set dialog height of 'new contact' popup
Coleman Watts [Mon, 23 Mar 2015 16:33:47 +0000 (12:33 -0400)]
Fix diacritics in api explorer output
Kurund Jalmi [Mon, 23 Mar 2015 16:21:36 +0000 (21:51 +0530)]
Merge pull request #5446 from atif-shaikh/CRM-14105
CRM-14105 - WordPress: mail_report Scheduled Job "access denied" unless ...
Kurund Jalmi [Mon, 23 Mar 2015 16:20:59 +0000 (21:50 +0530)]
Merge pull request #5450 from monishdeb/4.6
CRM-16103 Webtest and core-bug fix
Kurund Jalmi [Mon, 23 Mar 2015 16:20:46 +0000 (21:50 +0530)]
Merge pull request #5464 from monishdeb/CRM-16151
CRM-16151 fix - Deleted contacts are included in advanced search results when using Display As - Related Contacts option
colemanw [Mon, 23 Mar 2015 15:16:51 +0000 (11:16 -0400)]
Merge pull request #5386 from colemanw/CRM-15706
CRM-15706 - Add Angular help directive
colemanw [Mon, 23 Mar 2015 15:11:22 +0000 (11:11 -0400)]
Merge pull request #5461 from colemanw/CRM-16158
CRM-16158 - More compact quicksearch in menu
colemanw [Mon, 23 Mar 2015 15:10:05 +0000 (11:10 -0400)]
Merge pull request #5463 from pratikshad/mailing4.6
Fixed webtest for Mailing
monishdeb [Mon, 23 Mar 2015 15:04:56 +0000 (20:34 +0530)]
CRM-16151 fix - Deleted contacts are included in advanced search results when using Display As - Related Contacts option
https://issues.civicrm.org/jira/browse/CRM-16151
pratikshad [Mon, 23 Mar 2015 13:43:21 +0000 (19:13 +0530)]
Fixed warnings for mailing webtest
kurund [Mon, 23 Mar 2015 13:13:19 +0000 (18:43 +0530)]
Merge remote-tracking branch 'upstream/4.5' into 4.5-4.6-2015-03-23-18-42-19
Conflicts:
CRM/Contact/Form/CustomData.php
pratikshad [Mon, 23 Mar 2015 13:08:03 +0000 (18:38 +0530)]
Fixed webtest for Mailing
Monish Deb [Mon, 23 Mar 2015 08:25:35 +0000 (13:55 +0530)]
Merge pull request #5439 from rohankatkar/webtest-4.6
Webtest Fixes
Monish Deb [Mon, 23 Mar 2015 05:57:29 +0000 (11:27 +0530)]
Merge pull request #5449 from pratikshad/fixedWebtest4.6
Fixed webtest for contribution
Web Access [Mon, 23 Mar 2015 05:15:39 +0000 (10:45 +0530)]
Warning fixes
colemanw [Sun, 22 Mar 2015 23:20:24 +0000 (19:20 -0400)]
Merge pull request #5457 from colemanw/CRM-15705
CRM-15705 - Improve style of preview links
Coleman Watts [Sun, 22 Mar 2015 23:01:08 +0000 (19:01 -0400)]
CRM-16158 - More compact quicksearch in menu
colemanw [Sun, 22 Mar 2015 22:30:03 +0000 (18:30 -0400)]
Merge pull request #5460 from colemanw/bower
Move jQuery.validate to bower
Coleman Watts [Sun, 22 Mar 2015 20:50:34 +0000 (16:50 -0400)]
Move jQuery.validate to bower
colemanw [Sun, 22 Mar 2015 18:12:59 +0000 (14:12 -0400)]
Merge pull request #5459 from colemanw/CRM-16154
CRM-16154 - Update references to select2
Coleman Watts [Sun, 22 Mar 2015 18:11:38 +0000 (14:11 -0400)]
CRM-16154 - Update references to select2
colemanw [Sun, 22 Mar 2015 18:09:17 +0000 (14:09 -0400)]
Merge pull request #5458 from colemanw/CRM-16154
CRM-16154 - Use bower to load our Select2 fork
Coleman Watts [Sun, 22 Mar 2015 17:56:05 +0000 (13:56 -0400)]
CRM-16154 - Use bower to load our Select2 fork
Coleman Watts [Sun, 22 Mar 2015 00:28:10 +0000 (20:28 -0400)]
CRM-15705 - Improve style of preview links
colemanw [Sun, 22 Mar 2015 00:11:22 +0000 (20:11 -0400)]
Merge pull request #5455 from colemanw/CRM-16140
CRM-16140 - Hide menubar when CKEditor is fullscreen
Coleman Watts [Sat, 21 Mar 2015 17:43:39 +0000 (13:43 -0400)]
CRM-16140 - Hide menubar when CKEditor is fullscreen
Dave Greenberg [Sat, 21 Mar 2015 03:52:05 +0000 (20:52 -0700)]
Merge pull request #5441 from colemanw/CRM-16142
CRM-16142 - Confirm before sending test mailing to a group
colemanw [Sat, 21 Mar 2015 01:37:51 +0000 (21:37 -0400)]
Merge pull request #5454 from colemanw/CRM-16112
CRM-16112 - Remove unnecessary fields from contact spec
Coleman Watts [Sat, 21 Mar 2015 00:21:16 +0000 (20:21 -0400)]
CRM-16112 - Support group & tag filter options in api
The contact get "group_id" option seems to have no effect, so I removed it.
colemanw [Fri, 20 Mar 2015 20:42:35 +0000 (16:42 -0400)]
Merge pull request #5452 from mlutfy/4.5-crm16119
CRM-16119: Fix Contact custom data multiple save/more buttons translation
Coleman Watts [Fri, 20 Mar 2015 19:53:12 +0000 (15:53 -0400)]
CRM-16112 - Remove unnecessary fields from contact spec
Mathieu Lutfy [Mon, 16 Mar 2015 19:19:16 +0000 (15:19 -0400)]
CRM-16119: Fix Contact custom data multiple save/more buttons translation.
monishdeb [Fri, 20 Mar 2015 16:45:24 +0000 (22:15 +0530)]
formating fixes
monishdeb [Fri, 20 Mar 2015 16:40:57 +0000 (22:10 +0530)]
formating fixes
monishdeb [Fri, 20 Mar 2015 16:29:13 +0000 (21:59 +0530)]
CRM-16103 miscellaneous fix
----------------------------------------
* CRM-16103: CiviMailing status is not updating
https://issues.civicrm.org/jira/browse/CRM-16103
monishdeb [Thu, 19 Mar 2015 15:16:44 +0000 (20:46 +0530)]
CRM-16103 fix - CiviMailing status is not updating
https://issues.civicrm.org/jira/browse/CRM-16103
Dave Greenberg [Fri, 20 Mar 2015 15:55:40 +0000 (08:55 -0700)]
Merge pull request #5444 from davecivicrm/CRM-16134
CRM-16134 - Merge case activity created by should be logged in user.
Dave Greenberg [Fri, 20 Mar 2015 15:54:59 +0000 (08:54 -0700)]
Merge pull request #5443 from davecivicrm/CRM-16146
CRM-16146 - fix typo and incorrect date range calc for Fiscal Year range...
colemanw [Fri, 20 Mar 2015 14:27:17 +0000 (10:27 -0400)]
Merge pull request #5448 from pratikshad/fixedwebtest4.6
4.6 Fixed webtest
colemanw [Fri, 20 Mar 2015 14:22:00 +0000 (10:22 -0400)]
Merge pull request #5445 from totten/4.6-keeparg
CRM-16080 - CRM.strings - Preserve variable placeholders
Web Access [Fri, 20 Mar 2015 13:17:31 +0000 (18:47 +0530)]
Webtest Fixes
Web Access [Thu, 19 Mar 2015 13:16:09 +0000 (18:46 +0530)]
Webtest Fixes
Monish Deb [Fri, 20 Mar 2015 11:31:44 +0000 (17:01 +0530)]
Merge pull request #5447 from jitendrapurohit/CRM-16147
Select element not shown for Gender in Search Builder Form
pratikshad [Fri, 20 Mar 2015 10:56:45 +0000 (16:26 +0530)]
Fixed webtest for contribution
pratikshad [Fri, 20 Mar 2015 10:42:47 +0000 (16:12 +0530)]
tests/phpunit/CiviTest/CiviSeleniumTestCase.php
jitendrapurohit [Fri, 20 Mar 2015 09:44:56 +0000 (15:14 +0530)]
Select element not shown for Gender in Search Builder Form
atif-shaikh [Fri, 20 Mar 2015 05:44:11 +0000 (11:14 +0530)]
CRM-14105 - WordPress: mail_report Scheduled Job "access denied" unless report permission = Everyone
https://issues.civicrm.org/jira/browse/CRM-14105
Coleman Watts [Fri, 20 Mar 2015 04:15:26 +0000 (00:15 -0400)]
CRM-16142 - Disable test send if group is empty
Tim Otten [Fri, 20 Mar 2015 03:41:38 +0000 (20:41 -0700)]
CRM-16132 - Fix warning, "mysqli_error() expects parameter 1 to be mysqli"
The error-reporting code tests whehter it should lookup errors using
mysql_error() or mysqli_error(). However, it incorrectly assumes that
function-existence implies active-link. But both functions may exist --
even though only one connection is active. The active, in-use connection is
determined by the DSN.
Tim Otten [Fri, 20 Mar 2015 02:43:39 +0000 (19:43 -0700)]
CRM-16080 - CRM.strings - Preserve variable placeholders
Dave Greenberg [Fri, 20 Mar 2015 01:55:05 +0000 (18:55 -0700)]
CRM-16134 - Merge case activity created by should be logged in user.
----------------------------------------
* CRM-16134: merge case activities should be attributed to logged in user
https://issues.civicrm.org/jira/browse/CRM-16134
Dave Greenberg [Fri, 20 Mar 2015 01:33:16 +0000 (18:33 -0700)]
Merge pull request #5392 from pradpnayak/CRM-16015
Crm 16015
Dave Greenberg [Fri, 20 Mar 2015 01:19:35 +0000 (18:19 -0700)]
CRM-16146 - fix typo and incorrect date range calc for Fiscal Year ranges.
----------------------------------------
* CRM-16146: Fiscal year filters have typos and (slightly) incorrect date ranges
https://issues.civicrm.org/jira/browse/CRM-16146
Coleman Watts [Fri, 20 Mar 2015 00:34:48 +0000 (20:34 -0400)]
CRM-16142 - Add confirm dialog title
Coleman Watts [Thu, 19 Mar 2015 22:22:44 +0000 (18:22 -0400)]
CRM-16142 - Variable scope fixes
Coleman Watts [Thu, 19 Mar 2015 20:52:31 +0000 (16:52 -0400)]
CRM-16142 - Confirm before sending test mailing to a group
Coleman Watts [Thu, 19 Mar 2015 18:10:46 +0000 (14:10 -0400)]
CRM-15705 - Mailing UI dialog tweaks
Coleman Watts [Thu, 19 Mar 2015 17:29:11 +0000 (13:29 -0400)]
CRM-15706 - Refactor Angular uiAccordions and add help
Dave Greenberg [Thu, 19 Mar 2015 16:48:31 +0000 (09:48 -0700)]
Merge pull request #5440 from davecivicrm/CRM-16099
CRM-16099 - friendly error when mapping from profile with no mapping pro...
Dave Greenberg [Thu, 19 Mar 2015 16:49:05 +0000 (09:49 -0700)]
CRM-16099 - friendly error when mapping from profile with no mapping provider configured.
----------------------------------------
* CRM-16099: Map Profile Results Smarty error when no mapping provider is configured AND strict warning in 4.6 on mapping page
https://issues.civicrm.org/jira/browse/CRM-16099
Coleman Watts [Thu, 19 Mar 2015 15:34:38 +0000 (11:34 -0400)]
CRM-15706 - More mailing help additions/fixes
projects / civicrm-core.git / log