Eileen McNaughton [Mon, 19 May 2014 03:16:25 +0000 (15:16 +1200)]
Merge pull request #3284 from eileenmcnaughton/comments
some comment block fixes
Eileen McNaughton [Mon, 19 May 2014 02:56:50 +0000 (14:56 +1200)]
some comment block fixes
Dave Greenberg [Sat, 17 May 2014 01:02:23 +0000 (18:02 -0700)]
Merge pull request #3283 from davecivicrm/CRM-14700a
CRM-14700 - revert to addSelect() now that MembershipType.xml has valid ...
Dave Greenberg [Sat, 17 May 2014 01:01:47 +0000 (18:01 -0700)]
CRM-14700 - revert to addSelect() now that MembershipType.xml has valid ref to get the options.
----------------------------------------
* CRM-14700:
https://issues.civicrm.org/jira/browse/CRM-14700
Kurund Jalmi [Fri, 16 May 2014 22:04:48 +0000 (15:04 -0700)]
Merge pull request #2876 from mepps/participant-image-event-badge
Allows users to display a contact's profile picture on their name badge
Tim Otten [Fri, 16 May 2014 21:48:35 +0000 (14:48 -0700)]
Merge pull request #3248 from eileenmcnaughton/CRM-14684
CRM-14684 refactor function that identifies is a site supports back-offi...
Kurund Jalmi [Fri, 16 May 2014 21:43:38 +0000 (14:43 -0700)]
Merge pull request #3268 from eileenmcnaughton/CRM-14626
CRM-14626 fix event acl so that view event info & register for events ar...
Kurund Jalmi [Fri, 16 May 2014 20:48:18 +0000 (13:48 -0700)]
Merge pull request #3274 from jitendrapurohit/Webtest_4.5Fix
Web Test Fix 4.5alpha1
Kurund Jalmi [Fri, 16 May 2014 20:23:44 +0000 (13:23 -0700)]
Merge pull request #3282 from colemanw/memberVisibility
MembershipType schema fix
Coleman Watts [Fri, 16 May 2014 20:15:50 +0000 (16:15 -0400)]
MembershipType schema fix
Dave Greenberg [Fri, 16 May 2014 16:41:58 +0000 (09:41 -0700)]
Merge pull request #3281 from monishdeb/CRM-14669
CRM-14669 fix - Amount entered into Text/Numeric Quantity not included correctly
monishdeb [Fri, 16 May 2014 15:54:10 +0000 (21:24 +0530)]
CRM-14669 fix - Amount entered into Text/Numeric Quantity not included correctly
https://issues.civicrm.org/jira/browse/CRM-14669
Dave Greenberg [Thu, 15 May 2014 23:59:12 +0000 (16:59 -0700)]
Merge pull request #3269 from monishdeb/CRM-13981
CRM-13981 Upgrade fix
Dave Greenberg [Thu, 15 May 2014 23:12:52 +0000 (16:12 -0700)]
Merge pull request #3276 from davecivicrm/CRM-14700
CRM-14700 - revert to add() mechanism for Membership Type visibility.
Dave Greenberg [Thu, 15 May 2014 23:12:01 +0000 (16:12 -0700)]
CRM-14700 - revert to add() mechanism for Membership Type visibility.
----------------------------------------
* CRM-14700:
https://issues.civicrm.org/jira/browse/CRM-14700
Dave Greenberg [Thu, 15 May 2014 21:49:59 +0000 (14:49 -0700)]
Merge pull request #3273 from joannechester/master
CRM-14508 update URL for permissions documentation in book
Dave Greenberg [Thu, 15 May 2014 17:20:40 +0000 (10:20 -0700)]
Merge pull request #3275 from monishdeb/CRM-14675
CRM-14675 fix - Strict warning: Non-static method CRM_Event_BAO_Event::g...
Dave Greenberg [Thu, 15 May 2014 16:30:41 +0000 (09:30 -0700)]
Merge pull request #3272 from monishdeb/CRM-14625
CRM-14625 fix - missing asset: soft_credit_type.png
monishdeb [Thu, 15 May 2014 15:58:47 +0000 (21:28 +0530)]
CRM-14675 fix - Strict warning: Non-static method CRM_Event_BAO_Event::getTemplateDefaultValues() should not be called statically, assuming $this from incompatible context in CRM_Event_Form_ManageEvent_EventInfo->postProcess() (line 309
https://issues.civicrm.org/jira/browse/CRM-14675
jitendrapurohit [Thu, 15 May 2014 13:35:57 +0000 (19:05 +0530)]
Web Test Fix 4.5alpha1
joannechester [Thu, 15 May 2014 02:16:35 +0000 (12:16 +1000)]
new URL for permission doc
joannechester [Thu, 15 May 2014 02:04:32 +0000 (12:04 +1000)]
new url for permissions documentation
joannechester [Thu, 15 May 2014 01:36:49 +0000 (11:36 +1000)]
New URL for permissions and access control docs
monishdeb [Thu, 15 May 2014 10:27:46 +0000 (15:57 +0530)]
CRM-14625 fix - missing asset: soft_credit_type.png
https://issues.civicrm.org/jira/browse/CRM-14625
monishdeb [Thu, 15 May 2014 08:53:00 +0000 (14:23 +0530)]
CRM-13981 Upgrade fix
----------------------------------------
* CRM-13981: Migrate "In Honor of" to Soft Credits
https://issues.civicrm.org/jira/browse/CRM-13981
Eileen McNaughton [Thu, 15 May 2014 05:17:09 +0000 (17:17 +1200)]
CRM-14626 fix event acl so that view event info & register for events are 'all' permissions
Dave Greenberg [Wed, 14 May 2014 20:56:04 +0000 (13:56 -0700)]
Merge pull request #3263 from monishdeb/CRM-14689
CRM-14689 fix - Configure contribution page: On Behalf profile notice an...
Dave Greenberg [Wed, 14 May 2014 20:09:23 +0000 (13:09 -0700)]
Merge pull request #3262 from monishdeb/CRM-13981
CRM-13981, migrate honoree information to uf_join.module_data during upgrade
Kurund Jalmi [Wed, 14 May 2014 19:37:23 +0000 (09:37 -1000)]
Merge pull request #3225 from JSProffitt/jcronfix
CRM-14671: added file require for libraries/cms.php
Kurund Jalmi [Wed, 14 May 2014 19:22:09 +0000 (09:22 -1000)]
Merge pull request #3265 from kurund/CRM-14473
typo fixes
kurund [Wed, 14 May 2014 19:21:30 +0000 (09:21 -1000)]
typo fixes
Dave Greenberg [Wed, 14 May 2014 19:08:42 +0000 (12:08 -0700)]
Merge pull request #3264 from davecivicrm/CRM-14115
CRM-14115 - adding help block to explain the limit count for dashlets.
Dave Greenberg [Wed, 14 May 2014 19:08:07 +0000 (12:08 -0700)]
CRM-14115 - adding help block to explain the limit count for dashlets.
----------------------------------------
* CRM-14115:
https://issues.civicrm.org/jira/browse/CRM-14115
Kurund Jalmi [Wed, 14 May 2014 19:00:36 +0000 (09:00 -1000)]
Merge pull request #3257 from pratik-joshi/views-upgrade-error
views-upgrade-error : helper method to detect upgrade mode. this is used in civicrm.views.inc
Kurund Jalmi [Wed, 14 May 2014 18:51:36 +0000 (08:51 -1000)]
Merge pull request #3254 from jitendrapurohit/Webtest_Core_Bugs
Webtest Core bugs
Kurund Jalmi [Wed, 14 May 2014 18:48:15 +0000 (08:48 -1000)]
Merge pull request #3260 from atif-shaikh/WebTextFix
Web text fix
monishdeb [Wed, 14 May 2014 18:47:47 +0000 (00:17 +0530)]
CRM-14689 minor fix on Event Config
----------------------------------------
* CRM-14689: Configure contribution page: On Behalf profile notice and Edit / Copy buttons are not working
https://issues.civicrm.org/jira/browse/CRM-14689
Dave Greenberg [Wed, 14 May 2014 18:46:40 +0000 (11:46 -0700)]
Merge pull request #3255 from Edzelopez/CRM-14683
CRM-14683 Fixed constraint violation when batch update for grant is perf...
Dave Greenberg [Wed, 14 May 2014 18:31:09 +0000 (11:31 -0700)]
Merge pull request #3236 from GinkgoFJG/CRM-14677
CRM-14677
monishdeb [Wed, 14 May 2014 18:28:05 +0000 (23:58 +0530)]
CRM-14689 fix - Configure contribution page: On Behalf profile notice and Edit / Copy buttons are not working
https://issues.civicrm.org/jira/browse/CRM-14689
monishdeb [Wed, 14 May 2014 17:35:27 +0000 (23:05 +0530)]
CRM-13981, migrate honoree information to uf_join.module_data during upgrade
----------------------------------------
* CRM-13981: Migrate "In Honor of" to Soft Credits
https://issues.civicrm.org/jira/browse/CRM-13981
Dave Greenberg [Wed, 14 May 2014 16:53:14 +0000 (09:53 -0700)]
Update publicFooter.tpl
Indentation fixes.
Dave Greenberg [Wed, 14 May 2014 16:51:38 +0000 (09:51 -0700)]
Merge pull request #3251 from agh1/empowered-by
CRM-14486 - ts and link for empowered by image
atif-shaikh [Wed, 14 May 2014 14:13:32 +0000 (19:43 +0530)]
WebTestFix Further Changes
atif-shaikh [Wed, 14 May 2014 14:08:47 +0000 (19:38 +0530)]
WebTestFix
Pratik Joshi [Wed, 14 May 2014 12:44:12 +0000 (18:14 +0530)]
views-upgrade-error : helper method to detect upgrade mode. this is used in civicrm.views.inc
Eileen McNaughton [Wed, 14 May 2014 11:35:27 +0000 (23:35 +1200)]
Merge pull request #3256 from monishdeb/CRM-13981
CRM-13981 notice fix
monishdeb [Wed, 14 May 2014 11:32:30 +0000 (17:02 +0530)]
CRM-13981 notice fix
----------------------------------------
* CRM-13981: Migrate "In Honor of" to Soft Credits
https://issues.civicrm.org/jira/browse/CRM-13981
Edsel [Wed, 14 May 2014 09:52:10 +0000 (15:22 +0530)]
CRM-14683 Fixed constraint violation when batch update for grant is performed
----------------------------------------
* CRM-14683: Update Grant causes DB Error: constraint violation
https://issues.civicrm.org/jira/browse/CRM-14683
Kurund Jalmi [Wed, 14 May 2014 06:30:40 +0000 (20:30 -1000)]
Merge pull request #3242 from jitendrapurohit/Web_Fix_4.5alpha1
WebFixes 4.5alpha1
Kurund Jalmi [Wed, 14 May 2014 06:29:49 +0000 (20:29 -1000)]
Merge pull request #3244 from atif-shaikh/WebTextFix
WebTestFix
Kurund Jalmi [Wed, 14 May 2014 06:29:05 +0000 (20:29 -1000)]
Merge pull request #3252 from aputtu/patch-3
Minor typo: contraints -> constraints
Kurund Jalmi [Wed, 14 May 2014 06:28:39 +0000 (20:28 -1000)]
Merge pull request #3253 from kurund/CRM-14473
added xml_definition column to store xml file CRM-14473
kurund [Tue, 13 May 2014 07:36:38 +0000 (21:36 -1000)]
added xml_definition column to store xml file CRM-14473
----------------------------------------
* CRM-14473: Migrate case-types from OptionGroup to new table
https://issues.civicrm.org/jira/browse/CRM-14473
Eileen McNaughton [Wed, 14 May 2014 03:59:42 +0000 (15:59 +1200)]
more minor tidy-ups & comment fixes
Eileen McNaughton [Wed, 14 May 2014 02:41:01 +0000 (14:41 +1200)]
more comment fixes & minor tidy ups
Eileen McNaughton [Wed, 14 May 2014 02:32:54 +0000 (14:32 +1200)]
more comment fixes
Eileen McNaughton [Wed, 14 May 2014 02:29:16 +0000 (14:29 +1200)]
comment fix
Eileen McNaughton [Wed, 14 May 2014 02:27:09 +0000 (14:27 +1200)]
minor code cleanups - add comments, remove unused var, declare function as static
aputtu [Wed, 14 May 2014 02:17:24 +0000 (04:17 +0200)]
Minor typo: contraints -> constraints
Occurs in version 4.3 and 4.4.
Andrew Hunt [Wed, 14 May 2014 01:56:44 +0000 (21:56 -0400)]
CRM-14486 switch to display logo as a div with background
----------------------------------------
* CRM-14486: Empowered by CiviCRM - footer added to all public pages (with option to disable)
https://issues.civicrm.org/jira/browse/CRM-14486
Andrew Hunt [Wed, 14 May 2014 00:48:53 +0000 (20:48 -0400)]
CRM-14486 proper tag line
----------------------------------------
* CRM-14486: Empowered by CiviCRM - footer added to all public pages (with option to disable)
https://issues.civicrm.org/jira/browse/CRM-14486
Eileen McNaughton [Wed, 14 May 2014 00:48:33 +0000 (12:48 +1200)]
CRM-14684 add comments
Andrew Hunt [Wed, 14 May 2014 00:46:27 +0000 (20:46 -0400)]
CRM-14486 - ts and link for empowered by image
----------------------------------------
* CRM-14486: Empowered by CiviCRM - footer added to all public pages (with option to disable)
https://issues.civicrm.org/jira/browse/CRM-14486
Dave Greenberg [Wed, 14 May 2014 00:43:36 +0000 (17:43 -0700)]
Merge pull request #3250 from davecivicrm/CRM-14486b
CRM-14486 - Add prefetch TRUE for empoweredBy setting so it is included ...
Dave Greenberg [Wed, 14 May 2014 00:42:58 +0000 (17:42 -0700)]
CRM-14486 - Add prefetch TRUE for empoweredBy setting so it is included in config object.
----------------------------------------
* CRM-14486:
https://issues.civicrm.org/jira/browse/CRM-14486
Eileen McNaughton [Wed, 14 May 2014 00:26:44 +0000 (12:26 +1200)]
CRM-14684 refactor function that identifies is a site supports back-office contributions
& leave form layer part on forms
Dave Greenberg [Tue, 13 May 2014 23:39:30 +0000 (16:39 -0700)]
Merge pull request #3246 from agh1/empowered-by
CRM-14486 add empowered by CiviCRM as public footer
Dave Greenberg [Tue, 13 May 2014 21:22:53 +0000 (14:22 -0700)]
Merge pull request #3247 from davecivicrm/msgTplUpgradeHelp
Msg tpl upgrade help
Dave Greenberg [Tue, 13 May 2014 21:21:43 +0000 (14:21 -0700)]
Add missing end paragraph tag.
Dave Greenberg [Tue, 13 May 2014 21:20:03 +0000 (14:20 -0700)]
Add links in postUpgrade message and inline help pointing to wiki page about how to update system workflow templates after an upgrade.
Andrew Hunt [Wed, 7 May 2014 18:10:24 +0000 (14:10 -0400)]
CRM-14486 add empowered by CiviCRM as public footer
----------------------------------------
* CRM-14486: Empowered by CiviCRM - footer added to all public pages (with option to disable)
https://issues.civicrm.org/jira/browse/CRM-14486
Dave Greenberg [Tue, 13 May 2014 18:43:01 +0000 (11:43 -0700)]
Merge pull request #3238 from monishdeb/CRM-14424
CRM-14424 fix - Wrong parameters for geocoding batch
Dave Greenberg [Tue, 13 May 2014 17:48:48 +0000 (10:48 -0700)]
Merge pull request #3241 from pratik-joshi/upgrade-fix
upgrade-fix : droping foriegn key for pdf_format_id of msg_template table (4.4.5 -> 4.5)
Dave Greenberg [Tue, 13 May 2014 16:27:59 +0000 (09:27 -0700)]
Merge pull request #3245 from davecivicrm/CRM-14682
CRM-14682 - add link to Profile-Listings Mode
Dave Greenberg [Tue, 13 May 2014 16:25:47 +0000 (09:25 -0700)]
CRM-14682 - add link to Profile-Listings Mode
----------------------------------------
* CRM-14682:
https://issues.civicrm.org/jira/browse/CRM-14682
atif-shaikh [Tue, 13 May 2014 14:38:10 +0000 (20:08 +0530)]
WebTestFix
jitendrapurohit [Tue, 13 May 2014 14:07:26 +0000 (19:37 +0530)]
WebFixes 4.5alpha1
jitendrapurohit [Tue, 13 May 2014 14:04:04 +0000 (19:34 +0530)]
Webtest Core bugs
Pratik Joshi [Tue, 13 May 2014 11:33:26 +0000 (17:03 +0530)]
upgrade-fix : droping foriegn key for pdf_format_id of msg_template table
Eileen McNaughton [Tue, 13 May 2014 09:29:34 +0000 (21:29 +1200)]
Merge pull request #3239 from eileenmcnaughton/whitespace-fixes
Whitespace fixes
Eileen McNaughton [Tue, 13 May 2014 09:28:57 +0000 (21:28 +1200)]
finish on a new line to reduce merge clashes
Eileen McNaughton [Tue, 13 May 2014 09:27:03 +0000 (21:27 +1200)]
fix use of tabs (std is two spaces) & trailing whitespaces (std is none)
monishdeb [Tue, 13 May 2014 07:56:19 +0000 (13:26 +0530)]
CRM-14424 fix - Wrong parameters for geocoding batch
https://issues.civicrm.org/jira/browse/CRM-14424
Dave Greenberg [Mon, 12 May 2014 23:55:09 +0000 (16:55 -0700)]
Merge pull request #3231 from monishdeb/CRM-14665
CRM-14665 fix - On Behalf profile field values are not being displayed on Thank-you pages
Dave Greenberg [Mon, 12 May 2014 23:37:38 +0000 (16:37 -0700)]
Merge pull request #3237 from davecivicrm/pr-3234Redo
pr-3234 replacement. Grant status syntax error already fixed.
Dave Greenberg [Mon, 12 May 2014 23:36:12 +0000 (16:36 -0700)]
pr-3234 replacement. Grant status syntax error already fixed.
Frank J. Gómez [Mon, 12 May 2014 23:02:18 +0000 (19:02 -0400)]
Fixed CRM-14677 by removing API result set limit.
----------------------------------------
* CRM-14677: "My billing address is the same as above" can break if profile has 25+ fields
https://issues.civicrm.org/jira/browse/CRM-14677
Frank J. Gómez [Mon, 12 May 2014 22:49:35 +0000 (18:49 -0400)]
Whitespace change for readability.
Dave Greenberg [Mon, 12 May 2014 22:33:29 +0000 (15:33 -0700)]
Merge pull request #3232 from pradpnayak/CRM-14639
Crm 14639
Maggie [Wed, 30 Apr 2014 22:48:30 +0000 (18:48 -0400)]
Reformatted badges, fit text and realigned image.
Dave Greenberg [Mon, 12 May 2014 16:30:02 +0000 (09:30 -0700)]
Merge pull request #3230 from monishdeb/CRM-13981
CRM-13981, missing {ts} tag around accordion header
Pradeep Nayak [Mon, 12 May 2014 10:12:48 +0000 (15:42 +0530)]
-- crm test fix, Aprroved grant status is replaced by Eligible, CRM-14639
----------------------------------------
* CRM-14639: Grant status inconsistent after 4.3 upgrade
https://issues.civicrm.org/jira/browse/CRM-14639
Pradeep Nayak [Mon, 12 May 2014 10:12:03 +0000 (15:42 +0530)]
-- fixed script for multilingual and also syntax error, CRM-14639
----------------------------------------
* CRM-14639: Grant status inconsistent after 4.3 upgrade
https://issues.civicrm.org/jira/browse/CRM-14639
monishdeb [Mon, 12 May 2014 07:34:24 +0000 (13:04 +0530)]
CRM-14665 fix - On Behalf profile field values are not being displayed on Thank-you pages
https://issues.civicrm.org/jira/browse/CRM-14665
monishdeb [Mon, 12 May 2014 07:03:11 +0000 (12:33 +0530)]
CRM-13981, missing {ts} tag around accordion header
----------------------------------------
* CRM-13981: Migrate "In Honor of" to Soft Credits
https://issues.civicrm.org/jira/browse/CRM-13981
Eileen McNaughton [Sun, 11 May 2014 21:58:49 +0000 (09:58 +1200)]
Merge pull request #3229 from eileenmcnaughton/e-notice
enotice fix + missing comment
Eileen McNaughton [Sun, 11 May 2014 21:57:45 +0000 (09:57 +1200)]
enotice fix + missing comment
Dave Greenberg [Sat, 10 May 2014 14:57:39 +0000 (07:57 -0700)]
Merge pull request #3152 from pradpnayak/CRM-14112
Crm 14112
Dave Greenberg [Sat, 10 May 2014 14:54:37 +0000 (07:54 -0700)]
Merge pull request #3227 from davecivicrm/CRM-14666
CRM-14666 - add conditional explanation for recurring contributions.
projects / civicrm-core.git / log