Kurund Jalmi [Sun, 16 Aug 2015 15:37:07 +0000 (21:07 +0530)]
Merge pull request #6517 from kurund/version-fixes
Version fixes
Kurund Jalmi [Sun, 16 Aug 2015 15:35:37 +0000 (21:05 +0530)]
version fixes
Kurund Jalmi [Sun, 16 Aug 2015 15:25:37 +0000 (20:55 +0530)]
version fixes
Kurund Jalmi [Sun, 16 Aug 2015 15:23:31 +0000 (20:53 +0530)]
version fixes
Kurund Jalmi [Sun, 16 Aug 2015 15:11:06 +0000 (20:41 +0530)]
add status preference dao to ignore list
Eileen McNaughton [Sun, 16 Aug 2015 12:56:12 +0000 (00:56 +1200)]
Merge pull request #6512 from eileenmcnaughton/CRM-16955
CRM-16955 load billing details on processor form
Kurund Jalmi [Sun, 16 Aug 2015 12:42:03 +0000 (18:12 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-08-16-18-06-10
Conflicts:
sql/civicrm_generated.mysql
templates/CRM/Member/Form/MembershipRenewal.tpl
eileenmcnaugton [Sun, 16 Aug 2015 02:59:02 +0000 (14:59 +1200)]
add comment
Eileen McNaughton [Sun, 16 Aug 2015 02:54:30 +0000 (14:54 +1200)]
Merge pull request #6495 from eileenmcnaughton/master
add unique index for new sites on uf_group.name CRM-15961
eileenmcnaugton [Fri, 14 Aug 2015 05:06:34 +0000 (17:06 +1200)]
add unique index for new sites on uf_group.name CRM-15961
eileenmcnaugton [Sat, 15 Aug 2015 19:40:19 +0000 (07:40 +1200)]
CRM-16955 load billing details on processor form
eileenmcnaugton [Sat, 15 Aug 2015 08:22:07 +0000 (20:22 +1200)]
CRM-16955 ensure cid & checksum vars from the url are available to js so they can be passed when loading billing form
Eileen McNaughton [Sat, 15 Aug 2015 22:38:37 +0000 (10:38 +1200)]
Merge pull request #6511 from civicrm/eileenmcnaughton-patch-1
Validate record_type as being an integer.
Eileen McNaughton [Sat, 15 Aug 2015 22:35:46 +0000 (10:35 +1200)]
Merge pull request #6509 from eileenmcnaughton/test-fixes
Test fixes
Eileen McNaughton [Sat, 15 Aug 2015 22:33:59 +0000 (10:33 +1200)]
Validate record_type as being an integer.
data comes from an option-group, and option-groups are web-editable.
eileenmcnaugton [Sat, 15 Aug 2015 19:48:57 +0000 (07:48 +1200)]
CRM-16808 follow up - paypal express being validated as paypal pro
eileenmcnaugton [Sat, 15 Aug 2015 19:07:16 +0000 (07:07 +1200)]
fix new regression on payment block not showing
eileenmcnaugton [Sat, 15 Aug 2015 07:58:21 +0000 (19:58 +1200)]
extract setMessageFunction
eileenmcnaugton [Sat, 15 Aug 2015 07:43:53 +0000 (19:43 +1200)]
fix for test regressions
Note there has been traditional hodgepodge of use of paramters for the same thing causing ongoing confusion here, trying to reduce that
Tim Otten [Sat, 15 Aug 2015 12:56:47 +0000 (05:56 -0700)]
Merge pull request #6503 from totten/4.6-random
Utils - SQL, Array, Resolver, DAO - Random improvements
Tim Otten [Sat, 25 Jul 2015 03:40:14 +0000 (20:40 -0700)]
Civi\Core\Resolver - Add "global://" support
Tim Otten [Thu, 30 Jul 2015 04:21:55 +0000 (21:21 -0700)]
CRM_Utils_SQL_*
Tim Otten [Sat, 25 Jul 2015 03:43:08 +0000 (20:43 -0700)]
CRM_Utils_AutoClean
Tim Otten [Sat, 25 Jul 2015 03:38:06 +0000 (20:38 -0700)]
CRM_Utils_Array - Add pathGet() and pathSet()
Tim Otten [Thu, 23 Jul 2015 10:22:35 +0000 (03:22 -0700)]
CRM_Utils_Array::extend()
Tim Otten [Thu, 30 Jul 2015 04:21:23 +0000 (21:21 -0700)]
CRM_Core_DAO::fetchAll
Monish Deb [Fri, 14 Aug 2015 13:08:48 +0000 (18:38 +0530)]
Merge pull request #6498 from monishdeb/4.6
CRM-17022 fix - Bug introduced in 4.6.6 breaks Grant Search
Monish Deb [Fri, 14 Aug 2015 11:49:51 +0000 (17:19 +0530)]
Merge pull request #6497 from jitendrapurohit/CRM-17016
CRM-17016 -- State list for Fiji incomplete
monishdeb [Fri, 14 Aug 2015 07:17:39 +0000 (12:47 +0530)]
CRM-17022 fix - Bug introduced in 4.6.6 breaks Grant Search
https://issues.civicrm.org/jira/browse/CRM-17022
jitendrapurohit [Fri, 14 Aug 2015 06:00:33 +0000 (11:30 +0530)]
CRM-17016 -- State list for Fiji incomplete
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 [Fri, 14 Aug 2015 02:45:15 +0000 (19:45 -0700)]
Merge pull request #6293 from JoeMurray/patch-1
fix for CRM-16896
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
Eileen McNaughton [Thu, 13 Aug 2015 02:53:42 +0000 (14:53 +1200)]
Merge pull request #6488 from eileenmcnaughton/CRM-16036-master
CRM-16036 replace basic_get innids with sql builder
Tim Otten [Wed, 12 Aug 2015 07:48:04 +0000 (00:48 -0700)]
CRM_Core_BAO_ConfigSetting - Support components from extensions
eileenmcnaugton [Thu, 13 Aug 2015 00:06:16 +0000 (12:06 +1200)]
CRM-16036 fix for tests
eileenmcnaugton [Wed, 12 Aug 2015 23:49:58 +0000 (11:49 +1200)]
remove auto-grant test - this was a prototype for the single-value-alter & duplicates it, maintaining both = less good
eileenmcnaugton [Wed, 12 Aug 2015 23:35:18 +0000 (11:35 +1200)]
CRM-16036 - remove getfields from mailing test as it is producing incorrect results for the non-deprecated api
eileenmcnaughton [Mon, 10 Aug 2015 08:41:17 +0000 (08:41 +0000)]
CRM-16036 fixes to make all tess pass with new internalsx
wq!
eileenmcnaugton [Mon, 10 Aug 2015 03:05:20 +0000 (15:05 +1200)]
CRM-16036 stop overwriting of where clauses
eileenmcnaugton [Sun, 9 Aug 2015 00:18:43 +0000 (12:18 +1200)]
upport tested format return=custom
eileenmcnaugton [Thu, 6 Aug 2015 23:24:51 +0000 (11:24 +1200)]
CRM-16036 Eileen in prog
Johan Vervloet [Thu, 6 Aug 2015 07:53:13 +0000 (09:53 +0200)]
Whitespace fixes.
Johan Vervloet [Mon, 3 Aug 2015 12:02:46 +0000 (14:02 +0200)]
CRM-16036 - extra unit test.
----------------------------------------
* CRM-16036: API: searching on custom fields does not work
https://issues.civicrm.org/jira/browse/CRM-16036
Johan Vervloet [Mon, 3 Aug 2015 19:14:59 +0000 (21:14 +0200)]
Fixing style issues, as usual.
Johan Vervloet [Mon, 3 Aug 2015 15:46:07 +0000 (17:46 +0200)]
CRM-16036 - Fix for chaining.
When using a custom field as param for the API, chaining
didn't work as it should. This is a fix.
I have a unit test for this as well, but it depends on a fix for
CRM-16168, so if I add it here, it will break anyway.
I will document this in the issue itself.
----------------------------------------
* CRM-16036: API: searching on custom fields does not work
https://issues.civicrm.org/jira/browse/CRM-16036
* 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 [Thu, 19 Mar 2015 14:40:47 +0000 (15:40 +0100)]
CRM-16036 - Now contact references are returned the right way.
----------------------------------------
* CRM-16036: API: searching on custom fields does not work
https://issues.civicrm.org/jira/browse/CRM-16036
Johan Vervloet [Thu, 19 Mar 2015 12:50:25 +0000 (13:50 +0100)]
CRM-16036 - Contact reference custom values are returned incorrectly.
Here is a unit test.
----------------------------------------
* CRM-16036: API: searching on custom fields does not work
https://issues.civicrm.org/jira/browse/CRM-16036
Johan Vervloet [Wed, 11 Mar 2015 09:17:52 +0000 (10:17 +0100)]
Using CRM_Utils_Array::first.
Johan Vervloet [Tue, 10 Mar 2015 19:02:39 +0000 (20:02 +0100)]
CRM-16036 - Pleasing the php 5.3 gods :-)
Thank you @colemanw.
----------------------------------------
* CRM-16036: API: searching on custom fields does not work
https://issues.civicrm.org/jira/browse/CRM-16036
Johan Vervloet [Tue, 10 Mar 2015 15:07:45 +0000 (16:07 +0100)]
CRM-16036 - A hack around the issue.
I changed _civicrm_api3_basic_get so that it calls my hack
(_civicrm_api3_get_using_query_object_simple) whenever a
custom field is used in $params. In all other cases, the API
behaves as before.
----------------------------------------
* CRM-16036: API: searching on custom fields does not work
https://issues.civicrm.org/jira/browse/CRM-16036
Johan Vervloet [Tue, 10 Mar 2015 14:39:15 +0000 (15:39 +0100)]
A unit test for searching memberships on custom field values.
Johan Vervloet [Mon, 9 Mar 2015 20:43:59 +0000 (21:43 +0100)]
Build query using CRM_Utils_SQL_Select.
Johan Vervloet [Fri, 6 Mar 2015 08:07:29 +0000 (09:07 +0100)]
Fixed whitespace issues.
Johan Vervloet [Fri, 6 Mar 2015 07:53:56 +0000 (08:53 +0100)]
Free the query DAO.
Not sure whether this is really necessary. But I just did to
be safe.
Johan Vervloet [Thu, 5 Mar 2015 15:11:22 +0000 (16:11 +0100)]
Sort and limit options.
Johan Vervloet [Thu, 5 Mar 2015 14:37:02 +0000 (15:37 +0100)]
Support other filters than '='.
Johan Vervloet [Thu, 5 Mar 2015 13:10:10 +0000 (14:10 +0100)]
Populate $select_fields more efficiently.
Johan Vervloet [Thu, 5 Mar 2015 12:31:50 +0000 (13:31 +0100)]
Return all fields if no return option is given.
Johan Vervloet [Thu, 5 Mar 2015 12:12:36 +0000 (13:12 +0100)]
Changed key and values of the $select_fields array.
Because that seems to be more intuitive.
Johan Vervloet [Thu, 5 Mar 2015 11:35:22 +0000 (12:35 +0100)]
Some code refactoring.
Johan Vervloet [Wed, 4 Mar 2015 20:47:57 +0000 (21:47 +0100)]
Return fields as requested by the return option.
Johan Vervloet [Wed, 4 Mar 2015 09:33:46 +0000 (10:33 +0100)]
Some documentation, and better handling of fields to select.
The fields to select are still hard coded. But this is work
in progress.
Johan Vervloet [Tue, 3 Mar 2015 21:00:50 +0000 (22:00 +0100)]
Filter on custom fields.
civicrm_api3_get_using_query_object_simple now allows filtering on custom fields.
Johan Vervloet [Tue, 3 Mar 2015 20:31:23 +0000 (21:31 +0100)]
Created a custom civicrm_api3_get_using_query_object.
One to work around the issue. Still lots of TODOs.
If you filter on a custom field using the api, the custom
get_using_query_object is used. And it still ignores the
custom fields :-)
Johan Vervloet [Mon, 2 Mar 2015 10:39:43 +0000 (11:39 +0100)]
CRM-16036 - unit test: search event on custom field.
This test fails.
----------------------------------------
* CRM-16036: API: searching events on custom fields does not work
https://issues.civicrm.org/jira/browse/CRM-16036
Eileen McNaughton [Wed, 12 Aug 2015 23:18:39 +0000 (11:18 +1200)]
Merge pull request #6471 from eileenmcnaughton/master
CRM-16996 fix regression on form rule
Tim Otten [Wed, 12 Aug 2015 22:01:00 +0000 (15:01 -0700)]
Merge pull request #6457 from GinkgoFJG/angular_snippets
Fixes for CRM-16994 and CRM-16995.
Frank J. Gómez [Wed, 12 Aug 2015 19:21:50 +0000 (15:21 -0400)]
CRM-16994: Removed code that made too many assumptions about what the link passed to the tabset would be.
Frank J. Gómez [Wed, 12 Aug 2015 19:00:33 +0000 (15:00 -0400)]
CRM-16995: Documentation improvements.
Frank J. Gómez [Wed, 12 Aug 2015 18:49:24 +0000 (14:49 -0400)]
CRM-16995: Addressed XSS vulnerability.
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
Yashodha Chaku [Wed, 12 Aug 2015 10:51:41 +0000 (16:21 +0530)]
Merge pull request #6482 from sudhabisht/CRM-17005
Upgrade changes for renaming Palestinian Territory in country list
Kurund Jalmi [Wed, 12 Aug 2015 10:50:08 +0000 (16:20 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-08-12-15-44-44
Conflicts:
CRM/Contribute/BAO/Contribution/Utils.php
templates/CRM/Contribute/Form/Contribution/Main.tpl
tests/phpunit/CiviTest/CiviSeleniumTestCase.php
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…
Kurund Jalmi [Wed, 12 Aug 2015 06:40:33 +0000 (12:10 +0530)]
Merge pull request #6477 from shawnholt/country-update
CRM-17005 Removed word "Occupied" from Country PS
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…
Sudha Bisht [Wed, 12 Aug 2015 06:22:04 +0000 (11:52 +0530)]
Upgrade changes
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
shawnholt [Tue, 11 Aug 2015 21:06:42 +0000 (17:06 -0400)]
Removed word "Occupied" from Country PS
eileenmcnaugton [Tue, 11 Aug 2015 12:34:53 +0000 (00:34 +1200)]
CRM-16996 instead of requiring a financial_type_id when a priceset is selected use the price set one
Eileen McNaughton [Tue, 11 Aug 2015 20:36:45 +0000 (08:36 +1200)]
Merge pull request #6473 from colemanw/CRM-16809
CRM-16809 - Don't generate qfKey for payment snippet
monishdeb [Tue, 11 Aug 2015 19:56:21 +0000 (01:26 +0530)]
reverted extra code