Eileen McNaughton [Tue, 2 Jun 2015 08:11:46 +0000 (20:11 +1200)]
Merge pull request #5918 from eileenmcnaughton/check_hook
Check hook
kurund [Mon, 1 Jun 2015 17:08:20 +0000 (22:38 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-06-01-22-27-06
Conflicts:
CRM/Contribute/Form/Contribution/Main.php
colemanw [Sun, 31 May 2015 18:45:37 +0000 (14:45 -0400)]
Merge pull request #5938 from colemanw/CRM-16596
CRM-16596 - Fix adding PDF activity to case
Coleman Watts [Sun, 31 May 2015 00:40:15 +0000 (20:40 -0400)]
CRM-16596 - Fix adding PDF activity to case
colemanw [Sat, 30 May 2015 17:45:37 +0000 (13:45 -0400)]
Merge pull request #5937 from colemanw/CiviCase
CiviCase - cleanup 'File on Case' string
Coleman Watts [Sat, 30 May 2015 17:44:26 +0000 (13:44 -0400)]
CiviCase - cleanup 'File on Case' string
colemanw [Sat, 30 May 2015 17:31:45 +0000 (13:31 -0400)]
Merge pull request #5927 from colemanw/CRM-16585
CRM-16585 - Add print button to dialogs
colemanw [Sat, 30 May 2015 17:29:57 +0000 (13:29 -0400)]
Merge pull request #5935 from totten/4.6-ext-inst-err
CRM-16590 - Admin/Extensions - Fix regression
Tim Otten [Sat, 30 May 2015 04:23:53 +0000 (06:23 +0200)]
CRM-16590 - Admin/Extensions - Fix regression
When installing a new extension, it raises an exception because it cannot
display the pretty name of the extension. Moreover, it handles localization
inappropriately.
This is a follow-up to
17d48d22.
Dave Greenberg [Fri, 29 May 2015 22:32:14 +0000 (15:32 -0700)]
Merge pull request #5874 from JKingsnorth/CRM-16531
CRM-16531 Remove automatic http:// in website fields
Dave Greenberg [Fri, 29 May 2015 19:13:15 +0000 (12:13 -0700)]
Merge pull request #5890 from mallezie/add-participant-pdfletter
CRM-16550 add print-pdf-letter for event participants
Tim Mallezie [Fri, 29 May 2015 07:03:37 +0000 (09:03 +0200)]
add default values
Monish Deb [Fri, 29 May 2015 05:39:18 +0000 (11:09 +0530)]
Merge pull request #5920 from jitendrapurohit/CRM-16568
CRM-16568 - Repeating Events: excluding dates doesn't stop the event …
colemanw [Fri, 29 May 2015 01:11:28 +0000 (21:11 -0400)]
Merge pull request #5928 from eileenmcnaughton/CRM-16580
CRM-16580 cast contactID to an int when it is zero as currently it is…
colemanw [Fri, 29 May 2015 00:43:53 +0000 (20:43 -0400)]
Merge pull request #5923 from colemanw/Activity
Activity api getfields fixes
eileenmcnaughton [Fri, 29 May 2015 00:36:07 +0000 (00:36 +0000)]
CRM-16580 cast contactID to an int when it is zero as currently it is inconsistent
Coleman Watts [Thu, 28 May 2015 23:07:25 +0000 (19:07 -0400)]
CRM-16585 - Add print button to dialogs
Eileen McNaughton [Thu, 28 May 2015 21:06:49 +0000 (09:06 +1200)]
Merge pull request #5922 from eileenmcnaughton/master
CRM-16555 include BillingBlockWrapper as part of refactoring forms to…
Coleman Watts [Thu, 28 May 2015 20:45:05 +0000 (16:45 -0400)]
Correct FK entity for activity api pseudo-fields
Monish Deb [Thu, 28 May 2015 19:29:11 +0000 (00:59 +0530)]
Merge pull request #5926 from monishdeb/4.6
CRM-16576 fix - Cannot disable permissions in Relationships
Kurund Jalmi [Thu, 28 May 2015 18:07:34 +0000 (23:37 +0530)]
Merge pull request #5921 from sudhabisht/CRM-16552
Fix for map link and display
kurund [Thu, 28 May 2015 17:39:08 +0000 (23:09 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-05-28-22-50-49
Conflicts:
ang/crmUi.js
sql/civicrm_generated.mysql
xml/version.xml
monishdeb [Thu, 28 May 2015 17:10:59 +0000 (22:40 +0530)]
CRM-16576 fix - Cannot disable permissions in Relationships
https://issues.civicrm.org/jira/browse/CRM-16576
Coleman Watts [Thu, 28 May 2015 13:36:01 +0000 (09:36 -0400)]
Activity api getfields fixes
Eileen McNaughton [Thu, 28 May 2015 12:04:27 +0000 (00:04 +1200)]
CRM-16555 include BillingBlockWrapper as part of refactoring forms to have same behaviour
The wrapper has an extra div which is crucial for switching so where it isn't present, add the wrapper version
Also, note the wrapper may get the extra script added rather than billingBlock as part of the refactor (scri
jitendrapurohit [Thu, 28 May 2015 11:45:20 +0000 (17:15 +0530)]
CRM-16568 - Repeating Events: excluding dates doesn't stop the event from being created
Sudha Bisht [Thu, 28 May 2015 11:42:14 +0000 (17:12 +0530)]
Fix for map link and display
Monish Deb [Thu, 28 May 2015 10:19:33 +0000 (15:49 +0530)]
Merge pull request #5919 from monishdeb/4.6
CRM-15839 fix - Honoree profile doesn't show on Test contribution page
Monish Deb [Thu, 28 May 2015 10:19:22 +0000 (15:49 +0530)]
Merge pull request #5916 from laryn/patch-2
CRM-15839 fix - Honoree section not showing on Test Contribution Page
monishdeb [Thu, 28 May 2015 10:17:24 +0000 (15:47 +0530)]
CRM-15839 fix - Honoree profile doesn't show on Test contribution page
https://issues.civicrm.org/jira/browse/CRM-15839
Tim Mallezie [Thu, 28 May 2015 08:52:39 +0000 (10:52 +0200)]
Update comments
Eileen McNaughton [Thu, 28 May 2015 07:30:22 +0000 (19:30 +1200)]
Merge pull request #5917 from eileenmcnaughton/master
CRM-16555 add missing path fix from previous PR & phpcs tidyups
Monish Deb [Thu, 28 May 2015 05:16:13 +0000 (10:46 +0530)]
Merge pull request #5911 from jitendrapurohit/CRM-16554
CRM-16554 - Cannot Use or Delete Smart Groups Created by Contribution…
Eileen McNaughton [Tue, 26 May 2015 03:52:25 +0000 (15:52 +1200)]
clarify param
Tim Otten [Sat, 7 Mar 2015 00:49:58 +0000 (16:49 -0800)]
CRM_Utils_Check - Add Message::$level. Only harass admins about WARNING or higher.
Tim Otten [Sat, 7 Mar 2015 00:27:52 +0000 (16:27 -0800)]
CRM_Utils_Check - Allow extensions to define their own checks.
Eileen McNaughton [Tue, 26 May 2015 04:02:03 +0000 (16:02 +1200)]
minor phpcs updates
Eileen McNaughton [Thu, 28 May 2015 00:43:33 +0000 (12:43 +1200)]
CRM-16555 fix incorrect path on previous commit
Eileen McNaughton [Thu, 28 May 2015 00:38:30 +0000 (12:38 +1200)]
Merge pull request #5915 from eileenmcnaughton/master
CRM-16555 extract payment form into a separate class to make accessible from elsewhere
Laryn [Wed, 27 May 2015 22:31:27 +0000 (17:31 -0500)]
Honoree section not showing on Test Contribution Page
Eileen McNaughton [Wed, 27 May 2015 21:53:18 +0000 (09:53 +1200)]
CRM-16555 introduce separated payment form as snippet
The point of this is to allow the payment form to be disambiguated from the contribution & event forms - allowing it to be called from elsewhere
Eileen McNaughton [Sun, 24 May 2015 11:27:27 +0000 (23:27 +1200)]
CRM-16555 remove unnecessary variable assignment
Eileen McNaughton [Sun, 24 May 2015 21:25:51 +0000 (09:25 +1200)]
CRM-16555 code tidy up
Dave Greenberg [Wed, 27 May 2015 18:51:11 +0000 (11:51 -0700)]
Merge pull request #5908 from relldoesphp/CRM-16547
CRM-16457 Fixes error caused by contribution fulfillment date
JKingsnorth [Wed, 20 May 2015 11:07:06 +0000 (12:07 +0100)]
CRM-16531 Remove automatic in website fields
Monish Deb [Wed, 27 May 2015 12:58:33 +0000 (18:28 +0530)]
Merge pull request #5909 from monishdeb/CRM-16496
CRM-16496 fix - ACLs not respected when viewing custom data set on an…
jitendrapurohit [Wed, 27 May 2015 11:28:38 +0000 (16:58 +0530)]
warning fix
jitendrapurohit [Wed, 27 May 2015 11:19:41 +0000 (16:49 +0530)]
CRM-16554 - Cannot Use or Delete Smart Groups Created by Contribution Aggregate Search
Monish Deb [Wed, 27 May 2015 11:06:18 +0000 (16:36 +0530)]
Merge pull request #5907 from jmcclelland/CRM-16569
CRM-16569 - avoid backtrace when adding contacts to group
Monish Deb [Wed, 27 May 2015 09:35:13 +0000 (15:05 +0530)]
Merge pull request #5889 from rohankatkar/CRM-16285
CRM-16285: recurring_interval not checked in Backoffice form New CreditCard Payment
Monish Deb [Wed, 27 May 2015 09:32:44 +0000 (15:02 +0530)]
Merge pull request #5904 from sudhabisht/CRM-16549
Fixes for mailing url
Monish Deb [Wed, 27 May 2015 06:48:30 +0000 (12:18 +0530)]
Merge pull request #5905 from jitendrapurohit/CRM-16567
CRM-16567 - Zero Amount Contribution returns an error message
monishdeb [Tue, 26 May 2015 22:30:39 +0000 (04:00 +0530)]
CRM-16496 fix - ACLs not respected when viewing custom data set on an activity when activity is viewed from Manage Case screen
https://issues.civicrm.org/jira/browse/CRM-16496
relldoesphp [Tue, 26 May 2015 22:12:50 +0000 (18:12 -0400)]
CRM-16457 Fixes error caused by contribution fulfillment date
Jamie McClelland [Tue, 26 May 2015 20:32:59 +0000 (16:32 -0400)]
CRM-16569 - avoid backtrace when adding contacts to group
This happens if you filter on target name with a contains or not
contains.
Monish Deb [Tue, 26 May 2015 19:19:38 +0000 (00:49 +0530)]
Merge pull request #5873 from Kajakaran/hidecredit
CRM-16527 - Hide credit card section in membership contribution form
colemanw [Tue, 26 May 2015 18:32:13 +0000 (14:32 -0400)]
Merge pull request #5901 from colemanw/CRM-16557
CRM-16557 - Fix contact dashboard to display assigned activities
Dave Greenberg [Tue, 26 May 2015 16:27:30 +0000 (09:27 -0700)]
Merge pull request #5891 from davecivicrm/CRM-16503
CRM-16503 - Remove obsolete special handling of case type filter in C…
jitendrapurohit [Tue, 26 May 2015 13:01:55 +0000 (18:31 +0530)]
CRM-16567 - Zero Amount Contribution returns an error message
Sudha Bisht [Tue, 26 May 2015 12:25:08 +0000 (17:55 +0530)]
Fixes for mailing url
Monish Deb [Tue, 26 May 2015 11:03:14 +0000 (16:33 +0530)]
Merge pull request #5902 from jitendrapurohit/CRM-16548
Batch Data Entry screens do not require payment instrument
jitendrapurohit [Tue, 26 May 2015 08:42:20 +0000 (14:12 +0530)]
warning fix
jitendrapurohit [Tue, 26 May 2015 08:26:57 +0000 (13:56 +0530)]
minor fix
jitendrapurohit [Tue, 26 May 2015 07:06:24 +0000 (12:36 +0530)]
Batch Data Entry screens do not require payment instrument
Monish Deb [Tue, 26 May 2015 05:09:30 +0000 (10:39 +0530)]
Merge pull request #5895 from jitendrapurohit/CRM-16551
CRM-16551 Notice on demo site re custom fields
colemanw [Tue, 26 May 2015 02:02:50 +0000 (22:02 -0400)]
Merge pull request #5863 from totten/4.6-ang-win
CRM-16499 - Fix relative Angular paths in Windows
Coleman Watts [Tue, 26 May 2015 01:57:39 +0000 (21:57 -0400)]
CRM-16557 - Fix contact dashboard to display assigned activities
colemanw [Mon, 25 May 2015 16:47:48 +0000 (12:47 -0400)]
Merge pull request #5899 from colemanw/CRM-16477
CRM-16477 - Additional backwards compatibility for report instances pre-dating 4.5
Coleman Watts [Mon, 25 May 2015 16:43:57 +0000 (12:43 -0400)]
CRM-16477 - Additional backwards compatibility for report instances pre-dating 4.5
colemanw [Mon, 25 May 2015 16:33:31 +0000 (12:33 -0400)]
Merge pull request #5797 from GinkgoFJG/4.6
CRM-16477: Added backwards compatibility for report instances pre-dating 4.5.
colemanw [Mon, 25 May 2015 15:47:31 +0000 (11:47 -0400)]
Merge pull request #5897 from colemanw/caseStyle
CaseType UI styling improvements
Coleman Watts [Mon, 27 Apr 2015 17:41:52 +0000 (11:41 -0600)]
CaseType UI styling improvements
colemanw [Mon, 25 May 2015 15:01:06 +0000 (11:01 -0400)]
Merge pull request #5618 from sfe-ev/fix-upgrade-option_value-4.6
Upgrade: Fix `value` for added `option_value` entries in various places
jitendrapurohit [Mon, 25 May 2015 12:49:09 +0000 (18:19 +0530)]
CRM-16551 Notice on demo site re custom fields
Eileen McNaughton [Sun, 24 May 2015 11:31:44 +0000 (23:31 +1200)]
Merge pull request #5876 from mallezie/remove-inline-assert-message
CRM-16532 remove inline message from assert messages
Eileen McNaughton [Sun, 24 May 2015 11:29:01 +0000 (23:29 +1200)]
Merge pull request #5883 from mallezie/addfield-website
CRM-16178 use addfield in website form
Eileen McNaughton [Sun, 24 May 2015 11:28:22 +0000 (23:28 +1200)]
Merge pull request #5892 from eileenmcnaughton/CRM-16431
CRM-16431 update syntax conformance tests to test timestamps
Eileen McNaughton [Sun, 24 May 2015 08:23:15 +0000 (20:23 +1200)]
Merge pull request #5893 from eileenmcnaughton/billing-type-consolidate
Put function to assign billing type onto core_form due to frequency o…
Eileen McNaughton [Sat, 23 May 2015 09:06:55 +0000 (21:06 +1200)]
Put function to assign billing type onto core_form due to frequency of functionality
Eileen McNaughton [Sat, 2 May 2015 23:55:39 +0000 (11:55 +1200)]
CRM-16431 update syntax conformance tests to test timestamps
Dave Greenberg [Fri, 22 May 2015 23:02:34 +0000 (16:02 -0700)]
Merge pull request #5888 from JKingsnorth/CRM-16546
CRM-16546 Event registration navigation warning
Dave Greenberg [Fri, 22 May 2015 22:52:17 +0000 (15:52 -0700)]
CRM-16503 - Remove obsolete special handling of case type filter in Case Detail Report.
----------------------------------------
* CRM-16503: CiviCase Detail Report: Filter by Case Type finds no results
https://issues.civicrm.org/jira/browse/CRM-16503
Tim Mallezie [Fri, 22 May 2015 17:56:24 +0000 (19:56 +0200)]
add print-pdf-letter for event participants
colemanw [Fri, 22 May 2015 14:03:12 +0000 (10:03 -0400)]
Merge pull request #5881 from mallezie/fix-hiddenfields-addfield
fix hidden form elements in addFieldMethod
Web Access [Fri, 22 May 2015 13:23:40 +0000 (18:53 +0530)]
Added doc for CRM-16285
Kurund Jalmi [Fri, 22 May 2015 13:17:38 +0000 (18:47 +0530)]
Merge pull request #5887 from sudhabisht/CRM-7636
Fix for website url issue
Kurund Jalmi [Fri, 22 May 2015 13:17:19 +0000 (18:47 +0530)]
Merge pull request #5886 from sudhabisht/CRM-16519
Fixes for unable to deselect multi-select field
Web Access [Fri, 22 May 2015 13:04:56 +0000 (18:34 +0530)]
CRM-16285: recurring_interval not checked in Backoffice form New CreditCard Payment
JKingsnorth [Fri, 22 May 2015 10:19:09 +0000 (11:19 +0100)]
CRM-16546 Event registration navigation warning
Sudha Bisht [Fri, 22 May 2015 10:11:27 +0000 (15:41 +0530)]
Fix for website url issue
Sudha Bisht [Fri, 22 May 2015 09:50:35 +0000 (15:20 +0530)]
Fixes for unable to deselect multi-select field
Kurund Jalmi [Fri, 22 May 2015 09:25:14 +0000 (14:55 +0530)]
Merge pull request #5847 from GinkgoFJG/CRM-16511
CRM-16511: Fixed missing closing tag for price set rows.
Kurund Jalmi [Fri, 22 May 2015 07:47:20 +0000 (13:17 +0530)]
Merge pull request #5885 from pratikshad/16528
CRM-16528 Fixed-hook_civicrm_contact_get_displayname does not work. M…
pratikshad [Fri, 22 May 2015 04:40:02 +0000 (10:10 +0530)]
CRM-16528 Fixed-hook_civicrm_contact_get_displayname does not work. Missing an "&" in alterDisplayName inhooks.php
----------------------------------------
* CRM-16528: hook_civicrm_contact_get_displayname does not work. Missing an "&" in alterDisplayName inhooks.php
https://issues.civicrm.org/jira/browse/CRM-16528
Tim Mallezie [Thu, 21 May 2015 15:52:05 +0000 (17:52 +0200)]
use addfield in website form
Tim Mallezie [Thu, 21 May 2015 06:24:42 +0000 (08:24 +0200)]
fix hidden form elements in addFieldMethod
Tim Mallezie [Thu, 21 May 2015 05:50:07 +0000 (07:50 +0200)]
remove more inline messages
Tim Mallezie [Thu, 21 May 2015 05:45:49 +0000 (07:45 +0200)]
fix membershiptypetest
Eileen McNaughton [Thu, 21 May 2015 01:09:05 +0000 (13:09 +1200)]
Merge pull request #5880 from eileenmcnaughton/CRM-16536
CRM-16536 add settings overrides to template
Eileen McNaughton [Thu, 21 May 2015 00:54:02 +0000 (12:54 +1200)]
phpcs fixes - pre-existing issues
projects / civicrm-core.git / log