atif-shaikh [Fri, 13 Mar 2015 13:06:31 +0000 (18:36 +0530)]
WebtestFix
Monish Deb [Fri, 13 Mar 2015 11:31:47 +0000 (17:01 +0530)]
Merge pull request #5375 from monishdeb/4.6
CRM-16102 fix - Thows validation error on adding any 'Contact' field if ...
monishdeb [Fri, 13 Mar 2015 08:29:35 +0000 (13:59 +0530)]
CRM-16102 fix - Thows validation error on adding any 'Contact' field if the profile has any 'Subtype' field
https://issues.civicrm.org/jira/browse/CRM-16102
colemanw [Fri, 13 Mar 2015 00:40:03 +0000 (20:40 -0400)]
Merge pull request #5372 from agh1/reminder-created_date
CRM-16101 - Reminder based on created_date and modified_date
Dave Greenberg [Thu, 12 Mar 2015 23:35:29 +0000 (16:35 -0700)]
Merge pull request #5367 from atif-shaikh/CRM-16064WebTest
CRM-16064 - Webtest Fix
colemanw [Thu, 12 Mar 2015 21:07:48 +0000 (17:07 -0400)]
Merge pull request #5370 from colemanw/CRM-16075
CRM-16075 - Remove country alias from api spec
Andrew Hunt [Thu, 12 Mar 2015 20:25:53 +0000 (16:25 -0400)]
reminders: tests for created_date and modified_date
Monish Deb [Thu, 12 Mar 2015 19:35:00 +0000 (01:05 +0530)]
Merge pull request #5369 from rohankatkar/webtest-4.6
Webtest Fixes
Monish Deb [Thu, 12 Mar 2015 19:34:24 +0000 (01:04 +0530)]
Merge pull request #5368 from jitendrapurohit/webtestfix46
webtest fixes 4.6
Coleman Watts [Thu, 12 Mar 2015 18:47:29 +0000 (14:47 -0400)]
CRM-16075 - Remove country alias from api spec
Coleman Watts [Thu, 12 Mar 2015 17:59:57 +0000 (13:59 -0400)]
CRM-15988 - Use lowercase entity name in field_id
Andrew Hunt [Thu, 12 Mar 2015 16:46:22 +0000 (12:46 -0400)]
add reminders for created_date and modified_date
Coleman Watts [Thu, 12 Mar 2015 15:31:43 +0000 (11:31 -0400)]
Merge branch '4.5' into 4.6
Jon goldberg [Thu, 12 Mar 2015 03:42:28 +0000 (23:42 -0400)]
CRM-16056 - Core CiviCRM - Fix populating prev/next cache when jumping > 500 records past the end of cache
colemanw [Thu, 12 Mar 2015 14:04:21 +0000 (10:04 -0400)]
Merge pull request #5364 from colemanw/CRM-16085
CRM-16085 - Contact inline edit - Fix handling of empty name/email
Web Access [Thu, 12 Mar 2015 13:09:01 +0000 (18:39 +0530)]
Webtest Fixes
jitendrapurohit [Thu, 12 Mar 2015 13:06:36 +0000 (18:36 +0530)]
webtest fixes
atif-shaikh [Thu, 12 Mar 2015 11:01:23 +0000 (16:31 +0530)]
CRM-16064 - Contributions pricesets charge $1 more than selected
https://issues.civicrm.org/jira/browse/CRM-16064
atif-shaikh [Thu, 12 Mar 2015 10:36:36 +0000 (16:06 +0530)]
CRM-16064 - Webtest Fix
----------------------------------------
* CRM-16064: Contributions pricesets charge $1 more than selected
https://issues.civicrm.org/jira/browse/CRM-16064
Monish Deb [Thu, 12 Mar 2015 08:19:53 +0000 (13:49 +0530)]
Merge pull request #5366 from monishdeb/4.6
CRM-16092 fix - Incorrect API call in Civi/Payment/System.php
monishdeb [Thu, 12 Mar 2015 07:01:01 +0000 (12:31 +0530)]
CRM-16092 fix - Incorrect API call in Civi/Payment/System.php
https://issues.civicrm.org/jira/browse/CRM-16092
Monish Deb [Thu, 12 Mar 2015 05:38:28 +0000 (11:08 +0530)]
Merge pull request #5361 from rohankatkar/webtest-4.6
Webtest Fixes
Coleman Watts [Thu, 12 Mar 2015 01:58:48 +0000 (21:58 -0400)]
CRM-16085 - Contact inline edit - Fix handling of empty name/email
Dave Greenberg [Thu, 12 Mar 2015 00:32:01 +0000 (17:32 -0700)]
Merge pull request #5363 from colemanw/CRM-16093
CRM-16093 - Fix js error on participant form
Coleman Watts [Wed, 11 Mar 2015 18:10:53 +0000 (14:10 -0400)]
CRM-16093 - Fix js error on participant form
Web Access [Wed, 11 Mar 2015 13:26:13 +0000 (18:56 +0530)]
Webtest fixes
CiviCRM [Wed, 11 Mar 2015 10:51:48 +0000 (03:51 -0700)]
Update version to 4.6.beta4
Kurund Jalmi [Wed, 11 Mar 2015 08:55:52 +0000 (14:25 +0530)]
Merge pull request #5358 from atif-shaikh/CRM-14199WarningFix
CRM-14199 - Minor Warning Fix
Kurund Jalmi [Wed, 11 Mar 2015 08:55:27 +0000 (14:25 +0530)]
Merge pull request #5359 from monishdeb/4.6
CRM-16088 related notice fix
monishdeb [Wed, 11 Mar 2015 07:10:26 +0000 (12:40 +0530)]
CRM-16088 related notice fix
----------------------------------------
* CRM-16088: Allow to override preprocess function in class which extends CRM_Event_Form_ManageEvent_Location
https://issues.civicrm.org/jira/browse/CRM-16088
atif-shaikh [Wed, 11 Mar 2015 05:28:19 +0000 (10:58 +0530)]
CRM-14199 - Minor Warning Fix
----------------------------------------
* CRM-14199: Incorrect Math in Import routines
https://issues.civicrm.org/jira/browse/CRM-14199
Dave Greenberg [Wed, 11 Mar 2015 01:52:48 +0000 (18:52 -0700)]
Merge pull request #5355 from colemanw/CRM-16019
CRM-16019 - Reset mode if user entered an invalid date
colemanw [Wed, 11 Mar 2015 00:17:05 +0000 (20:17 -0400)]
Merge pull request #5356 from mallezie/crm-16088
CRM-16088 Allow subclassing of 'CRM_Event_Form_ManageEvent_Location'
Coleman Watts [Tue, 10 Mar 2015 20:26:24 +0000 (16:26 -0400)]
Merge branch 'johanv-CRM-16084-chaining_contacts_relationships_direction' into 4.6
Coleman Watts [Tue, 10 Mar 2015 20:25:55 +0000 (16:25 -0400)]
Merge branch 'CRM-16084-chaining_contacts_relationships_direction' of https://github.com/johanv/civicrm-core into johanv-CRM-16084-chaining_contacts_relationships_direction
Tim Mallezie [Tue, 10 Mar 2015 20:01:41 +0000 (21:01 +0100)]
Update change to is_a function, i should read the docs
Tim Mallezie [Tue, 10 Mar 2015 19:51:27 +0000 (20:51 +0100)]
Update to is_a function instead of is_subclass_of
Coleman Watts [Tue, 10 Mar 2015 19:41:11 +0000 (15:41 -0400)]
CRM-16019 - Reset mode if user entered an invalid date
Tim Mallezie [Tue, 10 Mar 2015 19:38:19 +0000 (20:38 +0100)]
CRM-16088 Allow subclassing of 'CRM_Event_Form_ManageEvent_Location' and 'CRM_Contact_Form_Domain'
colemanw [Tue, 10 Mar 2015 17:18:31 +0000 (13:18 -0400)]
Merge pull request #5339 from colemanw/CRM-16077
CRM-16077 - Expose optionEditPath to api getfields
Kurund Jalmi [Tue, 10 Mar 2015 14:30:36 +0000 (20:00 +0530)]
Merge pull request #5347 from atif-shaikh/CRM-16065
CRM-16065 - Custom field set data not being saved if contact has more th...
Johan Vervloet [Tue, 10 Mar 2015 13:42:23 +0000 (14:42 +0100)]
A unit test for CRM-15983.
This hack seems to fix CRM-15983 as well. (At least in the case that
contact_id_a or contact_id_b is given.)
I copied the unit test for CRM-15983.
----------------------------------------
* CRM-15983: limit and sort options don't work inside chained call to relationship API
https://issues.civicrm.org/jira/browse/CRM-15983
Johan Vervloet [Tue, 10 Mar 2015 13:29:20 +0000 (14:29 +0100)]
CRM-16084 - a hack that fixes the issue.
When you chain a relationship call to a contact call,
and contact_id_a or contact_id_b is provided for the
chained call, don't add the contact_id parameter.
----------------------------------------
* CRM-16084: API: when getting contact chaining relationships, the relationship direction is ignored
https://issues.civicrm.org/jira/browse/CRM-16084
Johan Vervloet [Tue, 10 Mar 2015 12:11:24 +0000 (13:11 +0100)]
CRM-16084 Unit test: direction of chaining relationships.
----------------------------------------
* CRM-16084: API: when getting contact chaining relationships, the relationship direction is ignored
https://issues.civicrm.org/jira/browse/CRM-16084
Monish Deb [Tue, 10 Mar 2015 11:31:12 +0000 (17:01 +0530)]
Merge pull request #5348 from jitendrapurohit/CRM-16083
Fatal Error when Signatures is clicked from more link on Campaign Dashbo...
Monish Deb [Tue, 10 Mar 2015 11:30:55 +0000 (17:00 +0530)]
Merge pull request #5346 from monishdeb/CRM-16064
CRM-16064 fix - Contributions pricesets charge $1 more than selected
jitendrapurohit [Tue, 10 Mar 2015 09:34:34 +0000 (15:04 +0530)]
failing webtest fix
jitendrapurohit [Tue, 10 Mar 2015 07:30:47 +0000 (13:00 +0530)]
Fatal Error when Signatures is clicked from more link on Campaign Dashboard (Petition tab)
atif-shaikh [Tue, 10 Mar 2015 07:16:34 +0000 (12:46 +0530)]
CRM-16065 - Custom field set data not being saved if contact has more than one contact sub type
https://issues.civicrm.org/jira/browse/CRM-16065
monishdeb [Tue, 10 Mar 2015 06:11:27 +0000 (11:41 +0530)]
CRM-16064 fix - Contributions pricesets charge $1 more than selected
https://issues.civicrm.org/jira/browse/CRM-16064
Dave Greenberg [Tue, 10 Mar 2015 01:26:03 +0000 (18:26 -0700)]
Merge pull request #5298 from colemanw/CRM-16019-b
CRM-16019 - New crmDatepicker widget for jQuery & Angular
colemanw [Tue, 10 Mar 2015 01:17:47 +0000 (21:17 -0400)]
Merge pull request #5342 from colemanw/searchCss
Add separate stylesheet for search forms
Coleman Watts [Tue, 10 Mar 2015 01:02:07 +0000 (21:02 -0400)]
CRM-15976 - Move styles from tpl to css file
Coleman Watts [Mon, 9 Mar 2015 17:51:20 +0000 (13:51 -0400)]
Add separate stylesheet for search forms
Dave Greenberg [Tue, 10 Mar 2015 00:43:12 +0000 (17:43 -0700)]
Merge pull request #5343 from davecivicrm/CRM-15976
CRM-15976 - advanced search help file has broken URL for link from Serar...
Dave Greenberg [Tue, 10 Mar 2015 00:43:29 +0000 (17:43 -0700)]
CRM-15976 - advanced search help file has broken URL for link from Serarch Views to profile section in user guide. Also, help title uses old label for this feature.
----------------------------------------
* CRM-15976: Formatting break on Advanced Search
https://issues.civicrm.org/jira/browse/CRM-15976
Dave Greenberg [Tue, 10 Mar 2015 00:36:02 +0000 (17:36 -0700)]
Merge pull request #5341 from colemanw/pradpnayak-CRM-15976
CRM-15976 - Improve advanced search layout
Coleman Watts [Mon, 9 Mar 2015 21:31:12 +0000 (17:31 -0400)]
Fix enableDisable dialog size
Coleman Watts [Mon, 9 Mar 2015 20:31:49 +0000 (16:31 -0400)]
CRM-16077 - Remove unsupported test cases
The grant tests gave custom field data in some obscure unsupported formats.
Rather than try to restore support for them I move to just remove the failing tests.
Justification: api for core fields haven't supported these formats in years.
Coleman Watts [Mon, 9 Mar 2015 14:22:42 +0000 (10:22 -0400)]
CRM-16077 - Expose optionEditPath to api getfields
Coleman Watts [Mon, 9 Mar 2015 20:15:28 +0000 (16:15 -0400)]
Comment fix - add @return tag
colemanw [Mon, 9 Mar 2015 19:41:52 +0000 (15:41 -0400)]
Merge pull request #5340 from colemanw/prettyPrintJson
Cleanup api explorer json formatting
kurund [Mon, 9 Mar 2015 16:27:45 +0000 (21:57 +0530)]
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-03-09-21-44-34
Conflicts:
CRM/Contact/Page/AJAX.php
CRM/Core/Form.php
CRM/Core/Page/AJAX.php
sql/civicrm_generated.mysql
xml/version.xml
Kurund Jalmi [Mon, 9 Mar 2015 16:04:01 +0000 (21:34 +0530)]
Merge pull request #5338 from kurund/CRM-15756
CRM-15756, add credit card class for validation
Coleman Watts [Mon, 9 Mar 2015 15:54:03 +0000 (11:54 -0400)]
CRM-15976 - Fix group selector layout
Coleman Watts [Mon, 9 Mar 2015 15:46:15 +0000 (11:46 -0400)]
CRM-15976 - Create section for search settings
Coleman Watts [Mon, 9 Mar 2015 15:39:54 +0000 (11:39 -0400)]
CRM-15976 - Show relationship selector on newline to avoid pushing elements off screen
Coleman Watts [Mon, 9 Mar 2015 15:27:05 +0000 (11:27 -0400)]
CRM-15976 - Force top submit buttons to align right
colemanw [Mon, 9 Mar 2015 14:35:41 +0000 (10:35 -0400)]
Merge pull request #5317 from sfe-ev/chainselect-missing-fields
Make "Chain Select" mechanism robust against missing 'target' form field
Coleman Watts [Mon, 9 Mar 2015 14:20:17 +0000 (10:20 -0400)]
Cleanup api explorer json formatting
colemanw [Mon, 9 Mar 2015 14:10:59 +0000 (10:10 -0400)]
Merge pull request #5334 from colemanw/CRM-16071
CRM-16071 - Expose field descriptions to api & explorer
kurund [Mon, 9 Mar 2015 12:55:08 +0000 (18:25 +0530)]
fixed typo
colemanw [Sun, 8 Mar 2015 20:07:36 +0000 (16:07 -0400)]
Merge pull request #5337 from colemanw/datePicker
CRM-15932 - Fix multi-date widget edge-case behavior
Coleman Watts [Sun, 8 Mar 2015 19:50:21 +0000 (15:50 -0400)]
CRM-15932 - Fix multi-date widget edge-case behavior
kurund [Sun, 8 Mar 2015 19:33:16 +0000 (01:03 +0530)]
CRM-15756, add credit card class for validation
----------------------------------------
* CRM-15756: Back-office Submit Credit Card Contribution form: card # validation is no longer working
https://issues.civicrm.org/jira/browse/CRM-15756
colemanw [Sun, 8 Mar 2015 16:53:38 +0000 (12:53 -0400)]
Merge pull request #5336 from colemanw/recurringFix
CRM-15932 - Repeat tab must refresh page when switching repeat mode so js & vars will get set-up
Coleman Watts [Sun, 8 Mar 2015 16:24:46 +0000 (12:24 -0400)]
CRM-14353 - Better select2 handling
Coleman Watts [Sun, 8 Mar 2015 16:12:10 +0000 (12:12 -0400)]
CRM-15932 - Multi-date-select2 widget improvements
Coleman Watts [Sun, 8 Mar 2015 14:10:55 +0000 (10:10 -0400)]
CRM-15932 - Repeat tab must refresh page when switching repeat mode so js & vars will get set-up
colemanw [Sun, 8 Mar 2015 12:48:41 +0000 (08:48 -0400)]
Merge pull request #5335 from colemanw/CRM-14353
CRM-14353 - Fix unsavedChanges js to support checkboxes & radios
Coleman Watts [Sun, 8 Mar 2015 02:39:11 +0000 (21:39 -0500)]
CRM-15932 - Fix recurringEntity form validation
Coleman Watts [Sun, 8 Mar 2015 02:38:11 +0000 (21:38 -0500)]
CRM-14353 - Fix unsavedChanges js to handle disabled fields
Coleman Watts [Sun, 8 Mar 2015 02:27:36 +0000 (21:27 -0500)]
CRM-14353 - Fix unsavedChanges js to support checkboxes & radios
colemanw [Sat, 7 Mar 2015 21:22:22 +0000 (16:22 -0500)]
Merge pull request #5332 from totten/4.5-mailingcomp-api
CRM-16063 - MailingComponent.create API fixes
colemanw [Sat, 7 Mar 2015 21:20:40 +0000 (16:20 -0500)]
Merge pull request #5325 from colemanw/CRM-14154
CRM-14154 - Fix broken message_template_send api and enhance spec
Coleman Watts [Sat, 7 Mar 2015 21:14:23 +0000 (16:14 -0500)]
CRM-16019 - Add rudimentary validation to date input
Coleman Watts [Sat, 7 Mar 2015 20:38:11 +0000 (15:38 -0500)]
CRM-16071 - Fix double-escaped single quotes
Escaping happens in a different layer and is not necessary in the xml.
Coleman Watts [Sat, 7 Mar 2015 18:27:47 +0000 (13:27 -0500)]
API Explorer - Disable operator selection when not appropriate
Coleman Watts [Sat, 7 Mar 2015 16:53:55 +0000 (11:53 -0500)]
CRM-16071 - Expose field descriptions to api & explorer
Tim Otten [Sat, 7 Mar 2015 04:29:24 +0000 (20:29 -0800)]
CRM-16063 - MailingComponent.create API - Fix management of is_default
Tim Otten [Sat, 7 Mar 2015 04:29:01 +0000 (20:29 -0800)]
CRM-16063 - MailingComponent.create API - is_active=1 by default
Tim Otten [Sat, 7 Mar 2015 04:01:00 +0000 (20:01 -0800)]
Merge pull request #5327 from colemanw/totten-master-headerlist
CRM-16063 - CiviMail - Ensure mailing option lookups have no limit
Coleman Watts [Sat, 7 Mar 2015 02:09:09 +0000 (21:09 -0500)]
CRM-16019 - Fix timeEntry format to respect global settings
Coleman Watts [Sat, 7 Mar 2015 00:15:43 +0000 (19:15 -0500)]
CRM-16063 - CiviMail - Filter civiMails by is_completed
Tim Otten [Sat, 7 Mar 2015 00:23:03 +0000 (16:23 -0800)]
Merge pull request #5329 from totten/master-bower-fch
setup.sh - bower - Only use "-f" if bower.json has changed since last run
Tim Otten [Sat, 7 Mar 2015 00:14:56 +0000 (16:14 -0800)]
Merge branch 'atif-shaikh-CRM-15979'
Tim Otten [Fri, 6 Mar 2015 22:55:26 +0000 (14:55 -0800)]
Merge branch 'master' into atif-shaikh-CRM-15979
Conflicts:
CRM/Upgrade/Incremental/sql/4.6.beta3.mysql.tpl
Coleman Watts [Fri, 6 Mar 2015 22:31:36 +0000 (17:31 -0500)]
CRM-16063 - CiviMail - Don't fetch unused fields/options
Tim Otten [Fri, 6 Mar 2015 22:29:18 +0000 (14:29 -0800)]
Merge pull request #5316 from GinkgoFJG/CRM-15965-4.6
CRM-15965: Update search interface for 4.6 (deferred in 4.5).
Tim Otten [Fri, 6 Mar 2015 22:19:58 +0000 (14:19 -0800)]
Merge pull request #5324 from totten/4.5-mailingcomp-bool
CRM-16063 - Mailing Component - Fix saving of booleans
projects / civicrm-core.git / log