civicrm-core.git
8 years agoCRM-16259, used api calling instead save()
Pradeep Nayak [Tue, 12 Jan 2016 11:03:45 +0000 (16:33 +0530)]
CRM-16259, used api calling instead save()

----------------------------------------
* CRM-16259: Create Payment API
  https://issues.civicrm.org/jira/browse/CRM-16259

8 years ago--CRM-16259, removed white space
Pradeep Nayak [Fri, 18 Dec 2015 14:10:09 +0000 (19:40 +0530)]
--CRM-16259, removed white space

8 years ago--CRM-16259, added function to allocate line item proportinally
Pradeep Nayak [Wed, 16 Dec 2015 13:49:52 +0000 (19:19 +0530)]
--CRM-16259, added function to allocate line item proportinally

8 years agoUpdate version to 4.7.0
CiviCRM [Wed, 20 Jan 2016 11:12:46 +0000 (03:12 -0800)]
Update version to 4.7.0

8 years agoMerge pull request #7604 from rohankatkar/17815
Monish Deb [Wed, 20 Jan 2016 06:14:09 +0000 (11:44 +0530)]
Merge pull request #7604 from rohankatkar/17815

CRM-17815 fix

8 years agoMinor changes
Web Access [Wed, 20 Jan 2016 05:47:23 +0000 (11:17 +0530)]
Minor changes

8 years agoAdditional fix for CRM-17815 and alignment fixes
Web Access [Tue, 19 Jan 2016 12:58:57 +0000 (18:28 +0530)]
Additional fix for CRM-17815 and alignment fixes

8 years agoCRM-17815 fix
Web Access [Fri, 15 Jan 2016 09:40:53 +0000 (15:10 +0530)]
CRM-17815 fix

8 years agoMerge pull request #7618 from eileenmcnaughton/CRM-17837
Eileen McNaughton [Wed, 20 Jan 2016 02:50:02 +0000 (15:50 +1300)]
Merge pull request #7618 from eileenmcnaughton/CRM-17837

CRM-17837 Report class, various minor tweaks to support increasing te…

8 years agoCRM-17837 Report class, various minor tweaks to support increasing test coverage
eileen [Tue, 19 Jan 2016 21:33:18 +0000 (10:33 +1300)]
CRM-17837 Report class, various minor tweaks to support increasing test coverage

8 years agoMerge pull request #7617 from eileenmcnaughton/CRM-17837
Eileen McNaughton [Tue, 19 Jan 2016 23:20:01 +0000 (12:20 +1300)]
Merge pull request #7617 from eileenmcnaughton/CRM-17837

CRM-17837 Report class pager function, test/ api access fix

8 years agoMerge pull request #7615 from colemanw/CRM-17429
colemanw [Tue, 19 Jan 2016 21:48:15 +0000 (16:48 -0500)]
Merge pull request #7615 from colemanw/CRM-17429

CRM-17429 - Disable google checkout payment processors

8 years agoReport class, add ts to untranslated string
eileen [Tue, 19 Jan 2016 21:33:18 +0000 (10:33 +1300)]
Report class, add ts to untranslated string

Change-Id: I4c63afabd9d3d0f7c31a07dae4b91f660b8b7466

8 years agoCRM-17837 Report class pager function, test/ api access fix.
eileen [Tue, 19 Jan 2016 21:32:15 +0000 (10:32 +1300)]
CRM-17837 Report class pager function, test/ api access fix.

This minor patch just checks if the get function is callable before calling it. It allows the api calls to not fatal.
The api calls are primarily used in the unit tests at this stage although the original intent was about more flexible charting by retrieving
the data from an api & passing it to 'any' charting library

Change-Id: I8b3e4e9ade3f75ce8bc6e608cb3c7c6e60d127b9

8 years agoMerge pull request #7616 from eileenmcnaughton/CRM-17837
Eileen McNaughton [Tue, 19 Jan 2016 21:06:05 +0000 (10:06 +1300)]
Merge pull request #7616 from eileenmcnaughton/CRM-17837

CRM-17837 store rollup result grand total on the class rather than di…

