civicrm-core.git
10 years agoMerge pull request #3928 from eileenmcnaughton/CRM-15168
Eileen McNaughton [Mon, 25 Aug 2014 01:36:38 +0000 (13:36 +1200)]
Merge pull request #3928 from eileenmcnaughton/CRM-15168

CRM-15168 increase test coverage

10 years agoCRM-15168 Update test to reflect almost all api are compliant
Eileen McNaughton [Mon, 25 Aug 2014 01:36:08 +0000 (13:36 +1200)]
CRM-15168 Update test to reflect almost all api are compliant

10 years agoCRM-15168 fix setting api metadata titles
Eileen McNaughton [Mon, 25 Aug 2014 01:35:20 +0000 (13:35 +1200)]
CRM-15168 fix setting api metadata titles

10 years agoMerge pull request #3927 from eileenmcnaughton/CRM-15168
Eileen McNaughton [Mon, 25 Aug 2014 01:29:38 +0000 (13:29 +1200)]
Merge pull request #3927 from eileenmcnaughton/CRM-15168

CRM-15168 add more titles to schema

10 years agoCRM-15168 add some more titles
Eileen McNaughton [Mon, 25 Aug 2014 01:29:03 +0000 (13:29 +1200)]
CRM-15168 add some more titles

10 years agoCRM-15168 add some more labels
Eileen McNaughton [Mon, 25 Aug 2014 01:23:16 +0000 (13:23 +1200)]
CRM-15168 add some more labels

10 years agoCRM-15168 add some titles inthe API layer
Eileen McNaughton [Mon, 25 Aug 2014 01:21:55 +0000 (13:21 +1200)]
CRM-15168 add some titles inthe API layer

10 years agoMerge pull request #3926 from eileenmcnaughton/CRM-15168
Eileen McNaughton [Mon, 25 Aug 2014 00:52:55 +0000 (12:52 +1200)]
Merge pull request #3926 from eileenmcnaughton/CRM-15168

CRM-15168 add more titles to schema

10 years agoCRM-15168 add more titles to schema
Eileen McNaughton [Mon, 25 Aug 2014 00:52:39 +0000 (12:52 +1200)]
CRM-15168 add more titles to schema

10 years agoMerge pull request #3925 from eileenmcnaughton/CRM-15168
Eileen McNaughton [Mon, 25 Aug 2014 00:52:31 +0000 (12:52 +1200)]
Merge pull request #3925 from eileenmcnaughton/CRM-15168

 CRM-15168 add some additional titles to schema

10 years agoCRM-15168 add some more titles
Eileen McNaughton [Mon, 25 Aug 2014 00:43:31 +0000 (12:43 +1200)]
CRM-15168 add some more titles

10 years agoCRM-15168 add titles for settings
Eileen McNaughton [Mon, 25 Aug 2014 00:29:13 +0000 (12:29 +1200)]
CRM-15168 add titles for settings

10 years agoCRM-15168 as mailing api are non-standard we need to code the titles into the api...
Eileen McNaughton [Mon, 25 Aug 2014 00:28:23 +0000 (12:28 +1200)]
CRM-15168 as mailing api are non-standard we need to code the titles into the api - can't leverage schema

10 years agoCRM-15168 add some additional titles to schema
Eileen McNaughton [Mon, 25 Aug 2014 00:11:07 +0000 (12:11 +1200)]
CRM-15168 add some additional titles to schema

10 years agoCRM-15168 a few more titles
Eileen McNaughton [Sun, 24 Aug 2014 22:31:48 +0000 (10:31 +1200)]
CRM-15168 a few more titles

10 years agoMerge pull request #3924 from eileenmcnaughton/CRM-15168
Eileen McNaughton [Sun, 24 Aug 2014 22:18:55 +0000 (10:18 +1200)]
Merge pull request #3924 from eileenmcnaughton/CRM-15168

CRM-15168 stdise whitespace across schema xml to make editing easier

10 years agoCRM-15168 stdise whitespace across schema xml to make editing easier
Eileen McNaughton [Sun, 24 Aug 2014 22:18:39 +0000 (10:18 +1200)]
CRM-15168 stdise whitespace across schema xml to make editing easier

