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
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
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
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…
Niko Bochan [Wed, 13 Jan 2016 09:17:08 +0000 (10:17 +0100)]
fixed missing ts() for activiy types in advanced search
CiviCRM [Wed, 13 Jan 2016 08:56:16 +0000 (00:56 -0800)]
Update version to 4.7.0
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
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.
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
JKingsnorth [Tue, 12 Jan 2016 15:17:24 +0000 (15:17 +0000)]
CRM-17629: Stop processing jobs if mailer batch limit reached
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…
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
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…
jitendrapurohit [Tue, 12 Jan 2016 12:33:47 +0000 (18:03 +0530)]
CRM-17809 -- Fatal Error on Date Format Page
Pradeep Nayak [Tue, 12 Jan 2016 10:39:56 +0000 (16:09 +0530)]
--CRM-16259, removed white spaces
monishdeb [Tue, 12 Jan 2016 09:08:23 +0000 (14:38 +0530)]
participant an grant fix
jitendrapurohit [Tue, 12 Jan 2016 08:28:38 +0000 (13:58 +0530)]
minor fix
monishdeb [Tue, 12 Jan 2016 08:27:35 +0000 (13:57 +0530)]
minor fix
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
jitendrapurohit [Tue, 12 Jan 2016 05:27:12 +0000 (10:57 +0530)]
CRM-17797 -- Primary participant can not confirm for additional participants
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
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
Coleman Watts [Tue, 12 Jan 2016 04:25:30 +0000 (23:25 -0500)]
CRM-17795 - Collapse join list in UI to be less obtrusive
Seamus Lee [Tue, 12 Jan 2016 04:19:38 +0000 (04:19 +0000)]
CRM-17802 Make start time midnight not midday woops
Coleman Watts [Tue, 12 Jan 2016 02:35:16 +0000 (21:35 -0500)]
CRM-17795 Fix testCreateSingleValueAlter
Coleman Watts [Tue, 12 Jan 2016 02:12:10 +0000 (21:12 -0500)]
CRM-17795 - Apparently not every DAO has a BAO
Coleman Watts [Tue, 12 Jan 2016 01:13:15 +0000 (20:13 -0500)]
Api explorer join fixes
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…
eileen [Tue, 12 Jan 2016 00:43:50 +0000 (13:43 +1300)]
CRM-17806 Class-api: Check if constant is defined before defining it
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
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
Coleman Watts [Mon, 11 Jan 2016 19:52:19 +0000 (14:52 -0500)]
CRM-17795 - Api explorer join style improvement
Coleman Watts [Mon, 11 Jan 2016 19:37:15 +0000 (14:37 -0500)]
CRM-17795 - Hard fail if permission denied for api join
colemanw [Mon, 11 Jan 2016 18:53:30 +0000 (13:53 -0500)]
Merge pull request #7574 from JKingsnorth/CRM-17803
CRM-17803: Fix display of registration links on info page
Coleman Watts [Mon, 11 Jan 2016 17:26:07 +0000 (12:26 -0500)]
CRM-17795 - Prevent recursion of joins in api explorer
monishdeb [Mon, 11 Jan 2016 16:44:24 +0000 (22:14 +0530)]
minor fix
monishdeb [Mon, 11 Jan 2016 16:38:12 +0000 (22:08 +0530)]
optimization
JKingsnorth [Mon, 11 Jan 2016 16:08:54 +0000 (16:08 +0000)]
Remove unused variable and tidy comments
Coleman Watts [Mon, 11 Jan 2016 15:15:00 +0000 (10:15 -0500)]
CRM-17795 - Validate nested input
Monish Deb [Mon, 11 Jan 2016 14:51:45 +0000 (20:21 +0530)]
Merge pull request #7573 from rohankatkar/webtests-fixes-master
Webtests Fixes
colemanw [Mon, 11 Jan 2016 14:26:38 +0000 (09:26 -0500)]
Merge pull request #7576 from JKingsnorth/patch-4
Update CONTRIBUTORS.txt
John Kingsnorth [Mon, 11 Jan 2016 13:45:23 +0000 (13:45 +0000)]
Update CONTRIBUTORS.txt
Fix organisation name
monishdeb [Fri, 8 Jan 2016 15:54:07 +0000 (21:24 +0530)]
improvement
monishdeb [Wed, 6 Jan 2016 05:54:09 +0000 (11:24 +0530)]
using is_numeric instead
monishdeb [Tue, 5 Jan 2016 21:34:03 +0000 (03:04 +0530)]
CRM-17770 fix - Custom contact fields with files prevent contact record from loading
https://issues.civicrm.org/jira/browse/CRM-17770
Saurabh Batra [Mon, 11 Jan 2016 12:34:14 +0000 (18:04 +0530)]
CRM-17801 - https://issues.civicrm.org/jira/browse/CRM-17801
JKingsnorth [Mon, 11 Jan 2016 12:30:36 +0000 (12:30 +0000)]
CRM-17803: Fix display of registration links
Pradeep Nayak [Mon, 11 Jan 2016 10:30:13 +0000 (16:00 +0530)]
CRM-16259, added unit test case for addPayments
----------------------------------------
* CRM-16259: Create Payment API
https://issues.civicrm.org/jira/browse/CRM-16259
Pradeep Nayak [Mon, 11 Jan 2016 10:26:32 +0000 (15:56 +0530)]
CRM-16259, used api calling instead save()
----------------------------------------
* CRM-16259: Create Payment API
https://issues.civicrm.org/jira/browse/CRM-16259
Pradeep Nayak [Sun, 3 Jan 2016 15:37:25 +0000 (21:07 +0530)]
--CRM-16259, optimized code
Pradeep Nayak [Wed, 16 Dec 2015 13:58:06 +0000 (19:28 +0530)]
--CRM-16259, add propotional payments when partially paid through participant UI
Pradeep Nayak [Wed, 16 Dec 2015 13:48:32 +0000 (19:18 +0530)]
--CRM-16259, added function to add payments for partially paid contribution
Yashodha Chaku [Mon, 11 Jan 2016 09:16:31 +0000 (14:46 +0530)]
Merge pull request #7570 from saurabhbatra96/CRM-17800
CRM-17800 - Missing and mispelled Saudi Arabia states
Web Access [Mon, 11 Jan 2016 08:36:05 +0000 (14:06 +0530)]
Webtests Fixes
Saurabh Batra [Sun, 10 Jan 2016 16:01:00 +0000 (21:31 +0530)]
CRM-17800 - Missing and mispelled Saudi Arabia states
https://issues.civicrm.org/jira/browse/CRM-17800
Monish Deb [Mon, 11 Jan 2016 05:16:01 +0000 (10:46 +0530)]
Merge pull request #7564 from jitendrapurohit/sectionfix
CRM-17793 -- Activity detail report: group by date
Coleman Watts [Sun, 10 Jan 2016 05:31:27 +0000 (00:31 -0500)]
CRM-17795 - Support joins in api explorer
Eileen McNaughton [Sun, 10 Jan 2016 23:21:42 +0000 (12:21 +1300)]
Merge pull request #7562 from yashodha/contributors
update the list of contributors for 4.7
eileen [Sun, 10 Jan 2016 23:11:11 +0000 (12:11 +1300)]
CRM-17439 layout changes for advanced search panes
Eileen McNaughton [Sun, 10 Jan 2016 22:19:35 +0000 (11:19 +1300)]
Merge pull request #7571 from eileenmcnaughton/CRM-17439
whitespace only
eileen [Sun, 10 Jan 2016 21:26:56 +0000 (10:26 +1300)]
whitespace only
Coleman Watts [Sun, 10 Jan 2016 00:02:58 +0000 (19:02 -0500)]
Api explorer optimizations
Coleman Watts [Sat, 9 Jan 2016 04:05:59 +0000 (23:05 -0500)]
CRM-17795 - Add unit test for api joins
Coleman Watts [Sat, 9 Jan 2016 03:04:08 +0000 (22:04 -0500)]
CRM-17795 - Refine api permissions for civiCase
Coleman Watts [Fri, 8 Jan 2016 22:29:46 +0000 (17:29 -0500)]
CRM-17795 - Refine api permissions
Improves permissions for relationship, address, email, phone, website, im, loc_block
Eileen McNaughton [Sat, 9 Jan 2016 01:53:51 +0000 (14:53 +1300)]
Merge pull request #7560 from rohankatkar/Webtests-16761
Webtest Changes for CRM-16761
Eileen McNaughton [Sat, 9 Jan 2016 01:53:41 +0000 (14:53 +1300)]
Merge pull request #7561 from eileenmcnaughton/CRM-11801
CRM-11801 defer to Authorize.net config on whether a.net receipts sho…
Coleman Watts [Fri, 8 Jan 2016 22:13:03 +0000 (17:13 -0500)]
Declare permission for api.getfield
Coleman Watts [Fri, 8 Jan 2016 20:19:49 +0000 (15:19 -0500)]
CRM-17795 - Enforce maximum join depth
Coleman Watts [Fri, 8 Jan 2016 19:46:23 +0000 (14:46 -0500)]
CRM-17795 - Add aclWhere clause to api joins
Coleman Watts [Fri, 8 Jan 2016 14:13:49 +0000 (09:13 -0500)]
CRM-17795 - Add aclWhere clause to contact-related apis
Coleman Watts [Thu, 7 Jan 2016 20:59:42 +0000 (15:59 -0500)]
CRM-17795 - Add basic permission checks for api joins
Coleman Watts [Thu, 7 Jan 2016 20:59:16 +0000 (15:59 -0500)]
CRM-17795 - Api test fixes
Coleman Watts [Thu, 7 Jan 2016 19:24:04 +0000 (14:24 -0500)]
Case test fixes
Coleman Watts [Thu, 7 Jan 2016 19:23:52 +0000 (14:23 -0500)]
CRM-17795 - Fix uniqueName handling in api.get
Coleman Watts [Thu, 7 Jan 2016 04:37:10 +0000 (23:37 -0500)]
CRM-17795 - Fetch data needed for joining on custom fields
Coleman Watts [Thu, 7 Jan 2016 03:38:24 +0000 (22:38 -0500)]
CRM-17795 - Add support for sql joins in api.*.get
Coleman Watts [Wed, 6 Jan 2016 02:24:25 +0000 (21:24 -0500)]
CRM-17795 - Refactor api SelectQuery into a class
Eileen McNaughton [Sat, 9 Jan 2016 00:04:27 +0000 (13:04 +1300)]
Merge pull request #7568 from JoeMurray/patch-5
Added a TODO re: unescaped literals
Tim Otten [Fri, 8 Jan 2016 23:25:52 +0000 (15:25 -0800)]
Merge pull request #7569 from totten/lcdservices-CRM-17798
CRM-17798 - Don't add trailing slash to CSS file
Tim Otten [Fri, 8 Jan 2016 23:25:36 +0000 (15:25 -0800)]
Merge pull request #7566 from routinet/NYSS-CRM-17748
CRM-17748 Expose options['result_buffering'] to CRM_Core_DAO
CiviCRM [Fri, 8 Jan 2016 22:32:12 +0000 (14:32 -0800)]
CRM-17798 - MagicMerge - Add `rel, `noslash` options for `setting-url`
Joe Murray [Fri, 8 Jan 2016 22:20:07 +0000 (17:20 -0500)]
Added a todo
Brian Shaughnessy [Fri, 8 Jan 2016 21:15:41 +0000 (16:15 -0500)]
CRM-17798: fix constant uppercase
Brian Shaughnessy [Fri, 8 Jan 2016 21:10:07 +0000 (16:10 -0500)]
CRM-17798: dont add trailing slash for css extra file
Steve Binkowski [Fri, 8 Jan 2016 20:26:48 +0000 (15:26 -0500)]
cosmetic fixes requested by Jenkins
Steve Binkowski [Fri, 8 Jan 2016 20:19:13 +0000 (15:19 -0500)]
CRM-17748 Expose options['result_buffering'] to CRM_Core_DAO
colemanw [Fri, 8 Jan 2016 18:36:15 +0000 (13:36 -0500)]
Merge pull request #7451 from josephlacey/datatables-update
Datatables update
Joseph Lacey [Fri, 8 Jan 2016 18:01:45 +0000 (13:01 -0500)]
Removing legacy handling of selector columns
Joseph Lacey [Fri, 8 Jan 2016 17:21:20 +0000 (12:21 -0500)]
Merge pull request #1 from eileenmcnaughton/patch-1
whitespace
jitendrapurohit [Fri, 8 Jan 2016 13:23:08 +0000 (18:53 +0530)]
warning fixes
jitendrapurohit [Fri, 8 Jan 2016 11:39:24 +0000 (17:09 +0530)]
make code generic
Eileen McNaughton [Fri, 8 Jan 2016 08:54:08 +0000 (21:54 +1300)]
Merge pull request #7558 from eileenmcnaughton/CRM-17028
Crm 17028
eileenmcnaugton [Fri, 8 Jan 2016 08:50:38 +0000 (21:50 +1300)]
CRM-11801 defer to Authorize.net config on whether a.net receipts should be sent.
This means CiviCRM receipts will go out as configured from CiviCRM & Authorize.net as configured from
the Authorize.net UI
Web Access [Fri, 8 Jan 2016 08:33:14 +0000 (14:03 +0530)]
Webtest Changes for CRM-16761
Peter Haight [Tue, 1 Sep 2015 21:09:59 +0000 (14:09 -0700)]
Test for CRM-17028
Only some of the repetition units (Repeat every X hours/days/...) for
Schedules Reminders were before the patch in CRM-17028. This tests for
the problem that the patch fixed.
Some style fixes.
yashodha [Fri, 8 Jan 2016 07:06:19 +0000 (12:36 +0530)]
update the list of contributors for 4.7
Yashodha Chaku [Fri, 8 Jan 2016 06:53:42 +0000 (12:23 +0530)]
Merge pull request #7557 from eileenmcnaughton/CRM-15238
CRM-15238 Add option to use semicolon as separator for the
colemanw [Fri, 8 Jan 2016 03:35:46 +0000 (22:35 -0500)]
Merge pull request #7495 from mollux/CRM-17747
Allow leading and trailing newlines in plain-text headers and footers
Eileen McNaughton [Fri, 8 Jan 2016 02:46:20 +0000 (15:46 +1300)]
whitespace
projects / civicrm-core.git / log