Eileen McNaughton [Mon, 1 Feb 2016 20:47:35 +0000 (09:47 +1300)]
Merge pull request #7696 from eileenmcnaughton/CRM-17898
CRM-17898 look at phone_numeric rather than phone when deduping
Eileen McNaughton [Mon, 1 Feb 2016 20:46:52 +0000 (09:46 +1300)]
Merge pull request #7700 from xurizaemon/CRM-17909
CRM-17909. Correct parameter to ts() for risky file warning.
colemanw [Mon, 1 Feb 2016 20:04:53 +0000 (13:04 -0700)]
Merge pull request #7710 from totten/master-ckeditor
CRM-17924 - crm.ckeditor.js - Allow email-style tags+attributes
Tim Otten [Mon, 1 Feb 2016 18:49:32 +0000 (11:49 -0700)]
CRM-17924 - crm.ckeditor.js - Allow email-style tags+attributes
colemanw [Mon, 1 Feb 2016 17:36:59 +0000 (10:36 -0700)]
Merge pull request #7707 from mlutfy/4.7-crm17914
CRM-17914: Support right-to-left languages in the CiviCRM installer.
Coleman Watts [Mon, 1 Feb 2016 17:08:41 +0000 (10:08 -0700)]
Standardize @inheritDoc annotation
Tim Otten [Sun, 31 Jan 2016 22:58:37 +0000 (15:58 -0700)]
Merge pull request #7694 from routinet/CRM17748
Fix: new unbuffered query wrapper, work-around for no record count
Mathieu Lutfy [Sun, 31 Jan 2016 22:39:38 +0000 (17:39 -0500)]
CRM-17914: Support right-to-left languages in the CiviCRM installer.
Tim Otten [Sun, 31 Jan 2016 22:13:28 +0000 (15:13 -0700)]
Merge pull request #7701 from totten/master-getlink
CRM-17911 - Fix cxn "Settings" link on WordPress
Tim Otten [Sun, 31 Jan 2016 01:39:59 +0000 (18:39 -0700)]
CRM-17911 - crmCxn ManageCtrl - Use `page_name` instead of `page`
Tim Otten [Sun, 31 Jan 2016 01:26:37 +0000 (18:26 -0700)]
CRM-17911 - Cxn.getlink API - Accept `page` or `page_name`
Chris Burgess [Sat, 30 Jan 2016 19:52:05 +0000 (08:52 +1300)]
CRM-17909. Correct parameter to ts() for risky file warning.
Monish Deb [Fri, 29 Jan 2016 18:18:58 +0000 (23:48 +0530)]
Merge pull request #7697 from monishdeb/CRM-17892
CRM-17892 fix
Monish Deb [Fri, 29 Jan 2016 18:17:18 +0000 (23:47 +0530)]
Merge pull request #7698 from jitendrapurohit/CRM-17889
CRM-17889 -- New Mailing page hangs on multilingual setup
jitendrapurohit [Fri, 29 Jan 2016 11:12:48 +0000 (16:42 +0530)]
CRM-17889 -- New Mailing page hangs on multilingual setup
deb.monish [Fri, 29 Jan 2016 07:51:13 +0000 (13:21 +0530)]
CRM-17892 fix
eileenmcnaughton [Fri, 29 Jan 2016 06:53:30 +0000 (06:53 +0000)]
CRM-17898 look at phone_numeric rather than phone when deduping
colemanw [Fri, 29 Jan 2016 02:22:20 +0000 (21:22 -0500)]
Merge pull request #7695 from colemanw/explorer
Api explorer - fix javascript error
Coleman Watts [Fri, 29 Jan 2016 02:15:19 +0000 (21:15 -0500)]
Api explorer - fix javascript error
Steve Binkowski [Thu, 28 Jan 2016 20:51:53 +0000 (15:51 -0500)]
Cosmetic fixes, per Jenkins
Steve Binkowski [Thu, 28 Jan 2016 20:33:22 +0000 (15:33 -0500)]
Fix: new unbuffered query wrapper, work-around for no record count
colemanw [Thu, 28 Jan 2016 19:34:45 +0000 (14:34 -0500)]
Merge pull request #7692 from sarehag/master
CRM-17852 - Misspeled state names in Estonia/Lithuania - updated wher…
Eileen McNaughton [Thu, 28 Jan 2016 15:24:18 +0000 (04:24 +1300)]
Merge pull request #7678 from eileenmcnaughton/CRM-17882
CRM-17882 Add index to civicrm_contribution.credit_note_id
Eileen McNaughton [Thu, 28 Jan 2016 15:22:10 +0000 (04:22 +1300)]
Merge pull request #7659 from JMAConsulting/CRM-16188-1
--CRM-16188, added function to check the total amount and sum of line…
Eileen McNaughton [Thu, 28 Jan 2016 15:15:37 +0000 (04:15 +1300)]
Merge pull request #7690 from sarehag/master
CRM-17852 - Misspeled state names in Estonia/Lithuania
sarehag [Thu, 28 Jan 2016 14:07:23 +0000 (15:07 +0100)]
CRM-17852 - Misspeled state names in Estonia/Lithuania - updated where statements
sarehag [Thu, 28 Jan 2016 11:55:02 +0000 (12:55 +0100)]
CRM-17852 - Misspeled state names in Estonia/Lithuania
CiviCRM [Wed, 27 Jan 2016 23:49:33 +0000 (15:49 -0800)]
Update version to 4.7.1
Tim Otten [Wed, 27 Jan 2016 23:31:36 +0000 (15:31 -0800)]
Merge pull request #7688 from totten/master-verchk
CRM_Utils_VersionCheck - Don't display warning on first login
Tim Otten [Wed, 27 Jan 2016 23:14:48 +0000 (15:14 -0800)]
CRM_Utils_VersionCheck - Don't display warning on first login
Using `$config->uploadDir` will trigger automatic setup for the dir.
Using `Civi::paths->getPath()` does not.
Tim Otten [Wed, 27 Jan 2016 22:11:12 +0000 (14:11 -0800)]
Merge pull request #7668 from totten/master-16514
CRM-16514 - Scheduled reminder should not be sent repeatedly
eileen [Wed, 27 Jan 2016 18:58:00 +0000 (07:58 +1300)]
CRM-17882 Add index to civicrm_contribution.credit_note_id
Change-Id: I5ad63820a3df93995ebd65ec76a8b3aac87ba1c6
colemanw [Wed, 27 Jan 2016 22:01:18 +0000 (17:01 -0500)]
Merge pull request #7682 from colemanw/undefined-index
Fix undefined index
colemanw [Wed, 27 Jan 2016 21:54:55 +0000 (16:54 -0500)]
Merge pull request #7681 from colemanw/CRM-17886
CRM-17886 - Fix contribution page toggleSubmitButton js
Coleman Watts [Wed, 27 Jan 2016 21:51:34 +0000 (16:51 -0500)]
Cleanup duplicate js
Tim Otten [Wed, 27 Jan 2016 01:30:31 +0000 (17:30 -0800)]
CRM-16514 - Scheduled reminder should not be sent repeatedly
Forward port of jitendra's
df8bf05e2dc6d4bd7979a0487a76f59fabf8a68b
Coleman Watts [Wed, 27 Jan 2016 21:25:07 +0000 (16:25 -0500)]
Fix undefined index
Coleman Watts [Wed, 27 Jan 2016 21:20:23 +0000 (16:20 -0500)]
CRM-17886 - Fix contribution page toggleSubmitButton js
colemanw [Wed, 27 Jan 2016 20:04:42 +0000 (15:04 -0500)]
Merge pull request #7673 from eileenmcnaughton/CRM-17752-re-do
CRM-17881 change index upgrade addition civicrm_financian_trxn.trxn_i…
Eileen McNaughton [Wed, 27 Jan 2016 20:01:46 +0000 (09:01 +1300)]
Merge pull request #7648 from eileenmcnaughton/master
Test Fix (entity tag ACL also needs access CiviCRM)
colemanw [Wed, 27 Jan 2016 19:59:06 +0000 (14:59 -0500)]
Merge pull request #7675 from PalanteJon/CRM-17885
CRM-17885 - Allow hiding notices on status screen
Eileen McNaughton [Wed, 27 Jan 2016 19:56:37 +0000 (08:56 +1300)]
Merge pull request #7672 from eileenmcnaughton/index
CRM-17881 add test to CRM_Core_BAO_SchemaHandler::createIndexes fn
eileen [Wed, 27 Jan 2016 19:36:20 +0000 (08:36 +1300)]
Test fix
Change-Id: I37cdcb1eae7dba845c619400f95eef6ca63425b4
eileen [Wed, 27 Jan 2016 08:23:53 +0000 (21:23 +1300)]
CRM-17881 add test to CRM_Core_BAO_SchemaHandler::createIndexes fn
eileen [Wed, 27 Jan 2016 08:38:10 +0000 (21:38 +1300)]
CRM-17881 change index upgrade addition civicrm_financian_trxn.trxn_id to be upgrade friendly
Also ref CRM-17752
colemanw [Wed, 27 Jan 2016 18:38:58 +0000 (13:38 -0500)]
Merge pull request #7676 from colemanw/iats-lock
Remove iats from 4.7.0 release
Coleman Watts [Wed, 27 Jan 2016 17:46:27 +0000 (12:46 -0500)]
Remove iats from 4.7.0 release
Jon goldberg [Wed, 27 Jan 2016 17:17:43 +0000 (12:17 -0500)]
CRM-17885 - Allow hiding notices on status screen
colemanw [Wed, 27 Jan 2016 14:42:51 +0000 (09:42 -0500)]
Merge pull request #7660 from JMAConsulting/CRM-16188-2
Crm 16188 2
Monish Deb [Wed, 27 Jan 2016 06:52:33 +0000 (12:22 +0530)]
Merge pull request #7595 from monishdeb/CRM-17807
Crm 17807
Eileen McNaughton [Wed, 27 Jan 2016 06:43:25 +0000 (19:43 +1300)]
Merge pull request #7671 from eileenmcnaughton/comments
some random comment fixes
Pradeep Nayak [Wed, 27 Jan 2016 03:55:22 +0000 (09:25 +0530)]
--CRM-16188, ignore syntax check for order
eileen [Wed, 27 Jan 2016 02:22:53 +0000 (15:22 +1300)]
some random comment fixes
colemanw [Wed, 27 Jan 2016 02:10:39 +0000 (21:10 -0500)]
Merge pull request #7665 from julialongtin/safe_changes
Safe changes
Julia Longtin [Tue, 26 Jan 2016 23:27:16 +0000 (23:27 +0000)]
missing period.
Julia Longtin [Tue, 26 Jan 2016 23:23:26 +0000 (23:23 +0000)]
group assignments, and add some better comments.
Pradeep Nayak [Tue, 26 Jan 2016 22:19:08 +0000 (03:49 +0530)]
CRM-16188, fixed check style
----------------------------------------
* CRM-16188: Create an order API
https://issues.civicrm.org/jira/browse/CRM-16188
Pradeep Nayak [Tue, 26 Jan 2016 22:15:47 +0000 (03:45 +0530)]
CRM-16188, modified code to add exception and also changed test to check exception errors
----------------------------------------
* CRM-16188: Create an order API
https://issues.civicrm.org/jira/browse/CRM-16188
Pradeep Nayak [Tue, 26 Jan 2016 21:57:20 +0000 (03:27 +0530)]
CRM-16188, added test for changes for commit https://github.com/JMAConsulting/civicrm-core/commit/
4a517906b390b7e9e73c77902f3a3ebf43c1ac15
----------------------------------------
* CRM-16188: Create an order API
https://issues.civicrm.org/jira/browse/CRM-16188
colemanw [Tue, 26 Jan 2016 21:25:59 +0000 (16:25 -0500)]
Merge pull request #7625 from totten/master-case-rel
CRM-17342 - Case Managed Entities - Don't recreate disabled relationship types
colemanw [Tue, 26 Jan 2016 21:21:39 +0000 (16:21 -0500)]
Merge pull request #7620 from monishdeb/CRM-17685
CRM-17836 fix - custom fields attached to relationships are unsearchable
Pradeep Nayak [Tue, 26 Jan 2016 21:05:02 +0000 (02:35 +0530)]
-- fixed array indentation, CRM-16188
----------------------------------------
* CRM-16188: Create an order API
https://issues.civicrm.org/jira/browse/CRM-16188
Pradeep Nayak [Tue, 26 Jan 2016 20:44:03 +0000 (02:14 +0530)]
--CRM-16188, fixed typo
Pradeep Nayak [Tue, 26 Jan 2016 20:39:51 +0000 (02:09 +0530)]
--CRM-16188, removed white spaces
Pradeep Nayak [Tue, 26 Jan 2016 20:37:11 +0000 (02:07 +0530)]
CRM-16188, removed white spaces
----------------------------------------
* CRM-16188: Create an order API
https://issues.civicrm.org/jira/browse/CRM-16188
Pradeep Nayak [Tue, 26 Jan 2016 20:31:47 +0000 (02:01 +0530)]
CRM-16188, added order api test for get action
----------------------------------------
* CRM-16188: Create an order API
https://issues.civicrm.org/jira/browse/CRM-16188
Pradeep Nayak [Tue, 26 Jan 2016 20:31:19 +0000 (02:01 +0530)]
--CRM-16188, changed code to use contribution_id when retrieving wrt contribution
Pradeep Nayak [Tue, 26 Jan 2016 20:30:38 +0000 (02:00 +0530)]
CRM-16188, added get Order api
----------------------------------------
* CRM-16188: Create an order API
https://issues.civicrm.org/jira/browse/CRM-16188
Pradeep Nayak [Tue, 26 Jan 2016 20:02:14 +0000 (01:32 +0530)]
--CRM-16188, added function to check the total amount and sum of line total
Tim Otten [Tue, 26 Jan 2016 19:52:23 +0000 (11:52 -0800)]
Merge pull request #7657 from totten/master-wp-upgr
SettingsBag - Fix upgrade failure for WP 4.4=>4.7
Coleman Watts [Tue, 26 Jan 2016 16:41:11 +0000 (11:41 -0500)]
Fix function docblock
Tim Otten [Tue, 26 Jan 2016 01:49:32 +0000 (17:49 -0800)]
SettingsBag - Fix upgrade failure for WP 4.4=>4.7
The WP integration attempts to define a new setting (`wpLoadPhp`) during
bootstrap -- before upgrade logic has run. This was failing because the
`group_name` property wouldn't get passed through by DAO (because the DAO is
newer than the schema).
Eileen McNaughton [Tue, 26 Jan 2016 07:37:10 +0000 (20:37 +1300)]
Merge pull request #7651 from seamuslee001/CRM-14901
CRM-14901 Add in entity_table whitelists for uf_join, entity_tag, mai…
colemanw [Tue, 26 Jan 2016 01:51:46 +0000 (20:51 -0500)]
Merge pull request #7656 from totten/master-civi-ns
CRM-17860 - tools/scripts/phpunit - Fix for 'Civi\Foo\Bar'
Tim Otten [Tue, 26 Jan 2016 00:57:33 +0000 (16:57 -0800)]
Merge pull request #7642 from totten/master-wp-path
CRM-17860 - CRM_Utils_System_WordPress - Path lookup
Tim Otten [Fri, 22 Jan 2016 09:48:17 +0000 (01:48 -0800)]
CRM-17860 - tools/scripts/phpunit - Fix for 'Civi\Foo\Bar'
monishdeb [Mon, 25 Jan 2016 19:46:00 +0000 (01:16 +0530)]
test coverage
Yashodha Chaku [Mon, 25 Jan 2016 13:13:39 +0000 (18:43 +0530)]
Merge pull request #7654 from yashodha/contributors-update
update contributor list from github
monishdeb [Wed, 20 Jan 2016 20:24:56 +0000 (01:54 +0530)]
CRM-17836 fix - custom fields attached to relationships are unsearchable
https://issues.civicrm.org/jira/browse/CRM-17836
yashodha [Mon, 25 Jan 2016 09:26:10 +0000 (14:56 +0530)]
update contributor list from github
Monish Deb [Mon, 25 Jan 2016 09:11:20 +0000 (14:41 +0530)]
Merge pull request #7603 from jitendrapurohit/CRM-17810
CRM-17810 Add pager to custom data tab
Seamus Lee [Mon, 25 Jan 2016 07:24:16 +0000 (07:24 +0000)]
add in missing callback tag
Yashodha Chaku [Mon, 25 Jan 2016 05:33:45 +0000 (11:03 +0530)]
Merge pull request #7636 from jitendrapurohit/CRM-17839
CRM-17839 -- unable to edit custom data in tab if inline set already …
Eileen McNaughton [Mon, 25 Jan 2016 05:02:38 +0000 (18:02 +1300)]
Merge pull request #7649 from eileenmcnaughton/CRM-17350
CRM-17350 - Allowing editing of tags by ACL
Seamus Lee [Sun, 17 Jan 2016 23:53:39 +0000 (23:53 +0000)]
CRM-14901 Add in entity_table whitelists for uf_join, entity_tag, mailing_group and note
eileenmcnaughton [Mon, 25 Jan 2016 01:08:06 +0000 (01:08 +0000)]
CRM-17350 add unit test for tag api create permission
eileenmcnaughton [Mon, 25 Jan 2016 03:13:02 +0000 (03:13 +0000)]
CRM-17350 fix previous entity acl fix to make check_permissions optional
Jon goldberg [Fri, 9 Oct 2015 01:21:58 +0000 (21:21 -0400)]
CRM-17350 - Allowing editing of tags when you don't have 'edit all contacts' permission
Conflicts:
CRM/Core/DAO/permissions.php
Eileen McNaughton [Mon, 25 Jan 2016 02:55:37 +0000 (15:55 +1300)]
Merge pull request #7650 from eileenmcnaughton/tests
CRM-17350 preliminary test clean up for entity-tag acl permission fix
colemanw [Mon, 25 Jan 2016 02:24:06 +0000 (21:24 -0500)]
Merge pull request #7647 from colemanw/CRM-17645
CRM-17645 - Tests and better joins for selectWhereClause
eileenmcnaughton [Mon, 25 Jan 2016 02:20:00 +0000 (02:20 +0000)]
CRM-17350 preliminary test clean up for entity-tag acl permission fix
Coleman Watts [Sun, 24 Jan 2016 22:12:48 +0000 (17:12 -0500)]
CRM-17645 - Tests and better joins for selectWhereClause
Eileen McNaughton [Sun, 24 Jan 2016 20:53:19 +0000 (09:53 +1300)]
Merge pull request #7643 from lcdservices/CRM-17865
CRM-17865: set participant custom field defaults on additional reg form
Eileen McNaughton [Sun, 24 Jan 2016 20:52:53 +0000 (09:52 +1300)]
Merge pull request #7646 from joshgowans/patch-1
Update success.tpl
joshgowans [Sun, 24 Jan 2016 17:29:16 +0000 (10:29 -0700)]
Update success.tpl
Looks like the upgrade message was already changed to reflect 4.7. Made a few very minor updates in the message.
Eileen McNaughton [Sat, 23 Jan 2016 21:28:47 +0000 (10:28 +1300)]
Merge pull request #7640 from eileenmcnaughton/lybunt
CRM-17837 Improve Lybunt report. …
Brian Shaughnessy [Sat, 23 Jan 2016 19:37:13 +0000 (14:37 -0500)]
CRM-17865: set participant custom field defaults on additional reg form
colemanw [Sat, 23 Jan 2016 17:14:12 +0000 (12:14 -0500)]
Merge pull request #7639 from colemanw/CRM-17857
CRM-17857 - Update api explorer to exclude participant joins
Tim Otten [Sat, 23 Jan 2016 05:50:41 +0000 (21:50 -0800)]
CRM-17860 - CRM_Utils_System_WordPress - Path lookup
The implementations of `getDefaultFileStorage()` and
`getCiviSourceStorage()` depended on having the CMS bootstrapped, causing
failures in scripts that boot Civi first.
This patch computes those values by doing some arithmetic, e.g.
* Civi source URL == CMS Base URL + relative path to source tree
* Civi file URL == CMS Base URL + relative path to files dir
----------------------------------------
* CRM-17860: More consistent, flexible handling of tests for extensions
https://issues.civicrm.org/jira/browse/CRM-17860
eileen [Tue, 19 Jan 2016 18:56:21 +0000 (07:56 +1300)]
CRM-17837 Improve Lybunt report.
Add tests for lynbunt results, get custom data working for contacts in it, remove non-working address group bys,
fix query to be more efficient on a large dataset
projects / civicrm-core.git / log