totten@civicrm.org [Fri, 27 Jun 2014 09:36:14 +0000 (02:36 -0700)]
CRM-14798 - CRM_Case_XMLRepository - Don't double-munge the case-type name.
Prior to this commit, the naming for a case-type flowed more or less
like:
1. User makes up a display-name (title/label)
2. That title is munged via CRM_Utils_String::titleToVar to produce a machine-name
3. That machine-name is munged via CRM_Case_XMLProcessor::mungeCaseType to produce a file-name
As we begin allowing more varied dataflows for managing CaseType XML files
and CaseType DB records, it becomes more important for the naming behavior
to intuitive.
Dave Greenberg [Tue, 1 Jul 2014 21:38:33 +0000 (14:38 -0700)]
Merge pull request #3590 from totten/master-crmCaseType-validate
CRM-14798 - crmCaseType - Validation fixes
Monish Deb [Tue, 1 Jul 2014 15:05:54 +0000 (20:35 +0530)]
Merge pull request #3592 from atif-shaikh/CRM-14927
CRM-14927 - Batch update via Profile - copy icon fails for fields of 'se...
atif-shaikh [Tue, 1 Jul 2014 12:50:31 +0000 (18:20 +0530)]
CRM-14927 - Batch update via Profile - copy icon fails for fields of 'select' type
https://issues.civicrm.org/jira/browse/CRM-14927
Kurund Jalmi [Tue, 1 Jul 2014 11:38:11 +0000 (17:08 +0530)]
Merge pull request #3591 from jitendrapurohit/SmartGroup_Notice
Smart Group Notice Fix
jitendrapurohit [Tue, 1 Jul 2014 05:19:59 +0000 (10:49 +0530)]
Smart Group Notice Fix
Tim Otten [Tue, 1 Jul 2014 04:51:34 +0000 (21:51 -0700)]
CRM-14798 - caseTypeDetails.html - Display warning when changing caseType.name
Tim Otten [Tue, 1 Jul 2014 04:46:06 +0000 (21:46 -0700)]
CRM-14798 - civicrm.css - Apply ng-invalid styling for <input>s but not <form>s
Tim Otten [Tue, 1 Jul 2014 04:08:44 +0000 (21:08 -0700)]
CRM-14798 - crmCaseType - Fix handling of labels+validation
In our UX, labels are supposed to turn red when a field becomes invalid, and
they're supposed to include a red "*" if required. This adds an Angular
directive to enforce both.
Tim Otten [Tue, 1 Jul 2014 00:25:35 +0000 (17:25 -0700)]
CRM-14798 - crmCaseType/timelineTable.html - Fix validation of hidden fields
Tim Otten [Tue, 1 Jul 2014 00:23:09 +0000 (17:23 -0700)]
CRM-14798 - crmCaseType/edit.html - Only allow saving of valid forms
Tim Otten [Tue, 1 Jul 2014 00:21:14 +0000 (17:21 -0700)]
CRM-14798 - civicrm.css - Styling for disabled buttons
Tim Otten [Tue, 1 Jul 2014 00:19:20 +0000 (17:19 -0700)]
CRM-14798 - crmUi - Add "goto()" helper function
Example: <button ng-click="goto('home')">Go home!</button>
This allows us to use buttons instead of <A HREF>'s -- which makes it easier
to maintain consistent styling in a button bar.
Tim Otten [Mon, 30 Jun 2014 23:09:47 +0000 (16:09 -0700)]
Merge pull request #3582 from totten/master-auto-reconcile
CRM-14786 - CaseType - Perform reconciliation whenever a case-type definition changes
Dave Greenberg [Mon, 30 Jun 2014 23:06:21 +0000 (16:06 -0700)]
Merge pull request #3589 from davecivicrm/CRM-14798a
CRM-14798 - better fix for lock icon markup.
Dave Greenberg [Mon, 30 Jun 2014 23:02:39 +0000 (16:02 -0700)]
CRM-14798 - better fix for lock icon markup.
----------------------------------------
* CRM-14798:
https://issues.civicrm.org/jira/browse/CRM-14798
Dave Greenberg [Mon, 30 Jun 2014 22:29:32 +0000 (15:29 -0700)]
Merge pull request #3571 from totten/master-casetype-maxinst
CRM-14798 - CiviCase - Fix max_instances check
Kurund Jalmi [Mon, 30 Jun 2014 19:55:33 +0000 (01:25 +0530)]
Merge pull request #3585 from atif-shaikh/CRM-14199
CRM-14199 - Incorrect Math in Import routines
Dave Greenberg [Mon, 30 Jun 2014 18:35:18 +0000 (11:35 -0700)]
Merge pull request #3586 from jmcclelland/auth-net-amount-fee-amount-sum
Auth net amount fee amount sum
Kurund Jalmi [Mon, 30 Jun 2014 18:28:45 +0000 (23:58 +0530)]
Merge pull request #3583 from yashodha/master
version fixes
Kurund Jalmi [Mon, 30 Jun 2014 18:04:54 +0000 (23:34 +0530)]
Merge pull request #3587 from kurund/CRM-14567
Crm 14567
kurund [Mon, 30 Jun 2014 17:57:03 +0000 (23:27 +0530)]
CRM-14567, switch back to dompdf, because tcpdf does not support css / classes that breaks layout for reports
----------------------------------------
* CRM-14567: Replace DOMPDF with TCPDF for "Create PDF Letter"
https://issues.civicrm.org/jira/browse/CRM-14567
kurund [Mon, 30 Jun 2014 17:55:41 +0000 (23:25 +0530)]
removed unwanted code CRM-14567
----------------------------------------
* CRM-14567: Replace DOMPDF with TCPDF for "Create PDF Letter"
https://issues.civicrm.org/jira/browse/CRM-14567
Jamie McClelland [Mon, 30 Jun 2014 17:17:37 +0000 (13:17 -0400)]
CRM-14881 - ensure we use the default NULL rather than 0.00 for fee/net
amounts so it's consistent with other IPNs.
----------------------------------------
* CRM-14881: Cannot edit contribution created by authorize.net recurring contribution
https://issues.civicrm.org/jira/browse/CRM-14881
Jamie McClelland [Mon, 30 Jun 2014 17:16:23 +0000 (13:16 -0400)]
CRM-14881 - avoid error when saving contribution made by authnet
We should only check the sum of the fee and net if there is a fee
and/or net that is not equal to 0.00.
----------------------------------------
* CRM-14881: Cannot edit contribution created by authorize.net recurring contribution
https://issues.civicrm.org/jira/browse/CRM-14881
Monish Deb [Mon, 30 Jun 2014 15:37:12 +0000 (21:07 +0530)]
Merge pull request #3557 from jitendrapurohit/CRM-14880
Monish Deb [Mon, 30 Jun 2014 15:35:15 +0000 (21:05 +0530)]
Merge pull request #3579 from jmcclelland/sms-character-count
Tested, working fine.
atif-shaikh [Mon, 30 Jun 2014 14:00:01 +0000 (19:30 +0530)]
CRM-14199 - Incorrect Math in Import routines
https://issues.civicrm.org/jira/browse/CRM-14199
Yashodha Chaku [Mon, 30 Jun 2014 12:57:51 +0000 (18:27 +0530)]
Merge pull request #3584 from NileemaJadhav/CRM-master
CRM-14919 fix api test failures and notice fixes
Nileema [Mon, 30 Jun 2014 11:53:34 +0000 (17:23 +0530)]
CRM-14919 fix api test failures and notice fixes
----------------------------------------
* CRM-14919: Add icon for related contact in listing in the relationship tab
https://issues.civicrm.org/jira/browse/CRM-14919
kurund [Mon, 30 Jun 2014 09:29:04 +0000 (14:59 +0530)]
CRM-14567, fixed the bug with initialization of TCPDF
----------------------------------------
* CRM-14567: Replace DOMPDF with TCPDF for "Create PDF Letter"
https://issues.civicrm.org/jira/browse/CRM-14567
CiviCRM [Mon, 30 Jun 2014 09:11:45 +0000 (14:41 +0530)]
version fixes
Yashodha Chaku [Mon, 30 Jun 2014 07:21:48 +0000 (12:51 +0530)]
Merge pull request #3577 from PoonamNalawade/HR-351
--HR-351 -New Case cancel button redirection to case dashboard.
kurund [Mon, 30 Jun 2014 06:28:11 +0000 (11:58 +0530)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-06-30-11-58-01
Yashodha Chaku [Mon, 30 Jun 2014 05:09:10 +0000 (10:39 +0530)]
Merge pull request #3576 from NileemaJadhav/CRM-14919
CRM-14919 Add icon for related contact in listing in the relationship tab
Tim Otten [Sat, 28 Jun 2014 03:37:16 +0000 (20:37 -0700)]
CRM-14786 - CaseType - Perform reconciliation whenever a case-type definition changes
Tim Otten [Sat, 28 Jun 2014 02:04:52 +0000 (19:04 -0700)]
Merge pull request #3572 from totten/master-casetype-tweaks
CRM-14798 - crmCaseType - Misc tweaks
Dave Greenberg [Fri, 27 Jun 2014 17:07:36 +0000 (10:07 -0700)]
Merge pull request #3574 from totten/master-casetype-redir
CRM-14917 - Redirect old CiviCase admin URL
Jamie McClelland [Fri, 27 Jun 2014 16:46:06 +0000 (12:46 -0400)]
CRM-14925 - count up the characters in use, not down from the max
----------------------------------------
* CRM-14925: SMS interface should count the characters entered, not count down
https://issues.civicrm.org/jira/browse/CRM-14925
Nileema [Fri, 27 Jun 2014 12:20:56 +0000 (17:50 +0530)]
fetching contact type from query
Poonam [Fri, 27 Jun 2014 10:42:26 +0000 (16:12 +0530)]
--HR-351 -New Case cancel button redirection to case dashboard.
Nileema [Fri, 27 Jun 2014 09:35:32 +0000 (15:05 +0530)]
CRM-14919 Add icon for related contact in listing in the relationship tab
----------------------------------------
* CRM-14919: Add icon for related contact in listing in the relationship tab
https://issues.civicrm.org/jira/browse/CRM-14919
Tim Otten [Fri, 27 Jun 2014 09:07:52 +0000 (02:07 -0700)]
Merge pull request #3575 from totten/master-casetype-testfix
api_v3_CaseTypeTest - Change example definition from XML to array().
totten@civicrm.org [Fri, 27 Jun 2014 09:04:43 +0000 (02:04 -0700)]
api_v3_CaseTypeTest - Change example definition from XML to array().
totten@civicrm.org [Fri, 27 Jun 2014 07:36:18 +0000 (00:36 -0700)]
CRM-14917 - Redirect old CiviCase admin URL
totten@civicrm.org [Fri, 27 Jun 2014 07:34:19 +0000 (00:34 -0700)]
CRM_Core_Page_Redirect - Generic page-redirect handler
totten@civicrm.org [Fri, 27 Jun 2014 07:32:04 +0000 (00:32 -0700)]
CRM_Core_Menu::getArrayForPathArgs - Allow page_arguments to include "=" in values
Tim Otten [Fri, 27 Jun 2014 04:09:05 +0000 (21:09 -0700)]
CRM-14798 - CiviCase - Fix max_instances check
This code was using the ambiguous generic variable names ("$key", "$val")
and confusing the content of "$val" (e.g. confusing caseId with
caseTypeName).
Tim Otten [Fri, 27 Jun 2014 03:38:49 +0000 (20:38 -0700)]
CRM-14798 - crmCaseType/timelineTable.html - Incl new activities in dropdown
Tim Otten [Fri, 27 Jun 2014 03:37:23 +0000 (20:37 -0700)]
CRM-14798 - crmCaseType/timelineTable.html - Use select2
Tim Otten [Fri, 27 Jun 2014 03:24:12 +0000 (20:24 -0700)]
CRM-14798 - crmCaseType/list.html - Fix enabled/disabled labels
Eileen McNaughton [Fri, 27 Jun 2014 03:22:33 +0000 (15:22 +1200)]
Merge pull request #3570 from eileenmcnaughton/ssgrouptest
Add Smart group test - CRM-14887
Eileen McNaughton [Fri, 27 Jun 2014 03:20:47 +0000 (15:20 +1200)]
remove incorrectly added (duplicate) test (only just added)
Tim Otten [Fri, 27 Jun 2014 03:12:13 +0000 (20:12 -0700)]
CRM-14798 - timelineTable.html - Allow blank statuses
The reference XML files include blank statuses, so XML files in the wild
probably have blanks, too. We should be able to read/write real XML files.
Note that for *new* activities in the timeline, the default status is
"Scheduled".
Eileen McNaughton [Fri, 27 Jun 2014 03:12:04 +0000 (15:12 +1200)]
comment fix
Eileen McNaughton [Fri, 27 Jun 2014 03:10:10 +0000 (15:10 +1200)]
additional group test
Eileen McNaughton [Fri, 27 Jun 2014 02:58:00 +0000 (14:58 +1200)]
fix for failing test search result
Eileen McNaughton [Thu, 26 Jun 2014 11:48:47 +0000 (23:48 +1200)]
create smartgroup test
Dave Greenberg [Thu, 26 Jun 2014 23:42:15 +0000 (16:42 -0700)]
Merge pull request #3569 from davecivicrm/CRM-14884
CRM-14884 - Rename report instance schema file.
Dave Greenberg [Thu, 26 Jun 2014 23:41:26 +0000 (16:41 -0700)]
CRM-14884 - Rename report instance schema file.
----------------------------------------
* CRM-14884:
https://issues.civicrm.org/jira/browse/CRM-14884
Dave Greenberg [Thu, 26 Jun 2014 23:14:53 +0000 (16:14 -0700)]
Merge pull request #3520 from davecivicrm/CRM-14882
CRM-14882 - hide billing block for online contrib forms with non-quick-config price-sets when total is ze...
Dave Greenberg [Thu, 26 Jun 2014 23:14:16 +0000 (16:14 -0700)]
CRM-14882 - fix indentations.
----------------------------------------
* CRM-14882:
https://issues.civicrm.org/jira/browse/CRM-14882
Dave Greenberg [Thu, 26 Jun 2014 23:11:53 +0000 (16:11 -0700)]
CRM-14882 - fix indentations.
----------------------------------------
* CRM-14882:
https://issues.civicrm.org/jira/browse/CRM-14882
Dave Greenberg [Thu, 26 Jun 2014 22:21:32 +0000 (15:21 -0700)]
Merge pull request #3568 from davecivicrm/CRM-14798
CRM-14798 - add class to lock icon to keep it on same line as form field...
Dave Greenberg [Thu, 26 Jun 2014 22:20:43 +0000 (15:20 -0700)]
CRM-14798 - add class to lock icon to keep it on same line as form field.
----------------------------------------
* CRM-14798:
https://issues.civicrm.org/jira/browse/CRM-14798
Dave Greenberg [Thu, 26 Jun 2014 21:58:09 +0000 (14:58 -0700)]
Merge pull request #3566 from totten/master-casetype-tweak
CRM-14798 - crmCaseType - Multiple UI updates
Dave Greenberg [Thu, 26 Jun 2014 19:10:22 +0000 (12:10 -0700)]
Merge pull request #3542 from davecivicrm/CRM-14857
Crm 14857
Dave Greenberg [Thu, 26 Jun 2014 19:10:04 +0000 (12:10 -0700)]
CRM-14857 - fix indenting.
----------------------------------------
* CRM-14857:
https://issues.civicrm.org/jira/browse/CRM-14857
Dave Greenberg [Thu, 26 Jun 2014 19:07:56 +0000 (12:07 -0700)]
CRM-14857 - fix indenting.
----------------------------------------
* CRM-14857:
https://issues.civicrm.org/jira/browse/CRM-14857
Dave Greenberg [Thu, 26 Jun 2014 18:46:24 +0000 (11:46 -0700)]
Merge pull request #3567 from lcdservices/CRM-14921
CRM-14921 retain context from custom search
Brian Shaughnessy [Thu, 26 Jun 2014 16:20:29 +0000 (12:20 -0400)]
CRM-14921 retain context from custom search
Yashodha Chaku [Thu, 26 Jun 2014 13:10:06 +0000 (18:40 +0530)]
Merge pull request #3448 from NileemaJadhav/CRM-master-HR
--Fix notices on Activities report
totten@civicrm.org [Thu, 26 Jun 2014 08:02:25 +0000 (01:02 -0700)]
CRM-14798 - crmCaseType - Lock/auto-generate the case-type's "name"
Kurund Jalmi [Thu, 26 Jun 2014 08:44:22 +0000 (14:14 +0530)]
Merge pull request #3565 from kurund/CRM-14787
CRM-14787, on save redirect to listing
kurund [Thu, 26 Jun 2014 08:43:27 +0000 (14:13 +0530)]
CRM-14787, on save redirect to listing
----------------------------------------
* CRM-14787: URL should update after saving case-type
https://issues.civicrm.org/jira/browse/CRM-14787
totten@civicrm.org [Thu, 26 Jun 2014 06:23:36 +0000 (23:23 -0700)]
CRM-14798 - crmCaseType - Set default values of "Reference" fields
totten@civicrm.org [Thu, 26 Jun 2014 06:22:19 +0000 (23:22 -0700)]
CRM-14798 - crmCaseType "Reference" fields - Disable for "Open Case". Require for others.
Tim Otten [Thu, 26 Jun 2014 01:04:06 +0000 (18:04 -0700)]
Merge pull request #3564 from totten/master-idx-err
CRM_Core_InnoDBIndexer - Fix (logged) drush error when doing clean install on MySQL <5.6.
totten@civicrm.org [Thu, 26 Jun 2014 00:37:08 +0000 (17:37 -0700)]
CRM_Core_InnoDBIndexer - Fix (logged) drush error when doing clean install on MySQL <5.6.
Dave Greenberg [Wed, 25 Jun 2014 21:11:30 +0000 (14:11 -0700)]
Merge pull request #3554 from eileenmcnaughton/4.4
CRM-14900 use INSERT ignore for states - this is primarily about copy & ...
Kurund Jalmi [Wed, 25 Jun 2014 21:00:50 +0000 (02:30 +0530)]
Merge pull request #3539 from totten/master-tx-api
CRM-14657, CRM-14486 - TransactionSubscriber - Respect $params['is_transactional']
kurund [Wed, 25 Jun 2014 18:25:13 +0000 (23:55 +0530)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-06-25-23-42-42
Conflicts:
CRM/Profile/Form/Edit.php
templates/CRM/Event/Form/Registration/Register.tpl
xml/schema/Core/MappingField.xml
CiviCRM [Wed, 25 Jun 2014 15:16:06 +0000 (08:16 -0700)]
Update version to 4.5.alpha3
Monish Deb [Wed, 25 Jun 2014 14:34:56 +0000 (20:04 +0530)]
Merge pull request #3510 from jitendrapurohit/CRM-12789
CRM-12789
Monish Deb [Wed, 25 Jun 2014 13:35:38 +0000 (19:05 +0530)]
Merge pull request #3563 from monishdeb/upgrade-fix
4.5alpha2 upgrade fixes
monishdeb [Wed, 25 Jun 2014 13:34:10 +0000 (19:04 +0530)]
4.5alpha2 upgrade fixes
Monish Deb [Wed, 25 Jun 2014 09:55:03 +0000 (15:25 +0530)]
Merge pull request #3545 from jitendrapurohit/CRM-14567
CRM-14567
Yashodha Chaku [Wed, 25 Jun 2014 09:11:39 +0000 (14:41 +0530)]
Merge pull request #3556 from divya-jose/HR-363
HR-363 url modification to show report instance on dashboard
Dave Greenberg [Tue, 24 Jun 2014 22:23:34 +0000 (15:23 -0700)]
Merge pull request #3544 from monishdeb/CRM-14830
CRM-14830 fix - Links to add CC and BCC are hidden in Send an Email task
Dave Greenberg [Tue, 24 Jun 2014 21:18:47 +0000 (14:18 -0700)]
Merge pull request #3562 from davecivicrm/CRM-14905
CRM-14905 - also fix contribution delete status.
Dave Greenberg [Tue, 24 Jun 2014 21:17:36 +0000 (14:17 -0700)]
CRM-14905 - also fix contribution delete status.
----------------------------------------
* CRM-14905:
https://issues.civicrm.org/jira/browse/CRM-14905
Dave Greenberg [Tue, 24 Jun 2014 21:12:40 +0000 (14:12 -0700)]
Merge pull request #3548 from wellebee/CRM-14905
CRM-14905 - Fixed and made consistent a few calls to CRM_Core_Session::setStatus().
Monish Deb [Tue, 24 Jun 2014 18:26:41 +0000 (23:56 +0530)]
Merge pull request #3560 from monishdeb/CRM-14893-fix
CRM-14893 fix - "partials" directory should be included in tar-balls
monishdeb [Tue, 24 Jun 2014 18:25:24 +0000 (23:55 +0530)]
CRM-14893 fix - "partials" directory should be included in tar-balls
https://issues.civicrm.org/jira/browse/CRM-14893
Dave Greenberg [Tue, 24 Jun 2014 17:58:07 +0000 (10:58 -0700)]
Merge pull request #3559 from davecivicrm/CRM-14908
CRM-14908 - Do not hide payment options just because a $0 price option i...
Dave Greenberg [Tue, 24 Jun 2014 17:56:49 +0000 (10:56 -0700)]
CRM-14908 - Do not hide payment options just because a $0 price option is selected if total is != $0.
----------------------------------------
* CRM-14908:
https://issues.civicrm.org/jira/browse/CRM-14908
jitendrapurohit [Tue, 24 Jun 2014 13:07:20 +0000 (18:37 +0530)]
CRM-12789
CiviCRM [Tue, 17 Jun 2014 14:19:56 +0000 (19:49 +0530)]
CRM-12789
jitendrapurohit [Tue, 24 Jun 2014 12:58:56 +0000 (18:28 +0530)]
CRM-14880
Divya Jose [Tue, 24 Jun 2014 10:15:00 +0000 (15:45 +0530)]
HR-363 url modification to show report instance on dashboard
projects / civicrm-core.git / log