jitendrapurohit [Thu, 11 Jun 2015 07:21:55 +0000 (12:51 +0530)]
CRM-16646 - Protection against multiple submits on contributions page
colemanw [Thu, 11 Jun 2015 02:37:55 +0000 (22:37 -0400)]
Merge pull request #5719 from PalanteJon/CRM-16403
CRM-16403 - CiviCRM API - Allow GET requests to make a 'check' API call
Dave Greenberg [Wed, 10 Jun 2015 20:30:47 +0000 (13:30 -0700)]
Merge pull request #5980 from marcov4lente/CRM-15829+CRM15881-for-4.6
CRM-15829 and CRM-15881 for 4.6
colemanw [Wed, 10 Jun 2015 19:50:00 +0000 (15:50 -0400)]
Merge pull request #5837 from mlutfy/46-crm16505
CRM-16505: Fix 'other amount' translation for multilingual/non-english contribution forms.
colemanw [Wed, 10 Jun 2015 19:46:45 +0000 (15:46 -0400)]
Merge pull request #5983 from relldoesphp/CRM-16544
CRM-16544 - CiviMail automatically attaches CiviGrant files to Mailing
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.
Monish Deb [Wed, 10 Jun 2015 05:38:21 +0000 (11:08 +0530)]
Merge pull request #5965 from sudhabisht/CRM-16542
Fix for PayPal Express payment gateway issue
relldoesphp [Tue, 9 Jun 2015 20:48:50 +0000 (16:48 -0400)]
CRM-16544 - CiviMail automatically attaches CiviGrant files to Mailing
https://issues.civicrm.org/jira/browse/CRM-16544
Monish Deb [Tue, 9 Jun 2015 20:21:41 +0000 (01:51 +0530)]
Merge pull request #5982 from monishdeb/CRM-16609
CRM-16609 fix - Strict warning variables should be passed by referenc…
Dave Greenberg [Tue, 9 Jun 2015 16:29:26 +0000 (09:29 -0700)]
Merge pull request #5967 from colemanw/CRM-16632
CRM-16632 - Fix calculation of contribution fees
monishdeb [Tue, 9 Jun 2015 14:29:13 +0000 (19:59 +0530)]
CRM-16609 fix - Strict warning variables should be passed by reference in civicrm/CRM/Mailing/MailStore.php
https://issues.civicrm.org/jira/browse/CRM-16609
Monish Deb [Tue, 9 Jun 2015 14:08:07 +0000 (19:38 +0530)]
Merge pull request #5981 from jitendrapurohit/CRM-16572
CRM-16572 - CiviMail sending to primary instead of bulk email account…
colemanw [Tue, 9 Jun 2015 12:05:19 +0000 (08:05 -0400)]
Merge pull request #5978 from colemanw/CRM-16521
CRM-16521 - Nicer UX for downloading files from a dialog
Monish Deb [Tue, 9 Jun 2015 11:46:40 +0000 (17:16 +0530)]
Merge pull request #5979 from pratikshad/16614
CRM-16614 Fix-Email Invoice: 500 Error in AJAX response
jitendrapurohit [Tue, 9 Jun 2015 11:43:32 +0000 (17:13 +0530)]
CRM-16572 - CiviMail sending to primary instead of bulk email account for smart groups
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
Yashodha Chaku [Tue, 9 Jun 2015 08:30:28 +0000 (14:00 +0530)]
Merge pull request #5971 from PalanteJon/activityreportfix
CRM-16640 - CiviReport - fix error when selecting email addresses on …
Yashodha Chaku [Tue, 9 Jun 2015 08:20:58 +0000 (13:50 +0530)]
Merge pull request #5972 from PalanteJon/premiumfulfillment
CRM-16641 - CiviReport - allow reporting on premium fulfillment date
pratikshad [Tue, 9 Jun 2015 07:34:05 +0000 (13:04 +0530)]
CRM-16614 Fix-Email Invoice: 500 Error in AJAX response
----------------------------------------
* CRM-16614: Email Invoice: 500 Error in AJAX response
https://issues.civicrm.org/jira/browse/CRM-16614
Coleman Watts [Tue, 9 Jun 2015 02:04:15 +0000 (22:04 -0400)]
CRM-16521 - Nicer UX for downloading files from a dialog
colemanw [Mon, 8 Jun 2015 22:17:04 +0000 (18:17 -0400)]
Merge pull request #5976 from colemanw/CRM-16521
CRM-16521 - Fix name badge download from popup
Dave Greenberg [Mon, 8 Jun 2015 22:03:00 +0000 (15:03 -0700)]
Merge pull request #5819 from guanhuan/batch-export
CSV Batch export hooks and extra fields
Coleman Watts [Mon, 8 Jun 2015 20:25:16 +0000 (16:25 -0400)]
CRM-16521 - Fix name badge download from popup
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
Monish Deb [Mon, 8 Jun 2015 13:29:37 +0000 (18:59 +0530)]
Merge pull request #5975 from rohankatkar/CRM-16425
CRM-16425 Added CiviCRM Licensing Exception in header
Web Access [Wed, 10 Jun 2015 11:34:49 +0000 (17:04 +0530)]
Warning fixes
Web Access [Wed, 10 Jun 2015 10:58:55 +0000 (16:28 +0530)]
CRM-16425 Added CiviCRM Licensing Exception in header
colemanw [Mon, 8 Jun 2015 01:38:16 +0000 (21:38 -0400)]
Merge pull request #5974 from colemanw/Add
Add clearfix class to caseSummary hook content
Coleman Watts [Mon, 8 Jun 2015 01:37:07 +0000 (21:37 -0400)]
Add clearfix class to caseSummary hook content
colemanw [Sun, 7 Jun 2015 18:54:06 +0000 (14:54 -0400)]
Merge pull request #5970 from colemanw/explorer
Fix basePath in APIExplorer examples
Jon goldberg [Sun, 7 Jun 2015 18:15:48 +0000 (14:15 -0400)]
CRM-16641 - CiviReport - allow reporting on premium fulfillment date - add'l fix
Jon goldberg [Sun, 7 Jun 2015 18:10:17 +0000 (14:10 -0400)]
CRM-16641 - CiviReport - Allow reporting on premium fulfillment
Jon goldberg [Sun, 7 Jun 2015 18:04:26 +0000 (14:04 -0400)]
CRM-16640 - CiviReport - fix error when selecting email addresses on activity report
colemanw [Sat, 6 Jun 2015 15:36:25 +0000 (11:36 -0400)]
Merge pull request #5968 from colemanw/Static
Static function fixes
Coleman Watts [Sat, 6 Jun 2015 15:35:57 +0000 (11:35 -0400)]
Fix basePath in APIExplorer examples
Coleman Watts [Sat, 6 Jun 2015 02:19:36 +0000 (22:19 -0400)]
Static function fixes
Coleman Watts [Fri, 5 Jun 2015 15:41:00 +0000 (11:41 -0400)]
CRM-16632 - Fix calculation of contribution fees
colemanw [Fri, 5 Jun 2015 15:03:50 +0000 (11:03 -0400)]
Merge pull request #5966 from colemanw/CRM-16631
CRM-16631 - Show unlimited case types
Coleman Watts [Fri, 5 Jun 2015 15:02:14 +0000 (11:02 -0400)]
CRM-16631 - Show unlimited case types
Sudha Bisht [Fri, 5 Jun 2015 13:17:24 +0000 (18:47 +0530)]
Test Fix
Monish Deb [Fri, 5 Jun 2015 13:14:29 +0000 (18:44 +0530)]
Merge pull request #5956 from rohankatkar/CRM-16451
Layout issues when recording back-office priceset contributions
Monish Deb [Fri, 5 Jun 2015 13:09:17 +0000 (18:39 +0530)]
Merge pull request #5959 from futurefirst/crm-16625-4.6
CRM-16625 fix formatting of dates to be passed to contact creation during import
Sudha Bisht [Fri, 5 Jun 2015 12:49:24 +0000 (18:19 +0530)]
Fix for paypal button
monishdeb [Fri, 5 Jun 2015 00:16:49 +0000 (05:46 +0530)]
QA fixes
monishdeb [Thu, 4 Jun 2015 13:42:19 +0000 (19:12 +0530)]
CRM-16542 fix - PayPal Express woes on 4.6
https://issues.civicrm.org/jira/browse/CRM-16542
Monish Deb [Fri, 5 Jun 2015 11:26:03 +0000 (16:56 +0530)]
Merge pull request #5964 from monishdeb/CRM-16574_Contribution_Summary_Report_grouping
Crm 16574 contribution summary report grouping
monishdeb [Fri, 5 Jun 2015 11:23:54 +0000 (16:53 +0530)]
notice fix
monishdeb [Fri, 5 Jun 2015 08:11:57 +0000 (13:41 +0530)]
Formatting fixes
Monish Deb [Thu, 4 Jun 2015 21:41:45 +0000 (03:11 +0530)]
Merge pull request #5955 from pratikshad/16534
CRM-16534 Fix-Contribution Export Places Campaign IDs in Campaign Tit…
Web Access [Thu, 4 Jun 2015 12:52:01 +0000 (18:22 +0530)]
Warning fix
David Knoll [Thu, 4 Jun 2015 12:37:12 +0000 (13:37 +0100)]
CRM-16625 fix formatting of dates to be passed to contact creation during import
Monish Deb [Thu, 4 Jun 2015 12:32:33 +0000 (18:02 +0530)]
Merge pull request #5944 from colemanw/CRM-16310
CRM-16310 - Fix inline link handling with dynamic content
Web Access [Thu, 4 Jun 2015 10:46:59 +0000 (16:16 +0530)]
Fix for CRM-16451
pratikshad [Thu, 4 Jun 2015 10:30:58 +0000 (16:00 +0530)]
CRM-16534 Fix-Contribution Export Places Campaign IDs in Campaign Title Column, Nothing in Campaign ID Column
----------------------------------------
* CRM-16534: Contribution Export Places Campaign IDs in Campaign Title Column, Nothing in Campaign ID Column
https://issues.civicrm.org/jira/browse/CRM-16534
Eileen McNaughton [Wed, 3 Jun 2015 22:49:34 +0000 (10:49 +1200)]
Merge pull request #5900 from eileenmcnaughton/CRM-16566
CRM-16566 upgrade authorize.net to support new style IPNS
Guanhuan Chen [Wed, 3 Jun 2015 14:20:50 +0000 (15:20 +0100)]
Add invoice number prefix and rename columns
Monish Deb [Wed, 3 Jun 2015 13:26:32 +0000 (18:56 +0530)]
Merge pull request #5950 from deepak-srivastava/CRM-16563
CRM-16563 include end-date by using time 23:59 than incrementing by day1
deepak-srivastava [Wed, 3 Jun 2015 08:50:43 +0000 (09:50 +0100)]
CRM-16563 include end-date by using time 23:59 than incrementing by day 1
----------------------------------------
* CRM-16563: Recurring event system sometimes suggests incorrect dates
https://issues.civicrm.org/jira/browse/CRM-16563
Eileen McNaughton [Wed, 3 Jun 2015 04:22:10 +0000 (16:22 +1200)]
Merge pull request #5945 from eileenmcnaughton/no-auction-46
Remove Auction & Touchstone
Coleman Watts [Wed, 3 Jun 2015 02:07:29 +0000 (22:07 -0400)]
CRM-16310 - Fix option view close button
Eileen McNaughton [Wed, 3 Jun 2015 00:35:09 +0000 (12:35 +1200)]
Remove Auction & Touchstone
Conflicts:
tools/CRM/Auction/BAO/Auction.php
tools/CRM/Auction/BAO/Item.php
tools/CRM/Auction/Form/Auction.php
tools/CRM/Auction/Form/Item.php
Coleman Watts [Tue, 2 Jun 2015 20:58:57 +0000 (16:58 -0400)]
CRM-16310 - Fix inline link handling with dynamic content
Monish Deb [Tue, 2 Jun 2015 11:04:13 +0000 (16:34 +0530)]
Merge pull request #5941 from rohankatkar/CRM16565
When signing up multiple participants, the second contact's selections appear on the first contact's participant record
Web Access [Tue, 2 Jun 2015 08:42:29 +0000 (14:12 +0530)]
Warning fix
Eileen McNaughton [Tue, 2 Jun 2015 08:11:19 +0000 (20:11 +1200)]
Merge pull request #5931 from eileenmcnaughton/CRM-16580
Crm 16580
Monish Deb [Tue, 2 Jun 2015 08:02:42 +0000 (13:32 +0530)]
Merge pull request #5932 from pratikshad/16535
CRM-16535 Fix-Cannot record contributions in a data entry batch of ty…
Web Access [Tue, 2 Jun 2015 06:57:01 +0000 (12:27 +0530)]
Fix for CRM-16565
colemanw [Tue, 2 Jun 2015 00:27:28 +0000 (20:27 -0400)]
Merge pull request #5940 from colemanw/CRM-16601
CRM-16601 - Fix string escaping in js
Coleman Watts [Mon, 1 Jun 2015 20:53:58 +0000 (16:53 -0400)]
CRM-16601 - Fix string escaping in js
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.
pratikshad [Fri, 29 May 2015 09:21:34 +0000 (14:51 +0530)]
CRM-16535 Fix-Cannot record contributions in a data entry batch of type pledge payment
----------------------------------------
* CRM-16535: Cannot record contributions in a data entry batch of type pledge payment
https://issues.civicrm.org/jira/browse/CRM-16535
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 …
Eileen McNaughton [Fri, 29 May 2015 02:14:26 +0000 (14:14 +1200)]
CRM-16580 type check when returning user
Eileen McNaughton [Fri, 29 May 2015 02:06:55 +0000 (14:06 +1200)]
CRM-16580 avoid matching cid to user id if null
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
Richard van Oosterhout [Wed, 27 May 2015 13:33:29 +0000 (15:33 +0200)]
Fix for Contribution Summary grouping
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
projects / civicrm-core.git / log