Monish Deb [Fri, 14 Aug 2015 05:31:43 +0000 (11:01 +0530)]
Merge pull request #6490 from sudhabisht/CRM-9066
Fix for duplicate entry in bookkeeping transaction report
Monish Deb [Fri, 14 Aug 2015 05:16:13 +0000 (10:46 +0530)]
Merge pull request #6484 from monishdeb/4.6
CRM-17011 fix
Tim Otten [Thu, 13 Aug 2015 21:41:50 +0000 (14:41 -0700)]
Merge pull request #6335 from totten/4.6-header-cleanup
ScheduledReminder, Extensions, Cxn - Fix copy-pasted header
Tim Otten [Thu, 13 Aug 2015 21:40:33 +0000 (14:40 -0700)]
Merge pull request #6489 from totten/4.6-comp-ext
CRM_Core_BAO_ConfigSetting - Support components from extensions
Monish Deb [Thu, 13 Aug 2015 20:01:31 +0000 (01:31 +0530)]
Merge pull request #6476 from monishdeb/CRM-16950
Crm 16950 ix
Monish Deb [Thu, 13 Aug 2015 16:59:16 +0000 (22:29 +0530)]
Merge pull request #6491 from monishdeb/46-upgrade-fix
Upgrade script failure on Jenkin fix
monishdeb [Thu, 13 Aug 2015 15:03:06 +0000 (20:33 +0530)]
Upgrade script failure on Jenkin fix
Sudha Bisht [Thu, 13 Aug 2015 10:11:40 +0000 (15:41 +0530)]
Fix for duplicate entry in bookkeeping transaction
Monish Deb [Thu, 13 Aug 2015 07:29:14 +0000 (12:59 +0530)]
Merge pull request #6487 from jitendrapurohit/CRM-17009
CRM-17009 -- event registration doesn't respect reg end date
Monish Deb [Thu, 13 Aug 2015 05:00:41 +0000 (10:30 +0530)]
Merge pull request #6486 from jitendrapurohit/CRM-15935
CRM-15935 -- Lybunt report includes people who made no contributions
Tim Otten [Wed, 12 Aug 2015 07:48:04 +0000 (00:48 -0700)]
CRM_Core_BAO_ConfigSetting - Support components from extensions
jitendrapurohit [Wed, 12 Aug 2015 13:11:15 +0000 (18:41 +0530)]
CRM-17009 -- event registration doesn't respect reg end date
jitendrapurohit [Wed, 12 Aug 2015 11:51:01 +0000 (17:21 +0530)]
CRM-15935 -- Lybunt report includes people who made no contributions
monishdeb [Wed, 12 Aug 2015 11:15:44 +0000 (16:45 +0530)]
CRM-17011 fix - Broken smart group regression - membership type, membership status
https://issues.civicrm.org/jira/browse/CRM-17011
eileenmcnaugton [Wed, 12 Aug 2015 00:12:56 +0000 (12:12 +1200)]
CRM-17011 fix for smart group regression
Yashodha Chaku [Wed, 12 Aug 2015 08:25:33 +0000 (13:55 +0530)]
Merge pull request #6350 from PalanteJon/CRM-16939-4.6
CRM-16939 - Allow exporting current employers > 64 characters
Monish Deb [Wed, 12 Aug 2015 07:32:58 +0000 (13:02 +0530)]
Merge pull request #6470 from monishdeb/CRM-17006
CRM-17006 fix - Advanced search on radio custom fields broken
Monish Deb [Wed, 12 Aug 2015 06:49:30 +0000 (12:19 +0530)]
Merge pull request #6427 from eileenmcnaughton/CRM-16975
CRM-16975 fix for membership price set config - backport 4.7 code tha…
Monish Deb [Wed, 12 Aug 2015 06:27:32 +0000 (11:57 +0530)]
Merge pull request #6481 from yashodha/CRM-16985
CRM-16985: Inline edit LABEL on Option Value selector updates NAME in…
Kurund Jalmi [Wed, 12 Aug 2015 04:40:24 +0000 (10:10 +0530)]
Merge pull request #6441 from monishdeb/4.6
CRM-14536 fix - Free Membership still submits to payment processor
colemanw [Wed, 12 Aug 2015 01:38:23 +0000 (21:38 -0400)]
Merge pull request #6475 from colemanw/CRM-16806
CRM-16806 - Additional cleanup
colemanw [Wed, 12 Aug 2015 01:37:53 +0000 (21:37 -0400)]
Merge pull request #6436 from seamuslee001/msgtemplate_dynamic_load
CRM-16983 Dynamically load the content of Message templates in CiviMail when se…
Eileen McNaughton [Tue, 11 Aug 2015 21:42:04 +0000 (09:42 +1200)]
Merge pull request #6468 from eileenmcnaughton/CRM-17010
CRM-17010 add data info to price-set-class
Seamus Lee [Tue, 11 Aug 2015 21:11:56 +0000 (21:11 +0000)]
Move to getsingle api and associated changes
monishdeb [Tue, 11 Aug 2015 19:56:21 +0000 (01:26 +0530)]
reverted extra code
monishdeb [Tue, 11 Aug 2015 19:31:37 +0000 (01:01 +0530)]
format fix
monishdeb [Tue, 11 Aug 2015 19:22:33 +0000 (00:52 +0530)]
QA changes
Coleman Watts [Tue, 11 Aug 2015 19:12:30 +0000 (15:12 -0400)]
CRM-16806 - Additional cleanup
colemanw [Tue, 11 Aug 2015 19:03:16 +0000 (15:03 -0400)]
Merge pull request #6177 from xurizaemon/CRM-16806
CRM-16806: Validate supplied entity type.
colemanw [Tue, 11 Aug 2015 17:16:13 +0000 (13:16 -0400)]
Merge pull request #6462 from eileenmcnaughton/4.6
CRM-16993 actual fix on not crashing when recurring is paid …
Brian Shaughnessy [Wed, 5 Aug 2015 00:59:43 +0000 (20:59 -0400)]
CRM-16950 display tax rate on renewal form
Brian Shaughnessy [Sat, 1 Aug 2015 17:53:44 +0000 (13:53 -0400)]
CRM-16950 apply tax during membership renewal
yashodha [Tue, 11 Aug 2015 13:09:35 +0000 (18:39 +0530)]
CRM-16985: Inline edit LABEL on Option Value selector updates NAME instead
----------------------------------------
* CRM-16985: Inline edit LABEL on Option Value selector updates NAME instead
https://issues.civicrm.org/jira/browse/CRM-16985
monishdeb [Tue, 11 Aug 2015 12:54:50 +0000 (18:24 +0530)]
Format fix
monishdeb [Tue, 11 Aug 2015 11:27:22 +0000 (16:57 +0530)]
CRM-17006 fix - Advanced search on radio custom fields broken
https://issues.civicrm.org/jira/browse/CRM-17006
eileenmcnaugton [Tue, 11 Aug 2015 05:46:37 +0000 (17:46 +1200)]
CRM-17010 add data info to price-set-class
colemanw [Tue, 11 Aug 2015 01:52:16 +0000 (21:52 -0400)]
Merge pull request #6466 from seamuslee001/permisssion_fixup_4.6
CRM-17003 Output Administer Multiple Organisation permission as an ar…
Tim Otten [Tue, 11 Aug 2015 01:24:01 +0000 (18:24 -0700)]
Merge pull request #6339 from cividesk/Fortify_Fixes
Fortify fixes
Seamus Lee [Mon, 10 Aug 2015 21:38:47 +0000 (21:38 +0000)]
CRM-17003 Output Administer Multiple Organisation permission as an array not as string
eileenmcnaugton [Mon, 10 Aug 2015 04:17:01 +0000 (16:17 +1200)]
CRM-16993 avoid fatal when line items are created & then altered to completed
monishdeb [Mon, 10 Aug 2015 10:31:22 +0000 (16:01 +0530)]
Webtests and improvisations
monishdeb [Fri, 7 Aug 2015 17:43:07 +0000 (23:13 +0530)]
CRM-14536 fix - Free Membership still submits to payment processor
https://issues.civicrm.org/jira/browse/CRM-14536
Tim Otten [Mon, 10 Aug 2015 07:08:17 +0000 (00:08 -0700)]
Merge pull request #6458 from totten/4.6-toxic-list
INFRA-142 - Add .toxic.json
Tim Otten [Mon, 10 Aug 2015 06:27:38 +0000 (23:27 -0700)]
INFRA-142 - distmaker - (Precaution) Exclude .toxic.json
This file shouldn't show up in the root (since dm_install_core uses a
whitelist), but if we add it to other repos, it could show there.
Monish Deb [Mon, 10 Aug 2015 05:36:18 +0000 (11:06 +0530)]
Merge pull request #6037 from colemanw/CRM-16512
CRM-16512 - Hide dashboard related contact table for users without 'view my contact'
Monish Deb [Mon, 10 Aug 2015 04:39:13 +0000 (10:09 +0530)]
Merge pull request #6439 from sudhabisht/CRM-16978
Fix for multiple role assignment between same contact cases
colemanw [Sun, 9 Aug 2015 21:05:22 +0000 (17:05 -0400)]
Merge pull request #6451 from colemanw/i18n
CRM-13301 - Add multilingual popup to participant status label
colemanw [Sun, 9 Aug 2015 19:35:27 +0000 (15:35 -0400)]
Merge pull request #6435 from seamuslee001/mailing_ui_tidy_up
CRM-16991 Order Header and Footer lists by name field not by table id
Seamus Lee [Sun, 9 Aug 2015 05:13:49 +0000 (05:13 +0000)]
Fix issue of now not already filterinng down to object within values array
Coleman Watts [Sun, 9 Aug 2015 02:14:22 +0000 (22:14 -0400)]
CRM-13301 - Add multilingual popup to participant status label
Tim Otten [Sat, 8 Aug 2015 04:04:53 +0000 (21:04 -0700)]
INFRA-142 - Add .toxic.json
colemanw [Fri, 7 Aug 2015 20:57:51 +0000 (16:57 -0400)]
Merge pull request #6442 from colemanw/CRM-12021
CRM-12021 - Don't allow no default location type
Coleman Watts [Fri, 7 Aug 2015 18:43:50 +0000 (14:43 -0400)]
CRM-12021 - Don't allow no default location type
Sudha Bisht [Fri, 7 Aug 2015 11:08:00 +0000 (16:38 +0530)]
Fix for multiple role assignment between cases
Seamus Lee [Fri, 7 Aug 2015 10:32:32 +0000 (10:32 +0000)]
Shift to Angular promise version as per advice from totten
Monish Deb [Fri, 7 Aug 2015 05:19:28 +0000 (10:49 +0530)]
Merge pull request #6409 from monishdeb/4.6
CRM-16961 fix - 4.6.5 search regression on custom fields where option…
Seamus Lee [Fri, 7 Aug 2015 00:53:55 +0000 (00:53 +0000)]
Fix JS style issue
Seamus Lee [Fri, 7 Aug 2015 00:27:40 +0000 (00:27 +0000)]
Dynamically load the content of Message templates in CiviMail when selected rather than load on inital load
Seamus Lee [Thu, 6 Aug 2015 21:34:42 +0000 (21:34 +0000)]
Order Header and Footer lists by name field not by table id
Kurund Jalmi [Thu, 6 Aug 2015 15:14:54 +0000 (20:44 +0530)]
Merge pull request #6428 from seamuslee001/membership_fix_up
Fix Spelling of membership in Membership Search form
Seamus Lee [Thu, 6 Aug 2015 08:57:28 +0000 (08:57 +0000)]
Fix Spelling of membership in Membership Search form
Eileen McNaughton [Thu, 6 Aug 2015 08:57:16 +0000 (20:57 +1200)]
Merge pull request #6422 from davecivicrm/CRM-16973
CRM-16973 - filter FROM Email Address select by domain_id
Eileen McNaughton [Thu, 6 Aug 2015 08:56:32 +0000 (20:56 +1200)]
Merge pull request #6424 from seamuslee001/4.6-CRM-13644
4.6 Backport - CRM-13644 Apply Permission Check for Group API
eileenmcnaugton [Thu, 6 Aug 2015 06:05:21 +0000 (18:05 +1200)]
CRM-16975 fix for membership price set config - backport 4.7 code that allows more sensible determination of whether
multiple payments are supported
Eileen McNaughton [Thu, 6 Aug 2015 08:24:25 +0000 (20:24 +1200)]
Merge pull request #6426 from eileenmcnaughton/CRM-16832
CRM-16832. Do not redirect offsite when fed invalid keys.
eileenmcnaugton [Wed, 5 Aug 2015 23:51:31 +0000 (11:51 +1200)]
CRM-16961 fix for search for cust data with parentheses
Conflicts:
CRM/Core/BAO/CustomQuery.php
----------------------------------------
* CRM-16961: 4.6.5 search regression on custom fields where option values have brackets
https://issues.civicrm.org/jira/browse/CRM-16961
monishdeb [Wed, 5 Aug 2015 11:45:41 +0000 (17:15 +0530)]
traditional way to fix by using special character in RLIKE
monishdeb [Tue, 4 Aug 2015 18:22:13 +0000 (23:52 +0530)]
formatting fix
monishdeb [Tue, 4 Aug 2015 15:34:07 +0000 (21:04 +0530)]
format fix
monishdeb [Tue, 4 Aug 2015 14:48:31 +0000 (20:18 +0530)]
CRM-16961 fix - 4.6.5 search regression on custom fields where option values have brackets
https://issues.civicrm.org/jira/browse/CRM-16961
Monish Deb [Thu, 6 Aug 2015 05:16:15 +0000 (10:46 +0530)]
Merge pull request #6420 from jitendrapurohit/CRM-16949
CRM-16949 - Multi-record custom fields repeated when displayed for an individual
Monish Deb [Thu, 6 Aug 2015 05:15:59 +0000 (10:45 +0530)]
Merge pull request #6410 from jmcclelland/CRM-10100
ensure correct open, click, etc. statistics
Chris Burgess [Mon, 13 Jul 2015 00:45:51 +0000 (12:45 +1200)]
CRM-16832. Do not redirect offsite when fed invalid keys.
URLs to test:
* http://civicrm.dev/civicrm/contribute/transact?qfKey=xxx&entryURL=http://evil.example.com/ should go to CIVICRM_UF_BASEURL
* http://civicrm.dev/civicrm/contribute/transact?qfKey=xxx&entryURL=/civicrm/contribute/transact%3Fid%3D1 should go to /civicrm/contribute/transact?id=1
* http://civicrm.dev/civicrm/contribute/transact?qfKey=xxx&entryURL=http://civicrm.dev/civicrm/contribute/transact%3Fid%3D1 should go to /civicrm/contribute/transact?id=1
Seamus Lee [Thu, 6 Aug 2015 00:06:12 +0000 (00:06 +0000)]
PHPcs Fixes
Seamus Lee [Wed, 5 Aug 2015 23:56:20 +0000 (23:56 +0000)]
CRM-13644 Apply Permission Check for Group API 4.6
Dave Greenberg [Wed, 5 Aug 2015 22:56:36 +0000 (15:56 -0700)]
CRM-16973 - filter FROM Email Address select by domain_id
----------------------------------------
* CRM-16973: CiviMail not respecting multisite ACL
https://issues.civicrm.org/jira/browse/CRM-16973
Eileen McNaughton [Wed, 5 Aug 2015 20:45:02 +0000 (08:45 +1200)]
Merge pull request #6418 from eileenmcnaughton/CRM-15815-46
CRM-15815 fix chaining with sequential
jitendrapurohit [Wed, 5 Aug 2015 13:27:54 +0000 (18:57 +0530)]
minor fixes
jitendrapurohit [Wed, 5 Aug 2015 13:18:18 +0000 (18:48 +0530)]
CRM-16949 - Multi-record custom fields repeated when displayed for an individual
CiviCRM [Wed, 5 Aug 2015 12:06:18 +0000 (05:06 -0700)]
Update version to 4.6.7
eileenmcnaugton [Wed, 5 Aug 2015 11:18:07 +0000 (23:18 +1200)]
CRM-16168 api chaining fix (plus some test tidy up)
Johan Vervloet [Tue, 24 Mar 2015 09:23:00 +0000 (10:23 +0100)]
CRM-16168 - Added 2 unit tests.
In the two tests, I try to get an event and its loc block
in one chained call.
In the first test, a loc block exists, so it should be
returned.
In the second test, no loc block exists. This should not
crash the API.
----------------------------------------
* CRM-16168: Chained call event-loc block returns an error if no loc block exists.
https://issues.civicrm.org/jira/browse/CRM-16168
Johan Vervloet [Mon, 2 Feb 2015 12:59:01 +0000 (13:59 +0100)]
Refs #15891 - Small fix.
I accidently left a line that writes debug output to a file.
Just removed it.
Johan Vervloet [Mon, 2 Feb 2015 12:23:15 +0000 (13:23 +0100)]
CRM-15891 - Unit test to illustrate the problem.
If I use the api to create a contact and two websites, I expect the
result values to contain the array key 'api.website.create' to be
there.
----------------------------------------
* CRM-15891: Inconsistency in returned json for chained get and chained create
https://issues.civicrm.org/jira/browse/CRM-15891
Conflicts:
tests/phpunit/api/v3/ContactTest.php
eileenmcnaughton [Wed, 5 Aug 2015 10:39:25 +0000 (10:39 +0000)]
CRM-15904 fix sequential with reload
Johan Vervloet [Mon, 2 Feb 2015 13:21:43 +0000 (14:21 +0100)]
CRM-15904 - Unit test to illustrate the issue.
This unit test illustrates the problem.
I use chaining to create a contact and an e-mail address. If I do
this with sequential=1 and the reload option, I get an error.
Obviously this pull request will cause errors during automatic
testing.
----------------------------------------
* CRM-15904: API: Reload option does not work with chaining and sequential
https://issues.civicrm.org/jira/browse/CRM-15904
Johan Vervloet [Sat, 24 Jan 2015 21:20:27 +0000 (22:20 +0100)]
Unit test for CRM-15815.
----------------------------------------
* CRM-15815: Two chained create calls, with the first one creating an array
https://issues.civicrm.org/jira/browse/CRM-15815
eileenmcnaughton [Wed, 5 Aug 2015 09:20:30 +0000 (09:20 +0000)]
CRM-15815 fix chaining with sequential
colemanw [Tue, 4 Aug 2015 19:33:54 +0000 (15:33 -0400)]
Merge pull request #6407 from civicrm/revert-6236-CRM-16836
Revert "CRM-16836 - Enforce permissions in group api getoptions"
Jamie McClelland [Mon, 26 Aug 2013 17:30:07 +0000 (13:30 -0400)]
ensure correct open, click, etc. statistics
See http://issues.civicrm.org/jira/browse/CRM-10100 We're counting opens
for the same message more than once. By counting the event_queue_id we
ensure only one count per message.
Monish Deb [Tue, 4 Aug 2015 14:33:09 +0000 (20:03 +0530)]
Merge pull request #6388 from monishdeb/4.6
CRM-16945 fix - Groups tab shows duplicate groups when a contact has …
colemanw [Tue, 4 Aug 2015 12:42:27 +0000 (08:42 -0400)]
Revert "CRM-16836 - Enforce permissions in group api getoptions"
Monish Deb [Tue, 4 Aug 2015 07:12:36 +0000 (12:42 +0530)]
Merge pull request #6403 from sudhabisht/WarningFix
Warning Fix
Sudha Bisht [Tue, 4 Aug 2015 07:11:01 +0000 (12:41 +0530)]
Warning Fix
Kurund Jalmi [Tue, 4 Aug 2015 06:45:49 +0000 (12:15 +0530)]
Merge pull request #6395 from colemanw/CRM-16846
CRM-16846 - run old sql without resetting locale to that version
Coleman Watts [Mon, 3 Aug 2015 21:23:50 +0000 (17:23 -0400)]
CRM-16846 - run old sql without resetting locale to that version
colemanw [Mon, 3 Aug 2015 21:16:42 +0000 (17:16 -0400)]
Merge pull request #6396 from eileenmcnaughton/4.6
CRM-16927 rename changed-name-function in the test suite
eileenmcnaugton [Mon, 3 Aug 2015 21:12:43 +0000 (09:12 +1200)]
CRM-16927 rename changed-name-function in the test suite
Eileen McNaughton [Mon, 3 Aug 2015 21:01:51 +0000 (09:01 +1200)]
Merge pull request #6390 from eileenmcnaughton/CRM-16958
CRM-16958 ensure sort_name is set when display_name set
eileenmcnaughton [Mon, 3 Aug 2015 12:16:31 +0000 (12:16 +0000)]
CRM-16958 ensure sort_name is set when display_name set
projects / civicrm-core.git / log