8 years agoCRM-17837 store rollup result grand total on the class rather than discarding it
eileen [Tue, 19 Jan 2016 19:47:59 +0000 (08:47 +1300)]
CRM-17837 store rollup result grand total on the class rather than discarding it

This makes it available for re-use in the statistics

8 years agoCRM-17429 - Disable google checkout payment processors
Coleman Watts [Tue, 19 Jan 2016 19:34:10 +0000 (14:34 -0500)]
CRM-17429 - Disable google checkout payment processors

8 years agoMerge pull request #7612 from colemanw/CRM-17429
colemanw [Tue, 19 Jan 2016 16:29:34 +0000 (11:29 -0500)]
Merge pull request #7612 from colemanw/CRM-17429

CRM-17429 - Remove Google Checkout payment processor

8 years agoCRM-17429 - Test fixes
Coleman Watts [Tue, 19 Jan 2016 03:17:04 +0000 (22:17 -0500)]
CRM-17429 - Test fixes

8 years agoCRM-17429 - Remove Google Checkout payment processor
Coleman Watts [Tue, 19 Jan 2016 01:39:43 +0000 (20:39 -0500)]
CRM-17429 - Remove Google Checkout payment processor

8 years agoMerge pull request #7609 from colemanw/editPerm
colemanw [Mon, 18 Jan 2016 23:28:27 +0000 (18:28 -0500)]
Merge pull request #7609 from colemanw/editPerm

CRM-17795 - Api.create/delete - support acls for contact related entities

8 years agoMerge pull request #7611 from eileenmcnaughton/CRM-16278
Eileen McNaughton [Mon, 18 Jan 2016 22:46:58 +0000 (11:46 +1300)]
Merge pull request #7611 from eileenmcnaughton/CRM-16278

CRM-16278 add financial type field to pledge reports

8 years agoCRM-16278 add financial type field to pledge reports
eileen [Mon, 18 Jan 2016 22:05:47 +0000 (11:05 +1300)]
CRM-16278 add financial type field to pledge reports

8 years agoCRM-17795 - Test fix
Coleman Watts [Mon, 18 Jan 2016 20:52:36 +0000 (15:52 -0500)]
CRM-17795 - Test fix

8 years agoMerge pull request #7610 from rohankatkar/CRM-17273-webtest
Eileen McNaughton [Mon, 18 Jan 2016 20:50:44 +0000 (09:50 +1300)]
Merge pull request #7610 from rohankatkar/CRM-17273-webtest

Webtest - CRM-17273

8 years agoMerge branch 'PalanteJon-CRM-17552-v2'
Coleman Watts [Mon, 18 Jan 2016 19:37:40 +0000 (14:37 -0500)]
Merge branch 'PalanteJon-CRM-17552-v2'

Conflicts:
CRM/Upgrade/Incremental/sql/4.7.beta8.mysql.tpl

8 years agoCRM-17795 - Api.contact.create/delete - support acls for contacts
Coleman Watts [Mon, 18 Jan 2016 18:06:26 +0000 (13:06 -0500)]
CRM-17795 - Api.contact.create/delete - support acls for contacts

8 years agoCRM-17795 - Api.create/delete - support acls for contact related entities
Coleman Watts [Sun, 17 Jan 2016 21:12:39 +0000 (16:12 -0500)]
CRM-17795 - Api.create/delete - support acls for contact related entities

8 years agoWarning fix
Web Access [Mon, 18 Jan 2016 13:31:11 +0000 (19:01 +0530)]
Warning fix

8 years agoWebtest - CRM-17273
Web Access [Mon, 18 Jan 2016 13:21:14 +0000 (18:51 +0530)]
Webtest - CRM-17273

8 years agoMerge pull request #7605 from monishdeb/CRM-17685
Monish Deb [Mon, 18 Jan 2016 06:30:34 +0000 (12:00 +0530)]
Merge pull request #7605 from monishdeb/CRM-17685

CRM-17685 fix - CiviCRM DB Syntax Error when enabling logging

8 years agoMerge pull request #7592 from colemanw/CRM-17645
colemanw [Sun, 17 Jan 2016 21:00:18 +0000 (16:00 -0500)]
Merge pull request #7592 from colemanw/CRM-17645

CRM-17645 - Case acl improvements

