Dave Greenberg [Mon, 21 Jul 2014 23:02:46 +0000 (16:02 -0700)]
Merge pull request #3710 from jmcclelland/import-participant-register-date
CRM-15019 - avoid validation error on register date if not using ISO
Dave Greenberg [Mon, 21 Jul 2014 17:35:09 +0000 (10:35 -0700)]
Merge pull request #3705 from eileenmcnaughton/CRM-15009
CRM-15009 extend permitted length of field on payment processor signatur...
Jamie McClelland [Mon, 21 Jul 2014 17:25:11 +0000 (13:25 -0400)]
CRM-15019 - avoid validation error on register date if not using ISO
date format.
----------------------------------------
* CRM-15019: Importing participant record with register date in a format other than YYYY-MM-DD results in validation error
https://issues.civicrm.org/jira/browse/CRM-15019
colemanw [Mon, 21 Jul 2014 11:22:34 +0000 (12:22 +0100)]
Merge pull request #3707 from colemanw/er
Form_Renderer - ensure params is an array
Coleman Watts [Mon, 21 Jul 2014 08:39:48 +0000 (09:39 +0100)]
Form_Renderer - ensure params is an array
Eileen McNaughton [Mon, 21 Jul 2014 02:56:27 +0000 (14:56 +1200)]
CRM-15009 extend permitted length of field on payment processor signature
colemanw [Sun, 20 Jul 2014 14:09:47 +0000 (15:09 +0100)]
Merge pull request #3704 from colemanw/memberOrg
CRM-15017 - Fix existing member check & remove unnecessary checkemail callback
Coleman Watts [Sun, 20 Jul 2014 13:45:44 +0000 (14:45 +0100)]
CRM-15017 - Fix existing member check & remove unnecessary checkemail callback
Coleman Watts [Sun, 20 Jul 2014 13:43:44 +0000 (14:43 +0100)]
Trigger change after loading remote EntityRef default
Coleman Watts [Sun, 20 Jul 2014 13:36:20 +0000 (14:36 +0100)]
Ensure 'extra' data gets loaded with EntityRef
Coleman Watts [Sun, 20 Jul 2014 01:23:15 +0000 (02:23 +0100)]
CRM-14949 - Remove unneeded tpl include
Coleman Watts [Sat, 19 Jul 2014 21:51:10 +0000 (22:51 +0100)]
Fix contribution context
Coleman Watts [Sat, 19 Jul 2014 19:22:18 +0000 (20:22 +0100)]
Slightly smaller Civi spinner
colemanw [Sat, 19 Jul 2014 14:01:50 +0000 (15:01 +0100)]
Merge pull request #3703 from colemanw/spinner
Add CiviCRM-branded spinner
Coleman Watts [Sat, 19 Jul 2014 13:58:58 +0000 (14:58 +0100)]
CiviCRM-branded spinner
colemanw [Sat, 19 Jul 2014 12:48:31 +0000 (13:48 +0100)]
Merge pull request #3702 from colemanw/limit
CRM-14984 - Fix default 25 limit being applied to getlist api when retrieving default values
Coleman Watts [Sat, 19 Jul 2014 12:22:41 +0000 (13:22 +0100)]
CRM-14984 - Fix default 25 limit being applied to getlist api when retrieving default values
Coleman Watts [Fri, 18 Jul 2014 23:50:45 +0000 (00:50 +0100)]
Block UI tweaks
colemanw [Fri, 18 Jul 2014 22:21:24 +0000 (23:21 +0100)]
Merge pull request #3700 from colemanw/spinner
Style jQuery block-ui to use a spinner instead of 'Please wait'
Coleman Watts [Fri, 18 Jul 2014 22:18:42 +0000 (23:18 +0100)]
Style jQuery block-ui to use a spinner instead of 'Please wait'
Dave Greenberg [Fri, 18 Jul 2014 21:32:57 +0000 (14:32 -0700)]
Merge pull request #3699 from monishdeb/CRM-14996
CRM-14996 fix
Dave Greenberg [Fri, 18 Jul 2014 19:08:40 +0000 (12:08 -0700)]
Merge pull request #3695 from totten/master-link-cases
CRM-15002 - Link Cases - Fix fatal error
monishdeb [Fri, 18 Jul 2014 17:30:53 +0000 (23:00 +0530)]
minor change
monishdeb [Fri, 18 Jul 2014 06:43:32 +0000 (12:13 +0530)]
CRM-14996 fix - Reports county filter option shows all counties regardless of state or states chosen
https://issues.civicrm.org/jira/browse/CRM-14996
Tim Otten [Thu, 17 Jul 2014 23:44:26 +0000 (16:44 -0700)]
Merge pull request #3697 from totten/master-commsg-times
CRM_Core_CommunityMessagesTest - Reduce probability of test-failure due to timing
Tim Otten [Thu, 17 Jul 2014 23:42:45 +0000 (16:42 -0700)]
CRM_Core_CommunityMessagesTest - Reduce probability of test-failure due to
timing
Dave Greenberg [Thu, 17 Jul 2014 23:40:51 +0000 (16:40 -0700)]
Merge pull request #3696 from davecivicrm/CRM-15002
CRM-15002 - Fix missing case types from case selectors (probably an erro...
Dave Greenberg [Thu, 17 Jul 2014 23:39:23 +0000 (16:39 -0700)]
CRM-15002 - Fix missing case types from case selectors (probably an error from typo when replacing CRM_Utils_Array instances with empty).
----------------------------------------
* CRM-15002:
https://issues.civicrm.org/jira/browse/CRM-15002
Tim Otten [Thu, 17 Jul 2014 22:47:19 +0000 (15:47 -0700)]
CRM-15002 - Link Cases - Fix fatal error
Kurund Jalmi [Thu, 17 Jul 2014 18:47:43 +0000 (00:17 +0530)]
Merge pull request #3689 from atif-shaikh/CRM-14999
CRM-14999 - Fix notice on Online Registration screen
Dave Greenberg [Thu, 17 Jul 2014 18:46:42 +0000 (11:46 -0700)]
Merge pull request #3668 from jitendrapurohit/CRM14967_Fix
CRM-14961 Fix
Dave Greenberg [Thu, 17 Jul 2014 17:52:17 +0000 (10:52 -0700)]
Merge pull request #3694 from ginkgomzd/patch-1
typo in variable name
Michael Z Daryabeygi [Thu, 17 Jul 2014 17:22:02 +0000 (13:22 -0400)]
typo in variable name
correct name of extracted variable, 'profileEntities'
Dave Greenberg [Thu, 17 Jul 2014 16:30:37 +0000 (09:30 -0700)]
Merge pull request #3690 from colemanw/quest
CRM-10780 - Remove quest-related files
CiviCRM [Thu, 17 Jul 2014 14:52:10 +0000 (20:22 +0530)]
Removal of Notice, warning and Communication label Fix
jitendrapurohit [Tue, 15 Jul 2014 14:44:12 +0000 (20:14 +0530)]
CRM-14961 Fix
colemanw [Thu, 17 Jul 2014 13:15:01 +0000 (14:15 +0100)]
Merge pull request #3693 from colemanw/CRM-14998
CRM-14998 - Fix mark-all checkbox in merge contacts screen
Coleman Watts [Thu, 17 Jul 2014 13:13:54 +0000 (14:13 +0100)]
CRM-14998 - Fix mark-all checkbox in merge contacts screen
colemanw [Thu, 17 Jul 2014 12:47:56 +0000 (13:47 +0100)]
Merge pull request #3692 from colemanw/caseSearch
CRM-15003 - Allow autocomplete to select closed cases
Coleman Watts [Thu, 17 Jul 2014 12:47:19 +0000 (13:47 +0100)]
CRM-15003 - Supply contacts' open case as a default
Coleman Watts [Thu, 17 Jul 2014 12:09:56 +0000 (13:09 +0100)]
CRM-15003 - Allow autocomplete to select closed cases
Coleman Watts [Thu, 17 Jul 2014 09:13:24 +0000 (10:13 +0100)]
CRM-10780 - Remove quest-related files
Coleman Watts [Thu, 17 Jul 2014 09:06:09 +0000 (10:06 +0100)]
Update group selectors to use select2 instead of advmultiselect
atif-shaikh [Thu, 17 Jul 2014 08:03:26 +0000 (13:33 +0530)]
CRM-14999 - Fix notice on Online Registration screen
https://issues.civicrm.org/jira/browse/CRM-14999
CiviCRM [Thu, 17 Jul 2014 06:26:57 +0000 (23:26 -0700)]
Update version to 4.5.beta3
Dave Greenberg [Thu, 17 Jul 2014 01:22:21 +0000 (18:22 -0700)]
Merge pull request #3672 from kurund/CRM-14937
CRM-14937
Dave Greenberg [Wed, 16 Jul 2014 22:55:47 +0000 (15:55 -0700)]
Merge pull request #3687 from GinkgoFJG/CRM-14990-2
CRM-14990: Round two.
Frank J. Gómez [Wed, 16 Jul 2014 21:57:49 +0000 (17:57 -0400)]
CRM-14990. Update strictness of param comparison for consistency with the rest of Civi's codebase, per Eileen's recommendation: https://github.com/civicrm/civicrm-core/commit/
f329e1deb8ebc36b68b3fe4448b16fc6f5cf52bd#commitcomment-
7036984.
Dave Greenberg [Wed, 16 Jul 2014 19:00:19 +0000 (12:00 -0700)]
Merge pull request #3673 from colemanw/mailing
CRM-14161 - Use select2 for mailing and group selectors
Kurund Jalmi [Wed, 16 Jul 2014 14:40:46 +0000 (20:10 +0530)]
Merge pull request #3685 from monishdeb/45beta2-upgrade-fix
multilingual related fix
monishdeb [Wed, 16 Jul 2014 14:38:42 +0000 (20:08 +0530)]
multilingual related fix
Frank J. Gómez [Wed, 16 Jul 2014 14:28:29 +0000 (10:28 -0400)]
CRM-14990: Don't force a value for is_reserved if it isn't passed into CRM_Core_BAO_CustomGroup::create().
Frank J. Gómez [Wed, 16 Jul 2014 14:15:59 +0000 (10:15 -0400)]
Added pre- hook to CRM_Core_BAO_CustomGroup::create().
Monish Deb [Wed, 16 Jul 2014 08:55:00 +0000 (14:25 +0530)]
Merge pull request #3682 from monishdeb/CRM-14969
Minor fix - CRM-14969
monishdeb [Wed, 16 Jul 2014 08:49:45 +0000 (14:19 +0530)]
Minor fix
kurund [Wed, 16 Jul 2014 07:38:50 +0000 (13:08 +0530)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-07-16-12-52-48
Conflicts:
CRM/Contact/Form/Contact.php
CRM/Profile/Form.php
CRM/Upgrade/Incremental/php/FourFour.php
CRM/Utils/String.php
Kurund Jalmi [Wed, 16 Jul 2014 07:18:33 +0000 (12:48 +0530)]
Merge pull request #3538 from totten/4.4-wordrep
CRM-14224 - CRM_Upgrade_Incremental_php_FourFour - Fix isValidWordReplacement()
Kurund Jalmi [Wed, 16 Jul 2014 07:15:09 +0000 (12:45 +0530)]
Merge pull request #3670 from monishdeb/CRM-14888
CRM-14888 fix - historical smart groups with membership status break on ...
Yashodha Chaku [Wed, 16 Jul 2014 04:55:14 +0000 (10:25 +0530)]
Merge pull request #3678 from kenwest/CRM-14994
CRM-14994 Fix activity type values
Eileen McNaughton [Wed, 16 Jul 2014 04:18:51 +0000 (16:18 +1200)]
Merge pull request #3677 from eileenmcnaughton/test-fix
reformat whitespace
Ken West [Wed, 16 Jul 2014 04:03:40 +0000 (14:03 +1000)]
CRM-14994 Fix activity type values
Eileen McNaughton [Wed, 16 Jul 2014 02:49:53 +0000 (14:49 +1200)]
reformat whitespace
Eileen McNaughton [Wed, 16 Jul 2014 02:47:18 +0000 (14:47 +1200)]
Merge pull request #3676 from eileenmcnaughton/test-fix
reformat whitespace
Eileen McNaughton [Wed, 16 Jul 2014 02:45:21 +0000 (14:45 +1200)]
fix whitespace
Eileen McNaughton [Wed, 16 Jul 2014 02:05:20 +0000 (14:05 +1200)]
reformat whitespace
Dave Greenberg [Wed, 16 Jul 2014 00:20:43 +0000 (17:20 -0700)]
Merge pull request #3669 from GinkgoFJG/CRM-14990
Fix for CRM-14990: allow is_reserved field on CustomGroup to be set during create.
Dave Greenberg [Wed, 16 Jul 2014 00:00:21 +0000 (17:00 -0700)]
Merge pull request #3671 from agh1/contrib-date-sort
CRM-14991 CiviContribute: add sort by date to contrib detail report
Eileen McNaughton [Tue, 15 Jul 2014 22:49:26 +0000 (10:49 +1200)]
Merge pull request #3675 from eileenmcnaughton/test-fix
fixes to test cleanup routine
Eileen McNaughton [Tue, 15 Jul 2014 22:48:23 +0000 (10:48 +1200)]
fixes to test cleanup routine
Eileen McNaughton [Tue, 15 Jul 2014 22:41:09 +0000 (10:41 +1200)]
Merge pull request #3674 from eileenmcnaughton/test-fix
Test fix
Eileen McNaughton [Tue, 15 Jul 2014 22:40:22 +0000 (10:40 +1200)]
update completetransaction test to reflect the update to make it only complete incomplete transactions
Coleman Watts [Tue, 15 Jul 2014 22:32:06 +0000 (23:32 +0100)]
CRM-14161 - Use select2 for sms & group selectors
Coleman Watts [Tue, 15 Jul 2014 22:16:27 +0000 (23:16 +0100)]
CRM-14161 - Use slect2 for mailing & group selectors
Eileen McNaughton [Tue, 15 Jul 2014 22:07:33 +0000 (10:07 +1200)]
comment fixes
Coleman Watts [Tue, 15 Jul 2014 22:00:07 +0000 (23:00 +0100)]
CRM-14161 - Use slect2 for opt-out group selector
kurund [Tue, 15 Jul 2014 21:32:18 +0000 (03:02 +0530)]
CRM-14937, also fixed display of phone type on event info
----------------------------------------
* CRM-14937: CiviEvents: when using existing location on a new event, only the first phone number is loaded causing data loss on save
https://issues.civicrm.org/jira/browse/CRM-14937
kurund [Tue, 15 Jul 2014 21:03:43 +0000 (02:33 +0530)]
CRM-14937, code cleanup
----------------------------------------
* CRM-14937: CiviEvents: when using existing location on a new event, only the first phone number is loaded causing data loss on save
https://issues.civicrm.org/jira/browse/CRM-14937
Tim Otten [Tue, 15 Jul 2014 20:39:45 +0000 (13:39 -0700)]
Merge pull request #3660 from totten/4.4-imgsize
CRM-14971 - Fix resizing of contact images
kurund [Tue, 15 Jul 2014 20:31:22 +0000 (02:01 +0530)]
CRM-14937, by default show 2 email and phone for location block in event configuration
----------------------------------------
* CRM-14937: CiviEvents: when using existing location on a new event, only the first phone number is loaded causing data loss on save
https://issues.civicrm.org/jira/browse/CRM-14937
kurund [Tue, 15 Jul 2014 19:11:57 +0000 (00:41 +0530)]
more cleanup CRM-14937
----------------------------------------
* CRM-14937: CiviEvents: when using existing location on a new event, only the first phone number is loaded causing data loss on save
https://issues.civicrm.org/jira/browse/CRM-14937
kurund [Tue, 15 Jul 2014 18:56:43 +0000 (00:26 +0530)]
fixed invaild html generate while adding additional blocks CRM-14937
----------------------------------------
* CRM-14937: CiviEvents: when using existing location on a new event, only the first phone number is loaded causing data loss on save
https://issues.civicrm.org/jira/browse/CRM-14937
Andrew Hunt [Tue, 15 Jul 2014 17:59:30 +0000 (13:59 -0400)]
CRM-14991 CiviContribute: add sort by date to contrib detail report
----------------------------------------
* CRM-14991: Sort contribution detail report by contribution date
https://issues.civicrm.org/jira/browse/CRM-14991
monishdeb [Tue, 15 Jul 2014 17:09:15 +0000 (22:39 +0530)]
CRM-14888 fix - historical smart groups with membership status break on upgrade to 4.4
https://issues.civicrm.org/jira/browse/CRM-14888
Frank J. Gómez [Tue, 15 Jul 2014 15:38:14 +0000 (11:38 -0400)]
Fix for CRM-14990: allow is_reserved field on CustomGroup to be set during create.
Kurund Jalmi [Tue, 15 Jul 2014 15:29:56 +0000 (20:59 +0530)]
Merge pull request #3651 from monishdeb/CRM-14969
Crm 14969
Kurund Jalmi [Tue, 15 Jul 2014 13:38:58 +0000 (19:08 +0530)]
Merge pull request #3665 from NileemaJadhav/CRM-master
-- Fix for broken js on form
Eileen McNaughton [Tue, 15 Jul 2014 08:43:48 +0000 (20:43 +1200)]
Merge pull request #3666 from eileenmcnaughton/test-fix
test fix to compensate for not truncating status anymore
Eileen McNaughton [Tue, 15 Jul 2014 08:42:30 +0000 (20:42 +1200)]
test fix to compensate for not truncating status anymore
Nileema [Tue, 15 Jul 2014 07:44:49 +0000 (13:14 +0530)]
-- Fix for broken js on form
Eileen McNaughton [Tue, 15 Jul 2014 04:43:20 +0000 (16:43 +1200)]
Merge pull request #3664 from eileenmcnaughton/CRM-14986
CRM-14986 add function comments as pointer as to why isoToDate fn may be...
Eileen McNaughton [Tue, 15 Jul 2014 04:35:48 +0000 (16:35 +1200)]
CRM-14986 add function comments as pointer as to why isoToDate fn may be over-used
Eileen McNaughton [Tue, 15 Jul 2014 04:27:10 +0000 (16:27 +1200)]
Merge pull request #3663 from eileenmcnaughton/CRM-14986
CRM-14986 fix DB error on date find + save
Eileen McNaughton [Tue, 15 Jul 2014 03:33:03 +0000 (15:33 +1200)]
CRM-14986 fix DB error on date find + save
this is manefesting in the failure to save contributions, however, it has been a recurrent problem
that the format used for date fields on ->find does not match the requirement of ->save
hence we see in the ContributionRecur class 3 lines like
->modified_date = CRM_Utils_Date::isoToMysql(->modified_date);
which exist simply to format the date fields for re-save.
The end_date & next_scheduled_date were missed - resulting in fatals when this function
is used
It seems kind of crazy to keep solving this problem in the form & BAO layer
so this commit is tests only & there is a commit on the packages dir
that alters the DAO->update fn to check for the presence of a '-' & do the isoToMysql there
instead.
Tim Otten [Tue, 15 Jul 2014 00:32:34 +0000 (17:32 -0700)]
Merge pull request #3662 from totten/master-contribution-syntax
Fix hard crash of test-suite due to syntax error
Tim Otten [Tue, 15 Jul 2014 00:27:44 +0000 (17:27 -0700)]
Fix hard crash of test-suite due to syntax error
Note: This is *only* a syntax fix. I don't what's supposed to be going on,
and there are other tests which fails... but at least they don't
crash the test-suite.
Original change was:
9e2ee07bf82624fe50070e14ccc6aa39ffa1b7d9
Dave Greenberg [Tue, 15 Jul 2014 00:19:51 +0000 (17:19 -0700)]
Merge pull request #3661 from davecivicrm/CRM-14789
CRM-14789 - Translate and tweak the error message when attempting to del...
Dave Greenberg [Tue, 15 Jul 2014 00:19:17 +0000 (17:19 -0700)]
CRM-14789 - Translate and tweak the error message when attempting to delete case type which is in use.
----------------------------------------
* CRM-14789:
https://issues.civicrm.org/jira/browse/CRM-14789
Tim Otten [Tue, 15 Jul 2014 00:08:19 +0000 (17:08 -0700)]
CRM-14971 - Fix resizing of contact images
----------------------------------------
* CRM-14971: Contact image URLs broken in WordPress after upgrade to 4.4.6
https://issues.civicrm.org/jira/browse/CRM-14971
Dave Greenberg [Mon, 14 Jul 2014 23:15:16 +0000 (16:15 -0700)]
Merge pull request #3655 from totten/master-casetype-delete-2
CRM-14789 - CaseType.delete - Generate error
Tim Otten [Mon, 14 Jul 2014 23:11:32 +0000 (16:11 -0700)]
Merge pull request #3647 from totten/4.4-wp-images
CRM-14971 - Contact image URLs should go through WP frontend
projects / civicrm-core.git / log