Coleman Watts [Sat, 3 Jan 2015 02:14:42 +0000 (21:14 -0500)]
CRM-15759 - Apply crmEditable behavior based on events instead of a template
Coleman Watts [Fri, 2 Jan 2015 18:46:57 +0000 (13:46 -0500)]
crmEditable code cleanup
Coleman Watts [Fri, 2 Jan 2015 15:26:08 +0000 (10:26 -0500)]
CRM-15759 - Extend in-place editing to more places
Coleman Watts [Fri, 2 Jan 2015 15:25:02 +0000 (10:25 -0500)]
CRM-15759 - support empty select option in crmEditable
Coleman Watts [Fri, 2 Jan 2015 15:22:47 +0000 (10:22 -0500)]
Remove unused code
Coleman Watts [Fri, 2 Jan 2015 01:34:08 +0000 (20:34 -0500)]
Fix membershipType options lookup and display
Coleman Watts [Thu, 1 Jan 2015 18:28:32 +0000 (13:28 -0500)]
CRM-15759 - Improve support for crmEditable select options
Coleman Watts [Thu, 1 Jan 2015 18:26:20 +0000 (13:26 -0500)]
Fix incorrect participantStatusClass options lookup
colemanw [Fri, 2 Jan 2015 21:01:25 +0000 (16:01 -0500)]
Merge pull request #4828 from colemanw/CRM-15773
CRM-15773 - Use the term Order instead of Weight consistently
Coleman Watts [Fri, 2 Jan 2015 19:29:26 +0000 (14:29 -0500)]
CRM-15773 - Use the term Order instead of Weight consistently
Yashodha Chaku [Fri, 2 Jan 2015 15:28:06 +0000 (20:58 +0530)]
Merge pull request #4826 from monishdeb/CRM-15740
CRM-15740 QA fix
monishdeb [Fri, 2 Jan 2015 14:17:04 +0000 (19:47 +0530)]
CRM-15740 QA fix
----------------------------------------
* CRM-15740: Really long URLs cause SQL issue in a trackable mass mail
https://issues.civicrm.org/jira/browse/CRM-15740
Monish Deb [Fri, 2 Jan 2015 13:50:43 +0000 (19:20 +0530)]
Merge pull request #4823 from jitendrapurohit/webtestfixes
webtest fixes 4.6
jitendrapurohit [Fri, 2 Jan 2015 12:34:12 +0000 (18:04 +0530)]
webtest fixes 4.6
Kurund Jalmi [Fri, 2 Jan 2015 12:27:58 +0000 (17:57 +0530)]
Merge pull request #4822 from kurund/indentation-fixes
indentation fixes
kurund [Fri, 2 Jan 2015 11:36:54 +0000 (17:06 +0530)]
indentation fixes
Yashodha Chaku [Fri, 2 Jan 2015 10:45:12 +0000 (16:15 +0530)]
Merge pull request #4817 from williamtheaker/patch-2
Replace wizard-bar radical with heavy checkmark
Kurund Jalmi [Fri, 2 Jan 2015 10:38:21 +0000 (16:08 +0530)]
Merge pull request #4820 from kurund/CRM-15705
CRM-15705
Yashodha Chaku [Fri, 2 Jan 2015 10:18:44 +0000 (15:48 +0530)]
Merge pull request #4821 from jitendrapurohit/webtestcorebugfix
Notification for Updation not shown after Save button is clicked on Mana...
jitendrapurohit [Fri, 2 Jan 2015 09:00:30 +0000 (14:30 +0530)]
Notification for Updation not shown after Save button is clicked on Manage Event Tab for PCP
Yashodha Chaku [Fri, 2 Jan 2015 05:35:06 +0000 (11:05 +0530)]
Merge pull request #4818 from pratikshad/CRM-15770
CRM-15770 fixes issue of empty date processing into membership page for ...
pratikshad [Fri, 2 Jan 2015 04:27:35 +0000 (09:57 +0530)]
CRM-15770 fixes issue of empty date processing into membership page for offline
----------------------------------------
* CRM-15770: if $dateString is 'null' make no attempt to format it
https://issues.civicrm.org/jira/browse/CRM-15770
William Theaker [Fri, 2 Jan 2015 03:42:57 +0000 (19:42 -0800)]
Replace wizard-bar radical with checkmark
Tim Otten [Thu, 1 Jan 2015 22:22:22 +0000 (14:22 -0800)]
Merge pull request #4684 from eileenmcnaughton/CRM-15683-masger
CRM-15678 hookable invalid page handling
Tim Otten [Thu, 1 Jan 2015 18:24:57 +0000 (10:24 -0800)]
CRM-15683 - CRM_Core_Error::handleUnhandledException - Log double exceptions
Tim Otten [Thu, 1 Jan 2015 18:21:43 +0000 (10:21 -0800)]
CRM-15683 - CRM_Core_Invoke - Cleanup comments. Remove duplicate code.
The catch{} block in _invoke() duplicates the code now in LegacyErrorHandler.
Tim Otten [Thu, 11 Dec 2014 00:10:00 +0000 (16:10 -0800)]
CRM-15683 - Add UnhandledExceptionEvent. Fixup LegacyErrorHandler.
Eileen McNaughton [Tue, 9 Dec 2014 00:25:07 +0000 (13:25 +1300)]
CRM-15683 Tim's proposed changes
Eileen McNaughton [Mon, 8 Dec 2014 23:59:13 +0000 (12:59 +1300)]
remove handling for legacy status bounce as not found anywhere in code
Eileen McNaughton [Sun, 7 Dec 2014 22:20:33 +0000 (11:20 +1300)]
CRM-15678 hookable invalid page handling
Conflicts:
CRM/Contribute/Form/ContributionBase.php
Monish Deb [Thu, 1 Jan 2015 17:53:20 +0000 (23:23 +0530)]
Merge pull request #4815 from rohankatkar/Webtests
Webtests Fixes
colemanw [Thu, 1 Jan 2015 15:44:44 +0000 (10:44 -0500)]
Merge pull request #4812 from colemanw/CRM-15495
CRM-15495 - Improve entityRef contact_type filter
Rohan Katkar [Thu, 1 Jan 2015 13:27:30 +0000 (18:57 +0530)]
Webtests Fixes
Monish Deb [Thu, 1 Jan 2015 12:43:51 +0000 (18:13 +0530)]
Merge pull request #4813 from rohankatkar/CRM_15764
CRM- 15764
Chris Burgess [Mon, 29 Dec 2014 20:44:18 +0000 (09:44 +1300)]
CRM-15764. Remove bogus opendir() call.
opendir($cmsIncludePath) appears to have been used as is_dir(), not required since we check file_exists("$cmsIncludePath/file.xxx") and that indicates that the directory exists.
Chris Burgess [Sun, 28 Dec 2014 18:33:42 +0000 (07:33 +1300)]
Merge fix - CRM-15764
Coleman Watts [Thu, 1 Jan 2015 03:54:43 +0000 (22:54 -0500)]
Improve api.getoptions to return nested groups/tags
Coleman Watts [Wed, 31 Dec 2014 21:45:33 +0000 (16:45 -0500)]
CRM-15495 - Improve entityRef contact_type filter
Tim Otten [Wed, 31 Dec 2014 17:53:14 +0000 (09:53 -0800)]
Merge pull request #4809 from totten/master-cs2
Cleanup visibility, final newlines, and CONST
Yashodha Chaku [Wed, 31 Dec 2014 13:19:12 +0000 (18:49 +0530)]
Merge pull request #4804 from atif-shaikh/CRM-15767
CRM-15767 - Back Office "Submit Credit Card Contribution" are not being ...
Kurund Jalmi [Wed, 31 Dec 2014 04:56:31 +0000 (10:26 +0530)]
Merge pull request #4780 from williamtheaker/patch-1
Themed wizard-bar
Tim Otten [Wed, 31 Dec 2014 01:23:33 +0000 (17:23 -0800)]
phpcs - Fix error, "Expected 1 newline at end of file; XXX found".
Tim Otten [Wed, 31 Dec 2014 01:00:26 +0000 (17:00 -0800)]
Style - Remove @access
1. These annotations are useful in PHP4-style code.
2. These annotations are useless in PHP5-style code. Either they're redundant with the code, or they contradict the code.
3. In cases where there are contradictions, I don't think there's anyway for us to generally resolve the contradiction except to say, "The code is right."
4. As a developer reading .php files, I look at the code and *never* look at @access.
Tim Otten [Tue, 30 Dec 2014 22:15:56 +0000 (14:15 -0800)]
Style - Remove @public, @private, @protected
1. These annotations are not valid in phpdoc. The actual annotation is "@access (public|private|protected)".
2. These annotations are useful in PHP4-style code.
3. These annotations are useless in PHP5-style code. Either they're redundant with the code, or they contradict the code.
Tim Otten [Tue, 30 Dec 2014 22:06:54 +0000 (14:06 -0800)]
phpcs - Fix error, "Visibility must be declared on method"
Tim Otten [Tue, 30 Dec 2014 21:27:36 +0000 (13:27 -0800)]
phpcs - Fix error, "CONST keyword must be lowercase; expected const but found CONST"
colemanw [Tue, 30 Dec 2014 20:40:42 +0000 (15:40 -0500)]
Merge pull request #4808 from colemanw/CRM-15759
CRM-15759 - Improve UX of crmEditable
Coleman Watts [Tue, 30 Dec 2014 20:38:05 +0000 (15:38 -0500)]
CRM-15759 - Improve UX of crmEditable
Kurund Jalmi [Tue, 30 Dec 2014 17:12:45 +0000 (22:42 +0530)]
Merge pull request #4802 from jitendrapurohit/webtest4.6
webtest fixes 4.6
Kurund Jalmi [Tue, 30 Dec 2014 17:12:03 +0000 (22:42 +0530)]
Merge pull request #4803 from rohankatkar/Webtests
Webtests Fix
colemanw [Tue, 30 Dec 2014 15:52:03 +0000 (10:52 -0500)]
Merge pull request #4806 from civicrm/4.5
Merge branch 4.5 into master
colemanw [Tue, 30 Dec 2014 15:42:54 +0000 (10:42 -0500)]
Merge pull request #4805 from colemanw/CRM-15766
CRM-15766 - Fix settings form wrongly adding everything to config
Coleman Watts [Tue, 30 Dec 2014 15:12:36 +0000 (10:12 -0500)]
CRM-15766 - Fix settings form wrongly adding everything to config
atif-shaikh [Tue, 30 Dec 2014 14:46:59 +0000 (20:16 +0530)]
CRM-15767 - Back Office "Submit Credit Card Contribution" are not being saved.
https://issues.civicrm.org/jira/browse/CRM-15767
Rohan Katkar [Tue, 30 Dec 2014 13:31:14 +0000 (19:01 +0530)]
Webtests Fix
jitendrapurohit [Tue, 30 Dec 2014 13:29:13 +0000 (18:59 +0530)]
webtest fixes 4.6
Monish Deb [Tue, 30 Dec 2014 12:35:52 +0000 (18:05 +0530)]
Merge pull request #4790 from mattrenner/CRM-15763
CRM-15763 - Payment Express has deprecated SSLv3
Yashodha Chaku [Tue, 30 Dec 2014 07:56:23 +0000 (13:26 +0530)]
Merge pull request #4800 from jitendrapurohit/CRM-15765upgradechanges
upgrade changes for CRM-15765
Monish Deb [Tue, 30 Dec 2014 07:11:53 +0000 (12:41 +0530)]
Merge pull request #4801 from rohankatkar/Webtests
Webtests fix for Reports
jitendrapurohit [Tue, 30 Dec 2014 06:55:52 +0000 (12:25 +0530)]
upgrade changes for CRM-15765
Rohan Katkar [Tue, 30 Dec 2014 06:55:42 +0000 (12:25 +0530)]
Webtests fix for Reports
Yashodha Chaku [Tue, 30 Dec 2014 06:27:28 +0000 (11:57 +0530)]
Merge pull request #4794 from civicrm/CRM-15740
CRM-15740 : increase size for url
Yashodha Chaku [Tue, 30 Dec 2014 05:33:29 +0000 (11:03 +0530)]
Merge pull request #4793 from jsnyder83/master
Added missing Indonesian provinces and revised outdated names
Yashodha Chaku [Tue, 30 Dec 2014 02:24:39 +0000 (07:54 +0530)]
Merge pull request #4796 from jitendrapurohit/webtest4.6
webtest fixes 4.6
colemanw [Tue, 30 Dec 2014 01:57:01 +0000 (20:57 -0500)]
Merge pull request #4758 from colemanw/CRM-13672
CRM-13672 - Add alerts for security releases
Coleman Watts [Wed, 24 Dec 2014 01:00:46 +0000 (20:00 -0500)]
CRM-13672 - Add unit test coverage for CRM_Utils_VersionCheck
Coleman Watts [Tue, 23 Dec 2014 00:48:34 +0000 (19:48 -0500)]
CRM-13672 - Run regen to add new settings to schema
Coleman Watts [Sat, 20 Dec 2014 19:47:04 +0000 (14:47 -0500)]
CRM-13672 - Add option to suppress current update alerts
Coleman Watts [Sat, 20 Dec 2014 02:54:28 +0000 (21:54 -0500)]
CRM-13672 - Add alerts for security releases
Support the new json output from latest.civicrm.org and display security alerts.
Also adds finer-grained control over how version alerts are displayed.
Coleman Watts [Fri, 19 Dec 2014 19:17:11 +0000 (14:17 -0500)]
Code/comment cleanup
kurund [Mon, 29 Dec 2014 19:13:42 +0000 (00:43 +0530)]
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-12-30-00-43-32
Tim Otten [Mon, 29 Dec 2014 16:43:02 +0000 (10:43 -0600)]
Merge pull request #4789 from totten/master-test-tx
tests/phpunit/api/v3 - Call useTransaction() where easy. Remove pointless get_info()/construct().
Tim Otten [Mon, 29 Dec 2014 16:41:22 +0000 (10:41 -0600)]
Merge pull request #4797 from totten/master-cs
Code style
Tim Otten [Mon, 29 Dec 2014 15:24:15 +0000 (07:24 -0800)]
Civi/API - Code style
Tim Otten [Mon, 29 Dec 2014 02:49:16 +0000 (18:49 -0800)]
CRM/Extension - Code style
jsnyder83 [Mon, 29 Dec 2014 13:54:41 +0000 (20:54 +0700)]
deleted duplicate lines from failed sync issue
jsnyder83 [Mon, 29 Dec 2014 13:31:03 +0000 (20:31 +0700)]
Merge remote-tracking branch 'origin/master'
Conflicts:
xml/templates/civicrm_state_province.tpl
jsnyder83 [Mon, 29 Dec 2014 13:28:18 +0000 (20:28 +0700)]
fixed syntax error on line 3918, (missing comma)
jitendrapurohit [Mon, 29 Dec 2014 13:27:42 +0000 (18:57 +0530)]
webtest fixes 4.6
yashodha [Mon, 29 Dec 2014 12:52:43 +0000 (18:22 +0530)]
CRM-15740 : increase size for url
----------------------------------------
* CRM-15740: Really long URLs cause SQL issue in a trackable mass mail
https://issues.civicrm.org/jira/browse/CRM-15740
jsnyder83 [Mon, 29 Dec 2014 11:36:24 +0000 (18:36 +0700)]
Update civicrm_state_province.tpl
correcting Indonesian province abbreviations, adding Kalimantan Utara
jsnyder83 [Mon, 29 Dec 2014 11:30:55 +0000 (18:30 +0700)]
Updating Indonesian Provinces - added Kalimantan Utara, updated abbreviations for a few incorrect entries
Monish Deb [Mon, 29 Dec 2014 10:42:59 +0000 (16:12 +0530)]
Merge pull request #4785 from jitendrapurohit/CRM-15735
CRM-15735 Update payment status for pay-later membership renewal ignores...
Monish Deb [Mon, 29 Dec 2014 10:41:47 +0000 (16:11 +0530)]
Merge pull request #4726 from atif-shaikh/CRM-5039
CRM-5039 - Events don't always limit registrations to "max participants"...
jsnyder83 [Mon, 29 Dec 2014 06:55:55 +0000 (13:55 +0700)]
Added missing Indonesian provinces and revised outdated names
Yashodha Chaku [Mon, 29 Dec 2014 06:36:21 +0000 (12:06 +0530)]
Merge pull request #4779 from pradpnayak/CRM-15758
--CRM-15758, added code to invoke pre and post hook
Tim Otten [Mon, 29 Dec 2014 02:25:09 +0000 (18:25 -0800)]
CRM/Queue - Code style
kurund [Sun, 28 Dec 2014 13:17:05 +0000 (18:47 +0530)]
CRM-15705, layout fixes
----------------------------------------
* CRM-15705: Improve visual appearance of new CiviMail
https://issues.civicrm.org/jira/browse/CRM-15705
kurund [Sun, 28 Dec 2014 13:16:00 +0000 (18:46 +0530)]
CRM-15705, layout fixes
----------------------------------------
* CRM-15705: Improve visual appearance of new CiviMail
https://issues.civicrm.org/jira/browse/CRM-15705
kurund [Sun, 28 Dec 2014 13:05:32 +0000 (18:35 +0530)]
CRM-15705, label sizes are now consistent
----------------------------------------
* CRM-15705: Improve visual appearance of new CiviMail
https://issues.civicrm.org/jira/browse/CRM-15705
Matt Renner [Sun, 28 Dec 2014 08:09:07 +0000 (21:09 +1300)]
CRM-15763 - Payment Express has deprecated SSLv3
Payment Express (DPS) no longer supports SSLv3 (3), so suggest this is adjusted to default (0) which will allow curl to auto-negotiate to use a compatible version of TLS
Kurund Jalmi [Sat, 27 Dec 2014 18:04:33 +0000 (23:34 +0530)]
Merge pull request #4788 from kurund/generated-data
fixed generated data
kurund [Sat, 27 Dec 2014 13:54:54 +0000 (19:24 +0530)]
fixed generated data
Kurund Jalmi [Fri, 26 Dec 2014 14:50:02 +0000 (20:20 +0530)]
Merge pull request #4787 from rohankatkar/Webtests
Webtest fix
Yashodha Chaku [Fri, 26 Dec 2014 14:33:16 +0000 (20:03 +0530)]
Merge pull request #4786 from rohankatkar/CRM_15757
CRM-15757 Notices fix
Rohan Katkar [Fri, 26 Dec 2014 13:35:00 +0000 (19:05 +0530)]
Webtest fix
Rohan Katkar [Fri, 26 Dec 2014 13:03:17 +0000 (18:33 +0530)]
CRM-15757 Notices fix
jitendrapurohit [Fri, 26 Dec 2014 11:37:55 +0000 (17:07 +0530)]
CRM-15735 Update payment status for pay-later membership renewal ignores Received date
Yashodha Chaku [Fri, 26 Dec 2014 10:58:24 +0000 (16:28 +0530)]
Merge pull request #4783 from pradpnayak/CRM-15760
-- changed size to 255 from 64 for civicrm_action_schedule.entity_value,...
Monish Deb [Fri, 26 Dec 2014 07:13:13 +0000 (12:43 +0530)]
Merge pull request #4784 from atif-shaikh/CRM-15718
CRM-15718 - Bulk sms: Check for do not send sms instead of is opt out
projects / civicrm-core.git / log