colemanw [Mon, 9 Feb 2015 16:18:25 +0000 (11:18 -0500)]
Merge pull request #5119 from colemanw/CRM-15789
CRM-15789 - Button cleanup
Coleman Watts [Mon, 9 Feb 2015 15:24:52 +0000 (10:24 -0500)]
CheckStyle cleanup
Tim Otten [Mon, 9 Feb 2015 14:19:31 +0000 (06:19 -0800)]
Merge pull request #5118 from totten/master-mgdent-test
CRM_Core_ManagedEntitiesTest - Fix compat w/drupal-demo. Use transactions.
Yashodha Chaku [Mon, 9 Feb 2015 13:04:05 +0000 (18:34 +0530)]
Merge pull request #5126 from yashodha/CRM-15940
CRM-15940: fix error message for missing report template
yashodha [Mon, 9 Feb 2015 11:35:14 +0000 (17:05 +0530)]
CRM-15940: fix error message for missing report template
----------------------------------------
* CRM-15940: Report gives white screen rather than sensible error if report instance is invalid
https://issues.civicrm.org/jira/browse/CRM-15940
Kurund Jalmi [Mon, 9 Feb 2015 07:39:54 +0000 (13:09 +0530)]
Merge pull request #5120 from eileenmcnaughton/CRM-15938
CRM-15938 e-notice fix
kurund [Mon, 9 Feb 2015 06:30:00 +0000 (12:00 +0530)]
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-02-09-11-44-07
Conflicts:
CRM/Contribute/BAO/ContributionPage.php
Eileen McNaughton [Sun, 8 Feb 2015 23:34:29 +0000 (12:34 +1300)]
CRM-15938 e-notice fix
Eileen McNaughton [Sun, 8 Feb 2015 23:31:13 +0000 (12:31 +1300)]
preliminary tidy up of report instance class & other uncommitted tidyups
Eileen McNaughton [Sun, 8 Feb 2015 23:30:13 +0000 (12:30 +1300)]
CRM-15938 preliminary tidy up
Coleman Watts [Sun, 8 Feb 2015 23:10:16 +0000 (18:10 -0500)]
CRM-15789 - Improve disabled button handling
----------------------------------------
* CRM-15789: Add icons to submit buttons
https://issues.civicrm.org/jira/browse/CRM-15789
Tim Otten [Sun, 8 Feb 2015 22:50:13 +0000 (14:50 -0800)]
CRM_Core_ManagedEntitiesTest - Fix compat w/drupal-demo. Use transactions.
Tim Otten [Sun, 8 Feb 2015 22:34:27 +0000 (14:34 -0800)]
Merge pull request #5117 from totten/master-crm-alltests
Fix fatal errors which break CRM_AllTests.
Tim Otten [Sun, 8 Feb 2015 22:29:40 +0000 (14:29 -0800)]
Merge pull request #5046 from totten/master-resolver
CRM-15578 - Add Civi\Core\Resolver. Fix loading of Angular content after updating components.
Tim Otten [Sun, 8 Feb 2015 22:27:06 +0000 (14:27 -0800)]
Fix fatal errors which break CRM_AllTests.
Coleman Watts [Sun, 8 Feb 2015 17:01:48 +0000 (12:01 -0500)]
CRM-15789 - Button cleanup
----------------------------------------
* CRM-15789: Add icons to submit buttons
https://issues.civicrm.org/jira/browse/CRM-15789
colemanw [Sat, 7 Feb 2015 23:47:04 +0000 (18:47 -0500)]
Merge pull request #5113 from colemanw/Fix
Fix crmEditable conversion of plain text to html and vice-versa
Coleman Watts [Sat, 7 Feb 2015 23:08:19 +0000 (18:08 -0500)]
jquery.crmeditable.js - fix jshint warnings
Coleman Watts [Sat, 7 Feb 2015 22:49:39 +0000 (17:49 -0500)]
Fix crmEditable conversion of plain text to html and vice-versa
Monish Deb [Sat, 7 Feb 2015 14:10:28 +0000 (19:40 +0530)]
Merge pull request #5107 from rohankatkar/4.6_webtest
Fix for Dates selection from datepicker in webtests
colemanw [Fri, 6 Feb 2015 21:46:01 +0000 (16:46 -0500)]
Merge pull request #5109 from colemanw/buttons
Button style fix
Coleman Watts [Fri, 6 Feb 2015 20:37:28 +0000 (15:37 -0500)]
Cleanup unused/seldom-used css selectors
Coleman Watts [Fri, 6 Feb 2015 15:43:07 +0000 (10:43 -0500)]
Button style fix
Tim Otten [Fri, 6 Feb 2015 18:20:17 +0000 (10:20 -0800)]
Merge pull request #5108 from colemanw/attachmentTest
Move testCustomFileField out of transactional class
Coleman Watts [Fri, 6 Feb 2015 15:07:36 +0000 (10:07 -0500)]
Move testCustomFileField out of transactional class
Tim Otten [Fri, 6 Feb 2015 12:55:24 +0000 (04:55 -0800)]
Merge pull request #5096 from totten/master-prettify-desert
CRM_Admin_Page_APIExplorer - Change syntax highlighting theme. Add offline support.
colemanw [Fri, 6 Feb 2015 12:53:54 +0000 (07:53 -0500)]
Merge pull request #5100 from colemanw/explorer
Api docblock cleanup.
Web Access [Fri, 6 Feb 2015 12:20:01 +0000 (17:50 +0530)]
Webtest fix
Yashodha Chaku [Fri, 6 Feb 2015 12:03:52 +0000 (17:33 +0530)]
Merge pull request #5102 from monishdeb/CRM-15900
CRM-15900 typo fix
Yashodha Chaku [Fri, 6 Feb 2015 11:05:25 +0000 (16:35 +0530)]
Merge pull request #5103 from civicrm/CRM-15912
CRM-15912: fix doc for Report settings
yashodha [Fri, 6 Feb 2015 07:34:28 +0000 (13:04 +0530)]
CRM-15912: fix doc for Report settings
----------------------------------------
* CRM-15912: Documentation is incorrect regarding emails in report settings
https://issues.civicrm.org/jira/browse/CRM-15912
monishdeb [Fri, 6 Feb 2015 07:31:26 +0000 (13:01 +0530)]
CRM-15900 typo fix
----------------------------------------
* CRM-15900: Upgrade problem [Unknown column 'e.contact_id' in 'on clause']
https://issues.civicrm.org/jira/browse/CRM-15900
Coleman Watts [Fri, 6 Feb 2015 02:20:09 +0000 (21:20 -0500)]
Remove unused API
Coleman Watts [Fri, 6 Feb 2015 02:19:24 +0000 (21:19 -0500)]
Api docblock cleanup.
Coleman Watts [Thu, 5 Feb 2015 22:32:31 +0000 (17:32 -0500)]
API explorer code parsing fix
Coleman Watts [Thu, 5 Feb 2015 22:31:51 +0000 (17:31 -0500)]
Fix api explorer menu entry
Tim Otten [Thu, 5 Feb 2015 22:14:10 +0000 (14:14 -0800)]
Merge pull request #5049 from totten/master-mailing-multiling
CRM-15880 - crmMailing - Properly display recipients on multi-lingual sites.
Tim Otten [Thu, 5 Feb 2015 21:51:59 +0000 (13:51 -0800)]
CRM_Admin_Page_APIExplorer - Change syntax highlighting theme. Add offline support.
The default theme has a very strong pair of alternating background colors which feels
distracting.
colemanw [Thu, 5 Feb 2015 19:12:09 +0000 (14:12 -0500)]
Merge pull request #5090 from colemanw/explorer
Add Examples to api explorer
Coleman Watts [Thu, 5 Feb 2015 19:09:30 +0000 (14:09 -0500)]
Cleanup api3 docblocks
Coleman Watts [Thu, 5 Feb 2015 18:06:16 +0000 (13:06 -0500)]
Add filename to api code doc
Monish Deb [Thu, 5 Feb 2015 17:42:48 +0000 (23:12 +0530)]
Merge pull request #5089 from monishdeb/CRM-15852
Crm 15852
Coleman Watts [Thu, 5 Feb 2015 15:49:55 +0000 (10:49 -0500)]
Expose code & docblocks to the api explorer
Kurund Jalmi [Thu, 5 Feb 2015 16:07:56 +0000 (21:37 +0530)]
Merge pull request #5039 from pratikshad/CRM-15470
Fixed issue of deadlock CRM-15470
Monish Deb [Thu, 5 Feb 2015 13:33:12 +0000 (19:03 +0530)]
Merge pull request #5094 from rohankatkar/CRM--15850
Fix for CRM-15850
Web Access [Thu, 5 Feb 2015 09:57:40 +0000 (15:27 +0530)]
Fix for CRM-15850
Yashodha Chaku [Thu, 5 Feb 2015 04:04:45 +0000 (09:34 +0530)]
Merge pull request #5061 from civicrm/CRM-15895
CRM-15895: fix copy contribution page which links PCP to original contri...
Dave Greenberg [Thu, 5 Feb 2015 00:06:37 +0000 (16:06 -0800)]
Merge pull request #5092 from davecivicrm/CRM-15750_backport
CRM-15750 - backporting fix to 4.5
Dave Greenberg [Wed, 4 Feb 2015 23:57:46 +0000 (15:57 -0800)]
Merge pull request #5064 from monishdeb/CRM-15728
CRM-15728, query improvement
Dave Greenberg [Wed, 4 Feb 2015 22:57:19 +0000 (14:57 -0800)]
CRM-15750 - backporting fix to 4.5
----------------------------------------
* CRM-15750: advanced search using relationship and smart group produces backtrace
https://issues.civicrm.org/jira/browse/CRM-15750
Dave Greenberg [Wed, 4 Feb 2015 22:30:50 +0000 (14:30 -0800)]
Merge pull request #5091 from davecivicrm/adixon-CRM-15714
CRM-15714 validateCreditCard function makes too many assumptions
Coleman Watts [Wed, 4 Feb 2015 21:51:56 +0000 (16:51 -0500)]
Simplify path to api explorer
Coleman Watts [Wed, 4 Feb 2015 21:15:43 +0000 (16:15 -0500)]
Remove boilerplate from the top of api example files
The @file comment added no information and was detrimental to readability
of examples in the api explorer.
Coleman Watts [Wed, 4 Feb 2015 21:08:30 +0000 (16:08 -0500)]
Remove old ApiDoc page
Coleman Watts [Wed, 4 Feb 2015 20:14:55 +0000 (15:14 -0500)]
Add Examples to api explorer
Dave Greenberg [Wed, 4 Feb 2015 20:38:51 +0000 (12:38 -0800)]
Merge branch 'CRM-15714' of https://github.com/adixon/civicrm-core into adixon-CRM-15714
Conflicts:
CRM/Core/Payment.php
----------------------------------------
* CRM-15714: validateCreditCard function makes too many assumptions
https://issues.civicrm.org/jira/browse/CRM-15714
monishdeb [Mon, 2 Feb 2015 12:43:07 +0000 (18:13 +0530)]
CRM-15728, query improvement
----------------------------------------
* CRM-15728: Improve Scheduled Reminders for membership renewals
https://issues.civicrm.org/jira/browse/CRM-15728
colemanw [Wed, 4 Feb 2015 20:09:06 +0000 (15:09 -0500)]
Merge pull request #5079 from colemanw/getfields
getfields api - ensure 'name' property is set for every field
Dave Greenberg [Wed, 4 Feb 2015 20:05:00 +0000 (12:05 -0800)]
Merge pull request #5081 from NileemaJadhav/CRM-15821-work
CRM-15821 - Provide option to notify Personal Campaign Page "Owner" when...
Dave Greenberg [Wed, 4 Feb 2015 19:56:17 +0000 (11:56 -0800)]
Merge pull request #5086 from deepak-srivastava/CRM-15490
CRM-15490 repetition_start_date_display not being set due to change in dat...
Monish Deb [Wed, 4 Feb 2015 14:17:49 +0000 (19:47 +0530)]
Merge pull request #5035 from TeNNoX/master
Fixed weird while-each-loop.
monishdeb [Wed, 4 Feb 2015 13:31:57 +0000 (19:01 +0530)]
CRM-14114 fix in addition
----------------------------------------
* CRM-14114: Online recurring contribution page does not translate recurring unit
https://issues.civicrm.org/jira/browse/CRM-14114
CiviCRM [Wed, 4 Feb 2015 13:24:49 +0000 (05:24 -0800)]
Update version to 4.6.alpha6
Niko Bochan [Thu, 15 Jan 2015 15:00:09 +0000 (16:00 +0100)]
do not translate frequency_unit
Conflicts:
CRM/Contribute/Form/ContributionBase.php
deepak-srivastava [Wed, 4 Feb 2015 12:03:25 +0000 (12:03 +0000)]
fix for repetition_start_date_display not being set due to change in date widget input id pattern > parent and child activity with same dates
NileemaJadhav [Wed, 4 Feb 2015 07:09:58 +0000 (12:39 +0530)]
CRM-15821 - Provide option to notify Personal Campaign Page "Owner" when someone donates via their page
https://issues.civicrm.org/jira/browse/CRM-15821
Eileen McNaughton [Wed, 4 Feb 2015 06:38:27 +0000 (19:38 +1300)]
Merge pull request #5080 from eileenmcnaughton/comment-full-stops
Comment full stops
Eileen McNaughton [Wed, 4 Feb 2015 05:02:22 +0000 (18:02 +1300)]
INFRA-132 comments to end with full stops
Coleman Watts [Wed, 4 Feb 2015 02:42:47 +0000 (21:42 -0500)]
getfields api - ensure 'name' property is set for every field
colemanw [Wed, 4 Feb 2015 02:23:19 +0000 (21:23 -0500)]
Merge pull request #5076 from colemanw/Attachment
Attachment api - add custom field handling
Eileen McNaughton [Wed, 4 Feb 2015 02:08:09 +0000 (15:08 +1300)]
Merge pull request #5078 from eileenmcnaughton/comment-full-stops
INFRA-132 drupal standard has a full stop after short-description
Eileen McNaughton [Wed, 4 Feb 2015 01:08:48 +0000 (14:08 +1300)]
INFRA-132 add full stops
Eileen McNaughton [Wed, 4 Feb 2015 01:02:15 +0000 (14:02 +1300)]
INFRA-132 add full stops
Eileen McNaughton [Wed, 4 Feb 2015 00:58:49 +0000 (13:58 +1300)]
additional formatting fixes picked up by CI
Dave Greenberg [Wed, 4 Feb 2015 00:40:04 +0000 (16:40 -0800)]
Merge pull request #5050 from agh1/orderby-fields-mismatch
CRM-15899 - Reports: "order by" can contain mismatched table aliases
Eileen McNaughton [Wed, 4 Feb 2015 00:39:30 +0000 (13:39 +1300)]
INFRA-132 add full stops
Eileen McNaughton [Wed, 4 Feb 2015 00:08:49 +0000 (13:08 +1300)]
INFRA-132 add full-stops after comments
Eileen McNaughton [Wed, 4 Feb 2015 00:02:05 +0000 (13:02 +1300)]
INFRA-132 add full stop after comments
Eileen McNaughton [Tue, 3 Feb 2015 23:22:38 +0000 (12:22 +1300)]
Merge pull request #5077 from eileenmcnaughton/comment-full-stops
INFRA-132 Function comment short description must end with a full stop
Eileen McNaughton [Tue, 3 Feb 2015 22:22:47 +0000 (11:22 +1300)]
INFRA-132 Function comment short description must end with a full stop
regex (\*\*\n \* [A-Za-z ]*)\n replace with .\n
Eileen McNaughton [Tue, 3 Feb 2015 22:17:48 +0000 (11:17 +1300)]
minor tidy-ups
Coleman Watts [Tue, 3 Feb 2015 21:27:36 +0000 (16:27 -0500)]
Attachment api - add custom field handling
TeNNoX [Tue, 3 Feb 2015 21:09:47 +0000 (22:09 +0100)]
you gotta do it right :P
Eileen McNaughton [Tue, 3 Feb 2015 20:49:33 +0000 (09:49 +1300)]
Merge pull request #5073 from monishdeb/CRM-15905
CRM-15905 fix - API: problem sorting contacts on ID
Dave Greenberg [Tue, 3 Feb 2015 19:35:46 +0000 (11:35 -0800)]
Merge pull request #5066 from deepak-srivastava/CRM-15490
CRM-15490 Support recurring for separate activities
Tim Otten [Tue, 3 Feb 2015 19:00:32 +0000 (11:00 -0800)]
Merge pull request #5075 from totten/master-lodash-karma
CRM-15890 - Fix reference to lodash
Dave Greenberg [Tue, 3 Feb 2015 18:36:21 +0000 (10:36 -0800)]
Merge pull request #5072 from xurizaemon/CRM-15910
CRM-15910. Increase field length of external_identifier to 64 bytes.
Tim Otten [Tue, 3 Feb 2015 16:58:39 +0000 (08:58 -0800)]
CRM-15890 - Fix reference to lodash
Coleman Watts [Tue, 3 Feb 2015 16:38:03 +0000 (11:38 -0500)]
Improve option-group help text to be more concise
Alan Dixon [Tue, 3 Feb 2015 15:15:39 +0000 (10:15 -0500)]
Added missing space
Coleman Watts [Tue, 3 Feb 2015 13:50:35 +0000 (08:50 -0500)]
Merge branch 4.5 into master
Conflicts:
CRM/Core/BAO/CustomValueTable.php
colemanw [Tue, 3 Feb 2015 13:44:06 +0000 (08:44 -0500)]
Merge pull request #5071 from colemanw/CRM-15906
CRM-15906 - Fix js error on pledge payment form
monishdeb [Tue, 3 Feb 2015 10:15:29 +0000 (15:45 +0530)]
CRM-15905 fix - API: problem sorting contacts on ID
https://issues.civicrm.org/jira/browse/CRM-15905
Chris Burgess [Tue, 3 Feb 2015 07:18:36 +0000 (20:18 +1300)]
CRM-15910. Increase field length of external_identifier to 64 bytes.
Eileen McNaughton [Tue, 3 Feb 2015 06:40:20 +0000 (19:40 +1300)]
a few phpcs fixups
Dave Greenberg [Tue, 3 Feb 2015 03:16:26 +0000 (19:16 -0800)]
Merge pull request #5068 from colemanw/CRM-13624
CRM-13624 - Fix api regression - format link in display layer instead of data layer
Eileen McNaughton [Tue, 3 Feb 2015 02:26:56 +0000 (15:26 +1300)]
Merge pull request #5060 from eileenmcnaughton/api-comment-fixes
Api comment fixes
Eileen McNaughton [Tue, 3 Feb 2015 00:59:39 +0000 (13:59 +1300)]
more comment fixes
Eileen McNaughton [Mon, 2 Feb 2015 23:11:51 +0000 (12:11 +1300)]
More comment fixes
Eileen McNaughton [Mon, 2 Feb 2015 19:24:21 +0000 (08:24 +1300)]
Further comment fixes
projects / civicrm-core.git / log