8 years agoCRM-17645 - Move util function
Coleman Watts [Sat, 16 Jan 2016 01:06:44 +0000 (20:06 -0500)]
CRM-17645 - Move util function

8 years agoMerge pull request #7608 from colemanw/CRM-16353
colemanw [Fri, 15 Jan 2016 21:14:37 +0000 (16:14 -0500)]
Merge pull request #7608 from colemanw/CRM-16353

CRM-16353 - Warn not to use deprecated function

8 years agoCRM-16353 - Warn not to copy-paste legacy code
Coleman Watts [Fri, 15 Jan 2016 18:38:06 +0000 (13:38 -0500)]
CRM-16353 - Warn not to copy-paste legacy code

8 years agoCRM-16353 - Warn not to use deprecated function
Coleman Watts [Fri, 15 Jan 2016 18:28:54 +0000 (13:28 -0500)]
CRM-16353 - Warn not to use deprecated function

8 years agoMerge pull request #7607 from JKingsnorth/unused-icons
colemanw [Fri, 15 Jan 2016 17:56:45 +0000 (12:56 -0500)]
Merge pull request #7607 from JKingsnorth/unused-icons

Remove unused icons

8 years agoRemove unused icons
JKingsnorth [Fri, 15 Jan 2016 15:57:48 +0000 (15:57 +0000)]
Remove unused icons

8 years agoMerge pull request #7606 from JKingsnorth/patch-5
colemanw [Fri, 15 Jan 2016 14:46:43 +0000 (09:46 -0500)]
Merge pull request #7606 from JKingsnorth/patch-5

Delete EnvelopeIn.gif

8 years agoDelete EnvelopeIn.gif
John Kingsnorth [Fri, 15 Jan 2016 14:42:58 +0000 (14:42 +0000)]
Delete EnvelopeIn.gif

Couldn't find anything that references this icon

8 years agoCRM-17685 fix - CiviCRM DB Syntax Error when enabling logging
monishdeb [Fri, 15 Jan 2016 14:12:01 +0000 (19:42 +0530)]
CRM-17685 fix - CiviCRM DB Syntax Error when enabling logging

https://issues.civicrm.org/jira/browse/CRM-17685

8 years agoMerge pull request #7602 from JKingsnorth/CRM-17826
colemanw [Fri, 15 Jan 2016 14:02:13 +0000 (09:02 -0500)]
Merge pull request #7602 from JKingsnorth/CRM-17826

CRM-17826: Font awesome icons

8 years agoUpdate icons in CiviCampaign
JKingsnorth [Fri, 15 Jan 2016 12:14:04 +0000 (12:14 +0000)]
Update icons in CiviCampaign

8 years agoUpdate tree icons to font awesome
JKingsnorth [Fri, 15 Jan 2016 11:40:04 +0000 (11:40 +0000)]
Update tree icons to font awesome

8 years agoMerge pull request #7600 from yashodha/fix-version
Monish Deb [Fri, 15 Jan 2016 06:25:33 +0000 (11:55 +0530)]
Merge pull request #7600 from yashodha/fix-version

Update version to 4.7.beta8

8 years agoUpdate version to 4.7.beta8
yashodha [Fri, 15 Jan 2016 06:20:58 +0000 (11:50 +0530)]
Update version to 4.7.beta8

8 years agoCRM-17645 - Better integration of hook_civicrm_selectWhereClause
Coleman Watts [Fri, 15 Jan 2016 04:53:55 +0000 (23:53 -0500)]
CRM-17645 - Better integration of hook_civicrm_selectWhereClause

8 years agoCRM-17645 - More consistent function naming
Coleman Watts [Fri, 15 Jan 2016 01:33:52 +0000 (20:33 -0500)]
CRM-17645 - More consistent function naming

8 years agoCRM-17645 - add hook_civicrm_selectWhereClause
Coleman Watts [Fri, 15 Jan 2016 01:30:44 +0000 (20:30 -0500)]
CRM-17645 - add hook_civicrm_selectWhereClause

8 years agoCRM-17645 - Introduce aclWhere clause into case search
Coleman Watts [Fri, 15 Jan 2016 01:16:41 +0000 (20:16 -0500)]
CRM-17645 - Introduce aclWhere clause into case search

