Edsel [Mon, 11 May 2015 13:53:25 +0000 (19:23 +0530)]
ICM-13 Modified LYBUNT report to use temp table instead of modifiication to query
Edsel [Mon, 11 May 2015 11:44:22 +0000 (17:14 +0530)]
ICM-13 Modified LYBUNT report to use temp table instead of modifiication to query
Edsel [Mon, 11 May 2015 11:37:06 +0000 (17:07 +0530)]
ICM-13 Modified LYBUNT report to use temp table instead of modifiication to query
Edsel [Mon, 11 May 2015 11:34:24 +0000 (17:04 +0530)]
ICM-13 Modified LYBUNT report to use temp table instead of modifiication to query
Edsel [Thu, 7 May 2015 11:44:28 +0000 (17:14 +0530)]
ICM-1 Fixed manage groups contribution status id bug
Edsel [Thu, 30 Apr 2015 10:09:31 +0000 (15:39 +0530)]
CIVI-28 Added filter for bookeeping report
Edsel [Thu, 23 Apr 2015 13:20:33 +0000 (18:50 +0530)]
CIVI-28 Bug fixes
Edsel [Thu, 23 Apr 2015 13:08:32 +0000 (18:38 +0530)]
CIVI-28 Bug fixes
Edsel [Thu, 23 Apr 2015 12:43:32 +0000 (18:13 +0530)]
CIVI-28 Contribution stats modified
Edsel [Thu, 23 Apr 2015 12:21:12 +0000 (17:51 +0530)]
CIVI-28 Contribution count tab modified
Edsel [Thu, 23 Apr 2015 11:45:19 +0000 (17:15 +0530)]
CIVI-28 Added perms for price field display
Edsel [Thu, 23 Apr 2015 11:28:59 +0000 (16:58 +0530)]
CIVI-28 Added perms for price field option display
Edsel [Thu, 23 Apr 2015 10:35:18 +0000 (16:05 +0530)]
CIVI-28 Added perms for price field option display
Edsel [Mon, 20 Apr 2015 11:36:03 +0000 (17:06 +0530)]
CIVI-28 Fixed fatal error when no permissions are specified
Edsel [Fri, 17 Apr 2015 12:19:19 +0000 (17:49 +0530)]
CIVI-28 More fixes for reports and memberships
Edsel [Thu, 16 Apr 2015 14:03:49 +0000 (19:33 +0530)]
CIVI-28 Added lineitem FT and contribution FT perms in LYBUNT report
Edsel [Thu, 16 Apr 2015 13:52:32 +0000 (19:22 +0530)]
CIVI-28 Added lineitem FT and contribution FT perms in SYBUNT report
Edsel [Thu, 16 Apr 2015 13:40:00 +0000 (19:10 +0530)]
CIVI-28 Added lineitem FT and contribution FT perms in Top Doonor report
Edsel [Thu, 16 Apr 2015 13:27:33 +0000 (18:57 +0530)]
CIVI-28 Added lineitem FT and contribution FT perms in Household summary report
Edsel [Thu, 16 Apr 2015 13:22:02 +0000 (18:52 +0530)]
CIVI-28 Added lineitem FT and contribution FT perms in Organization summary report
Edsel [Thu, 16 Apr 2015 12:21:00 +0000 (17:51 +0530)]
CIVI-28 Added lineitem check for contribution detail report
Edsel [Thu, 16 Apr 2015 12:07:31 +0000 (17:37 +0530)]
CIVI-28 Added lineitem check in contribution summaryr report
Edsel [Tue, 14 Apr 2015 12:31:54 +0000 (18:01 +0530)]
CIVI-28 Added permission check for membership view, edit and delete for individual memberships
Edsel [Tue, 14 Apr 2015 12:12:13 +0000 (17:42 +0530)]
CIVI-28 Added permissions for links on membership search results
Edsel [Tue, 14 Apr 2015 08:00:00 +0000 (13:30 +0530)]
CIVI-28 Added check for lineitems and delete operations from actions
Edsel [Tue, 14 Apr 2015 06:24:00 +0000 (11:54 +0530)]
CIVI-28 Notice fixes
Edsel [Mon, 13 Apr 2015 14:38:02 +0000 (20:08 +0530)]
CIVI-28 bug fixes
Edsel [Mon, 13 Apr 2015 14:26:58 +0000 (19:56 +0530)]
CIVI-28 Rewrote filtering for contribution and membership search results
Edsel [Mon, 13 Apr 2015 06:43:47 +0000 (12:13 +0530)]
CIVI-28 Added check for multiple pricesets
Edsel [Fri, 10 Apr 2015 12:18:35 +0000 (17:48 +0530)]
CIVI-28 Added check for financial types on membership search form
Edsel [Thu, 9 Apr 2015 13:46:55 +0000 (19:16 +0530)]
CIVI-28 Added support for individual membership types and pricefield options
Edsel [Thu, 9 Apr 2015 12:26:42 +0000 (17:56 +0530)]
CIVI-35 Applied permissions for premiums on contributions
Edsel [Wed, 8 Apr 2015 12:46:25 +0000 (18:16 +0530)]
CIVI-28 Added permissions for memberrship types
Edsel [Tue, 7 Apr 2015 07:45:29 +0000 (13:15 +0530)]
CIVI-35 Added check for permissions on premiums
Edsel [Mon, 6 Apr 2015 12:38:21 +0000 (18:08 +0530)]
CIVI-28 Added check for base financial type in online contributions
Edsel [Mon, 6 Apr 2015 12:00:16 +0000 (17:30 +0530)]
CIVI-33 Added permissions for price sets and price fields
Edsel [Wed, 1 Apr 2015 14:01:06 +0000 (19:31 +0530)]
CIVI-28 Added support for delete contribution API
Edsel [Wed, 1 Apr 2015 12:50:56 +0000 (18:20 +0530)]
CIVI-33 Removed unpermissioned price fields
Edsel [Wed, 1 Apr 2015 12:25:38 +0000 (17:55 +0530)]
CIVI-34 Adding fix for search builder
Edsel [Wed, 1 Apr 2015 12:22:41 +0000 (17:52 +0530)]
CIVI-33 Added checks for price sets
Edsel [Thu, 26 Mar 2015 12:39:05 +0000 (18:09 +0530)]
CIVI-28 Added permission check for online events
Edsel [Wed, 25 Mar 2015 10:29:17 +0000 (15:59 +0530)]
CIVI-28 Handled permission for create contribution API
Edsel [Fri, 20 Mar 2015 13:25:00 +0000 (18:55 +0530)]
CIVI-28 Added check for lineitems edit and delete
Edsel [Fri, 20 Mar 2015 13:23:25 +0000 (18:53 +0530)]
CIVI-28 Added checks for permissions on contribution search
Edsel [Fri, 20 Mar 2015 11:08:06 +0000 (16:38 +0530)]
CIVI-28 Added check for lineitems edit and delete
Edsel [Fri, 20 Mar 2015 10:24:41 +0000 (15:54 +0530)]
CIVI-28 Reverted changes made to edit for selector (still working), Added check for lineitem for contribution edit
Edsel [Fri, 20 Mar 2015 06:50:00 +0000 (12:20 +0530)]
CIVI-28 Added check for viewable lineitems in contribution search results
Edsel [Thu, 19 Mar 2015 11:20:42 +0000 (16:50 +0530)]
CIVI-28 Added check for Contribution get API
Edsel [Wed, 18 Mar 2015 10:25:32 +0000 (15:55 +0530)]
CIVI-28 Added WhereClause for Summary and Detail contribution reports
Edsel [Wed, 18 Mar 2015 10:24:29 +0000 (15:54 +0530)]
CIVI-28 Added WhereClause for Summary and Detail contribution reports
Edsel [Tue, 17 Mar 2015 13:03:39 +0000 (18:33 +0530)]
CIVI-28 Added permission check for Contribution Recur & Repeat Reports
Edsel [Tue, 17 Mar 2015 11:57:31 +0000 (17:27 +0530)]
CIVI-28 Added permission check for Contribution Detail Report
Edsel [Tue, 17 Mar 2015 11:52:48 +0000 (17:22 +0530)]
CIVI-28 Added permission check for Contribution Summary Report
Edsel [Tue, 17 Mar 2015 11:22:39 +0000 (16:52 +0530)]
CIVI-28 Removed Edit and delete links according to permission from contribution view page
Edsel [Tue, 17 Mar 2015 11:05:27 +0000 (16:35 +0530)]
CIVI-28 Removed unnecessary code
Edsel [Tue, 17 Mar 2015 11:04:22 +0000 (16:34 +0530)]
CIVI-28 Added check for permissions while search results are being displayed on contribution search, advanced search and contact summary page (Contributions tab)
Edsel [Tue, 17 Mar 2015 10:19:54 +0000 (15:49 +0530)]
CIVI-28 Bug fixes and modifications
Edsel [Tue, 17 Mar 2015 06:37:55 +0000 (12:07 +0530)]
CIVI-28 Modified functionality for offline contribution page
Edsel [Tue, 17 Mar 2015 06:36:14 +0000 (12:06 +0530)]
CIVI-28 Added permission check for Contrirbution pages
Edsel [Mon, 16 Mar 2015 14:14:58 +0000 (19:44 +0530)]
CIVI-28 Added permission forr contribution view
Edsel [Mon, 16 Mar 2015 14:14:38 +0000 (19:44 +0530)]
CIVI-28 Added permissions for Drupal page
Edsel [Mon, 16 Mar 2015 14:14:22 +0000 (19:44 +0530)]
CIVI-28 Added permission check for admin financial type
Edsel [Mon, 16 Mar 2015 14:14:02 +0000 (19:44 +0530)]
CIVI-28 Added permission check for Contribution page
Edsel [Mon, 16 Mar 2015 14:11:27 +0000 (19:41 +0530)]
CIVI-28 Added permission cehck for offline contribution form
Edsel [Mon, 16 Mar 2015 14:11:05 +0000 (19:41 +0530)]
CIVI-28 Added permissions for Drupal permission pages
Kurund Jalmi [Mon, 21 Sep 2015 10:34:02 +0000 (16:04 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-09-21-15-52-41
Conflicts:
CRM/Contribute/BAO/ContributionPage.php
CRM/Core/Resources.php
Yashodha Chaku [Mon, 21 Sep 2015 09:34:52 +0000 (15:04 +0530)]
Merge pull request #6712 from jitendrapurohit/CRM-17146-tests
Test to check CRM-17146 - include trxn_date in completetransaction API
Tim Otten [Mon, 21 Sep 2015 07:46:00 +0000 (00:46 -0700)]
Merge pull request #6776 from totten/master-setting-redux
CRM-16373 - $config - Separate runtime and boot services
Tim Otten [Mon, 21 Sep 2015 06:50:02 +0000 (23:50 -0700)]
Fix api_v3_ContactTest.testContactGetBy*Username
Tim Otten [Sun, 20 Sep 2015 23:17:06 +0000 (16:17 -0700)]
Construct runtime+extensions+container through boot services
Tim Otten [Sat, 19 Sep 2015 08:33:57 +0000 (01:33 -0700)]
Convert $config->userSystem to boot service
Tim Otten [Sat, 19 Sep 2015 05:09:01 +0000 (22:09 -0700)]
CRM-16373 - Bootstrap subsystems in more predictable order
Several subsystems were initialized on-demand. This had a weird side-effect
where the container would start initializing and call another service, which
would then (indirectly) try to initialize another container. The two container
instances would not be the same.
This revision enforces a more carefully considered sequence of events (which
will be documented in the wiki page, "Bootstrap Reference").
Tim Otten [Sat, 19 Sep 2015 05:03:20 +0000 (22:03 -0700)]
CRM_Core_Error - Don't display HTML crash when running tests
Tim Otten [Sat, 19 Sep 2015 01:00:30 +0000 (18:00 -0700)]
CRM-16373 - MagicMerge - Improve comments/readability.
Tim Otten [Mon, 21 Sep 2015 03:54:45 +0000 (20:54 -0700)]
Merge pull request #6774 from totten/master-fs25
composer.json - Use symfony/filesystem circa 2.5
Tim Otten [Mon, 21 Sep 2015 03:00:00 +0000 (20:00 -0700)]
composer.json - Use symfony/filesystem circa 2.5
The rest of the Symfony components are targetting ~2.5, but some reason
we're autoselecting `symfony/filesystem` ~2.7. That produces errors on
`test-debian6-1`.
Eileen McNaughton [Mon, 21 Sep 2015 02:24:27 +0000 (14:24 +1200)]
Merge pull request #6773 from civicrm/eileenmcnaughton-patch-1
CRM-16555 add code-comments
Eileen McNaughton [Mon, 21 Sep 2015 02:01:34 +0000 (14:01 +1200)]
CRM-16555 add code-comments
The patch added for CRM-16555 should not have been needed as the intention was that the function to getValidProcessors handling for mode would have worked. Adding some comments to indicate this for next time someone looks at it.
Dave Greenberg [Fri, 18 Sep 2015 23:55:35 +0000 (16:55 -0700)]
Merge pull request #6771 from seamuslee001/CRM-17231-Master
CRM-17231 Allow for Multipart Report to be included in the Email Processor
Monish Deb [Fri, 18 Sep 2015 22:22:29 +0000 (03:52 +0530)]
Merge pull request #6769 from monishdeb/CRM-17191
CRM-17246 fix - Contact name showing in Contribution summary report
Seamus Lee [Fri, 18 Sep 2015 04:43:38 +0000 (04:43 +0000)]
PHPCS fixes
Seamus Lee [Fri, 18 Sep 2015 04:34:20 +0000 (04:34 +0000)]
Further tweeks following testing
Seamus Lee [Wed, 16 Sep 2015 23:45:37 +0000 (23:45 +0000)]
PHPCS fixes
Seamus Lee [Wed, 16 Sep 2015 23:36:45 +0000 (23:36 +0000)]
CRM-17231 Allow for Multipart Report to be included in the Email Processor
Monish Deb [Fri, 18 Sep 2015 21:45:52 +0000 (03:15 +0530)]
Merge pull request #6755 from agileware/master-crm-17055
CRM-17055: Confirmation email on unpaid events produces syntax error …
Monish Deb [Fri, 18 Sep 2015 21:36:17 +0000 (03:06 +0530)]
Merge pull request #6770 from monishdeb/CRM16920
CRM-16920 - When coding a report template, can specify a default 'fro…
monishdeb [Fri, 18 Sep 2015 20:39:45 +0000 (02:09 +0530)]
CRM-16920 - When coding a report template, can specify a default 'from' and 'to' for date ranges, but not for integer ranges
https://issues.civicrm.org/jira/browse/CRM-16920
monishdeb [Fri, 18 Sep 2015 20:08:55 +0000 (01:38 +0530)]
format fix
monishdeb [Fri, 18 Sep 2015 19:53:49 +0000 (01:23 +0530)]
CRM-17246 fix - Contact name showing in Contribution summary report
https://issues.civicrm.org/jira/browse/CRM-17246
Tim Otten [Fri, 18 Sep 2015 19:51:47 +0000 (12:51 -0700)]
Merge pull request #6768 from totten/master-composer-lock
composer.lock - update
Tim Otten [Fri, 18 Sep 2015 19:37:50 +0000 (12:37 -0700)]
composer.lock - update
Previous merges left composer.lock with incorrect hash
Monish Deb [Fri, 18 Sep 2015 17:41:29 +0000 (23:11 +0530)]
Merge pull request #6766 from monishdeb/CRM-17191
Crm 17191
Dave Greenberg [Fri, 18 Sep 2015 17:07:38 +0000 (10:07 -0700)]
Merge pull request #6764 from davecivicrm/CRM-15378
CRM-15378 - Add max participants and count to price option browse page.
monishdeb [Fri, 18 Sep 2015 13:44:57 +0000 (19:14 +0530)]
notice and format fixes
Jamie McClelland [Thu, 10 Sep 2015 12:45:33 +0000 (08:45 -0400)]
CRM-17191 - removing redundant if clause.
Jamie McClelland [Thu, 10 Sep 2015 12:38:48 +0000 (08:38 -0400)]
CRM-17191 - ensure Participant list report works with custom Grouping
Previously, we got a trace back if a user defined a group by clause.
I've removed what appears to be crufty code that tries to add the
group by fields to an ORDER BY statement - which conflicts with the
existing ORDER BY statement and seems unnecessary. Also, if the user
wants to group by another field, we should not group by the participant
id.
Yashodha Chaku [Fri, 18 Sep 2015 10:19:44 +0000 (15:49 +0530)]
Merge pull request #6756 from agileware/4.6-crm-17055
CRM-17055: Confirmation email on unpaid events produces syntax error …
Monish Deb [Fri, 18 Sep 2015 09:45:44 +0000 (15:15 +0530)]
Merge pull request #6757 from yashodha/CRM-17227
CRM-17227: Error thrown while saving profile in Contribution page
Tim Otten [Fri, 18 Sep 2015 08:14:47 +0000 (01:14 -0700)]
Merge pull request #6765 from totten/master-cdl
CRM-14232, CRM-16373 - Fix saving of contact_default_language
Tim Otten [Fri, 18 Sep 2015 04:34:12 +0000 (21:34 -0700)]
CRM-14232, CRM-16373 - Fix saving of contact_default_language