10 years agoMerge pull request #3923 from eileenmcnaughton/CRM-15168
Eileen McNaughton [Sun, 24 Aug 2014 22:16:38 +0000 (10:16 +1200)]
Merge pull request #3923 from eileenmcnaughton/CRM-15168

CRM-15168 add titles to another entity

10 years agoCRM-15168 add titles to another entity
Eileen McNaughton [Sun, 24 Aug 2014 22:16:21 +0000 (10:16 +1200)]
CRM-15168 add titles to another entity

10 years agoMerge pull request #3922 from eileenmcnaughton/CRM-15168
Eileen McNaughton [Sun, 24 Aug 2014 22:02:57 +0000 (10:02 +1200)]
Merge pull request #3922 from eileenmcnaughton/CRM-15168

CRM-15168 xml tidy ups

10 years agoCRM-15168 fix whitespace
Eileen McNaughton [Sun, 24 Aug 2014 22:02:01 +0000 (10:02 +1200)]
CRM-15168 fix whitespace

10 years agoCRM-15168 add titles to Price Set Entities
Eileen McNaughton [Sun, 24 Aug 2014 22:01:45 +0000 (10:01 +1200)]
CRM-15168 add titles to Price Set Entities

10 years agoMerge pull request #3921 from eileenmcnaughton/CRM-15168
Eileen McNaughton [Sun, 24 Aug 2014 21:48:28 +0000 (09:48 +1200)]
Merge pull request #3921 from eileenmcnaughton/CRM-15168

CRM-15168 add a few more xml titles

10 years agoCRM-15168 fix titles on a couple more entities
Eileen McNaughton [Sun, 24 Aug 2014 21:46:43 +0000 (09:46 +1200)]
CRM-15168 fix titles on a couple more entities

10 years agoCRM-15168 whitespace only
Eileen McNaughton [Sun, 24 Aug 2014 21:42:50 +0000 (09:42 +1200)]
CRM-15168 whitespace only

10 years agoMerge pull request #3917 from eileenmcnaughton/CRM-15168
Eileen McNaughton [Fri, 22 Aug 2014 23:36:05 +0000 (11:36 +1200)]
Merge pull request #3917 from eileenmcnaughton/CRM-15168

Crm 15168

10 years agoCRM-15168 open up test to include a few more entities
Eileen McNaughton [Fri, 22 Aug 2014 23:35:55 +0000 (11:35 +1200)]
CRM-15168 open up test to include a few more entities

10 years agoCRM-15168 a few more titles
Eileen McNaughton [Fri, 22 Aug 2014 23:34:10 +0000 (11:34 +1200)]
CRM-15168 a few more titles

10 years agoCRM-15168 a few more titles
Eileen McNaughton [Fri, 22 Aug 2014 23:31:31 +0000 (11:31 +1200)]
CRM-15168 a few more titles

10 years agoCRM-15168 a couple more titles
Eileen McNaughton [Fri, 22 Aug 2014 23:30:09 +0000 (11:30 +1200)]
CRM-15168 a couple more titles

10 years agoCRM-15168 a few more titles
Eileen McNaughton [Fri, 22 Aug 2014 23:27:58 +0000 (11:27 +1200)]
CRM-15168 a few more titles

10 years agoMerge pull request #3916 from eileenmcnaughton/CRM-15168
Eileen McNaughton [Fri, 22 Aug 2014 23:25:50 +0000 (11:25 +1200)]
Merge pull request #3916 from eileenmcnaughton/CRM-15168

CRM-15168 fix intermittantly failing test that was highlighted by previous commits

10 years agoCRM-15168 test fix for bug highlighted by this issue
Eileen McNaughton [Fri, 22 Aug 2014 23:25:09 +0000 (11:25 +1200)]
CRM-15168 test fix for bug highlighted by this issue

