colemanw [Sat, 6 Jun 2015 02:38:13 +0000 (22:38 -0400)]
Merge pull request #5954 from JKingsnorth/CRM-16624
CRM-16624: Mark 'Number of participants' as required; remove unused reqMark
colemanw [Thu, 4 Jun 2015 18:33:01 +0000 (14:33 -0400)]
Merge pull request #5963 from colemanw/CRM-16130
CRM-16130 - Add action to contact inline edit forms
Coleman Watts [Thu, 4 Jun 2015 16:56:34 +0000 (12:56 -0400)]
CRM-16130 - Add action to contact inline edit forms
Coleman Watts [Thu, 4 Jun 2015 14:34:21 +0000 (10:34 -0400)]
Merge branch '4.6' into 'master'
Conflicts:
tools/CRM/Auction/BAO/Auction.php
tools/CRM/Auction/BAO/Item.php
tools/CRM/Auction/Form/Auction.php
tools/CRM/Auction/Form/Item.php
Monish Deb [Thu, 4 Jun 2015 12:32:33 +0000 (18:02 +0530)]
Merge pull request #5944 from colemanw/CRM-16310
CRM-16310 - Fix inline link handling with dynamic content
JKingsnorth [Thu, 4 Jun 2015 10:09:12 +0000 (11:09 +0100)]
CRM-16624: Remove unused and outdated reqMark variable from templates
JKingsnorth [Thu, 4 Jun 2015 10:03:19 +0000 (11:03 +0100)]
CRM-16624: Add required mark for number of participants
Eileen McNaughton [Thu, 4 Jun 2015 04:53:20 +0000 (16:53 +1200)]
Merge pull request #5894 from eileenmcnaughton/CRM-16555
CRM-16555 - Make Payment form credit / debit card changing available …
Coleman Watts [Thu, 4 Jun 2015 02:56:57 +0000 (22:56 -0400)]
CRM-16555 - Cleanup billing block js
Eileen McNaughton [Wed, 3 Jun 2015 22:49:34 +0000 (10:49 +1200)]
Merge pull request #5900 from eileenmcnaughton/CRM-16566
CRM-16566 upgrade authorize.net to support new style IPNS
Monish Deb [Wed, 3 Jun 2015 13:26:32 +0000 (18:56 +0530)]
Merge pull request #5950 from deepak-srivastava/CRM-16563
CRM-16563 include end-date by using time 23:59 than incrementing by day1
Eileen McNaughton [Wed, 3 Jun 2015 10:47:50 +0000 (22:47 +1200)]
Merge pull request #5949 from mallezie/crm-16615
CRM-16615 add getDefaultContext to ManageEvent form
deepak-srivastava [Wed, 3 Jun 2015 08:50:43 +0000 (09:50 +0100)]
CRM-16563 include end-date by using time 23:59 than incrementing by day 1
----------------------------------------
* CRM-16563: Recurring event system sometimes suggests incorrect dates
https://issues.civicrm.org/jira/browse/CRM-16563
Tim Mallezie [Wed, 3 Jun 2015 08:09:17 +0000 (10:09 +0200)]
add getDefaultContext to ManageEvent form
Eileen McNaughton [Wed, 3 Jun 2015 04:23:54 +0000 (16:23 +1200)]
Merge pull request #5943 from eileenmcnaughton/master
Remove some unused params & a call by reference
Eileen McNaughton [Wed, 3 Jun 2015 04:22:10 +0000 (16:22 +1200)]
Merge pull request #5945 from eileenmcnaughton/no-auction-46
Remove Auction & Touchstone
Coleman Watts [Wed, 3 Jun 2015 02:07:29 +0000 (22:07 -0400)]
CRM-16310 - Fix option view close button
Eileen McNaughton [Wed, 3 Jun 2015 02:02:53 +0000 (14:02 +1200)]
CRM-16555 do not include js in snippet
Eileen McNaughton [Wed, 3 Jun 2015 00:35:09 +0000 (12:35 +1200)]
Remove Auction & Touchstone
Conflicts:
tools/CRM/Auction/BAO/Auction.php
tools/CRM/Auction/BAO/Item.php
tools/CRM/Auction/Form/Auction.php
tools/CRM/Auction/Form/Item.php
Eileen McNaughton [Wed, 3 Jun 2015 00:04:54 +0000 (12:04 +1200)]
phpcs fixes
Eileen McNaughton [Tue, 2 Jun 2015 23:43:42 +0000 (11:43 +1200)]
Merge pull request #5942 from eileenmcnaughton/CRM-16605
CRM-16605 remove hard-coded payment processor ref
Coleman Watts [Tue, 2 Jun 2015 20:58:57 +0000 (16:58 -0400)]
CRM-16310 - Fix inline link handling with dynamic content
Coleman Watts [Tue, 2 Jun 2015 19:20:10 +0000 (15:20 -0400)]
CRM-16555 - Fix paymentBlock js for front-end forms
Coleman Watts [Tue, 2 Jun 2015 18:52:41 +0000 (14:52 -0400)]
Fix backend PayPal button style
colemanw [Tue, 2 Jun 2015 18:09:21 +0000 (14:09 -0400)]
Merge pull request #5933 from colemanw/Print
Print button should print
Monish Deb [Tue, 2 Jun 2015 11:04:13 +0000 (16:34 +0530)]
Merge pull request #5941 from rohankatkar/CRM16565
When signing up multiple participants, the second contact's selections appear on the first contact's participant record
Eileen McNaughton [Tue, 2 Jun 2015 10:46:48 +0000 (22:46 +1200)]
refactor pending one step closer to the form when renewing membership status - goal is to get it completely out of the form layer
Eileen McNaughton [Tue, 2 Jun 2015 09:52:30 +0000 (21:52 +1200)]
Remove some unused params & a call by reference
Eileen McNaughton [Tue, 2 Jun 2015 09:34:24 +0000 (21:34 +1200)]
CRM-16605 remove hard-coded payment processor ref
Web Access [Tue, 2 Jun 2015 08:42:29 +0000 (14:12 +0530)]
Warning fix
Eileen McNaughton [Tue, 2 Jun 2015 08:11:46 +0000 (20:11 +1200)]
Merge pull request #5918 from eileenmcnaughton/check_hook
Check hook
Eileen McNaughton [Tue, 2 Jun 2015 08:11:19 +0000 (20:11 +1200)]
Merge pull request #5931 from eileenmcnaughton/CRM-16580
Crm 16580
Monish Deb [Tue, 2 Jun 2015 08:02:42 +0000 (13:32 +0530)]
Merge pull request #5932 from pratikshad/16535
CRM-16535 Fix-Cannot record contributions in a data entry batch of ty…
Web Access [Tue, 2 Jun 2015 06:57:01 +0000 (12:27 +0530)]
Fix for CRM-16565
colemanw [Tue, 2 Jun 2015 00:27:28 +0000 (20:27 -0400)]
Merge pull request #5940 from colemanw/CRM-16601
CRM-16601 - Fix string escaping in js
Coleman Watts [Mon, 1 Jun 2015 20:53:58 +0000 (16:53 -0400)]
CRM-16601 - Fix string escaping in js
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
Coleman Watts [Fri, 29 May 2015 19:27:02 +0000 (15:27 -0400)]
Print button should print
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
Coleman Watts [Fri, 29 May 2015 19:04:10 +0000 (15:04 -0400)]
Fix js error on contribution page
pratikshad [Fri, 29 May 2015 09:21:34 +0000 (14:51 +0530)]
CRM-16535 Fix-Cannot record contributions in a data entry batch of type pledge payment
----------------------------------------
* CRM-16535: Cannot record contributions in a data entry batch of type pledge payment
https://issues.civicrm.org/jira/browse/CRM-16535
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 …
Eileen McNaughton [Fri, 29 May 2015 02:14:26 +0000 (14:14 +1200)]
CRM-16580 type check when returning user
Eileen McNaughton [Fri, 29 May 2015 02:06:55 +0000 (14:06 +1200)]
CRM-16580 avoid matching cid to user id if null
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 [Sun, 24 May 2015 11:19:30 +0000 (23:19 +1200)]
CRM-16555 remove accordian from billing section & hence a bunch of code
None of the other backoffice forms put this in an accordian & it is not optional if shown - because it is processor loaded
so putting in an accordian here seems odd. If it is to be in an accordian we should do in billingblock & apply to membership & event forms
Eileen McNaughton [Wed, 27 May 2015 22:26:56 +0000 (10:26 +1200)]
CRM-16555 call extracted form snippet not overloaded form snippet.
The payment form snippet has been extracted so it can be called from anywhere, use this & remove the over-loaded snippet
note the change of field name is to align front end & back-end but still an issue as back-end is select & front end is radio
CRM-16555 last may have been too agressive
CRM-16555 test fixes
x
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…
projects / civicrm-core.git / log