8 years agoCase api test fixes/skips
Coleman Watts [Thu, 14 Jan 2016 21:04:39 +0000 (16:04 -0500)]
Case api test fixes/skips

8 years agoCRM-17645 - Migrate more case lookups to go through api
Coleman Watts [Thu, 14 Jan 2016 20:26:16 +0000 (15:26 -0500)]
CRM-17645 - Migrate more case lookups to go through api

8 years agoRemove unused case functions
Coleman Watts [Thu, 14 Jan 2016 17:44:08 +0000 (12:44 -0500)]
Remove unused case functions

8 years agoCRM-17645 - Add filters for Case entityRef
Coleman Watts [Thu, 14 Jan 2016 17:17:27 +0000 (12:17 -0500)]
CRM-17645 - Add filters for Case entityRef

8 years agoCRM-17645 - Convert case autocompletes to use EntityRef
Coleman Watts [Thu, 14 Jan 2016 02:22:23 +0000 (21:22 -0500)]
CRM-17645 - Convert case autocompletes to use EntityRef

8 years agoCRM-17795 - Prevent (most) redundant acl sub clauses
Coleman Watts [Wed, 13 Jan 2016 21:14:30 +0000 (16:14 -0500)]
CRM-17795 - Prevent (most) redundant acl sub clauses

8 years agoCRM-17645 - Add entityRef support for autocompleting Cases
Coleman Watts [Wed, 13 Jan 2016 04:04:32 +0000 (23:04 -0500)]
CRM-17645 - Add entityRef support for autocompleting Cases

8 years agoCRM-17795 - Fix order by to work across joins
Coleman Watts [Wed, 13 Jan 2016 04:03:44 +0000 (23:03 -0500)]
CRM-17795 - Fix order by to work across joins

8 years agoCRM-17645 - Refactor case permissions to go through the api
Coleman Watts [Tue, 5 Jan 2016 21:28:30 +0000 (16:28 -0500)]
CRM-17645 - Refactor case permissions to go through the api

8 years agoCleanup - rm unused vars
Coleman Watts [Mon, 4 Jan 2016 22:56:28 +0000 (17:56 -0500)]
Cleanup - rm unused vars

8 years agoMerge pull request #7597 from colemanw/CRM-17819
colemanw [Thu, 14 Jan 2016 17:47:22 +0000 (12:47 -0500)]
Merge pull request #7597 from colemanw/CRM-17819

CRM-17819 - Api explorer - fix field name parsing

8 years agoCRM-17819 - Api explorer - fix field name parsing
Coleman Watts [Thu, 14 Jan 2016 17:47:07 +0000 (12:47 -0500)]
CRM-17819 - Api explorer - fix field name parsing

8 years agoMerge pull request #7596 from agh1/dedupe-modified-date
colemanw [Thu, 14 Jan 2016 17:23:07 +0000 (12:23 -0500)]
Merge pull request #7596 from agh1/dedupe-modified-date

CRM-17818 Dedupe merge: use crmDate instead of hardcoded format

8 years agoCRM-17818 Dedupe merge: use crmDate instead of hardcoded format
Andrew Hunt [Thu, 14 Jan 2016 16:36:05 +0000 (11:36 -0500)]
CRM-17818 Dedupe merge: use crmDate instead of hardcoded format

----------------------------------------
* CRM-17818: Merge screen modified date hardcoded format
  https://issues.civicrm.org/jira/browse/CRM-17818

8 years agoMerge pull request #7590 from rohankatkar/CRM-17787
Monish Deb [Thu, 14 Jan 2016 10:37:04 +0000 (16:07 +0530)]
Merge pull request #7590 from rohankatkar/CRM-17787

CRM-17787

8 years agoMerge pull request #7584 from jitendrapurohit/CRM-17809
Monish Deb [Thu, 14 Jan 2016 07:54:40 +0000 (13:24 +0530)]
Merge pull request #7584 from jitendrapurohit/CRM-17809

CRM-17809 -- Fatal Error on Date Format Page