10 years agoCRM-15168 Fix Dashboard test failure (not caused by this issue - but started failing...
Eileen McNaughton [Fri, 22 Aug 2014 23:15:58 +0000 (11:15 +1200)]
CRM-15168 Fix Dashboard test failure (not caused by this issue - but started failing off this issues commit)

10 years agoCRM-15168 a few more titles
Eileen McNaughton [Fri, 22 Aug 2014 23:14:34 +0000 (11:14 +1200)]
CRM-15168 a few more titles

10 years agoCRM-15168 whitespace only
Eileen McNaughton [Fri, 22 Aug 2014 23:11:53 +0000 (11:11 +1200)]
CRM-15168 whitespace only

10 years agoMerge pull request #3915 from eileenmcnaughton/CRM-15168
Eileen McNaughton [Fri, 22 Aug 2014 23:11:49 +0000 (11:11 +1200)]
Merge pull request #3915 from eileenmcnaughton/CRM-15168

CRM-15168 a few more titles

10 years agoCRM-15168 a few more titles
Eileen McNaughton [Fri, 22 Aug 2014 23:09:22 +0000 (11:09 +1200)]
CRM-15168 a few more titles

10 years agoMerge pull request #3914 from eileenmcnaughton/CRM-15168
Eileen McNaughton [Fri, 22 Aug 2014 23:04:33 +0000 (11:04 +1200)]
Merge pull request #3914 from eileenmcnaughton/CRM-15168

CRM-15168 whitespace only

10 years agoCRM-15168 whitespace only
Eileen McNaughton [Fri, 22 Aug 2014 23:03:53 +0000 (11:03 +1200)]
CRM-15168 whitespace only

10 years agoMerge pull request #3913 from davecivicrm/CRM-15145
Dave Greenberg [Fri, 22 Aug 2014 22:53:57 +0000 (15:53 -0700)]
Merge pull request #3913 from davecivicrm/CRM-15145

CRM-15145 - Fundraising and membership program related changes to Config...

10 years agoCRM-15145 - Fundraising and membership program related changes to Configuration Check...
Dave Greenberg [Fri, 22 Aug 2014 22:52:08 +0000 (15:52 -0700)]
CRM-15145 - Fundraising and membership program related changes to Configuration Checklist and Upgrade Success screen.

----------------------------------------
* CRM-15145:
  https://issues.civicrm.org/jira/browse/CRM-15145

10 years agoMerge pull request #3912 from eileenmcnaughton/CRM-15168
Eileen McNaughton [Fri, 22 Aug 2014 22:39:44 +0000 (10:39 +1200)]
Merge pull request #3912 from eileenmcnaughton/CRM-15168

CRM-15168 whitespace only

10 years agoCRM-15168 whitespace only
Eileen McNaughton [Fri, 22 Aug 2014 22:39:17 +0000 (10:39 +1200)]
CRM-15168 whitespace only

10 years agoMerge pull request #3911 from eileenmcnaughton/CRM-15168
Eileen McNaughton [Fri, 22 Aug 2014 22:28:52 +0000 (10:28 +1200)]
Merge pull request #3911 from eileenmcnaughton/CRM-15168

CRM-15168 add titles to ACL xml

10 years agoCRM-15168 add titles to ACL xml
Eileen McNaughton [Fri, 22 Aug 2014 22:28:31 +0000 (10:28 +1200)]
CRM-15168 add titles to ACL xml

10 years agoMerge pull request #3901 from eileenmcnaughton/CRM-15168
Eileen McNaughton [Fri, 22 Aug 2014 21:29:37 +0000 (09:29 +1200)]
Merge pull request #3901 from eileenmcnaughton/CRM-15168

CRM-15168 add titles to some xml fields

10 years agoMerge pull request #3903 from atif-shaikh/CRM-15142
Kurund Jalmi [Fri, 22 Aug 2014 19:39:27 +0000 (01:09 +0530)]
Merge pull request #3903 from atif-shaikh/CRM-15142

CRM-15142 - "Strict warning" when Manually executing Scheduled job

10 years agoMerge pull request #3897 from totten/master-casetype-tweaks
Dave Greenberg [Fri, 22 Aug 2014 17:56:10 +0000 (10:56 -0700)]
Merge pull request #3897 from totten/master-casetype-tweaks

CRM-15166 crmCaseType - Tighten control over "Standard Timeline" and "Open Case"

10 years agoMerge pull request #3898 from totten/master-casetype-defaults
Dave Greenberg [Fri, 22 Aug 2014 17:55:28 +0000 (10:55 -0700)]
Merge pull request #3898 from totten/master-casetype-defaults

CRM-15167 - crmCaseType - Update default activity-types (Open Case, Email, Follow up, Meeting, Phone Call)

10 years agoImprove hover-button visibility
Coleman Watts [Fri, 22 Aug 2014 17:00:44 +0000 (18:00 +0100)]
Improve hover-button visibility

10 years agoMerge pull request #3909 from davecivicrm/optionLabelTweak
Dave Greenberg [Fri, 22 Aug 2014 16:51:48 +0000 (09:51 -0700)]
Merge pull request #3909 from davecivicrm/optionLabelTweak

Tweak option label in Tags admin.

10 years agoTweak option label in Tags admin.
Dave Greenberg [Fri, 22 Aug 2014 16:49:05 +0000 (09:49 -0700)]
Tweak option label in Tags admin.

10 years agoMerge pull request #3908 from colemanw/css
colemanw [Fri, 22 Aug 2014 16:43:35 +0000 (17:43 +0100)]
Merge pull request #3908 from colemanw/css

css fix for overriding cms table styles (e.g. Bartik)

10 years agocss fix for overriding cms table styles (e.g. Bartik)
Coleman Watts [Fri, 22 Aug 2014 16:43:21 +0000 (17:43 +0100)]
css fix for overriding cms table styles (e.g. Bartik)

10 years agoMerge pull request #3907 from colemanw/reports
colemanw [Fri, 22 Aug 2014 16:26:09 +0000 (17:26 +0100)]
Merge pull request #3907 from colemanw/reports

UI improvements for reports

10 years agoRe-order country/state/county to make more sense with chainselect
Coleman Watts [Fri, 22 Aug 2014 16:18:29 +0000 (17:18 +0100)]
Re-order country/state/county to make more sense with chainselect

10 years agoEnsure reports use nested group selector and remove boilerplate
Coleman Watts [Fri, 22 Aug 2014 16:15:43 +0000 (17:15 +0100)]
Ensure reports use nested group selector and remove boilerplate

10 years agoMerge pull request #3906 from colemanw/CRM-15141
colemanw [Fri, 22 Aug 2014 15:51:09 +0000 (16:51 +0100)]
Merge pull request #3906 from colemanw/CRM-15141

CRM-15141 - Fill smart group cache if empty

10 years agoCRM-15141 - Fill smart group cache if empty
Coleman Watts [Fri, 22 Aug 2014 15:49:33 +0000 (16:49 +0100)]
CRM-15141 - Fill smart group cache if empty

10 years agoMerge pull request #3905 from colemanw/Use
colemanw [Fri, 22 Aug 2014 15:36:50 +0000 (16:36 +0100)]
Merge pull request #3905 from colemanw/Use

Use select2 for report forms

10 years agoUse select2 for report forms
Coleman Watts [Fri, 22 Aug 2014 15:36:23 +0000 (16:36 +0100)]
Use select2 for report forms

10 years agoMerge pull request #3904 from colemanw/locSearch
colemanw [Fri, 22 Aug 2014 15:20:26 +0000 (16:20 +0100)]
Merge pull request #3904 from colemanw/locSearch

Cleanup and rearrange adv search location pane

10 years agoCleanup and rearrange adv search location pane
Coleman Watts [Fri, 22 Aug 2014 15:09:57 +0000 (16:09 +0100)]
Cleanup and rearrange adv search location pane

10 years agoRemove obsolete style
Coleman Watts [Fri, 22 Aug 2014 12:44:55 +0000 (13:44 +0100)]
Remove obsolete style

10 years agoSwitch search address location to select2 widget
Coleman Watts [Fri, 22 Aug 2014 12:43:39 +0000 (13:43 +0100)]
Switch search address location to select2 widget

10 years agoUpdate state/county placeholder
Coleman Watts [Fri, 22 Aug 2014 12:01:24 +0000 (13:01 +0100)]
Update state/county placeholder

10 years agoCRM-15142 - "Strict warning" when Manually executing Scheduled job
atif-shaikh [Fri, 22 Aug 2014 11:05:11 +0000 (16:35 +0530)]
CRM-15142 - "Strict warning" when Manually executing Scheduled job

https://issues.civicrm.org/jira/browse/CRM-15142

10 years agoLocation.tpl - whitespace cleanup
Coleman Watts [Fri, 22 Aug 2014 10:49:16 +0000 (11:49 +0100)]
Location.tpl - whitespace cleanup

10 years agoCRM-15168 a few more titles
Eileen McNaughton [Fri, 22 Aug 2014 10:01:14 +0000 (22:01 +1200)]
CRM-15168 a few more titles

10 years agoCRM-15168 add some more emails
Eileen McNaughton [Fri, 22 Aug 2014 09:55:45 +0000 (21:55 +1200)]
CRM-15168 add some more emails

10 years agomore whitespace
Eileen McNaughton [Fri, 22 Aug 2014 09:52:39 +0000 (21:52 +1200)]
more whitespace

10 years agowhitespace only
Eileen McNaughton [Fri, 22 Aug 2014 09:47:38 +0000 (21:47 +1200)]
whitespace only

10 years agoCRM-15168 add line-in-the-sand title test
Eileen McNaughton [Fri, 22 Aug 2014 09:43:35 +0000 (21:43 +1200)]
CRM-15168 add line-in-the-sand title test

10 years agometadata fix
Eileen McNaughton [Fri, 22 Aug 2014 09:42:20 +0000 (21:42 +1200)]
metadata fix

10 years agowhitespace
Eileen McNaughton [Fri, 22 Aug 2014 09:37:12 +0000 (21:37 +1200)]
whitespace

10 years agowhitespace only
Eileen McNaughton [Fri, 22 Aug 2014 09:35:51 +0000 (21:35 +1200)]
whitespace only

10 years agoCRM-15168 more metadata titles (& whitespace
Eileen McNaughton [Fri, 22 Aug 2014 09:35:11 +0000 (21:35 +1200)]
CRM-15168 more metadata titles (& whitespace

10 years agoCRM-15168 more title metadate fixes (& some whitespace snuck in)
Eileen McNaughton [Fri, 22 Aug 2014 09:22:36 +0000 (21:22 +1200)]
CRM-15168 more title metadate fixes (& some whitespace snuck in)

10 years agoCRM-15168 add titles to more enities
Eileen McNaughton [Fri, 22 Aug 2014 09:12:53 +0000 (21:12 +1200)]
CRM-15168 add titles to more enities

10 years agoCRM-15168 add titles to case type
Eileen McNaughton [Fri, 22 Aug 2014 08:53:27 +0000 (20:53 +1200)]
CRM-15168 add titles to case type

10 years agoMerge pull request #3891 from colemanw/CRM-14996
colemanw [Fri, 22 Aug 2014 08:46:18 +0000 (09:46 +0100)]
Merge pull request #3891 from colemanw/CRM-14996

CRM-14996

10 years agoCRM-14996 - Fix display bug in adv search
Coleman Watts [Fri, 22 Aug 2014 08:45:15 +0000 (09:45 +0100)]
CRM-14996 - Fix display bug in adv search

10 years agoDeclare data on batch metadate (even though something fishy about that field
Eileen McNaughton [Fri, 22 Aug 2014 08:42:08 +0000 (20:42 +1200)]
Declare data on batch metadate (even though something fishy about that field

10 years agoCRM-15168 add titles to some xml fields
Eileen McNaughton [Fri, 22 Aug 2014 08:38:21 +0000 (20:38 +1200)]
CRM-15168 add titles to some xml fields

10 years agoMerge pull request #3899 from jitendrapurohit/CRM-15160
Yashodha Chaku [Fri, 22 Aug 2014 06:48:52 +0000 (12:18 +0530)]
Merge pull request #3899 from jitendrapurohit/CRM-15160

CRM-15160

10 years agoMerge pull request #3900 from totten/master-seqtest-syn
Tim Otten [Fri, 22 Aug 2014 06:02:04 +0000 (23:02 -0700)]
Merge pull request #3900 from totten/master-seqtest-syn

SequenceListenerTest - Fix PHP 5.3 syntax error

10 years agoSequenceListenerTest - Fix PHP 5.3 syntax error
Tim Otten [Fri, 22 Aug 2014 05:59:22 +0000 (22:59 -0700)]
SequenceListenerTest - Fix PHP 5.3 syntax error

The old syntax works in 5.4 but not 5.3. The new syntax works in both.

10 years agocheck for state province
Jitendra Purohit [Fri, 22 Aug 2014 05:55:14 +0000 (11:25 +0530)]
check for state province

10 years agoCRM-15160
Jitendra Purohit [Fri, 22 Aug 2014 04:49:21 +0000 (10:19 +0530)]
CRM-15160

10 years agoCRM-15166 - crmCaseType/timelineTable.html - Don't allow removal of the standard...
Tim Otten [Thu, 21 Aug 2014 21:21:10 +0000 (14:21 -0700)]
CRM-15166 - crmCaseType/timelineTable.html - Don't allow removal of the standard timeline's "Open Case".

Note: If (for some bizarre/erroneous reason) an admin added the "Open Case" activity to another
timeline, then it would be reasonable to delete it.

10 years agoCRM-15166 - crmCaseType/activitySetDetails.html - Lock the name by default
Tim Otten [Thu, 21 Aug 2014 21:14:26 +0000 (14:14 -0700)]
CRM-15166 - crmCaseType/activitySetDetails.html - Lock the name by default

10 years agoCRM-15166 - crmCaseType/edit.html - Don't allow deletion of the standard timeline
Tim Otten [Thu, 21 Aug 2014 21:13:56 +0000 (14:13 -0700)]
CRM-15166 - crmCaseType/edit.html - Don't allow deletion of the standard timeline

10 years agoCRM-15162 - crmCaseType - Update default activity-types (Open Case, Email, Follow...
Tim Otten [Fri, 22 Aug 2014 01:31:06 +0000 (18:31 -0700)]
CRM-15162 - crmCaseType - Update default activity-types (Open Case, Email, Follow up, Meeting, Phone Call)

10 years agoMerge pull request #3890 from colemanw/CRM-14052
Dave Greenberg [Thu, 21 Aug 2014 23:23:48 +0000 (16:23 -0700)]
Merge pull request #3890 from colemanw/CRM-14052

CRM-14052 - Revert workarounds for tokenInput.js and cleanup tagset code

10 years agoMerge pull request #3895 from davecivicrm/CRM-15143
Dave Greenberg [Thu, 21 Aug 2014 22:26:38 +0000 (15:26 -0700)]
Merge pull request #3895 from davecivicrm/CRM-15143

CRM-15143 - adding postal_code for autocomplete and contact reference se...

10 years agoCRM-15143 - adding postal_code for autocomplete and contact reference searches. Also...
Dave Greenberg [Thu, 21 Aug 2014 22:20:43 +0000 (15:20 -0700)]
CRM-15143 - adding postal_code for autocomplete and contact reference searches. Also correcting info in Upgrade/Incremental/sql/README.txt.

----------------------------------------
* CRM-15143:
  https://issues.civicrm.org/jira/browse/CRM-15143

10 years agoMerge pull request #3894 from colemanw/hideCount
colemanw [Thu, 21 Aug 2014 21:20:14 +0000 (22:20 +0100)]
Merge pull request #3894 from colemanw/hideCount

Hide count in tab for single-value custom groups

10 years agoHide count in tab for single-value custom groups
Coleman Watts [Thu, 21 Aug 2014 21:19:47 +0000 (22:19 +0100)]
Hide count in tab for single-value custom groups

10 years agoMerge pull request #3876 from davecivicrm/CRM-15118
Eileen McNaughton [Thu, 21 Aug 2014 20:45:49 +0000 (08:45 +1200)]
Merge pull request #3876 from davecivicrm/CRM-15118

We have tested this & it works as expected