civicrm-core.git
9 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

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

9 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

9 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

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

9 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...

9 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

9 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

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

9 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

9 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

9 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

9 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

9 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"

9 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)

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

9 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.

9 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.

9 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)

9 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)

9 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

9 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

9 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

9 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

9 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

9 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

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

9 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

9 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

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

9 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

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

9 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

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

9 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

9 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

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

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

9 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

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

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

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

9 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

9 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)

9 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

9 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

9 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

9 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

9 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

9 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

9 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

9 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

9 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.

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

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

9 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.

9 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

9 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

9 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)

9 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

9 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...

9 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

9 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

9 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

9 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

9 years agoMerge pull request #3893 from colemanw/CRM-15164
colemanw [Thu, 21 Aug 2014 20:44:43 +0000 (21:44 +0100)]
Merge pull request #3893 from colemanw/CRM-15164

CRM-15164 - Fix to allow CKEditor controls to function correctly in dialogs

9 years agoCRM-15164 - Fix to allow CKEditor controls to function correctly in dialogs
Coleman Watts [Thu, 21 Aug 2014 20:44:25 +0000 (21:44 +0100)]
CRM-15164 - Fix to allow CKEditor controls to function correctly in dialogs

9 years agoCRM-14996 - Support multi-valued fields for state/country chain-select
Coleman Watts [Thu, 21 Aug 2014 19:45:38 +0000 (20:45 +0100)]
CRM-14996 - Support multi-valued fields for state/country chain-select

When selecting more than one, it groups the results into option groups for better usability.
Applies select2 to all chain-select fields to avoid any push-me/pull-me in future patches to the js
(e.g. fixing the code to work for normal selects and breaking select2 and vice-versa).

9 years agoMerge pull request #3892 from colemanw/Button
colemanw [Thu, 21 Aug 2014 20:13:58 +0000 (21:13 +0100)]
Merge pull request #3892 from colemanw/Button

Button css fix

9 years agoButton css fix
Coleman Watts [Thu, 21 Aug 2014 20:13:37 +0000 (21:13 +0100)]
Button css fix

9 years agoMerge pull request #3888 from jitendrapurohit/CRM-15137
Kurund Jalmi [Thu, 21 Aug 2014 19:08:24 +0000 (00:38 +0530)]
Merge pull request #3888 from jitendrapurohit/CRM-15137

CRM-15137

9 years agoCRM-13863 - Double title removal
Coleman Watts [Thu, 21 Aug 2014 12:44:59 +0000 (13:44 +0100)]
CRM-13863 - Double title removal

9 years agoFix invalad html in sort links
Coleman Watts [Thu, 21 Aug 2014 12:43:45 +0000 (13:43 +0100)]
Fix invalad html in sort links

9 years agoCRM-14052 - Revert workarounds for tokenInput.js and cleanup tagset code
Coleman Watts [Thu, 21 Aug 2014 07:51:07 +0000 (08:51 +0100)]
CRM-14052 - Revert workarounds for tokenInput.js and cleanup tagset code

9 years agoCRM-15137
Jitendra Purohit [Thu, 21 Aug 2014 07:23:50 +0000 (12:53 +0530)]
CRM-15137

9 years agoMerge pull request #3886 from monishdeb/CRM-15150
Dave Greenberg [Thu, 21 Aug 2014 00:46:47 +0000 (17:46 -0700)]
Merge pull request #3886 from monishdeb/CRM-15150

Crm 15150 fix

9 years agoMerge pull request #3887 from colemanw/formId
colemanw [Wed, 20 Aug 2014 22:08:02 +0000 (23:08 +0100)]
Merge pull request #3887 from colemanw/formId

Form fixes

9 years agoUpdate cid read-only field
Coleman Watts [Wed, 20 Aug 2014 21:39:16 +0000 (22:39 +0100)]
Update cid read-only field

9 years agoCleanup inline-edit add/remove buttons
Coleman Watts [Wed, 20 Aug 2014 21:28:01 +0000 (22:28 +0100)]
Cleanup inline-edit add/remove buttons

9 years agoImprove tagTree and fix tag formatting on contact summary
Coleman Watts [Wed, 20 Aug 2014 21:08:04 +0000 (22:08 +0100)]
Improve tagTree and fix tag formatting on contact summary

9 years agoCRM-15153 - Give forms a unique css class based on full class name
Coleman Watts [Wed, 20 Aug 2014 19:37:10 +0000 (20:37 +0100)]
CRM-15153 - Give forms a unique css class based on full class name