8 years agoMerge pull request #7535 from monishdeb/unitTestFixes
Monish Deb [Thu, 14 Jan 2016 05:11:09 +0000 (10:41 +0530)]
Merge pull request #7535 from monishdeb/unitTestFixes

CRM-11153 fix - Custom tokens in scheduled reminders

8 years agoUpgrade script for CRM-17552
Jon goldberg [Thu, 14 Jan 2016 05:09:21 +0000 (00:09 -0500)]
Upgrade script for CRM-17552

8 years agoCRM-17522 - CiviMember - support using membership price sets on contribution pages...
Jon goldberg [Thu, 12 Nov 2015 00:32:54 +0000 (19:32 -0500)]
CRM-17522 - CiviMember - support using membership price sets on contribution pages without requiring selecting a membership option

8 years agoMerge pull request #7589 from systopia/master
Yashodha Chaku [Thu, 14 Jan 2016 03:54:15 +0000 (09:24 +0530)]
Merge pull request #7589 from systopia/master

CRM-17814 - fixed missing ts() for activity types in advanced search

8 years agoMerge pull request #7476 from JMAConsulting/CRM-16259-4
Eileen McNaughton [Wed, 13 Jan 2016 22:10:55 +0000 (11:10 +1300)]
Merge pull request #7476 from JMAConsulting/CRM-16259-4

--CRM-16259, added function to add payments for partially paid contri…

8 years agoCRM-17787
Web Access [Wed, 13 Jan 2016 11:29:18 +0000 (16:59 +0530)]
CRM-17787

8 years agofixed missing ts() for activiy types in advanced search
Niko Bochan [Wed, 13 Jan 2016 09:17:08 +0000 (10:17 +0100)]
fixed missing ts() for activiy types in advanced search

8 years agoUpdate version to 4.7.0
CiviCRM [Wed, 13 Jan 2016 08:56:16 +0000 (00:56 -0800)]
Update version to 4.7.0

8 years agoMerge pull request #7588 from ejegg/utils
Monish Deb [Wed, 13 Jan 2016 05:36:18 +0000 (11:06 +0530)]
Merge pull request #7588 from ejegg/utils

Clean up extraneous if clause

8 years agoClean up extraneous if clause
Elliott Eggleston [Wed, 13 Jan 2016 00:31:54 +0000 (16:31 -0800)]
Clean up extraneous if clause

Was returning same thing in either case.

8 years agoMerge pull request #7585 from JKingsnorth/CRM-17629
Tim Otten [Tue, 12 Jan 2016 21:22:39 +0000 (13:22 -0800)]
Merge pull request #7585 from JKingsnorth/CRM-17629

CRM-17629: Stop processing jobs if mailer batch limit reached

8 years agoCRM-17629: Stop processing jobs if mailer batch limit reached
JKingsnorth [Tue, 12 Jan 2016 15:17:24 +0000 (15:17 +0000)]
CRM-17629: Stop processing jobs if mailer batch limit reached

8 years agoMerge pull request #7582 from jitendrapurohit/CRM-17797
Monish Deb [Tue, 12 Jan 2016 15:17:17 +0000 (20:47 +0530)]
Merge pull request #7582 from jitendrapurohit/CRM-17797

CRM-17797 -- Primary participant can not confirm for additional parti…

8 years agoMerge pull request #7565 from colemanw/CRM-17795
colemanw [Tue, 12 Jan 2016 14:12:42 +0000 (09:12 -0500)]
Merge pull request #7565 from colemanw/CRM-17795

Api.get - add support for joins and ACLs

8 years agoMerge pull request #7543 from monishdeb/CRM-17770
Monish Deb [Tue, 12 Jan 2016 12:50:24 +0000 (18:20 +0530)]
Merge pull request #7543 from monishdeb/CRM-17770

CRM-17770 fix - Custom contact fields with files prevent contact reco…

8 years agoCRM-17809 -- Fatal Error on Date Format Page
jitendrapurohit [Tue, 12 Jan 2016 12:33:47 +0000 (18:03 +0530)]
CRM-17809 -- Fatal Error on Date Format Page

8 years ago--CRM-16259, removed white spaces
Pradeep Nayak [Tue, 12 Jan 2016 10:39:56 +0000 (16:09 +0530)]
--CRM-16259, removed white spaces

