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

9 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

9 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

9 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

9 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

9 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

9 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

9 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

9 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

9 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

9 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

9 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

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

9 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

9 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

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

9 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

9 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

9 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

9 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

9 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

9 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

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

9 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

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 agoCRM-15168 whitespace only
Eileen McNaughton [Fri, 22 Aug 2014 23:03:53 +0000 (11:03 +1200)]
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 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 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 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 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 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

9 years agoMerge pull request #3833 from NileemaJadhav/CRM-HR-master
Yashodha Chaku [Wed, 20 Aug 2014 06:57:19 +0000 (12:27 +0530)]
Merge pull request #3833 from NileemaJadhav/CRM-HR-master

HR-405 CSS changes for icon overlay display

9 years agoMerge pull request #3879 from jitendrapurohit/CRM-15146
Yashodha Chaku [Wed, 20 Aug 2014 05:28:36 +0000 (10:58 +0530)]
Merge pull request #3879 from jitendrapurohit/CRM-15146

CRM-15146

9 years agoCRM-15146
Jitendra Purohit [Wed, 20 Aug 2014 04:16:47 +0000 (09:46 +0530)]
CRM-15146

9 years agoMerge pull request #3878 from yashodha/version-fixes
Yashodha Chaku [Wed, 20 Aug 2014 04:10:41 +0000 (09:40 +0530)]
Merge pull request #3878 from yashodha/version-fixes

version fixes

9 years agoversion fixes
CiviCRM [Wed, 20 Aug 2014 04:26:37 +0000 (09:56 +0530)]
version fixes

9 years agoMerge pull request #3746 from eileenmcnaughton/prtest
Dave Greenberg [Wed, 20 Aug 2014 00:13:41 +0000 (17:13 -0700)]
Merge pull request #3746 from eileenmcnaughton/prtest

partial fix on membership type's stompiness on updates to test pr

9 years agoMerge pull request #3859 from civicrm/revert-3799-patch-1
Dave Greenberg [Tue, 19 Aug 2014 23:41:20 +0000 (16:41 -0700)]
Merge pull request #3859 from civicrm/revert-3799-patch-1

Revert "Fix DAO to properly enforce desired collation"

9 years agoMerge pull request #2842 from totten/master-api-rollback-soft-errors
Tim Otten [Tue, 19 Aug 2014 23:34:06 +0000 (16:34 -0700)]
Merge pull request #2842 from totten/master-api-rollback-soft-errors

API TransactionSubscriber - Rollback on soft errors (as well as exceptions)

9 years agoCRM-15118 - potential replacement for https://github.com/civicrm/civicrm-core/pull...
Dave Greenberg [Tue, 19 Aug 2014 23:06:29 +0000 (16:06 -0700)]
CRM-15118 - potential replacement for https://github.com/civicrm/civicrm-core/pull/3872 which did not work in my testing (billing block never hideable).

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

9 years agoCRM-15147 - Fix bug where embedded search shows wrong content after paging and refreshing
Coleman Watts [Tue, 19 Aug 2014 20:34:37 +0000 (21:34 +0100)]
CRM-15147 - Fix bug where embedded search shows wrong content after paging and refreshing

9 years agoAdd pager to contact pledge tab
Coleman Watts [Tue, 19 Aug 2014 20:30:32 +0000 (21:30 +0100)]
Add pager to contact pledge tab

9 years agoImprove action-item style
Coleman Watts [Tue, 19 Aug 2014 20:29:59 +0000 (21:29 +0100)]
Improve action-item style