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
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...
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
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
Coleman Watts [Thu, 21 Aug 2014 21:19:47 +0000 (22:19 +0100)]
Hide count in tab for single-value custom groups
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
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
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
colemanw [Thu, 21 Aug 2014 20:13:58 +0000 (21:13 +0100)]
Merge pull request #3892 from colemanw/Button
Button css fix
Coleman Watts [Thu, 21 Aug 2014 20:13:37 +0000 (21:13 +0100)]
Button css fix
Kurund Jalmi [Thu, 21 Aug 2014 19:08:24 +0000 (00:38 +0530)]
Merge pull request #3888 from jitendrapurohit/CRM-15137
CRM-15137
Coleman Watts [Thu, 21 Aug 2014 12:44:59 +0000 (13:44 +0100)]
CRM-13863 - Double title removal
Coleman Watts [Thu, 21 Aug 2014 12:43:45 +0000 (13:43 +0100)]
Fix invalad html in sort links
Coleman Watts [Thu, 21 Aug 2014 07:51:07 +0000 (08:51 +0100)]
CRM-14052 - Revert workarounds for tokenInput.js and cleanup tagset code
Jitendra Purohit [Thu, 21 Aug 2014 07:23:50 +0000 (12:53 +0530)]
CRM-15137
Dave Greenberg [Thu, 21 Aug 2014 00:46:47 +0000 (17:46 -0700)]
Merge pull request #3886 from monishdeb/CRM-15150
Crm 15150 fix
colemanw [Wed, 20 Aug 2014 22:08:02 +0000 (23:08 +0100)]
Merge pull request #3887 from colemanw/formId
Form fixes
Coleman Watts [Wed, 20 Aug 2014 21:39:16 +0000 (22:39 +0100)]
Update cid read-only field
Coleman Watts [Wed, 20 Aug 2014 21:28:01 +0000 (22:28 +0100)]
Cleanup inline-edit add/remove buttons
Coleman Watts [Wed, 20 Aug 2014 21:08:04 +0000 (22:08 +0100)]
Improve tagTree and fix tag formatting on contact summary
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
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
Coleman Watts [Wed, 20 Aug 2014 16:01:48 +0000 (17:01 +0100)]
Add helper function for setting form css classes
Coleman Watts [Wed, 20 Aug 2014 14:54:21 +0000 (15:54 +0100)]
CRM-13863 - Add ajax paging to contribution tab and dashboard
Kurund Jalmi [Wed, 20 Aug 2014 16:08:34 +0000 (21:38 +0530)]
Merge pull request #3885 from jitendrapurohit/CRM-15142
CRM-15142
Jitendra Purohit [Wed, 20 Aug 2014 14:57:30 +0000 (20:27 +0530)]
CRM-15142
Coleman Watts [Wed, 20 Aug 2014 14:50:26 +0000 (15:50 +0100)]
CRM-12872 - Handle sorting links with ajax
Coleman Watts [Wed, 20 Aug 2014 14:36:39 +0000 (15:36 +0100)]
Summary.js cleanup
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
Yashodha Chaku [Wed, 20 Aug 2014 12:23:10 +0000 (17:53 +0530)]
Merge pull request #3881 from jitendrapurohit/CRM-15144
CRM-15144
Coleman Watts [Wed, 20 Aug 2014 10:34:33 +0000 (11:34 +0100)]
crm.ajax.js - Code & commment cleanup
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
Coleman Watts [Wed, 20 Aug 2014 10:03:39 +0000 (11:03 +0100)]
CRM-15151 - Ensure form errors always close when popup form submitted
Jitendra Purohit [Wed, 20 Aug 2014 09:52:41 +0000 (15:22 +0530)]
CRM-15144
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
Coleman Watts [Wed, 20 Aug 2014 09:39:52 +0000 (10:39 +0100)]
Fix crmReplace clobbering standard form element css classes
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
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...
Rohan Katkar [Wed, 20 Aug 2014 07:08:05 +0000 (12:38 +0530)]
Webtest for CRM-15108
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
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
Yashodha Chaku [Wed, 20 Aug 2014 05:28:36 +0000 (10:58 +0530)]
Merge pull request #3879 from jitendrapurohit/CRM-15146
CRM-15146
Jitendra Purohit [Wed, 20 Aug 2014 04:16:47 +0000 (09:46 +0530)]
CRM-15146
Yashodha Chaku [Wed, 20 Aug 2014 04:10:41 +0000 (09:40 +0530)]
Merge pull request #3878 from yashodha/version-fixes
version fixes
CiviCRM [Wed, 20 Aug 2014 04:26:37 +0000 (09:56 +0530)]
version fixes
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
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"
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)
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
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
Coleman Watts [Tue, 19 Aug 2014 20:30:32 +0000 (21:30 +0100)]
Add pager to contact pledge tab
Coleman Watts [Tue, 19 Aug 2014 20:29:59 +0000 (21:29 +0100)]
Improve action-item style
Coleman Watts [Tue, 19 Aug 2014 20:28:16 +0000 (21:28 +0100)]
Fix missing arg from fn declaration
Coleman Watts [Tue, 19 Aug 2014 20:27:42 +0000 (21:27 +0100)]
CRM_Contribute_Form - Cleanup code redundant with CRM_Admin_Form
Coleman Watts [Mon, 18 Aug 2014 20:49:02 +0000 (21:49 +0100)]
CRM-13863 - Get rid of double title for forms that use popups
Transfer responsibility for page title from tpl to php.
Add setPageTitle helper method to CRM_Core_Form.
And a bit of misc form/tpl cleanup
Dave Greenberg [Tue, 19 Aug 2014 19:20:07 +0000 (12:20 -0700)]
Merge pull request #3871 from jmcclelland/final-fix-invalid-net-amount
Fixing data integrity problem with net amount and auth.net
Rohan Katkar [Tue, 19 Aug 2014 16:11:44 +0000 (21:41 +0530)]
Fix for CRM-15136
Monish Deb [Tue, 19 Aug 2014 14:17:12 +0000 (19:47 +0530)]
Merge pull request #3868 from rohankatkar/CRM_14961_webtest
Webtest for CRM-14961
Rohan Katkar [Tue, 19 Aug 2014 14:00:02 +0000 (19:30 +0530)]
Additional changes for CRM-14961
kurund [Mon, 18 Aug 2014 18:42:45 +0000 (00:12 +0530)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-08-19-00-06-22
Conflicts:
CRM/Contribute/BAO/Contribution.php
CRM/Report/BAO/ReportInstance.php
Jamie McClelland [Mon, 18 Aug 2014 15:38:32 +0000 (11:38 -0400)]
CRM-14930 - ensure data integrity of all contributions.
Some auth.net contributions may not have correct net amount set.
----------------------------------------
* CRM-14930: Authorize.net silentpost transactions cannot be edited due to invalid net_amount
https://issues.civicrm.org/jira/browse/CRM-14930
Jamie McClelland [Mon, 18 Aug 2014 15:12:11 +0000 (11:12 -0400)]
CRM-14930 - net amount and fee amount are not provided by authnet
Removing these lines because they will never be set (which should allow
the values to be set to NULL anyway).
----------------------------------------
* CRM-14930: Authorize.net silentpost transactions cannot be edited due to invalid net_amount
https://issues.civicrm.org/jira/browse/CRM-14930
Jamie McClelland [Mon, 18 Aug 2014 15:09:52 +0000 (11:09 -0400)]
CRM-14930 - fix underlying data problem with authnet net_amount
Revert "CRM-14881 - avoid error when saving contribution made by authnet"
This reverts commit
b29eb7605df438ab222f1f741d220b145da2f059.
Conflicts:
CRM/Contribute/Form/Contribution.php
Reverting in favor of a solution that solves the underlying data
problem, rather than a solution that works around a data problem.
The original issue is: https://issues.civicrm.org/jira/browse/CRM-14881
This revert is: https://issues.civicrm.org/jira/browse/CRM-14930
colemanw [Mon, 18 Aug 2014 13:09:04 +0000 (14:09 +0100)]
Merge pull request #3869 from totten/master-win-dynjs
CRM-15126, CRM-14949 - CRM_Utils_File - Fix dynamicResourcePath() and absoluteDirectory()
colemanw [Mon, 18 Aug 2014 12:21:19 +0000 (13:21 +0100)]
Merge pull request #3870 from colemanw/CRM-13863
CRM-13863 - Improve workflow with container sets (custom fields/prices/profiles)
Yashodha Chaku [Mon, 18 Aug 2014 12:19:22 +0000 (17:49 +0530)]
Merge pull request #3867 from yashodha/4.4.CRM-15073
CRM-15073 : fix overwrite of subtype for onbehalf org
Yashodha Chaku [Mon, 18 Aug 2014 12:17:26 +0000 (17:47 +0530)]
Merge pull request #3866 from yashodha/4.4
CRM-15090: fix name when adding dashlet
Coleman Watts [Mon, 18 Aug 2014 12:14:00 +0000 (13:14 +0100)]
CRM-13863 - Improve workflow with container sets (custom fields/prices/profiles)
Tim Otten [Mon, 18 Aug 2014 05:33:37 +0000 (22:33 -0700)]
CRM-15126, CRM-14949 - CRM_Utils_File - Fix dynamicResourcePath() and absoluteDirectory()
- In dynamicResourcePath(), don't allow mixed-delimiters to produce double-delimiters (e.g. "files/civicrm/\dynamic")
- Update absoluteDirectory() to work in Windows
Rohan Katkar [Mon, 18 Aug 2014 05:23:00 +0000 (10:53 +0530)]
Webtest for CRM-14961
CiviCRM [Mon, 18 Aug 2014 04:09:11 +0000 (09:39 +0530)]
CRM-15073 : fix overwrite of subtype for onbehalf org
Yashodha Chaku [Mon, 18 Aug 2014 03:19:46 +0000 (08:49 +0530)]
Merge pull request #3813 from NileemaJadhav/CRM-master
--HR-350 Add parameter for extra whereClause to getRows() function
CiviCRM [Mon, 18 Aug 2014 03:16:53 +0000 (08:46 +0530)]
CRM-15090: fix name when adding dashlet
Jon goldberg - Linux laptop [Sat, 16 Aug 2014 20:24:01 +0000 (16:24 -0400)]
CRM-14584 - Core Advanced Search - fix incorrect boolean logic on privacy preferences when privacy toggle = 'exclude'
colemanw [Sat, 16 Aug 2014 19:54:52 +0000 (20:54 +0100)]
Merge pull request #3864 from colemanw/msg-template
msg-template layout fix
Coleman Watts [Sat, 16 Aug 2014 19:54:31 +0000 (20:54 +0100)]
msg-template layout fix
colemanw [Sat, 16 Aug 2014 19:42:29 +0000 (20:42 +0100)]
Merge pull request #3863 from colemanw/Auto-resize
Auto-resize dialog to fit content
Coleman Watts [Sat, 16 Aug 2014 19:40:40 +0000 (20:40 +0100)]
Auto-resize dialog to fit content
Coleman Watts [Sat, 16 Aug 2014 19:37:19 +0000 (20:37 +0100)]
Membership js fix to work in popup
colemanw [Sat, 16 Aug 2014 16:33:52 +0000 (17:33 +0100)]
Merge pull request #3858 from giant-rabbit/feature/reports-nav-url-fix
Fix issue with reports creating invalid URLs when updated.
colemanw [Sat, 16 Aug 2014 13:18:34 +0000 (14:18 +0100)]
Merge pull request #3862 from colemanw/CRM-14830
CRM-14830 - Email tpl cleanup and removed unused function
Coleman Watts [Sat, 16 Aug 2014 13:17:41 +0000 (14:17 +0100)]
CRM-14830 - Email tpl cleanup and removed unused function
colemanw [Sat, 16 Aug 2014 07:18:59 +0000 (08:18 +0100)]
Merge pull request #3860 from colemanw/PriceSet
PriceSet help text improvement
Coleman Watts [Sat, 16 Aug 2014 07:18:09 +0000 (08:18 +0100)]
PriceSet help text improvement
Tim Otten [Sat, 16 Aug 2014 02:29:21 +0000 (19:29 -0700)]
Revert "Fix DAO to properly enforce desired collation"
Anthony Nemirovsky [Sat, 16 Aug 2014 00:39:34 +0000 (17:39 -0700)]
Fix issue with reports creating invalid URLs when updated.
When updating a report, if the Report Settings is set to "Include Report in
Navigation Menu", the navigation url that is created is formatted like
/civicrm/report/instance/1_reset_1, which is incorrect. The correct URL
should be /civicrm/report/instance/1?reset=1.
Dave Greenberg [Sat, 16 Aug 2014 00:26:12 +0000 (17:26 -0700)]
Merge pull request #3814 from magnolia61/CRM-13595-Event-ID-in-Participant-Export
Include Event ID in participant export
Dave Greenberg [Sat, 16 Aug 2014 00:05:04 +0000 (17:05 -0700)]
Merge pull request #3848 from totten/master-debug-ui
CRM-14850, CRM-15089 - Fix for debug setting
Dave Greenberg [Fri, 15 Aug 2014 23:30:46 +0000 (16:30 -0700)]
Merge pull request #3617 from eileenmcnaughton/CRM-14946
CRM-14946 add relevant test data set
Dave Greenberg [Fri, 15 Aug 2014 22:52:13 +0000 (15:52 -0700)]
Merge pull request #3799 from routinet/patch-1
Fix DAO to properly enforce desired collation
Tim Otten [Fri, 15 Aug 2014 22:50:34 +0000 (15:50 -0700)]
Merge pull request #3853 from totten/master-forkable-eval
CRM-15097 - CaseType::isForkable() - Allow variations on true/false/0/1
Coleman Watts [Fri, 15 Aug 2014 22:21:00 +0000 (23:21 +0100)]
CRM-15107 - Also align count column for child groups
Coleman Watts [Fri, 15 Aug 2014 22:05:37 +0000 (23:05 +0100)]
Fix form css in popups
Coleman Watts [Fri, 15 Aug 2014 22:05:22 +0000 (23:05 +0100)]
CRM-15107 - More prominent refresh button
colemanw [Fri, 15 Aug 2014 19:30:35 +0000 (20:30 +0100)]
Merge pull request #3856 from colemanw/groupRight
CRM-15107 - Right-align count column in manage groups table
Coleman Watts [Fri, 15 Aug 2014 19:30:19 +0000 (20:30 +0100)]
CRM-15107 - Right-align count column in manage groups table
colemanw [Fri, 15 Aug 2014 19:21:43 +0000 (20:21 +0100)]
Merge pull request #3855 from colemanw/sms
Update SMS providers form for 4.5
Coleman Watts [Fri, 15 Aug 2014 19:20:54 +0000 (20:20 +0100)]
Update SMS providers form for 4.5
colemanw [Fri, 15 Aug 2014 19:20:10 +0000 (20:20 +0100)]
Merge pull request #3854 from colemanw/groupRedirect
CRM-15108 - Redirect back to starting point after adding contacts to group
Coleman Watts [Fri, 15 Aug 2014 18:01:05 +0000 (19:01 +0100)]
CRM-15108 - Redirect back to starting point after adding contacts to group
projects / civicrm-core.git / log