Marco Valente [Wed, 10 Jun 2015 10:05:06 +0000 (11:05 +0100)]
Code updated to fetch record id's using built in civi methods, namely:
- CRM_Core_DAO::getFieldValue()
- CRM_Member_PseudoConstant::membershipStatus()
As record ids may differ from system to system.
Marco Valente [Tue, 9 Jun 2015 09:53:45 +0000 (10:53 +0100)]
CRM-15829 and CRM-15881 for CiviCRM 4.6
-----------------------------------
CRM-15829 (Relationships and inherited pending memberships)
Add pending memberships to new members of an organisation that has pending memberships
CRM/Contact/BAO/Relationship -> line ~1458
CRM/Contact/BAO/Relationship -> line ~1479
CRM/Contact/BAO/Relationship -> line ~1483
Ensure these new pending memberships for an organisation's employees are not set to active
CRM/Member/BAO/Membership -> line 265
-----------------------------------
CRM-15881 (Contact relationships (employee of))
Clear current employee when deleting a relationship that is the employer
CRM/Contact/BAO/Relationship -> line ~623
Reload the tab ajax views to reflect removed employer display when deleting a relationship that is the employer
CRM/Contact/Form/Relationship -> line ~399
If disabling an employer relationship (via the popup modal), unset the is_current_employer, please see comments in code
CRM/Contact/Form/Relationship -> line ~444
Marco Valente [Mon, 8 Jun 2015 17:16:48 +0000 (18:16 +0100)]
CRM-15829 and CRM-15881 for CiviCRM 4.6
-----------------------------------
CRM-15829 (Relationships and inherited pending memberships)
Add pending memberships to new members of an organisation that has pending memberships
CRM/Contact/BAO/Relationship -> line ~1458
CRM/Contact/BAO/Relationship -> line ~1479
CRM/Contact/BAO/Relationship -> line ~1483
Ensure these new pending memberships for an organisation's employees are not set to active
CRM/Member/BAO/Membership -> line 265
-----------------------------------
CRM-15881 (Contact relationships (employee of))
Clear current employee when deleting a relationship that is the employer
CRM/Contact/BAO/Relationship -> line ~623
Reload the tab ajax views to reflect removed employer display when deleting a relationship that is the employer
CRM/Contact/Form/Relationship -> line ~399
If disabling an employer relationship (via the popup modal), unset the is_current_employer, please see comments in code
CRM/Contact/Form/Relationship -> line ~444
colemanw [Sun, 31 May 2015 18:45:37 +0000 (14:45 -0400)]
Merge pull request #5938 from colemanw/CRM-16596
CRM-16596 - Fix adding PDF activity to case
Coleman Watts [Sun, 31 May 2015 00:40:15 +0000 (20:40 -0400)]
CRM-16596 - Fix adding PDF activity to case
colemanw [Sat, 30 May 2015 17:45:37 +0000 (13:45 -0400)]
Merge pull request #5937 from colemanw/CiviCase
CiviCase - cleanup 'File on Case' string
Coleman Watts [Sat, 30 May 2015 17:44:26 +0000 (13:44 -0400)]
CiviCase - cleanup 'File on Case' string
colemanw [Sat, 30 May 2015 17:31:45 +0000 (13:31 -0400)]
Merge pull request #5927 from colemanw/CRM-16585
CRM-16585 - Add print button to dialogs
colemanw [Sat, 30 May 2015 17:29:57 +0000 (13:29 -0400)]
Merge pull request #5935 from totten/4.6-ext-inst-err
CRM-16590 - Admin/Extensions - Fix regression
Tim Otten [Sat, 30 May 2015 04:23:53 +0000 (06:23 +0200)]
CRM-16590 - Admin/Extensions - Fix regression
When installing a new extension, it raises an exception because it cannot
display the pretty name of the extension. Moreover, it handles localization
inappropriately.
This is a follow-up to
17d48d22.
Monish Deb [Fri, 29 May 2015 05:39:18 +0000 (11:09 +0530)]
Merge pull request #5920 from jitendrapurohit/CRM-16568
CRM-16568 - Repeating Events: excluding dates doesn't stop the event …
colemanw [Fri, 29 May 2015 01:11:28 +0000 (21:11 -0400)]
Merge pull request #5928 from eileenmcnaughton/CRM-16580
CRM-16580 cast contactID to an int when it is zero as currently it is…
colemanw [Fri, 29 May 2015 00:43:53 +0000 (20:43 -0400)]
Merge pull request #5923 from colemanw/Activity
Activity api getfields fixes
eileenmcnaughton [Fri, 29 May 2015 00:36:07 +0000 (00:36 +0000)]
CRM-16580 cast contactID to an int when it is zero as currently it is inconsistent
Coleman Watts [Thu, 28 May 2015 23:07:25 +0000 (19:07 -0400)]
CRM-16585 - Add print button to dialogs
Coleman Watts [Thu, 28 May 2015 20:45:05 +0000 (16:45 -0400)]
Correct FK entity for activity api pseudo-fields
Monish Deb [Thu, 28 May 2015 19:29:11 +0000 (00:59 +0530)]
Merge pull request #5926 from monishdeb/4.6
CRM-16576 fix - Cannot disable permissions in Relationships
Kurund Jalmi [Thu, 28 May 2015 18:07:34 +0000 (23:37 +0530)]
Merge pull request #5921 from sudhabisht/CRM-16552
Fix for map link and display
monishdeb [Thu, 28 May 2015 17:10:59 +0000 (22:40 +0530)]
CRM-16576 fix - Cannot disable permissions in Relationships
https://issues.civicrm.org/jira/browse/CRM-16576
Coleman Watts [Thu, 28 May 2015 13:36:01 +0000 (09:36 -0400)]
Activity api getfields fixes
jitendrapurohit [Thu, 28 May 2015 11:45:20 +0000 (17:15 +0530)]
CRM-16568 - Repeating Events: excluding dates doesn't stop the event from being created
Sudha Bisht [Thu, 28 May 2015 11:42:14 +0000 (17:12 +0530)]
Fix for map link and display
Monish Deb [Thu, 28 May 2015 10:19:33 +0000 (15:49 +0530)]
Merge pull request #5919 from monishdeb/4.6
CRM-15839 fix - Honoree profile doesn't show on Test contribution page
monishdeb [Thu, 28 May 2015 10:17:24 +0000 (15:47 +0530)]
CRM-15839 fix - Honoree profile doesn't show on Test contribution page
https://issues.civicrm.org/jira/browse/CRM-15839
Monish Deb [Thu, 28 May 2015 05:16:13 +0000 (10:46 +0530)]
Merge pull request #5911 from jitendrapurohit/CRM-16554
CRM-16554 - Cannot Use or Delete Smart Groups Created by Contribution…
Dave Greenberg [Wed, 27 May 2015 18:51:11 +0000 (11:51 -0700)]
Merge pull request #5908 from relldoesphp/CRM-16547
CRM-16457 Fixes error caused by contribution fulfillment date
Monish Deb [Wed, 27 May 2015 12:58:33 +0000 (18:28 +0530)]
Merge pull request #5909 from monishdeb/CRM-16496
CRM-16496 fix - ACLs not respected when viewing custom data set on an…
jitendrapurohit [Wed, 27 May 2015 11:28:38 +0000 (16:58 +0530)]
warning fix
jitendrapurohit [Wed, 27 May 2015 11:19:41 +0000 (16:49 +0530)]
CRM-16554 - Cannot Use or Delete Smart Groups Created by Contribution Aggregate Search
Monish Deb [Wed, 27 May 2015 11:06:18 +0000 (16:36 +0530)]
Merge pull request #5907 from jmcclelland/CRM-16569
CRM-16569 - avoid backtrace when adding contacts to group
Monish Deb [Wed, 27 May 2015 09:35:13 +0000 (15:05 +0530)]
Merge pull request #5889 from rohankatkar/CRM-16285
CRM-16285: recurring_interval not checked in Backoffice form New CreditCard Payment
Monish Deb [Wed, 27 May 2015 09:32:44 +0000 (15:02 +0530)]
Merge pull request #5904 from sudhabisht/CRM-16549
Fixes for mailing url
monishdeb [Tue, 26 May 2015 22:30:39 +0000 (04:00 +0530)]
CRM-16496 fix - ACLs not respected when viewing custom data set on an activity when activity is viewed from Manage Case screen
https://issues.civicrm.org/jira/browse/CRM-16496
relldoesphp [Tue, 26 May 2015 22:12:50 +0000 (18:12 -0400)]
CRM-16457 Fixes error caused by contribution fulfillment date
Jamie McClelland [Tue, 26 May 2015 20:32:59 +0000 (16:32 -0400)]
CRM-16569 - avoid backtrace when adding contacts to group
This happens if you filter on target name with a contains or not
contains.
colemanw [Tue, 26 May 2015 18:32:13 +0000 (14:32 -0400)]
Merge pull request #5901 from colemanw/CRM-16557
CRM-16557 - Fix contact dashboard to display assigned activities
Dave Greenberg [Tue, 26 May 2015 16:27:30 +0000 (09:27 -0700)]
Merge pull request #5891 from davecivicrm/CRM-16503
CRM-16503 - Remove obsolete special handling of case type filter in C…
Sudha Bisht [Tue, 26 May 2015 12:25:08 +0000 (17:55 +0530)]
Fixes for mailing url
Monish Deb [Tue, 26 May 2015 11:03:14 +0000 (16:33 +0530)]
Merge pull request #5902 from jitendrapurohit/CRM-16548
Batch Data Entry screens do not require payment instrument
jitendrapurohit [Tue, 26 May 2015 08:42:20 +0000 (14:12 +0530)]
warning fix
jitendrapurohit [Tue, 26 May 2015 08:26:57 +0000 (13:56 +0530)]
minor fix
jitendrapurohit [Tue, 26 May 2015 07:06:24 +0000 (12:36 +0530)]
Batch Data Entry screens do not require payment instrument
Monish Deb [Tue, 26 May 2015 05:09:30 +0000 (10:39 +0530)]
Merge pull request #5895 from jitendrapurohit/CRM-16551
CRM-16551 Notice on demo site re custom fields
colemanw [Tue, 26 May 2015 02:02:50 +0000 (22:02 -0400)]
Merge pull request #5863 from totten/4.6-ang-win
CRM-16499 - Fix relative Angular paths in Windows
Coleman Watts [Tue, 26 May 2015 01:57:39 +0000 (21:57 -0400)]
CRM-16557 - Fix contact dashboard to display assigned activities
colemanw [Mon, 25 May 2015 16:47:48 +0000 (12:47 -0400)]
Merge pull request #5899 from colemanw/CRM-16477
CRM-16477 - Additional backwards compatibility for report instances pre-dating 4.5
Coleman Watts [Mon, 25 May 2015 16:43:57 +0000 (12:43 -0400)]
CRM-16477 - Additional backwards compatibility for report instances pre-dating 4.5
colemanw [Mon, 25 May 2015 16:33:31 +0000 (12:33 -0400)]
Merge pull request #5797 from GinkgoFJG/4.6
CRM-16477: Added backwards compatibility for report instances pre-dating 4.5.
colemanw [Mon, 25 May 2015 15:47:31 +0000 (11:47 -0400)]
Merge pull request #5897 from colemanw/caseStyle
CaseType UI styling improvements
Coleman Watts [Mon, 27 Apr 2015 17:41:52 +0000 (11:41 -0600)]
CaseType UI styling improvements
colemanw [Mon, 25 May 2015 15:01:06 +0000 (11:01 -0400)]
Merge pull request #5618 from sfe-ev/fix-upgrade-option_value-4.6
Upgrade: Fix `value` for added `option_value` entries in various places
jitendrapurohit [Mon, 25 May 2015 12:49:09 +0000 (18:19 +0530)]
CRM-16551 Notice on demo site re custom fields
Dave Greenberg [Fri, 22 May 2015 22:52:17 +0000 (15:52 -0700)]
CRM-16503 - Remove obsolete special handling of case type filter in Case Detail Report.
----------------------------------------
* CRM-16503: CiviCase Detail Report: Filter by Case Type finds no results
https://issues.civicrm.org/jira/browse/CRM-16503
Web Access [Fri, 22 May 2015 13:23:40 +0000 (18:53 +0530)]
Added doc for CRM-16285
Kurund Jalmi [Fri, 22 May 2015 13:17:38 +0000 (18:47 +0530)]
Merge pull request #5887 from sudhabisht/CRM-7636
Fix for website url issue
Kurund Jalmi [Fri, 22 May 2015 13:17:19 +0000 (18:47 +0530)]
Merge pull request #5886 from sudhabisht/CRM-16519
Fixes for unable to deselect multi-select field
Web Access [Fri, 22 May 2015 13:04:56 +0000 (18:34 +0530)]
CRM-16285: recurring_interval not checked in Backoffice form New CreditCard Payment
Sudha Bisht [Fri, 22 May 2015 10:11:27 +0000 (15:41 +0530)]
Fix for website url issue
Sudha Bisht [Fri, 22 May 2015 09:50:35 +0000 (15:20 +0530)]
Fixes for unable to deselect multi-select field
Kurund Jalmi [Fri, 22 May 2015 09:25:14 +0000 (14:55 +0530)]
Merge pull request #5847 from GinkgoFJG/CRM-16511
CRM-16511: Fixed missing closing tag for price set rows.
Kurund Jalmi [Fri, 22 May 2015 07:47:20 +0000 (13:17 +0530)]
Merge pull request #5885 from pratikshad/16528
CRM-16528 Fixed-hook_civicrm_contact_get_displayname does not work. M…
pratikshad [Fri, 22 May 2015 04:40:02 +0000 (10:10 +0530)]
CRM-16528 Fixed-hook_civicrm_contact_get_displayname does not work. Missing an "&" in alterDisplayName inhooks.php
----------------------------------------
* CRM-16528: hook_civicrm_contact_get_displayname does not work. Missing an "&" in alterDisplayName inhooks.php
https://issues.civicrm.org/jira/browse/CRM-16528
Eileen McNaughton [Thu, 21 May 2015 01:09:05 +0000 (13:09 +1200)]
Merge pull request #5880 from eileenmcnaughton/CRM-16536
CRM-16536 add settings overrides to template
Eileen McNaughton [Thu, 21 May 2015 00:54:02 +0000 (12:54 +1200)]
phpcs fixes - pre-existing issues
Eileen McNaughton [Wed, 20 May 2015 21:45:23 +0000 (09:45 +1200)]
CRM-16536 add settings overrides to templateg
Dave Greenberg [Wed, 20 May 2015 18:54:25 +0000 (11:54 -0700)]
Merge pull request #5869 from totten/4.6-ck-src
CRM-16445 - crmUiRichtext - Fix "Source" mode. Listen to 'key' event.
Dave Greenberg [Wed, 20 May 2015 17:08:45 +0000 (10:08 -0700)]
Merge pull request #5755 from eileenmcnaughton/CRM-16450
Crm 16450
Eileen McNaughton [Wed, 20 May 2015 09:28:30 +0000 (21:28 +1200)]
CRM-16450 patch for div layout on multi custom tab
CiviCRM [Wed, 20 May 2015 08:02:22 +0000 (01:02 -0700)]
Update version to 4.6.4
Tim Otten [Wed, 20 May 2015 00:41:13 +0000 (17:41 -0700)]
CRM-16445 - crmUiRichtext - Fix "Source" mode. Listen to 'key' event.
See also:
* http://civicrm.stackexchange.com/questions/2492/civimail-mailings-not-saving-or-corrupting
* http://stackoverflow.com/questions/
17358203/how-to-detect-ckeditor-source-mode-on-change-event
This is not strictly part of CRM-16445, but it's very similar (dealing with
the events emitted by ckeditor).
Dave Greenberg [Tue, 19 May 2015 21:28:33 +0000 (14:28 -0700)]
Merge pull request #5868 from davecivicrm/CRM-16524
CRM-16524 - fix batch entry total amount validation.
Dave Greenberg [Tue, 19 May 2015 18:42:25 +0000 (11:42 -0700)]
CRM-16524 - fix batch entry total amount validation.
----------------------------------------
* CRM-16524: Batch Entry form Validation failed, even total_amount reach the expected total_amount
https://issues.civicrm.org/jira/browse/CRM-16524
Tim Otten [Tue, 19 May 2015 05:09:24 +0000 (22:09 -0700)]
CRM-16499 - Fix relative Angular paths in Windows
Dave Greenberg [Tue, 19 May 2015 00:03:07 +0000 (17:03 -0700)]
Merge pull request #5861 from totten/4.6-ck-img
CRM-16445 - crmUiRichtext - Fix image insertion. Wait 50ms.
Tim Otten [Mon, 18 May 2015 21:28:56 +0000 (14:28 -0700)]
CRM-16445 - crmUiRichtext - Fix image insertion. Wait 50ms.
Kurund Jalmi [Mon, 18 May 2015 17:01:55 +0000 (22:31 +0530)]
Merge pull request #5857 from sudhabisht/CRM-16390
Fix for pledge payments record for particular contact id
Kurund Jalmi [Mon, 18 May 2015 17:01:51 +0000 (22:31 +0530)]
Merge pull request #5859 from sudhabisht/CRM16485
Fix for subject not display on delete page
Kurund Jalmi [Mon, 18 May 2015 15:42:34 +0000 (21:12 +0530)]
Merge pull request #5858 from jitendrapurohit/CRM-16488
Search Builder: Qill display operator is missing when searching by Co…
Kurund Jalmi [Mon, 18 May 2015 12:32:19 +0000 (18:02 +0530)]
Merge pull request #5736 from eileenmcnaughton/CRM-16422
CRM-16422 permit processor_id without ? in IPN urls
Kurund Jalmi [Mon, 18 May 2015 11:31:04 +0000 (17:01 +0530)]
Merge pull request #5854 from kurund/CRM-15629
CRM-15629
Sudha Bisht [Mon, 18 May 2015 10:03:59 +0000 (15:33 +0530)]
Fix for subject not display on delete page
Sudha Bisht [Mon, 18 May 2015 09:40:29 +0000 (15:10 +0530)]
Fix for pledge api
jitendrapurohit [Mon, 18 May 2015 09:34:59 +0000 (15:04 +0530)]
Search Builder: Qill display operator is missing when searching by Contact Type
Eileen McNaughton [Mon, 18 May 2015 09:00:01 +0000 (21:00 +1200)]
phpcs fixes
kurund [Mon, 18 May 2015 06:38:12 +0000 (12:08 +0530)]
CRM-15629, more cleanup
----------------------------------------
* CRM-15629: Paypal IPN not working on Wordpress the first time
https://issues.civicrm.org/jira/browse/CRM-15629
kurund [Mon, 18 May 2015 06:35:53 +0000 (12:05 +0530)]
CRM-15629, more cleanup
----------------------------------------
* CRM-15629: Paypal IPN not working on Wordpress the first time
https://issues.civicrm.org/jira/browse/CRM-15629
Eileen McNaughton [Mon, 18 May 2015 00:19:12 +0000 (12:19 +1200)]
phpcs fixes
Eileen McNaughton [Sun, 17 May 2015 23:36:13 +0000 (11:36 +1200)]
CRM-16450 fix for multiple custom fields
Eileen McNaughton [Mon, 4 May 2015 00:31:00 +0000 (12:31 +1200)]
CRM-16450 Custom data tab - fix indentation on tpl
This is separate to the previous commit for readability
Eileen McNaughton [Mon, 4 May 2015 00:28:36 +0000 (12:28 +1200)]
CRM-16450 add pre & post custom group text & region to data tab
Kurund Jalmi [Sat, 16 May 2015 09:31:27 +0000 (15:01 +0530)]
Merge pull request #5833 from kurund/CRM-15629
CRM-15629
Dave Greenberg [Fri, 15 May 2015 21:48:49 +0000 (14:48 -0700)]
Merge pull request #5846 from totten/4.6-dedupe-email
CRM-16465 - CiviMail - Handle dedupe_email
Dave Greenberg [Fri, 15 May 2015 21:39:50 +0000 (14:39 -0700)]
Merge pull request #5836 from eileenmcnaughton/4.6
CRM-16504 add auto-renew to back office renewal form
Dave Greenberg [Fri, 15 May 2015 21:07:18 +0000 (14:07 -0700)]
Merge pull request #5842 from sudhabisht/CRM-16441
Fix for re-assign a case to another contact
Frank J. Gómez [Fri, 15 May 2015 20:45:51 +0000 (16:45 -0400)]
CRM-16511: Fixed missing closing tag for price set rows.
Tim Otten [Fri, 15 May 2015 19:57:12 +0000 (12:57 -0700)]
CRM-16465 - crmMailing - Update estimate when toggling dedupe_email
Tim Otten [Fri, 15 May 2015 19:56:20 +0000 (12:56 -0700)]
CRM-16465 - Mailing BAO - Handle dedupe_email
Dave Greenberg [Fri, 15 May 2015 19:14:21 +0000 (12:14 -0700)]
Merge pull request #5841 from rohankatkar/CRM-16475
Fix for CRM-16475
Frank J. Gómez [Fri, 15 May 2015 13:24:11 +0000 (09:24 -0400)]
CRM-16477: Compliance with code style standards.
Kurund Jalmi [Fri, 15 May 2015 12:00:42 +0000 (17:30 +0530)]
Merge pull request #5834 from sudhabisht/CRM-16480
Fix for batch validation issue
projects / civicrm-core.git / log