Tim Otten [Mon, 17 Aug 2015 23:51:16 +0000 (16:51 -0700)]
CRM_Admin_Form_Setting - Report errors in saving settings
Tim Otten [Mon, 17 Aug 2015 22:29:28 +0000 (15:29 -0700)]
CRM-16373 - Setting, weekBegins - Use pseudoconstant
Tim Otten [Tue, 18 Aug 2015 00:39:43 +0000 (17:39 -0700)]
CRM_Admin_Form_Setting - Use Setting.getoptions
Tim Otten [Mon, 17 Aug 2015 07:09:49 +0000 (00:09 -0700)]
CRM-16373 - Config - Declare settings for geoAPIKey, geoProvider, mapAPIKey, mapProvider
Coleman Watts [Tue, 18 Aug 2015 01:42:54 +0000 (21:42 -0400)]
Move CKEDITOR related code to crm.ckeditor.js
Coleman Watts [Tue, 18 Aug 2015 01:33:14 +0000 (21:33 -0400)]
Ensure CRM.vars is always defined
eileenmcnaugton [Tue, 18 Aug 2015 00:42:17 +0000 (12:42 +1200)]
CRM-16955 move setting of contact_id to parent form
Eileen [Tue, 10 Mar 2015 05:23:46 +0000 (01:23 -0400)]
CRM-16082 move responsibility for ensuring a domain group exists out of core
Monish Deb [Mon, 17 Aug 2015 20:31:54 +0000 (02:01 +0530)]
Merge pull request #6510 from monishdeb/4.6
Test fixes for All kind of Custom Values
Tim Otten [Mon, 17 Aug 2015 07:31:43 +0000 (00:31 -0700)]
Merge pull request #6493 from eileenmcnaughton/CRM-17023
CRM-17023 - Search settings
Tim Otten [Mon, 17 Aug 2015 06:53:42 +0000 (23:53 -0700)]
CRM-16373 - Setting.getoptions - Read/execute callbacks from *.settings.php
Tim Otten [Mon, 17 Aug 2015 05:29:38 +0000 (22:29 -0700)]
CRM-16373 - Config - Remove unused `revampPages`, `maxLocationBlocks`, `formKeyDisable`
These variables all appear to be unused.
Tim Otten [Mon, 17 Aug 2015 05:03:40 +0000 (22:03 -0700)]
CRM-16373 - Config - Remove `mapGeoCoding` option
It looks like this is a boolean that enables/disables certain geocoding
features. However, the variable is not actually editable, so it is
effectively fixed at "true".
Tim Otten [Mon, 17 Aug 2015 04:27:15 +0000 (21:27 -0700)]
Merge pull request #6518 from totten/master-config-dead
CRM-16373 - CRM_Core_Config - Remove ephemeral and unused fields
Tim Otten [Mon, 17 Aug 2015 04:23:38 +0000 (21:23 -0700)]
Merge pull request #6499 from mlutfy/47-crm17025
CRM-17025: use https in 'empowered by' link.
Eileen McNaughton [Mon, 17 Aug 2015 02:35:54 +0000 (14:35 +1200)]
Merge pull request #6513 from totten/master-sql-fragment
CRM-16036 - _civicrm_api3_get_using_utils_sql - Pass SQL fragments as object
Tim Otten [Mon, 17 Aug 2015 01:33:53 +0000 (18:33 -0700)]
CRM-16373 - Config - Remove `maxImportFileSize`
This variable does not appear to be used.
From grepping, it seems that perhaps it was used at once point, but the
major elements of it were moved to a helper function, and now that function
is used multiple places.
Tim Otten [Mon, 17 Aug 2015 01:28:15 +0000 (18:28 -0700)]
CRM-16373 - Config - Remove `captchaFont` and `captchaFontPath`
These variables are not read or written anywhere.
Tim Otten [Mon, 17 Aug 2015 01:26:11 +0000 (18:26 -0700)]
CRM-16373 - Config - Remove `importDataSourceDir`
This variable is a trivial variant on `$civicrm_root`. It does not appear to
be editable, and it is only used in one place.
Tim Otten [Mon, 17 Aug 2015 01:17:38 +0000 (18:17 -0700)]
CRM-16373 - Config - Remove gettextResourceDir
This field is not a genuine setting - it's a small variant on `$civicrm_root`.
Use CRM_Core_I18n::getResourceDir() instead.
Tim Otten [Mon, 17 Aug 2015 01:00:45 +0000 (18:00 -0700)]
CRM-16373 - Config - Remove `gettextCodeset` and `gettextDomain`
These variables are not read or written anywhere.
Tim Otten [Mon, 17 Aug 2015 00:58:22 +0000 (17:58 -0700)]
CRM-16373 - Remove `config->civiRelativeURL` and `civicrm_variables.tpl`
These appear to be an outmoded technique for building links in JS. We now
CRM.url(), which does a better job anyway (w/clean or dirty URLs).
Tim Otten [Mon, 17 Aug 2015 00:54:57 +0000 (17:54 -0700)]
CRM-16373 - Config - Remove `civiVersion` property
Only used once in the entire codebase, and it can be fetched
directly (without any weird statefulness).
Tim Otten [Sun, 16 Aug 2015 04:28:44 +0000 (21:28 -0700)]
CRM-16036 - _civicrm_api3_get_using_utils_sql - Pass SQL fragments as object
This enables IDE goodies (autocomplete/drilldown/docs) and allows you to use
CRM_Utils_SQL_Select's interpolate/escape/implode features
(e.g. `foo.id IN (#idlist)`).
Eileen McNaughton [Sun, 16 Aug 2015 20:46:24 +0000 (08:46 +1200)]
Merge pull request #6516 from eileenmcnaughton/CRM-16737
CRM-16737 adjustment, (do not merge to master) referred to wrong param
Kurund Jalmi [Sun, 16 Aug 2015 18:33:55 +0000 (00:03 +0530)]
Merge pull request #6508 from lsmithgo/patch-2
CRM-17030 Fix to Event Confirmation template to improve deliverability
monishdeb [Sun, 16 Aug 2015 15:54:52 +0000 (21:24 +0530)]
Formatting fixes 2
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
monishdeb [Sun, 16 Aug 2015 15:34:39 +0000 (21:04 +0530)]
contact reference fix and minor improvments
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
eileenmcnaughton [Sun, 16 Aug 2015 13:44:52 +0000 (13:44 +0000)]
CRM-16737 adjustment, (do not merge to master) referred to wrong param
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 [Sun, 16 Aug 2015 02:47:06 +0000 (14:47 +1200)]
CRM-17023 declare relevant settings metadata
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
eileenmcnaugton [Fri, 14 Aug 2015 03:20:49 +0000 (15:20 +1200)]
CRM-17023 exactfirst doesn't work
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.
monishdeb [Sat, 15 Aug 2015 21:11:59 +0000 (02:41 +0530)]
formatting fixes 1
monishdeb [Sat, 15 Aug 2015 21:02:38 +0000 (02:32 +0530)]
formatting fixes
monishdeb [Sat, 15 Aug 2015 20:45:28 +0000 (02:15 +0530)]
Test fixes for All kind of Custom Values
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
lsmithgo [Sat, 15 Aug 2015 15:28:32 +0000 (16:28 +0100)]
CRM-17030 Fix to Event Confirmation template to improve email deliverability
The Google API is only required by the webpages, not the emails. So the fix is simply to move the <script> reference into an IF statement that only applies if SocialNetworks is being used on a webpage.
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
Mathieu Lutfy [Fri, 14 Aug 2015 13:52:54 +0000 (09:52 -0400)]
CRM-17025: use https in 'empowered by' link.
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
Tim Otten [Fri, 14 Aug 2015 05:59:39 +0000 (22:59 -0700)]
CRM-16205 - regen.sh - Exclude cache, extension, dir/path settings, and third-party tables.
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
eileenmcnaugton [Fri, 14 Aug 2015 02:18:49 +0000 (14:18 +1200)]
Formatting fixes
eileenmcnaugton [Fri, 14 Aug 2015 01:27:15 +0000 (13:27 +1200)]
CRM-17020 remove unindexed join from activity report
:
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.