8 years agoparticipant an grant fix
monishdeb [Tue, 12 Jan 2016 09:08:23 +0000 (14:38 +0530)]
participant an grant fix

8 years agominor fix
jitendrapurohit [Tue, 12 Jan 2016 08:28:38 +0000 (13:58 +0530)]
minor fix

8 years agominor fix
monishdeb [Tue, 12 Jan 2016 08:27:35 +0000 (13:57 +0530)]
minor fix

8 years agoMerge pull request #7581 from seamuslee001/CRM-17802-further
Monish Deb [Tue, 12 Jan 2016 06:19:59 +0000 (11:49 +0530)]
Merge pull request #7581 from seamuslee001/CRM-17802-further

CRM-17802 Make start time midnight not midday woops

8 years agoCRM-17797 -- Primary participant can not confirm for additional participants
jitendrapurohit [Tue, 12 Jan 2016 05:27:12 +0000 (10:57 +0530)]
CRM-17797 -- Primary participant can not confirm for additional participants

8 years agoMerge pull request #7575 from saurabhbatra96/CRM-17801
Yashodha Chaku [Tue, 12 Jan 2016 04:34:56 +0000 (10:04 +0530)]
Merge pull request #7575 from saurabhbatra96/CRM-17801

CRM-17801: Error importing empty CSV

8 years agoMerge pull request #7579 from eileenmcnaughton/CRM-17806
Eileen McNaughton [Tue, 12 Jan 2016 04:26:07 +0000 (17:26 +1300)]
Merge pull request #7579 from eileenmcnaughton/CRM-17806

CRM-17806 Class-api: Check if constant is defined before defining it

8 years agoCRM-17795 - Collapse join list in UI to be less obtrusive
Coleman Watts [Tue, 12 Jan 2016 04:25:30 +0000 (23:25 -0500)]
CRM-17795 - Collapse join list in UI to be less obtrusive

8 years agoCRM-17802 Make start time midnight not midday woops
Seamus Lee [Tue, 12 Jan 2016 04:19:38 +0000 (04:19 +0000)]
CRM-17802 Make start time midnight not midday woops

8 years agoCRM-17795 Fix testCreateSingleValueAlter
Coleman Watts [Tue, 12 Jan 2016 02:35:16 +0000 (21:35 -0500)]
CRM-17795 Fix testCreateSingleValueAlter

8 years agoCRM-17795 - Apparently not every DAO has a BAO
Coleman Watts [Tue, 12 Jan 2016 02:12:10 +0000 (21:12 -0500)]
CRM-17795 - Apparently not every DAO has a BAO

8 years agoApi explorer join fixes
Coleman Watts [Tue, 12 Jan 2016 01:13:15 +0000 (20:13 -0500)]
Api explorer join fixes

8 years agoMerge pull request #7578 from seamuslee001/CRM-17802-master
Eileen McNaughton [Tue, 12 Jan 2016 01:03:28 +0000 (14:03 +1300)]
Merge pull request #7578 from seamuslee001/CRM-17802-master

CRM-17802 Fix default end and start times and switch to use !empty ra…

8 years agoCRM-17806 Class-api: Check if constant is defined before defining it
eileen [Tue, 12 Jan 2016 00:43:50 +0000 (13:43 +1300)]
CRM-17806 Class-api: Check if constant is defined before defining it

8 years agoCRM-17802 Fix default end and start times and switch to use !empty rather than isset
Seamus Lee [Mon, 11 Jan 2016 22:51:59 +0000 (22:51 +0000)]
CRM-17802 Fix default end and start times and switch to use !empty rather than isset

8 years agoMerge pull request #7572 from eileenmcnaughton/CRM-17439
colemanw [Mon, 11 Jan 2016 20:47:57 +0000 (15:47 -0500)]
Merge pull request #7572 from eileenmcnaughton/CRM-17439

CRM-17439 layout changes for advanced search panes

8 years agoCRM-17795 - Api explorer join style improvement
Coleman Watts [Mon, 11 Jan 2016 19:52:19 +0000 (14:52 -0500)]
CRM-17795 - Api explorer join style improvement