dlobo [Thu, 5 Dec 2013 15:08:12 +0000 (07:08 -0800)]
Merge pull request #2167 from colemanw/CRM-13836
CRM-13836 Handle multivalued custom sets during merge
monishdeb [Thu, 5 Dec 2013 07:25:56 +0000 (12:55 +0530)]
CRM-13833, Soft Credit Type implementation for Contribution
----------------------------------------
* CRM-13833: Implement Soft Credit Types
http://issues.civicrm.org/jira/browse/CRM-13833
dlobo [Thu, 5 Dec 2013 05:51:36 +0000 (21:51 -0800)]
Merge pull request #2153 from dlobo/CRM-13904
CRM-13904 - Improve proximity query accuracy
Donald A. Lobo [Thu, 5 Dec 2013 05:50:02 +0000 (21:50 -0800)]
CRM-13904 - add links to formula used
----------------------------------------
* CRM-13904: Improve proximity query accuracy
http://issues.civicrm.org/jira/browse/CRM-13904
Donald A. Lobo [Wed, 4 Dec 2013 14:29:55 +0000 (06:29 -0800)]
CRM-13904 - Improve proximity query accuracy
http://issues.civicrm.org/jira/browse/CRM-13904
Coleman Watts [Thu, 5 Dec 2013 03:59:31 +0000 (19:59 -0800)]
CRM-13836 Handle multivalued custom sets during merge
Kurund Jalmi [Thu, 5 Dec 2013 00:59:32 +0000 (16:59 -0800)]
Merge pull request #2166 from davecivicrm/CRM-13420
CRM-13420 - Check for missing payment instruments during upgrade and giv...
Dave Greenberg [Thu, 5 Dec 2013 00:49:52 +0000 (16:49 -0800)]
CRM-13420 - Check for missing payment instruments during upgrade and give warning.
----------------------------------------
* CRM-13420: Upgrade: Report invalid data resulting from allowing transaction w/o payment instrument
http://issues.civicrm.org/jira/browse/CRM-13420
Dave Greenberg [Thu, 5 Dec 2013 00:40:48 +0000 (16:40 -0800)]
Merge pull request #2165 from davecivicrm/CRM-13890
CRM-13890 - Cleanup message template text. Update obsolete wiki referenc...
Dave Greenberg [Thu, 5 Dec 2013 00:34:21 +0000 (16:34 -0800)]
Merge pull request #2164 from davecivicrm/CRM-13880c
CRM-13880 - fix sample data to always set payment_instrument.
colemanw [Thu, 5 Dec 2013 00:33:49 +0000 (16:33 -0800)]
Merge pull request #2163 from totten/master-wp-active
CRM-13913 - WordReplacement - is_active default
Dave Greenberg [Thu, 5 Dec 2013 00:32:47 +0000 (16:32 -0800)]
CRM-13890 - Cleanup message template text. Update obsolete wiki reference in Legacy.php.
----------------------------------------
* CRM-13890: Participant status is not being passed to message template for online event registration
http://issues.civicrm.org/jira/browse/CRM-13890
Dave Greenberg [Thu, 5 Dec 2013 00:30:33 +0000 (16:30 -0800)]
CRM-13880 - fix sample data to always set payment_instrument.
----------------------------------------
* CRM-13880: Make payment instrument required for all contribution, event registration and membership forms
http://issues.civicrm.org/jira/browse/CRM-13880
Tim Otten [Thu, 5 Dec 2013 00:29:37 +0000 (16:29 -0800)]
CRM-13913 - api/v3/WordReplacement - Remove is_active default
The API-based default is redundant with the schema-based default.
----------------------------------------
* CRM-13913: WordReplacements created via API should default to enabled
http://issues.civicrm.org/jira/browse/CRM-13913
Tim Otten [Thu, 5 Dec 2013 00:11:12 +0000 (16:11 -0800)]
CRM-13913 - civicrm_word_replacement.is_active - Default to 1
----------------------------------------
* CRM-13913: WordReplacements created via API should default to enabled
http://issues.civicrm.org/jira/browse/CRM-13913
Tim Otten [Thu, 5 Dec 2013 00:27:04 +0000 (16:27 -0800)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-12-04-16-27-01
Tim Otten [Thu, 5 Dec 2013 00:24:46 +0000 (16:24 -0800)]
Merge pull request #2162 from totten/4.4-wp-active
CRM-13913 - api/v3/WordReplacement - Set default (is_active=1)
kurund [Wed, 4 Dec 2013 23:25:15 +0000 (15:25 -0800)]
update generated data
kurund [Wed, 4 Dec 2013 23:22:27 +0000 (15:22 -0800)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-12-04-15-16-31
Conflicts:
CRM/Admin/Form/Options.php
api/v3/Contact.php
sql/civicrm_generated.mysql
Tim Otten [Wed, 4 Dec 2013 23:15:09 +0000 (15:15 -0800)]
CRM-13913 - api/v3/WordReplacement - Set default (is_active=1)
----------------------------------------
* CRM-13913: WordReplacements created via API should default to enabled
http://issues.civicrm.org/jira/browse/CRM-13913
Dave Greenberg [Wed, 4 Dec 2013 23:10:18 +0000 (15:10 -0800)]
Merge pull request #2152 from pratik-joshi/CRM-13890
CRM-13890 : participant_status
colemanw [Wed, 4 Dec 2013 22:52:08 +0000 (14:52 -0800)]
Merge pull request #2159 from lcdservices/CRM-13909
CRM-13909 rebuild word replacement on clear cache
dlobo [Wed, 4 Dec 2013 22:40:17 +0000 (14:40 -0800)]
Merge pull request #2161 from kurund/reminders
fixed broken accordions, CRM-13910
kurund [Wed, 4 Dec 2013 22:36:58 +0000 (14:36 -0800)]
fixed broken accordions, CRM-13910
----------------------------------------
* CRM-13910: HTML and Plain-Text Format accordion panes are broken on Schedule Reminder
http://issues.civicrm.org/jira/browse/CRM-13910
dlobo [Wed, 4 Dec 2013 22:36:39 +0000 (14:36 -0800)]
Merge pull request #2135 from pratik-joshi/CRM-13861
CRM-13861 : instead of strpos check on 'title' of profile lets do a check on profile's group type so that no translation specific issue arise
kurund [Wed, 4 Dec 2013 22:03:56 +0000 (14:03 -0800)]
CRM-13896, redirect to contact screen is contact is created and action is cancel
----------------------------------------
* CRM-13896: Fatal error on cancel action for new activity after new contact is created
http://issues.civicrm.org/jira/browse/CRM-13896
colemanw [Wed, 4 Dec 2013 21:52:59 +0000 (13:52 -0800)]
Merge pull request #2160 from colemanw/4.4
CRM-12578 - Fix weight of custom css file
Coleman Watts [Wed, 4 Dec 2013 21:52:27 +0000 (13:52 -0800)]
CRM-12578 - Fix weight of custom css file
Brian Shaughnessy [Wed, 4 Dec 2013 21:46:22 +0000 (16:46 -0500)]
CRM-13909 rebuild word replacement on clear cache
Tim Otten [Wed, 4 Dec 2013 21:45:23 +0000 (13:45 -0800)]
Merge pull request #2136 from vivekarora/CRM-13615-UnitTest
CRM-13615 - Action schedule API modifications
Dave Greenberg [Wed, 4 Dec 2013 21:44:40 +0000 (13:44 -0800)]
Merge pull request #2147 from eileenmcnaughton/CRM-13901
CRM-13901 suppress membership dashboard for acl users
dlobo [Wed, 4 Dec 2013 21:37:57 +0000 (13:37 -0800)]
Merge pull request #2158 from jmcclelland/aggregate-contribution-search-smart-group
Aggregate contribution search smart group
Jamie McClelland [Wed, 4 Dec 2013 21:32:28 +0000 (16:32 -0500)]
CRM-13908 - Contribution - fixing indentation.
----------------------------------------
* CRM-13908:
http://issues.civicrm.org/jira/browse/CRM-13908
Jamie McClelland [Wed, 4 Dec 2013 21:30:20 +0000 (16:30 -0500)]
CRM-13908 - Contribution - Allow smart group creation from Aggregate Contribution search
----------------------------------------
* CRM-13908:
http://issues.civicrm.org/jira/browse/CRM-13908
dlobo [Wed, 4 Dec 2013 19:44:37 +0000 (11:44 -0800)]
Merge pull request #2146 from davecivicrm/CRM-13900
CRM-13900 - Fix back to report URL.
dlobo [Wed, 4 Dec 2013 19:04:05 +0000 (11:04 -0800)]
Merge pull request #2155 from dlobo/CRM-13906
CRM-13906 - Notices and Warnings in Contribute Repeat report
Donald A. Lobo [Wed, 4 Dec 2013 19:03:16 +0000 (11:03 -0800)]
CRM-13906 - Notices and Warnings in Contribute Repeat report
http://issues.civicrm.org/jira/browse/CRM-13906
dlobo [Wed, 4 Dec 2013 19:01:34 +0000 (11:01 -0800)]
Merge pull request #2154 from dlobo/CRM-13905
CRM-13905 - Strict warning php 5.4.19
Donald A. Lobo [Wed, 4 Dec 2013 19:00:55 +0000 (11:00 -0800)]
CRM-13905 - Strict warning php 5.4.19
http://issues.civicrm.org/jira/browse/CRM-13905
colemanw [Wed, 4 Dec 2013 17:53:10 +0000 (09:53 -0800)]
Merge pull request #2086 from eileenmcnaughton/CRM_13493
CRM-13493 api don't fatal on duplicate invoice id + don't concantenate errors
colemanw [Wed, 4 Dec 2013 17:39:51 +0000 (09:39 -0800)]
Merge pull request #2111 from lcdservices/CRM-13851
CRM-13851 phone search wildcard handling
kurund [Wed, 4 Dec 2013 15:13:13 +0000 (20:43 +0530)]
remove redundant usercontext, which messes activity form, CRM-13896
----------------------------------------
* CRM-13896:
http://issues.civicrm.org/jira/browse/CRM-13896
dlobo [Wed, 4 Dec 2013 14:00:38 +0000 (06:00 -0800)]
Merge pull request #2150 from deepak-srivastava/44-customextends-join-override
CRM-13903 - Allow custom table join clause to override
dlobo [Wed, 4 Dec 2013 13:57:56 +0000 (05:57 -0800)]
Merge pull request #2139 from dlobo/CRM-13897
CRM-13897 - Upgrade script not runs under wordpress
Pratik Joshi [Wed, 4 Dec 2013 13:40:02 +0000 (19:10 +0530)]
CRM-13890 : participant_status
Deepak Srivastava [Wed, 4 Dec 2013 10:07:29 +0000 (15:37 +0530)]
remove CRM_Core_PseudoConstant::activityType concatenation
Deepak Srivastava [Wed, 4 Dec 2013 10:04:20 +0000 (15:34 +0530)]
Merge branch 'CRM-13842' of github.com:davecivicrm/civicrm-core into davecivicrm-CRM-13842
Deepak Srivastava [Wed, 4 Dec 2013 07:53:21 +0000 (13:23 +0530)]
indentation correction
Deepak Srivastava [Wed, 4 Dec 2013 07:42:56 +0000 (13:12 +0530)]
Allow custom table join clause to override
dlobo [Wed, 4 Dec 2013 04:42:01 +0000 (20:42 -0800)]
Merge pull request #2149 from eileenmcnaughton/schema-tidy-ups
CRM-13902 Add psuedoconstants to schema definition
Eileen [Wed, 4 Dec 2013 02:58:14 +0000 (15:58 +1300)]
Schema tidy ups - add pseudoconstants for recurring contributions, add a couple of titles
dlobo [Wed, 4 Dec 2013 02:41:15 +0000 (18:41 -0800)]
Merge pull request #2148 from dlobo/CRM-13879
CRM-13879 - Strict warning
Donald A. Lobo [Wed, 4 Dec 2013 02:40:20 +0000 (18:40 -0800)]
CRM-13879 - Strict warning
http://issues.civicrm.org/jira/browse/CRM-13879
Eileen [Wed, 4 Dec 2013 01:56:59 +0000 (14:56 +1300)]
limited whitespace indentation fix (fixed where most inportant for readability)
Eileen [Wed, 4 Dec 2013 01:54:21 +0000 (14:54 +1300)]
remove trailing whitespace
Eileen [Wed, 4 Dec 2013 01:53:47 +0000 (14:53 +1300)]
CRM-13901 suppress membership dashboard for acl users
Dave Greenberg [Tue, 3 Dec 2013 21:02:30 +0000 (13:02 -0800)]
Merge pull request #2145 from lcdservices/CRM-13812
CRM-13812 retain trashed contacts in activity selector and apply visual ...
Brian Shaughnessy [Tue, 3 Dec 2013 20:59:08 +0000 (15:59 -0500)]
CRM-13812 additional cleanup as we no longer need to cycle through deleted contacts separately
Dave Greenberg [Tue, 3 Dec 2013 20:28:20 +0000 (12:28 -0800)]
CRM-13900 - Fix back to report URL.
----------------------------------------
* CRM-13900: Back to Report listing in Mailing Event reports has the wrong URL
http://issues.civicrm.org/jira/browse/CRM-13900
Brian Shaughnessy [Tue, 3 Dec 2013 19:59:15 +0000 (14:59 -0500)]
CRM-13812 retain trashed contacts in activity selector and apply visual indicator
dlobo [Tue, 3 Dec 2013 18:20:44 +0000 (10:20 -0800)]
Merge pull request #2141 from jmcclelland/change-test-to-draft-for-civimail
Change test to draft for civimail
Jamie McClelland [Tue, 3 Dec 2013 18:12:49 +0000 (13:12 -0500)]
CRM-13891 - CiviMail - Use brackets around civicrm draft in subject line.
This seems to be the convention these days.
----------------------------------------
* CRM-13891: remove word "test" from the subject line of test email
http://issues.civicrm.org/jira/browse/CRM-13891
Tim Otten [Tue, 3 Dec 2013 18:04:37 +0000 (10:04 -0800)]
Merge pull request #2138 from NileemaJadhav/CRM-13886
-- CRM-13886 Modification for api_v3_SettingTest regression test
Dave Greenberg [Tue, 3 Dec 2013 18:02:20 +0000 (10:02 -0800)]
Merge pull request #2144 from davecivicrm/CRM-13880b
CRM-13880 - Fix testContributionCreateExample to reflect change in contr...
Dave Greenberg [Tue, 3 Dec 2013 18:00:30 +0000 (10:00 -0800)]
CRM-13880 - Fix testContributionCreateExample to reflect change in contribution create api to set payment_instrument automatically if not provided in params
----------------------------------------
* CRM-13880: Make payment instrument required for all contribution, event registration and membership forms
http://issues.civicrm.org/jira/browse/CRM-13880
Dave Greenberg [Tue, 3 Dec 2013 17:38:29 +0000 (09:38 -0800)]
Merge pull request #2137 from pradpnayak/CRM-13310
--CRM-13310, fixed api test
dlobo [Tue, 3 Dec 2013 17:37:16 +0000 (09:37 -0800)]
Merge pull request #2143 from dlobo/CRM-13883
CRM-13883 - permanently delete contact should not remove activities if connected to other contacts
Donald A. Lobo [Tue, 3 Dec 2013 17:23:20 +0000 (09:23 -0800)]
CRM-13883 - white space fix
----------------------------------------
* CRM-13883: permanently delete contact should not remove activities if connected to other contacts
http://issues.civicrm.org/jira/browse/CRM-13883
Donald A. Lobo [Tue, 3 Dec 2013 17:21:13 +0000 (09:21 -0800)]
CRM-13883 - permanently delete contact should not remove activities if connected to other contacts
http://issues.civicrm.org/jira/browse/CRM-13883
dlobo [Tue, 3 Dec 2013 17:13:16 +0000 (09:13 -0800)]
Merge pull request #2129 from lcdservices/CRM-13883
CRM-13883 retain activity if connected to other contacts
dlobo [Tue, 3 Dec 2013 17:02:24 +0000 (09:02 -0800)]
Merge pull request #2142 from dlobo/CRM-13885
CRM-13885 - Set timezone for WP on Cron
Donald A. Lobo [Tue, 3 Dec 2013 17:01:03 +0000 (09:01 -0800)]
CRM-13885 - Set timezone for WP on Cron
http://issues.civicrm.org/jira/browse/CRM-13885
Jamie McClelland [Tue, 3 Dec 2013 16:17:56 +0000 (11:17 -0500)]
CRM-13891 - CiviMail - Change "test" to "draft" on test messages
dlobo [Tue, 3 Dec 2013 16:07:42 +0000 (08:07 -0800)]
Merge pull request #2140 from jmcclelland/totals-to-pcp-report
CRM-13898 - Contribute - Add summary to PCP report
Jamie McClelland [Tue, 3 Dec 2013 15:51:05 +0000 (10:51 -0500)]
CRM-13898 - Contribute - Add summary to PCP report
Donald A. Lobo [Tue, 3 Dec 2013 14:49:48 +0000 (06:49 -0800)]
CRM-13897 - Update script not runs under wordpress
http://issues.civicrm.org/jira/browse/CRM-13897
Nileema [Tue, 3 Dec 2013 13:13:50 +0000 (18:43 +0530)]
-- CRM-13886 Modification for api_v3_SettingTest regression test
----------------------------------------
* CRM-13886: api_v3_SettingTest regression
http://issues.civicrm.org/jira/browse/CRM-13886
Pradeep Nayak [Tue, 3 Dec 2013 12:56:28 +0000 (18:26 +0530)]
--CRM-13310, fixed api test
vivekarora [Tue, 3 Dec 2013 12:05:40 +0000 (17:35 +0530)]
Action schedule API modifications
Adam Roses Wight [Sun, 1 Dec 2013 00:31:22 +0000 (16:31 -0800)]
Split code generation into components.
Parsing the specification has become its own class.
Templating has been abstracted, now beautifying is built into all php
generation. We lose the singleton efficiency, it gained us a few seconds
at most.
Generation tasks are split into ITasks, and are fed the main CG object
as if it were a configuration object. Eventually we will want to make
the configuration a first-class object so that it is customizable.
----------------------------------------
* CRM-13871: Provide an ORM layer: Doctrine
http://issues.civicrm.org/jira/browse/CRM-13871
Kurund Jalmi [Tue, 3 Dec 2013 10:09:14 +0000 (02:09 -0800)]
Merge pull request #2134 from dlobo/MiscFixes
Improve end of install messages
Pratik Joshi [Tue, 3 Dec 2013 08:52:19 +0000 (14:22 +0530)]
CRM-13861 : instead of strpos check on 'title' of group lets do a check on profile's group type so that no translation specific issue araise
colemanw [Mon, 2 Dec 2013 23:30:11 +0000 (15:30 -0800)]
Merge pull request #2126 from davecivicrm/CRM-13880
CRM-13880 Make payment instrument field required in all forms. Set to Ch...
Coleman Watts [Mon, 2 Dec 2013 23:29:39 +0000 (15:29 -0800)]
CRM-13880 - Update payment instrument help text
dlobo [Mon, 2 Dec 2013 22:56:43 +0000 (14:56 -0800)]
Merge pull request #2125 from lcdservices/CRM-13873
CRM-13873 add support for permissionEmails for D7
Donald A. Lobo [Mon, 2 Dec 2013 22:41:24 +0000 (14:41 -0800)]
Improve end of install messages - Fix typo
Donald A. Lobo [Mon, 2 Dec 2013 22:34:04 +0000 (14:34 -0800)]
Improving end of install messages
colemanw [Mon, 2 Dec 2013 22:23:43 +0000 (14:23 -0800)]
Merge pull request #2091 from colemanw/navigation
CRM-12337 - Optimize Menu Rendering
colemanw [Mon, 2 Dec 2013 22:21:20 +0000 (14:21 -0800)]
Merge pull request #2130 from kirkatcaat/master
Participant BAO can accept role IDs in an array
colemanw [Mon, 2 Dec 2013 22:19:51 +0000 (14:19 -0800)]
Merge pull request #2133 from colemanw/master
Work on AJAX related issues
Coleman Watts [Mon, 2 Dec 2013 22:17:52 +0000 (14:17 -0800)]
CRM-11864 CRM-10693 - Improve multistep forms and menus in popup context
Coleman Watts [Mon, 2 Dec 2013 22:14:00 +0000 (14:14 -0800)]
CRM-11864 - Options admin - improve user feedback
Brian Shaughnessy [Mon, 2 Dec 2013 16:10:31 +0000 (11:10 -0500)]
CRM-13883 retain activity if connected to other contacts
Kirk Jackson [Mon, 2 Dec 2013 15:26:21 +0000 (15:26 +0000)]
Allow Participant roles to be specified as an array
Kurund Jalmi [Mon, 2 Dec 2013 11:57:33 +0000 (03:57 -0800)]
Merge pull request #2121 from kurund/CRM-13809
CRM-13809, prevent sending emails to deceased contacts..
Kurund Jalmi [Mon, 2 Dec 2013 11:54:26 +0000 (03:54 -0800)]
Merge pull request #2127 from pratik-joshi/CRM-13857
CRM-13857 : modifications to not show empty created_by, modified_by fields i.e while new creation and first time modification
Kurund Jalmi [Mon, 2 Dec 2013 11:50:05 +0000 (03:50 -0800)]
Merge pull request #2122 from kurund/CRM-13847
CRM-13847, upgrade fixes for non-english installs
Kurund Jalmi [Mon, 2 Dec 2013 11:35:57 +0000 (03:35 -0800)]
Merge pull request #2128 from pradpnayak/CRM-13847
-- CRM-13847, removed ts tag since we never translate civicrm_financial_...
Pradeep Nayak [Mon, 2 Dec 2013 11:15:19 +0000 (16:45 +0530)]
-- CRM-13847, removed ts tag since we never translate civicrm_financial_account.name field.
----------------------------------------
* CRM-13847: Upgrade 4.2.14 -> 4.4.2 fails when Language set to German
http://issues.civicrm.org/jira/browse/CRM-13847
Pratik Joshi [Mon, 2 Dec 2013 06:29:50 +0000 (11:59 +0530)]
CRM-13857 : modifications to not show empty created_by, modified_by fields i.e while new creation and first time modification