Monish Deb [Wed, 22 Jun 2016 13:17:20 +0000 (18:47 +0530)]
Merge pull request #8179 from monishdeb/CRM-18147
CRM-18147 - Advanced filtering on email or email_id does not work for the Contact API
Monish Deb [Wed, 22 Jun 2016 13:13:21 +0000 (18:43 +0530)]
Merge pull request #8614 from jitendrapurohit/webtest-fixes
webtest fixes
jitendrapurohit [Wed, 22 Jun 2016 13:13:32 +0000 (18:43 +0530)]
webtest fixes
Monish Deb [Wed, 22 Jun 2016 13:04:48 +0000 (18:34 +0530)]
Merge pull request #8613 from monishdeb/CRM-18989
CRM-18989: Dollar Sign showing twice in Activity custom field (money)
jitendrapurohit [Wed, 22 Jun 2016 12:36:09 +0000 (18:06 +0530)]
fix jenkin test failures
Monish Deb [Wed, 22 Jun 2016 11:57:19 +0000 (17:27 +0530)]
Merge pull request #8611 from jitendrapurohit/CRM-18827
CRM-18827 - Missed Required Field Returns Default Value of Membership…
deb.monish [Wed, 22 Jun 2016 11:40:34 +0000 (17:10 +0530)]
CRM-18989: Dollar Sign showing twice in Activity custom field (money)
deb.monish [Tue, 19 Apr 2016 20:45:10 +0000 (02:15 +0530)]
CRM-18147 - Advanced filtering on email or email_id does not work for the Contact API
Eileen McNaughton [Wed, 22 Jun 2016 07:45:56 +0000 (19:45 +1200)]
Merge pull request #8563 from JMAConsulting/CRM-16189-5
Crm 16189 5
jitendrapurohit [Wed, 22 Jun 2016 06:15:43 +0000 (11:45 +0530)]
CRM-18827 - Missed Required Field Returns Default Value of Membership after Overriding
Edsel [Wed, 22 Jun 2016 06:14:16 +0000 (11:44 +0530)]
CRM-16189 Fixed jenkins errors
----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
https://issues.civicrm.org/jira/browse/CRM-16189
Eileen McNaughton [Tue, 21 Jun 2016 22:03:02 +0000 (10:03 +1200)]
Merge pull request #7047 from johanv/CRM-17430-dont_change_domain_version_1st_attempt
Changing something to the domain should leave the domain_version untouched
Eileen McNaughton [Tue, 21 Jun 2016 20:51:34 +0000 (08:51 +1200)]
Merge pull request #8380 from mollux/CRM-18563_or_permission_api_exception
CRM-18563 API or permissions
Monish Deb [Tue, 21 Jun 2016 11:17:02 +0000 (16:47 +0530)]
Merge pull request #8606 from jitendrapurohit/CRM-18975
CRM-18975 - Activity date filter ignored when viewing activity reports
jitendrapurohit [Tue, 21 Jun 2016 10:46:05 +0000 (16:16 +0530)]
CRM-18975 - Activity date filter ignored when viewing activity reports
Eileen McNaughton [Tue, 21 Jun 2016 08:59:22 +0000 (20:59 +1200)]
Merge pull request #8509 from josephlacey/CRM-18665
CRM-18665 Fixing bug where event subtype doesn't reload when validati…
Yashodha Chaku [Tue, 21 Jun 2016 08:40:37 +0000 (14:10 +0530)]
Merge pull request #8604 from yashodha/CRM-18982
CRM-18982: Pledge report: cannot add results to a group
Eileen McNaughton [Tue, 21 Jun 2016 07:03:37 +0000 (19:03 +1200)]
Merge pull request #8494 from kcristiano/CRM-18221
CRM-18221 filter relativize with realpath function to properly configure [civicrm.root] and [civicrm.files] on hosts with symlinked file systems
yashodha [Tue, 21 Jun 2016 06:48:49 +0000 (12:18 +0530)]
CRM-18982: Pledge report: cannot add results to a group
----------------------------------------
* CRM-18982:
https://issues.civicrm.org/jira/browse/CRM-18982
Monish Deb [Mon, 20 Jun 2016 11:14:23 +0000 (16:44 +0530)]
Merge pull request #8596 from jitendrapurohit/CRM-18656
CRM-18656 - Advanced search fails to show tagset criteria when editing saved search
jitendrapurohit [Mon, 20 Jun 2016 10:09:12 +0000 (15:39 +0530)]
CRM-18656 - minor optimisation
kenwest [Sun, 29 May 2016 06:50:27 +0000 (16:50 +1000)]
Changed comment to comply with style checker
kenwest [Mon, 23 May 2016 12:43:03 +0000 (22:43 +1000)]
CRM-18656 Advanced search fails to show tagset criteria when editing saved search
Monish Deb [Mon, 20 Jun 2016 08:49:34 +0000 (14:19 +0530)]
Merge pull request #8471 from johanv/CRM-18697-export_batches
Make it possible to create new batch ExportFormats in an extension
Yashodha Chaku [Mon, 20 Jun 2016 08:33:02 +0000 (14:03 +0530)]
Merge pull request #8595 from civicrm/eileenmcnaughton-patch-1
Remove unnecessary deprected require_once
Monish Deb [Mon, 20 Jun 2016 05:10:55 +0000 (10:40 +0530)]
Merge pull request #8593 from yashodha/CRM-18960
CRM-18960: Change title in Getting Started widget
Eileen McNaughton [Mon, 20 Jun 2016 05:03:06 +0000 (17:03 +1200)]
Remove unnecessary deprected require_once
Edsel [Sun, 19 Jun 2016 06:52:14 +0000 (12:22 +0530)]
CRM-16189 Added unit test for option group extra param
----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
https://issues.civicrm.org/jira/browse/CRM-16189
Eileen McNaughton [Fri, 17 Jun 2016 23:39:16 +0000 (11:39 +1200)]
Merge pull request #8100 from cividesk/CRM-18362-4.7
CRM-18362 get current local for navigation menu
Monish Deb [Fri, 17 Jun 2016 19:45:13 +0000 (01:15 +0530)]
Merge pull request #8590 from adixon/CRM-18973
CRM-18973
Yashodha Chaku [Fri, 17 Jun 2016 14:14:53 +0000 (19:44 +0530)]
Merge pull request #8551 from scardinius/crm-18815
CRM-18815: getTrackerURL() returns invalid url_id for CiviMail A/B Test
Monish Deb [Fri, 17 Jun 2016 10:17:13 +0000 (15:47 +0530)]
Merge pull request #8575 from monishdeb/CRM-18071
CRM-18071: free membership doesn't depend on is_monetary
adixon [Thu, 16 Jun 2016 19:23:49 +0000 (15:23 -0400)]
CRM-18973
deb.monish [Wed, 15 Jun 2016 18:45:27 +0000 (00:15 +0530)]
CRM-18071: free membership doesn't depend on is_monetary
yashodha [Thu, 16 Jun 2016 10:21:23 +0000 (15:51 +0530)]
CRM-18960: Change title in Getting Started widget
----------------------------------------
* CRM-18960: Change title in Getting Started widget
https://issues.civicrm.org/jira/browse/CRM-18960
yashodha [Thu, 16 Jun 2016 08:25:38 +0000 (13:55 +0530)]
CRM-18960: Change title in Getting Started widget
----------------------------------------
* CRM-18960: Change title in Getting Started widget
https://issues.civicrm.org/jira/browse/CRM-18960
Yashodha Chaku [Thu, 16 Jun 2016 06:43:36 +0000 (12:13 +0530)]
Merge pull request #8557 from yashodha/fix-CRM-18472
CRM-18472: notice fixes
Yashodha Chaku [Thu, 16 Jun 2016 06:14:19 +0000 (11:44 +0530)]
Merge pull request #8567 from yashodha/CRM-18954
CRM-18954: Error on adding a field to a profile used by a contributio…
yashodha [Wed, 15 Jun 2016 10:31:39 +0000 (16:01 +0530)]
CRM-18954: Error on adding a field to a profile used by a contribution page
----------------------------------------
* CRM-18954: Error on adding a field to a profile used by a contribution page
https://issues.civicrm.org/jira/browse/CRM-18954
Pradeep Nayak [Wed, 15 Jun 2016 10:29:02 +0000 (15:59 +0530)]
CRM-16189, modified code to allow sort option values with different column field
----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
https://issues.civicrm.org/jira/browse/CRM-16189
Pradeep Nayak [Wed, 15 Jun 2016 10:26:32 +0000 (15:56 +0530)]
CRM-16189, modified function to sort option values with other column fields
----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
https://issues.civicrm.org/jira/browse/CRM-16189
Yashodha Chaku [Tue, 14 Jun 2016 13:08:30 +0000 (18:38 +0530)]
Merge pull request #8554 from stevekessler/patch-2
CRM-18836 -Update Address.tpl
Yashodha Chaku [Tue, 14 Jun 2016 09:27:52 +0000 (14:57 +0530)]
Merge pull request #8550 from jitendrapurohit/CRM-17815test
CRM-17815 - Unit Test to check due date in invoices
yashodha [Tue, 14 Jun 2016 06:43:12 +0000 (12:13 +0530)]
CRM-18472: notice fixes
----------------------------------------
* CRM-18472: Notice fixes
https://issues.civicrm.org/jira/browse/CRM-18472
Steve Kessler [Mon, 13 Jun 2016 20:56:28 +0000 (14:56 -0600)]
Update Address.tpl
Corrected URL for USPS in 4.7 (master).
scardinius [Mon, 13 Jun 2016 14:45:17 +0000 (16:45 +0200)]
CRM-18815: Fix concatenation spacing
scardinius [Mon, 13 Jun 2016 14:13:35 +0000 (16:13 +0200)]
CRM-18815: getTrackerURL() returns invalid url_id for CiviMail A/B Test
jitendrapurohit [Mon, 13 Jun 2016 13:07:42 +0000 (18:37 +0530)]
CRM-17815 - Unit Test to check due date in invoices
Yashodha Chaku [Mon, 13 Jun 2016 12:45:55 +0000 (18:15 +0530)]
Merge pull request #8549 from yashodha/CRM-17684
CRM-17684: check where end date is past to determine auto-renew subsc…
yashodha [Mon, 13 Jun 2016 11:25:44 +0000 (16:55 +0530)]
minor fixes
yashodha [Mon, 13 Jun 2016 11:15:21 +0000 (16:45 +0530)]
minor fixes
yashodha [Mon, 13 Jun 2016 09:59:06 +0000 (15:29 +0530)]
CRM-17684: check where end date is past to determine auto-renew subscription has ended
----------------------------------------
* CRM-17684: Find Memberships with no auto-renew
https://issues.civicrm.org/jira/browse/CRM-17684
Yashodha Chaku [Mon, 13 Jun 2016 09:45:23 +0000 (15:15 +0530)]
Merge pull request #8346 from sqweets/auto-renew-filter-changes
CRM-17684 Find Memberships with no auto-renew
Monish Deb [Mon, 13 Jun 2016 08:48:41 +0000 (14:18 +0530)]
Merge pull request #8543 from monishdeb/CRM-18399
CRM-18399: 'My billing address is the same as above' option goes away when selecting other payment options
colemanw [Sun, 12 Jun 2016 21:27:44 +0000 (15:27 -0600)]
Merge pull request #8533 from eileenmcnaughton/membership_form
CRM-18701 fix setting of membership amount set on the fly for backoff…
deb.monish [Fri, 10 Jun 2016 14:44:05 +0000 (20:14 +0530)]
additional fix for event and optimisation
Eileen McNaughton [Sat, 11 Jun 2016 23:06:17 +0000 (16:06 -0700)]
Merge pull request #8498 from eileenmcnaughton/ajax
Initial test to prepare to refactor dupe ajax function
Eileen McNaughton [Fri, 10 Jun 2016 15:54:01 +0000 (08:54 -0700)]
Merge pull request #8546 from JMAConsulting/CRM-18807
CRM-18807, fixed fatal error when saving participant
Pradeep Nayak [Fri, 10 Jun 2016 15:18:18 +0000 (20:48 +0530)]
CRM-18807, fixed fatal error when saving participant
----------------------------------------
* CRM-18807: Fatal error when trying to register participant offline
https://issues.civicrm.org/jira/browse/CRM-18807
deb.monish [Fri, 10 Jun 2016 11:29:50 +0000 (16:59 +0530)]
CRM-18399: 'My billing address is the same as above' option goes away when selecting other payment options
Monish Deb [Fri, 10 Jun 2016 05:34:40 +0000 (11:04 +0530)]
Merge pull request #8526 from jitendrapurohit/CRM-18706
CRM-18706 - Activity type filter on user activities is not working
Yashodha Chaku [Thu, 9 Jun 2016 12:11:23 +0000 (17:41 +0530)]
Merge pull request #8541 from jitendrapurohit/CRM-18779
CRM-18779 - generated data changes
jitendrapurohit [Thu, 9 Jun 2016 04:54:40 +0000 (10:24 +0530)]
generated data changes
Eileen McNaughton [Wed, 8 Jun 2016 16:43:40 +0000 (10:43 -0600)]
Merge pull request #8420 from ineffyble/fix-membership-id-in-search-builder
CRM-18523 - Search Builder - Fix searching on Membership ID
Eileen McNaughton [Wed, 8 Jun 2016 16:42:03 +0000 (10:42 -0600)]
Merge pull request #8470 from ankitjain28may/master
error in input tag
Eileen McNaughton [Wed, 8 Jun 2016 15:25:17 +0000 (09:25 -0600)]
Merge pull request #8368 from mlutfy/master-crm18555
CRM-18555: API utils: avoid unset() on empty array.
Yashodha Chaku [Wed, 8 Jun 2016 06:03:43 +0000 (11:33 +0530)]
Merge pull request #8534 from agh1/CRM-18778-2
CRM-18778 i18n petition: thank-you page title translation to wrong table
Yashodha Chaku [Wed, 8 Jun 2016 05:14:33 +0000 (10:44 +0530)]
Merge pull request #8524 from yashodha/CRM-18554
CRM-18554: Using IS EMPTY operator for some date fields crashes 4.7.7
eileen [Wed, 8 Jun 2016 01:19:07 +0000 (19:19 -0600)]
CRM-18701 fix setting of membership amount set on the fly for backoffice membership form
Andrew Hunt [Wed, 8 Jun 2016 03:36:33 +0000 (23:36 -0400)]
CRM-18778 i18n petition: thank-you page title translation to wrong table
----------------------------------------
* CRM-18778: Petition thank-you fields translatable to wrong table
https://issues.civicrm.org/jira/browse/CRM-18778
colemanw [Wed, 8 Jun 2016 01:33:29 +0000 (19:33 -0600)]
Merge pull request #8347 from eileenmcnaughton/tidy-up
CRM-17335 reduce use of nullArray
Eileen McNaughton [Wed, 8 Jun 2016 00:32:28 +0000 (18:32 -0600)]
Merge pull request #8528 from eileenmcnaughton/membership_form
CRM-18701 remove inappropriate actions from processAmount
Eileen McNaughton [Wed, 8 Jun 2016 00:26:50 +0000 (18:26 -0600)]
Merge pull request #8531 from PalanteJon/CRM-16888
CRM-16888 - CiviSMS - fix templates not working with CiviSMS
Eileen McNaughton [Wed, 8 Jun 2016 00:09:17 +0000 (18:09 -0600)]
Merge pull request #8532 from xurizaemon/patch-1
Correct typo
eileen [Mon, 6 Jun 2016 23:57:37 +0000 (17:57 -0600)]
CRM-18701 first round refactor towards removing amount_priceset_level_radio from processPriceSet
Looking to determine the values in a more approprite place & also removing the select one that is NOT used
Change-Id: I0e2087ebbc2f0d8e6b06cec00415c77b9ef44da9
Chris Burgess [Tue, 7 Jun 2016 23:27:06 +0000 (17:27 -0600)]
Correct typo
Random period placed outside XML tags, removing.
Eileen McNaughton [Tue, 7 Jun 2016 19:29:38 +0000 (13:29 -0600)]
Merge pull request #8506 from eileenmcnaughton/eileenmcnaughton-my_reports
Eileenmcnaughton my reports
Eileen McNaughton [Tue, 7 Jun 2016 19:29:08 +0000 (13:29 -0600)]
Merge pull request #8520 from hkillam/patch-4
CRM-17619 add space before numeric suffix
eileen [Mon, 6 Jun 2016 21:55:44 +0000 (15:55 -0600)]
CRM-18701 minor, tangental tidy up
eileen [Mon, 6 Jun 2016 19:48:42 +0000 (13:48 -0600)]
CRM-17310 add reports to menu when rebuilding nav from civicrm/admin/menu?reset=1
CRM-17310 add reports to menu when rebuilding nav from civicrm/admin/menu?reset=1
eileen [Tue, 6 Oct 2015 02:48:23 +0000 (15:48 +1300)]
This is a combination of 2 commits.
CRM-17310 add My Reports to initial navigation
typo fx
eileen [Mon, 6 Jun 2016 14:45:05 +0000 (08:45 -0600)]
Report test fix
Samuel Vanhove [Mon, 6 Jun 2016 00:07:38 +0000 (20:07 -0400)]
CRM-17310 - simplification
eileenmcnaugton [Wed, 30 Sep 2015 07:11:19 +0000 (20:11 +1300)]
CRM-17310 Add my reports functionality
This includes a new my reports menu & the ability to save reports as 'my report' to show on there
jitendrapurohit [Tue, 7 Jun 2016 11:17:53 +0000 (16:47 +0530)]
CRM-18706 - Activity type filter on user activities is not working
Yashodha Chaku [Tue, 7 Jun 2016 10:46:56 +0000 (16:16 +0530)]
Merge pull request #8522 from seamuslee001/CRM-18772
CRM-18772 Create function to check if column already exists in the da…
yashodha [Tue, 7 Jun 2016 09:56:48 +0000 (15:26 +0530)]
CRM-18554: Using IS EMPTY operator for some date fields crashes 4.7.7
----------------------------------------
* CRM-18554: Using IS EMPTY operator for some date fields crashes 4.7.7
https://issues.civicrm.org/jira/browse/CRM-18554
yashodha [Tue, 7 Jun 2016 06:56:20 +0000 (12:26 +0530)]
CRM-18554: Using IS EMPTY operator for some date fields crashes 4.7.7
----------------------------------------
* CRM-18554: Using IS EMPTY operator for some date fields crashes 4.7.7
https://issues.civicrm.org/jira/browse/CRM-18554
colemanw [Tue, 7 Jun 2016 05:14:31 +0000 (23:14 -0600)]
Merge pull request #8422 from colemanw/CRM-18586
CRM-18586 - Fix race condition when loading custom data forms
colemanw [Tue, 7 Jun 2016 05:14:20 +0000 (23:14 -0600)]
Merge pull request #8450 from jitendrapurohit/CRM-18586-additional
CRM-18586 - add delete link and fix add more button
Yashodha Chaku [Tue, 7 Jun 2016 05:07:45 +0000 (10:37 +0530)]
Merge pull request #8507 from josephlacey/CRM-18116
CRM-18116 Fixing bug with editing assigned activities within case.
colemanw [Tue, 7 Jun 2016 05:06:21 +0000 (23:06 -0600)]
Merge pull request #8518 from twomice/CRM-18770
Fix for CRM-18770.
Heather Killam [Tue, 7 Jun 2016 02:24:28 +0000 (20:24 -0600)]
Update Address.php
Heather Killam [Tue, 7 Jun 2016 02:12:09 +0000 (20:12 -0600)]
Update Address.php
Heather Killam [Mon, 6 Jun 2016 22:50:31 +0000 (18:50 -0400)]
Merge pull request #2 from hkillam/patch-3
Merge two patches into single patch.
Eileen McNaughton [Mon, 6 Jun 2016 21:45:45 +0000 (15:45 -0600)]
Merge pull request #8519 from eileenmcnaughton/membership_form
Membership form
eileen [Mon, 6 Jun 2016 21:08:13 +0000 (15:08 -0600)]
CRM-18701 remove unused variables
eileen [Mon, 6 Jun 2016 20:37:09 +0000 (14:37 -0600)]
CRM-18701 tidy up, do not pass variables around as a reference when they are not being altered
eileen [Mon, 6 Jun 2016 20:20:50 +0000 (14:20 -0600)]
CRM-18701 tidy up, stop setting an array key & use a variable.
The array key is returned to the calling function but grepping did not find any more instances of it so we should limit it's scope to the function that uses it.
Really we want to pass in as a non-reference or else it's too unpredictable but this is just a small step
Allen Shaw [Mon, 6 Jun 2016 19:39:06 +0000 (14:39 -0500)]
Fix for CRM-18770.
projects / civicrm-core.git / log