9 years agoCRM-15150 fix - Sample participant data has invalid financial transaction data
monishdeb [Wed, 20 Aug 2014 19:33:10 +0000 (01:03 +0530)]
CRM-15150 fix - Sample participant data has invalid financial transaction data

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

9 years agoAdd helper function for setting form css classes
Coleman Watts [Wed, 20 Aug 2014 16:01:48 +0000 (17:01 +0100)]
Add helper function for setting form css classes

9 years agoCRM-13863 - Add ajax paging to contribution tab and dashboard
Coleman Watts [Wed, 20 Aug 2014 14:54:21 +0000 (15:54 +0100)]
CRM-13863 - Add ajax paging to contribution tab and dashboard

9 years agoMerge pull request #3885 from jitendrapurohit/CRM-15142
Kurund Jalmi [Wed, 20 Aug 2014 16:08:34 +0000 (21:38 +0530)]
Merge pull request #3885 from jitendrapurohit/CRM-15142

CRM-15142

9 years agoCRM-15142
Jitendra Purohit [Wed, 20 Aug 2014 14:57:30 +0000 (20:27 +0530)]
CRM-15142

9 years agoCRM-12872 - Handle sorting links with ajax
Coleman Watts [Wed, 20 Aug 2014 14:50:26 +0000 (15:50 +0100)]
CRM-12872 - Handle sorting links with ajax

9 years agoSummary.js cleanup
Coleman Watts [Wed, 20 Aug 2014 14:36:39 +0000 (15:36 +0100)]
Summary.js cleanup

9 years agoCRM-15150 fix - Sample participant data has invalid financial transaction data
monishdeb [Wed, 20 Aug 2014 14:12:06 +0000 (19:42 +0530)]
CRM-15150 fix - Sample participant data has invalid financial transaction data

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

9 years agoMerge pull request #3881 from jitendrapurohit/CRM-15144
Yashodha Chaku [Wed, 20 Aug 2014 12:23:10 +0000 (17:53 +0530)]
Merge pull request #3881 from jitendrapurohit/CRM-15144

CRM-15144

9 years agocrm.ajax.js - Code & commment cleanup
Coleman Watts [Wed, 20 Aug 2014 10:34:33 +0000 (11:34 +0100)]
crm.ajax.js - Code & commment cleanup

9 years agoMerge pull request #3882 from colemanw/CRM-15151
colemanw [Wed, 20 Aug 2014 10:04:37 +0000 (11:04 +0100)]
Merge pull request #3882 from colemanw/CRM-15151

CRM-15151 - Ensure form errors always close when popup form submitted

9 years agoCRM-15151 - Ensure form errors always close when popup form submitted
Coleman Watts [Wed, 20 Aug 2014 10:03:39 +0000 (11:03 +0100)]
CRM-15151 - Ensure form errors always close when popup form submitted

9 years agoCRM-15144
Jitendra Purohit [Wed, 20 Aug 2014 09:52:41 +0000 (15:22 +0530)]
CRM-15144

9 years agoMerge pull request #3875 from colemanw/h3
colemanw [Wed, 20 Aug 2014 09:42:33 +0000 (10:42 +0100)]
Merge pull request #3875 from colemanw/h3

Get rid of double title and other popup and form tweaks

9 years agoFix crmReplace clobbering standard form element css classes
Coleman Watts [Wed, 20 Aug 2014 09:39:52 +0000 (10:39 +0100)]
Fix crmReplace clobbering standard form element css classes

9 years agoMerge pull request #3880 from rohankatkar/webtestCRM-15108
Monish Deb [Wed, 20 Aug 2014 08:54:16 +0000 (14:24 +0530)]
Merge pull request #3880 from rohankatkar/webtestCRM-15108

Webtest for CRM-15108

9 years agoMerge pull request #3865 from PalanteJon/CRM-14584
Monish Deb [Wed, 20 Aug 2014 08:35:15 +0000 (14:05 +0530)]
Merge pull request #3865 from PalanteJon/CRM-14584

CRM-14584 - Core Advanced Search - fix incorrect boolean logic on privac...

9 years agoWebtest for CRM-15108
Rohan Katkar [Wed, 20 Aug 2014 07:08:05 +0000 (12:38 +0530)]
Webtest for CRM-15108

9 years agoMerge pull request #3874 from rohankatkar/CRM-15136
Monish Deb [Wed, 20 Aug 2014 07:04:44 +0000 (12:34 +0530)]
Merge pull request #3874 from rohankatkar/CRM-15136

Fix for CRM-15136