Monish Deb [Wed, 24 Jun 2015 11:30:53 +0000 (17:00 +0530)]
Merge pull request #6077 from onlyjob/CRM-16731
CRM-16731: correct AGPL version number.
Eileen McNaughton [Wed, 24 Jun 2015 10:39:04 +0000 (22:39 +1200)]
Merge pull request #6080 from eileenmcnaughton/master
test & comment fixes - unrelated failures
Monish Deb [Wed, 24 Jun 2015 09:52:25 +0000 (15:22 +0530)]
Merge pull request #6078 from jitendrapurohit/CRM-14844
CRM-14844 - Cannot copy-paste fatal errors
Monish Deb [Wed, 24 Jun 2015 08:35:02 +0000 (14:05 +0530)]
Merge pull request #6070 from rohankatkar/CRM-16713
CRM-16713 Find Contributions: Search by Premium
Monish Deb [Wed, 24 Jun 2015 08:26:12 +0000 (13:56 +0530)]
Merge pull request #6067 from monishdeb/master
CRM-16716 fix - Recurring Contributions report improvements
Monish Deb [Wed, 24 Jun 2015 07:47:58 +0000 (13:17 +0530)]
Merge pull request #6056 from yashodha/CRM-16720.new
CRM-16720 : Activity Details report: add source, target and assignee …
Eileen McNaughton [Wed, 24 Jun 2015 07:06:10 +0000 (19:06 +1200)]
test & comment fixes
jitendrapurohit [Wed, 24 Jun 2015 06:43:34 +0000 (12:13 +0530)]
CRM-14844 - Cannot copy-paste fatal errors
Dmitry Smirnov [Wed, 24 Jun 2015 01:22:25 +0000 (11:22 +1000)]
CRM-16731: correct AGPL version number.
colemanw [Tue, 23 Jun 2015 19:24:21 +0000 (15:24 -0400)]
Merge pull request #6075 from colemanw/CRM-16706
CRM-16706 - Remove unused fn
Coleman Watts [Tue, 23 Jun 2015 19:23:50 +0000 (15:23 -0400)]
CRM-16706 - Remove unused fn
colemanw [Tue, 23 Jun 2015 19:19:18 +0000 (15:19 -0400)]
Merge pull request #6041 from mallezie/crm-16706
merge commonLetterCompose() and commonCompose()
Eileen McNaughton [Tue, 23 Jun 2015 13:48:49 +0000 (01:48 +1200)]
Merge pull request #6072 from eileenmcnaughton/master
Merge 4.6 to master
Eileen McNaughton [Tue, 23 Jun 2015 11:10:42 +0000 (23:10 +1200)]
Merge branch '4.6' of https://github.com/civicrm/civicrm-core
Conflicts:
xml/templates/civicrm_data.tpl
Web Access [Tue, 23 Jun 2015 10:52:20 +0000 (16:22 +0530)]
CRM-16713 Find Contributions: Search by Premium
monishdeb [Tue, 23 Jun 2015 05:54:20 +0000 (11:24 +0530)]
minor fix
Dave Greenberg [Tue, 23 Jun 2015 01:07:28 +0000 (18:07 -0700)]
Merge pull request #6068 from eileenmcnaughton/4.6
fixes to comments
Eileen McNaughton [Mon, 22 Jun 2015 23:00:17 +0000 (11:00 +1200)]
phpcs fixes
Eileen McNaughton [Mon, 22 Jun 2015 22:40:15 +0000 (10:40 +1200)]
phpcs fixes
Dave Greenberg [Mon, 22 Jun 2015 18:17:13 +0000 (11:17 -0700)]
Merge pull request #6062 from eileenmcnaughton/CRM-16417-46
CRM-16417 add failed payment activity type
monishdeb [Mon, 22 Jun 2015 17:19:31 +0000 (22:49 +0530)]
minor fix
monishdeb [Mon, 22 Jun 2015 17:12:41 +0000 (22:42 +0530)]
formatting fix
monishdeb [Mon, 22 Jun 2015 17:09:21 +0000 (22:39 +0530)]
formatting fix
monishdeb [Mon, 22 Jun 2015 17:03:44 +0000 (22:33 +0530)]
CRM-16716 fix - Recurring Contributions report improvements
https://issues.civicrm.org/jira/browse/CRM-16716
Monish Deb [Mon, 22 Jun 2015 17:01:16 +0000 (22:31 +0530)]
Merge pull request #6058 from monishdeb/CRM-16575
CRM-16581 fix - API and checking if a custom field is empty is ignored
kurund [Mon, 22 Jun 2015 16:48:05 +0000 (22:18 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-06-22-22-17-50
Monish Deb [Mon, 22 Jun 2015 05:05:38 +0000 (10:35 +0530)]
Merge pull request #5898 from monishdeb/master
Merge conflict fix
colemanw [Sat, 20 Jun 2015 18:20:11 +0000 (14:20 -0400)]
Merge pull request #6063 from colemanw/editable
Fix caching of multi-custom options
Coleman Watts [Sat, 20 Jun 2015 18:06:22 +0000 (14:06 -0400)]
Fix caching of multi-custom options
colemanw [Sat, 20 Jun 2015 16:13:52 +0000 (12:13 -0400)]
Merge pull request #6055 from colemanw/CRM-16401
CRM-16401 - Allow admin to set which day is the first day of the week
Eileen McNaughton [Sat, 20 Jun 2015 08:54:00 +0000 (20:54 +1200)]
CRM-16417 add failed payment activity type
monishdeb [Fri, 19 Jun 2015 23:06:25 +0000 (04:36 +0530)]
merge conflict fix
Monish Deb [Fri, 19 Jun 2015 22:51:16 +0000 (04:21 +0530)]
Merge pull request #6057 from sudhabisht/CRM-16116
Fix for financial_type_id not returned on Contribution get
monishdeb [Fri, 19 Jun 2015 22:13:30 +0000 (03:43 +0530)]
improvement fixes
monishdeb [Fri, 19 Jun 2015 11:00:29 +0000 (16:30 +0530)]
CRM-16581 fix - API and checking if a custom field is empty is ignored
https://issues.civicrm.org/jira/browse/CRM-16581
Dave Greenberg [Fri, 19 Jun 2015 21:56:36 +0000 (14:56 -0700)]
Merge pull request #5252 from JKingsnorth/CRM-10551
CRM-10551: Allow deletion of blanked location-based fields edited via a profile
Coleman Watts [Fri, 19 Jun 2015 19:25:55 +0000 (15:25 -0400)]
Merge branch '4.6' into master
Conflicts:
CRM/Contribute/Form/Contribution.php
CRM/Core/BAO/Mapping.php
CRM/Core/BAO/PdfFormat.php
CRM/Core/Payment/Form.php
CRM/Member/BAO/Membership.php
CRM/Utils/Hook.php
sql/civicrm_generated.mysql
xml/version.xml
colemanw [Fri, 19 Jun 2015 18:29:40 +0000 (14:29 -0400)]
Merge pull request #5961 from colemanw/CRM-16577
CRM-16577 - Clear caches more thoroughly from UpdateConfigBackend
Coleman Watts [Fri, 19 Jun 2015 17:59:32 +0000 (13:59 -0400)]
Ensure caches are cleared after changing settings
Coleman Watts [Fri, 19 Jun 2015 17:34:35 +0000 (13:34 -0400)]
CRM-16401 - Modify day of week ordering based on user prefs
colemanw [Fri, 19 Jun 2015 16:36:00 +0000 (12:36 -0400)]
Merge pull request #5962 from colemanw/CRM-16556
CRM-16556 - Clear caches more thoroughly from config->cleanupCaches
Monish Deb [Fri, 19 Jun 2015 07:04:59 +0000 (12:34 +0530)]
Merge pull request #6053 from rohankatkar/CRM-14705
Notice fix for CRM-14705
Monish Deb [Fri, 19 Jun 2015 07:04:14 +0000 (12:34 +0530)]
Merge pull request #6044 from monishdeb/CRM-16575
Crm 16575, CRM-16581 fixes
Sudha Bisht [Fri, 19 Jun 2015 07:01:21 +0000 (12:31 +0530)]
Fix for financial_type_id not returned on Contribution get
Yashodha Chaku [Fri, 19 Jun 2015 05:30:18 +0000 (11:00 +0530)]
Merge pull request #6054 from yashodha/CRM-16718
CRM-16718: Update Recurring Contribution: Indicate direction
yashodha [Fri, 19 Jun 2015 05:29:04 +0000 (10:59 +0530)]
clean up
yashodha [Fri, 19 Jun 2015 03:52:31 +0000 (09:22 +0530)]
CRM-16720 : Activity Details report: add source, target and assignee phone number columns
----------------------------------------
* CRM-16720: Activity Details report: add source, target and assignee phone number columns
https://issues.civicrm.org/jira/browse/CRM-16720
Coleman Watts [Fri, 19 Jun 2015 03:12:19 +0000 (23:12 -0400)]
CRM-16401 - Allow admin to set which day is the first day of the week
colemanw [Fri, 19 Jun 2015 01:58:19 +0000 (21:58 -0400)]
Merge pull request #5998 from seamuslee001/CRM-16600-4.6
Crm 16600 4.6
Web Access [Thu, 18 Jun 2015 15:19:04 +0000 (20:49 +0530)]
Notice fix for CRM-14705
yashodha [Thu, 18 Jun 2015 12:05:26 +0000 (17:35 +0530)]
CRM-16718: Update Recurring Contribution: Indicate direction
----------------------------------------
* CRM-16718: Update Recurring Contribution: Indicate direction of amount change in activity subject
https://issues.civicrm.org/jira/browse/CRM-16718
Monish Deb [Thu, 18 Jun 2015 11:47:46 +0000 (17:17 +0530)]
Merge pull request #6051 from rohankatkar/CRM-16691
Fix for CRM-16691
monishdeb [Thu, 18 Jun 2015 10:43:07 +0000 (16:13 +0530)]
improvement for api
monishdeb [Wed, 17 Jun 2015 15:39:40 +0000 (21:09 +0530)]
minor fix
monishdeb [Wed, 17 Jun 2015 15:37:46 +0000 (21:07 +0530)]
CRM-16575 fix - Searching/reporting on similar values in multi select fields breaks
https://issues.civicrm.org/jira/browse/CRM-16575
unknown [Wed, 27 May 2015 14:42:25 +0000 (15:42 +0100)]
New Warnings - Category ScopeIndent
unknown [Wed, 27 May 2015 13:56:29 +0000 (14:56 +0100)]
CheckStyle Result fixes
unknown [Wed, 27 May 2015 13:39:41 +0000 (14:39 +0100)]
Updating white space
unknown [Wed, 27 May 2015 13:36:06 +0000 (14:36 +0100)]
Proposed fix for searching similar multi select values CRM-16575
Web Access [Thu, 18 Jun 2015 09:09:56 +0000 (14:39 +0530)]
Minor changes
Web Access [Thu, 18 Jun 2015 06:06:06 +0000 (11:36 +0530)]
Fix for CRM-16691
Dave Greenberg [Wed, 17 Jun 2015 23:29:05 +0000 (16:29 -0700)]
Merge pull request #6048 from davecivicrm/CRM-16708
CRM-16708 - Fix link from event/info configure menu to Schedule Remin…
Dave Greenberg [Wed, 17 Jun 2015 23:28:46 +0000 (16:28 -0700)]
Merge pull request #6047 from davecivicrm/CRM-16700
CRM-16700 - Fix notice on Print PDF Letters from search task.
CiviCRM [Wed, 17 Jun 2015 20:16:20 +0000 (13:16 -0700)]
Update version to 4.6.5
Tim Otten [Wed, 17 Jun 2015 20:03:18 +0000 (13:03 -0700)]
Merge pull request #6049 from colemanw/releaser
Move releaser to buildkit
Coleman Watts [Wed, 17 Jun 2015 19:59:27 +0000 (15:59 -0400)]
Move releaser to buildkit
Dave Greenberg [Wed, 17 Jun 2015 18:36:48 +0000 (11:36 -0700)]
CRM-16708 - Fix link from event/info configure menu to Schedule Reminders.
----------------------------------------
* CRM-16708: Link from Event Info page "Configure" menu to Schedule Reminders is incorrect
https://issues.civicrm.org/jira/browse/CRM-16708
Dave Greenberg [Wed, 17 Jun 2015 18:13:30 +0000 (11:13 -0700)]
CRM-16700 - Fix notice on Print PDF Letters from search task.
----------------------------------------
* CRM-16700: Notice pdfformat when creating pdf letters
https://issues.civicrm.org/jira/browse/CRM-16700
Monish Deb [Wed, 17 Jun 2015 15:49:03 +0000 (21:19 +0530)]
Merge pull request #6039 from sudhabisht/CRM-16635
Fix for PCP giving default anonymous
colemanw [Wed, 17 Jun 2015 15:24:45 +0000 (11:24 -0400)]
Merge pull request #6040 from yashodha/CRM-12675.cleanup
CRM-12675 : cleanup - Contribution activities shown to users without …
Tim Mallezie [Wed, 17 Jun 2015 13:53:55 +0000 (15:53 +0200)]
merge commonLetterCompose() and commonCompose()
deprecate commonLetterCompose() function
yashodha [Wed, 17 Jun 2015 13:29:33 +0000 (18:59 +0530)]
CRM-12675 : cleanup - Contribution activities shown to users without permission
https://issues.civicrm.org/jira/browse/CRM-12675
Yashodha Chaku [Wed, 17 Jun 2015 10:52:57 +0000 (16:22 +0530)]
Merge pull request #6034 from jitendrapurohit/test47
warning fixes on Activity Search
Sudha Bisht [Wed, 17 Jun 2015 07:19:18 +0000 (12:49 +0530)]
Fix for PCP giving default anonymous
colemanw [Wed, 17 Jun 2015 00:48:52 +0000 (20:48 -0400)]
Merge pull request #6009 from eileenmcnaughton/CRM-16675
CRM-16675 remove unused function composeMessage on ContributionPage c…
Eileen McNaughton [Tue, 16 Jun 2015 21:28:31 +0000 (09:28 +1200)]
Merge pull request #6031 from eileenmcnaughton/CRM-16699
CRM-16699 retrieve custom fields with subtypes from api
Dave Greenberg [Tue, 16 Jun 2015 17:50:28 +0000 (10:50 -0700)]
Merge pull request #6033 from monishdeb/4.6
CRM-16398 fix - Block editing of recurring contribution total when mo…
colemanw [Tue, 16 Jun 2015 17:49:04 +0000 (13:49 -0400)]
Merge pull request #6036 from mallezie/16629
CRM-16629 revert default lengths of text-fields
Tim Mallezie [Tue, 16 Jun 2015 14:52:03 +0000 (16:52 +0200)]
CRM-16629 revert default lengths of text-fields
Monish Deb [Tue, 16 Jun 2015 14:12:34 +0000 (19:42 +0530)]
Merge pull request #6035 from sudhabisht/CRM-16694
Fix for change selection edit field issue
Sudha Bisht [Tue, 16 Jun 2015 13:35:59 +0000 (19:05 +0530)]
Fix for change selection edit field issue
jitendrapurohit [Tue, 16 Jun 2015 13:18:42 +0000 (18:48 +0530)]
warning fixes on Activity Search
monishdeb [Tue, 16 Jun 2015 12:59:16 +0000 (18:29 +0530)]
CRM-16398 fix - Block editing of recurring contribution total when more than one line item exists
https://issues.civicrm.org/jira/browse/CRM-16398
Yashodha Chaku [Tue, 16 Jun 2015 09:43:18 +0000 (15:13 +0530)]
Merge pull request #6029 from yashodha/CRM-12675
CRM-12675
Eileen McNaughton [Tue, 16 Jun 2015 09:41:06 +0000 (21:41 +1200)]
CRM-16699 retrieve custom fields with subtypes from api
Monish Deb [Tue, 16 Jun 2015 09:33:33 +0000 (15:03 +0530)]
Merge pull request #6028 from sudhabisht/5770CodeCleanup
Code cleanup
Monish Deb [Tue, 16 Jun 2015 09:31:53 +0000 (15:01 +0530)]
Merge pull request #6030 from monishdeb/4.6
CRM-16611 fix - Fatal error on batch processing membership when Payme…
Eileen McNaughton [Tue, 16 Jun 2015 09:27:59 +0000 (21:27 +1200)]
CRM-16699 stop update overwriting params
Eileen McNaughton [Tue, 16 Jun 2015 08:11:37 +0000 (20:11 +1200)]
CRM-16699 pass entity_type to basic get
Monish Deb [Tue, 16 Jun 2015 07:39:57 +0000 (13:09 +0530)]
Merge pull request #6023 from rohankatkar/CRM-16636
CRM-16636 duplicate primary addresses causes error in report
monishdeb [Tue, 16 Jun 2015 07:19:39 +0000 (12:49 +0530)]
CRM-16611 fix - Fatal error on batch processing membership when Payment status = Pending
https://issues.civicrm.org/jira/browse/CRM-16611
yashodha [Tue, 16 Jun 2015 06:49:44 +0000 (12:19 +0530)]
fix whitespaces
Sudha Bisht [Tue, 16 Jun 2015 06:13:07 +0000 (11:43 +0530)]
Code cleanup
Web Access [Tue, 16 Jun 2015 05:10:27 +0000 (10:40 +0530)]
minor changes
Web Access [Tue, 16 Jun 2015 05:07:39 +0000 (10:37 +0530)]
Minor fixes for CRM-16636
yashodha [Tue, 16 Jun 2015 04:33:16 +0000 (10:03 +0530)]
CRM-12675: generalize for all components
----------------------------------------
* CRM-12675: Contribution activities shown to users without permission
https://issues.civicrm.org/jira/browse/CRM-12675
colemanw [Tue, 16 Jun 2015 00:30:40 +0000 (20:30 -0400)]
Merge pull request #6025 from colemanw/caseManager
Fix missing case manager in sample case type
Dave Greenberg [Mon, 15 Jun 2015 23:20:26 +0000 (16:20 -0700)]
Merge pull request #6024 from davecivicrm/CRM-15775
CRM-15775 - upgrade logic to fix uf.group_type on on_behalf_organizat…
Eileen McNaughton [Mon, 15 Jun 2015 21:47:45 +0000 (09:47 +1200)]
Merge pull request #6027 from eileenmcnaughton/CRM-16682-46
CRM-16682 add price-set-1 region
Eileen McNaughton [Mon, 15 Jun 2015 21:46:23 +0000 (09:46 +1200)]
Merge pull request #6026 from civicrm/revert-6018-CRM-16682-46
Revert "CRM-16682 add price-set region & placement option"
projects / civicrm-core.git / log