colemanw [Tue, 7 Jun 2016 05:14:31 +0000 (23:14 -0600)]
Merge pull request #8422 from colemanw/CRM-18586
CRM-18586 - Fix race condition when loading custom data forms
colemanw [Tue, 7 Jun 2016 05:14:20 +0000 (23:14 -0600)]
Merge pull request #8450 from jitendrapurohit/CRM-18586-additional
CRM-18586 - add delete link and fix add more button
Yashodha Chaku [Tue, 7 Jun 2016 05:07:45 +0000 (10:37 +0530)]
Merge pull request #8507 from josephlacey/CRM-18116
CRM-18116 Fixing bug with editing assigned activities within case.
colemanw [Tue, 7 Jun 2016 05:06:21 +0000 (23:06 -0600)]
Merge pull request #8518 from twomice/CRM-18770
Fix for CRM-18770.
Eileen McNaughton [Mon, 6 Jun 2016 21:45:45 +0000 (15:45 -0600)]
Merge pull request #8519 from eileenmcnaughton/membership_form
Membership form
eileen [Mon, 6 Jun 2016 21:08:13 +0000 (15:08 -0600)]
CRM-18701 remove unused variables
eileen [Mon, 6 Jun 2016 20:37:09 +0000 (14:37 -0600)]
CRM-18701 tidy up, do not pass variables around as a reference when they are not being altered
eileen [Mon, 6 Jun 2016 20:20:50 +0000 (14:20 -0600)]
CRM-18701 tidy up, stop setting an array key & use a variable.
The array key is returned to the calling function but grepping did not find any more instances of it so we should limit it's scope to the function that uses it.
Really we want to pass in as a non-reference or else it's too unpredictable but this is just a small step
Allen Shaw [Mon, 6 Jun 2016 19:39:06 +0000 (14:39 -0500)]
Fix for CRM-18770.
Eileen McNaughton [Mon, 6 Jun 2016 19:37:45 +0000 (13:37 -0600)]
Merge pull request #8513 from eileenmcnaughton/dash
CRM-18675 do extra check before trying to create dashlets to avoid un…
colemanw [Mon, 6 Jun 2016 19:30:28 +0000 (13:30 -0600)]
Merge pull request #8497 from colemanw/CRM-18652
CRM-18652 - Improve style of no-results item
Joseph Lacey [Mon, 6 Jun 2016 17:00:49 +0000 (11:00 -0600)]
Including all users for case permission check
eileen [Mon, 6 Jun 2016 14:45:51 +0000 (08:45 -0600)]
CRM-18675 do extra check before trying to create dashlets to avoid unexpected message
Yashodha Chaku [Mon, 6 Jun 2016 08:49:39 +0000 (14:19 +0530)]
Merge pull request #8426 from Anjali2906/crm_18560_validation
CRM-18560 - Validate either body text or body html
Eileen McNaughton [Mon, 6 Jun 2016 03:27:18 +0000 (21:27 -0600)]
Merge pull request #8490 from eileenmcnaughton/trans
CRM-18661 Fix & add test for financial rows created by repeattransaction
colemanw [Mon, 6 Jun 2016 02:57:10 +0000 (20:57 -0600)]
Merge pull request #8504 from rollox/patch-2
CRM-18743 - Undefined variable $order
Joseph Lacey [Mon, 6 Jun 2016 02:34:52 +0000 (20:34 -0600)]
CRM-18116 Fixing bug with editing assigned activities within case.
----------------------------------------
* CRM-18116: CiviCase Users Unable to Edit & Add Activities on Cases They've Been Assigned
https://issues.civicrm.org/jira/browse/CRM-18116
eileen [Mon, 6 Jun 2016 00:53:03 +0000 (18:53 -0600)]
CRM-18661 further fix to ensure payment processor account is used
colemanw [Mon, 6 Jun 2016 00:41:07 +0000 (18:41 -0600)]
Merge pull request #8312 from colemanw/CRM-18344
CRM-18344 - Show attachments on CiviMail review panel
Eileen McNaughton [Mon, 6 Jun 2016 00:33:42 +0000 (18:33 -0600)]
Merge pull request #8342 from rohankatkar/CRM18472NoticeFix
CRM-18472: Notice fix
rollox [Mon, 6 Jun 2016 00:18:09 +0000 (01:18 +0100)]
CRM-18743 - Undefined variable $order
Fixes 3 notice/errors stating "Undefined variable: order in CRM_Contact_BAO_Query->prepareOrderBy()" on Drupal user page when the user record is linked to a Civi contact record. eg at path: user/1
Eileen McNaughton [Mon, 6 Jun 2016 00:15:08 +0000 (18:15 -0600)]
Merge pull request #8499 from eileenmcnaughton/strings
CRM-10210 add test for international strings
colemanw [Sun, 5 Jun 2016 23:54:48 +0000 (17:54 -0600)]
Merge pull request #8475 from johanv/CRM-18696-addresses_in_reports_without_address_parsing
CRM-18696 - Street address filtering in reports for sites w/o address parsing
Eileen McNaughton [Sun, 5 Jun 2016 23:19:11 +0000 (17:19 -0600)]
Merge pull request #8318 from AdamHillier/CRM-17657
CRM-17657 - Update ReCAPCHA validation text to reflect new style of captcha.
eileen [Sun, 5 Jun 2016 22:27:51 +0000 (16:27 -0600)]
CRM-10210 add test for international strings
Coleman Watts [Sun, 5 Jun 2016 21:54:33 +0000 (15:54 -0600)]
CRM-18652 - Improve style of no-results item
Coleman Watts [Sat, 7 May 2016 21:02:11 +0000 (17:02 -0400)]
Fix wide date input in CiviMail
Coleman Watts [Sat, 7 May 2016 20:59:06 +0000 (16:59 -0400)]
CRM-18344 - Show attachments on CiviMail review panel
Eileen McNaughton [Sun, 5 Jun 2016 20:00:32 +0000 (14:00 -0600)]
Merge pull request #8408 from AdamHillier/bug-fix
Typo fix: remove space before question mark.
Eileen McNaughton [Sun, 5 Jun 2016 19:25:14 +0000 (13:25 -0600)]
Merge pull request #8435 from totten/master-regen-cms
bin/regen.sh - Execute GenerateData.php after initializing other database structures
Eileen McNaughton [Sun, 5 Jun 2016 18:49:41 +0000 (12:49 -0600)]
Merge pull request #8495 from seamuslee001/CRM-18652
CRM-18652 Show no results label in quick search
Eileen McNaughton [Sun, 5 Jun 2016 18:45:57 +0000 (12:45 -0600)]
Merge pull request #8421 from ineffyble/correctly-update-test-payment-processor-urls
CRM-18625 - payment processors - correctly set test URLs from edit form
colemanw [Sun, 5 Jun 2016 17:56:47 +0000 (11:56 -0600)]
CRM-18751 - Add method for setting payment processor return URL (#8488)
* CRM-18751 - Add method for setting payment processor return URL
* CRM-18751 - Restore protected visibility of functions
Eileen McNaughton [Sun, 5 Jun 2016 17:53:50 +0000 (11:53 -0600)]
Merge pull request #8491 from seamuslee001/CRM-18752
CRM-18752 Fix Custom multi value importer
Eileen McNaughton [Sun, 5 Jun 2016 17:51:22 +0000 (11:51 -0600)]
Merge pull request #8142 from monishdeb/CRM-17779
CRM-17779: Authorize.Net payments held for fraud detection aren't logged in CiviCRM
Mathieu Lutfy [Sun, 5 Jun 2016 16:59:18 +0000 (12:59 -0400)]
Merge pull request #7797 from JKingsnorth/CRM-17977
CRM-17977 Usability of allowed countries/states
eileen [Sun, 5 Jun 2016 06:36:11 +0000 (00:36 -0600)]
CRM-18661 Fix & add test for financial rows created by repeattransaction
Seamus Lee [Sun, 5 Jun 2016 07:48:20 +0000 (17:48 +1000)]
CRM-18652 fix bug found in testing
Effy Elden [Mon, 23 May 2016 14:32:17 +0000 (10:32 -0400)]
CRM-18652 - Localize label for no results
----------------------------------------
* CRM-18652: Quick search should provide feedback to user if no matches are found
https://issues.civicrm.org/jira/browse/CRM-18652
Effy Elden [Sun, 22 May 2016 05:19:32 +0000 (01:19 -0400)]
CRM-18652 - Show 'no matches' if quick search returns no results
----------------------------------------
* CRM-18652: Quick search should provide feedback to user if no matches are found
https://issues.civicrm.org/jira/browse/CRM-18652
colemanw [Sun, 5 Jun 2016 07:23:15 +0000 (01:23 -0600)]
Merge pull request #8483 from colemanw/CRM-18742
CRM-18742 - Focus first text field on search forms
colemanw [Sun, 5 Jun 2016 07:17:35 +0000 (01:17 -0600)]
Merge pull request #8460 from colemanw/CRM-18660
CRM-18660 - Fix custom field year range selection
Eileen McNaughton [Sun, 5 Jun 2016 06:45:48 +0000 (00:45 -0600)]
Merge pull request #8233 from PalanteJon/CRM-18468
CRM-18468 - Recurring Contributions - don't use mid for subscription …
Seamus Lee [Sun, 5 Jun 2016 06:09:10 +0000 (16:09 +1000)]
Add in fixes for CRM-18708 as well as its needed on 4.7 and make minor fix as suggested by Coleman
Seamus Lee [Sun, 5 Jun 2016 05:46:14 +0000 (15:46 +1000)]
CRM-18752 Fix Custom multi value importer
Eileen McNaughton [Sun, 5 Jun 2016 02:23:56 +0000 (20:23 -0600)]
Merge pull request #7728 from andrew-cormick-dockery/CRM-17959
CRM-17959 - allow URL to be redirected if the queue ID is invalid but…
colemanw [Sun, 5 Jun 2016 01:52:02 +0000 (19:52 -0600)]
Merge pull request #8485 from colemanw/CRM-18744
CRM-18744 - Remember quicksearch field selection
colemanw [Sun, 5 Jun 2016 01:44:02 +0000 (19:44 -0600)]
Merge pull request #8484 from colemanw/actCustomSearch
Fix undeclared variables in custom activity search
colemanw [Sun, 5 Jun 2016 00:12:58 +0000 (18:12 -0600)]
Remove deprecated param
Eileen McNaughton [Sat, 4 Jun 2016 23:08:14 +0000 (17:08 -0600)]
Merge pull request #8332 from TobiasLounsbury/CRM-17888-freq-unit
CRM-17888: Updated frequency unit to type T_STRING
Tim Otten [Sat, 4 Jun 2016 21:42:37 +0000 (15:42 -0600)]
Merge pull request #8472 from cividesk/CRM-10230-4.7
CRM-10230 Custom fields text type with limited length not validated
Coleman Watts [Fri, 3 Jun 2016 22:16:41 +0000 (16:16 -0600)]
CRM-18744 - Remember quicksearch field selection
Coleman Watts [Fri, 3 Jun 2016 21:28:37 +0000 (15:28 -0600)]
Fix undeclared variables in custom activity search
Coleman Watts [Fri, 3 Jun 2016 16:51:00 +0000 (10:51 -0600)]
CRM-18742 - Focus first text field on search forms
Yashodha Chaku [Fri, 3 Jun 2016 11:39:57 +0000 (17:09 +0530)]
Merge pull request #8482 from JKingsnorth/CRM-18739
CRM-18739: Display currency for canceled contribution amount
Yashodha Chaku [Fri, 3 Jun 2016 11:17:19 +0000 (16:47 +0530)]
Merge pull request #8481 from yashodha/CRM-18699
CRM-18699: fix generated data for the typo
Yashodha Chaku [Fri, 3 Jun 2016 11:06:40 +0000 (16:36 +0530)]
Merge pull request #8430 from yashodha/CRM-18655
CRM-18655: Selected id's not escaped properly
Yashodha Chaku [Fri, 3 Jun 2016 10:51:04 +0000 (16:21 +0530)]
Merge pull request #8451 from yashodha/CRM-18139
CRM-18139: Notification needed when using Batch Update of Participant…
JKingsnorth [Fri, 3 Jun 2016 10:50:31 +0000 (11:50 +0100)]
CRM-18739: Display currency for canceled contribution amount
yashodha [Fri, 3 Jun 2016 08:36:58 +0000 (14:06 +0530)]
CRM-18699: fix generated data for the typo
----------------------------------------
* CRM-18699: Wake Island is misspelled
https://issues.civicrm.org/jira/browse/CRM-18699
Yashodha Chaku [Fri, 3 Jun 2016 08:34:27 +0000 (14:04 +0530)]
Merge pull request #8477 from mpnordland/master
CRM-18699 Fixed Wake Island spelling
Micah Nordland [Thu, 2 Jun 2016 15:25:50 +0000 (11:25 -0400)]
CRM-18699 fix in 4.7.9 now, better where statment
Yashodha Chaku [Thu, 2 Jun 2016 13:05:24 +0000 (18:35 +0530)]
Merge pull request #8328 from mlutfy/master-crm18524
CRM-18524: Fix db error when exporting contributions (phone_type_id is not a real ID field).
Tim Otten [Thu, 2 Jun 2016 06:34:46 +0000 (00:34 -0600)]
Merge remote-tracking branch 'origin/4.7.8-rc' into 4.7.8-rc-master-2016-06-02-00-34-42
Micah Nordland [Wed, 1 Jun 2016 16:33:58 +0000 (12:33 -0400)]
CRM-18699 Fixed Wake Island spelling
Yashodha Chaku [Wed, 1 Jun 2016 12:52:09 +0000 (18:22 +0530)]
Merge pull request #8438 from yashodha/CRM-18659
CRM-18659: inappropriate place for upgrade script
Johan Vervloet [Mon, 30 May 2016 14:46:43 +0000 (16:46 +0200)]
CRM-18696 - Street address filtering in reports for sites without address parsing.
----------------------------------------
* CRM-18696: Street filter in Constituent Summary report broken without street address parsing
https://issues.civicrm.org/jira/browse/CRM-18696
sunil [Tue, 31 May 2016 06:27:14 +0000 (11:57 +0530)]
CRM-10230 Custom fields text type with limited length not validated
Anjali Ujjainia [Mon, 30 May 2016 08:03:07 +0000 (13:33 +0530)]
Test formatting and changed to base_convert
Tim Otten [Sat, 28 May 2016 02:19:57 +0000 (19:19 -0700)]
bin/regen.sh - Run DatabaseInitializer (first boot) before GenerateData
The DatabaseInitializer is called during first boot
(`CRM_Core_Config::singleton()`) and runs `system.flush session=1
triggers=1` which (among other things) enumerates modules (including CMS
modules). In standalone boot protocol, that means it runs before
`CRM_Utils_System::loadBootstrap()` (which means that CMS modules
cannot be enumerated yet).
A simple work-around is to always boot the CMS first (before
`CRM_Core_Config::singleton()` or `DatabaseInitializer` runs).
Tim Otten [Mon, 23 May 2016 22:36:21 +0000 (15:36 -0700)]
bin/regen.sh - Execute GenerateData.php with a dummy CMS
1. This addresses the error [PHP Fatal error: Call to undefined function db_query() in /opt/buildkit/build/mytestbuild/sites/all/modules/civicrm/CRM/Utils/System/DrupalBase.php](http://civicrm.stackexchange.com/questions/11972/regen-sh-call-to-undefined-function-db-query/11986#11986).
2. Generally, the goal here is to produce `civicrm_generated.mysql`, which
is used on any/all CMS's to initialize the Civi database. If the generation
were really dependent on Drupal 7, then we wouldn't be able to use that
output on other CMS's, right? Thus I'm hopeful that we can generate
`civicrm_generated.mysql` with any `CIVICRM_UF`. And the `UnitTests` UF has
fewer dependencies/interactions.
3. Since `GenerateData.php` is running in a dummy CMS, we can remove
these weird mock-drupal-functions.
4. To test, I ran `regen.sh` and compared the output with the old one.
All the changes looked like random-data (`civicrm_contact`, etal) and
not structural data (`civicrm_option_value`, etal).
colemanw [Fri, 27 May 2016 22:26:52 +0000 (18:26 -0400)]
Merge pull request #8452 from jitendrapurohit/CRM-18677
CRM-18677 - Bugs with multivalued custom data displayed Inline.
Anjali Ujjainia [Fri, 27 May 2016 19:06:02 +0000 (00:36 +0530)]
CRM_18560 Added test for empty body mailing component
Yashodha Chaku [Fri, 27 May 2016 07:11:50 +0000 (12:41 +0530)]
Merge pull request #8441 from rajbdilip/CRM-17887_2
CRM-17887 - Add a new setting `Financial Batch date`
Coleman Watts [Fri, 27 May 2016 01:43:42 +0000 (21:43 -0400)]
CRM-18660 - Fix custom field year range selection
This fixes the yearRange setting to be the responsibility of the crmDatepicker
widget instead of setting it from php. The php implementation was also buggy.
Tim Otten [Thu, 26 May 2016 23:38:00 +0000 (16:38 -0700)]
Merge pull request #8445 from eileenmcnaughton/merge_rc
CRM-18673 fix merge handling of identifal addresses
colemanw [Thu, 26 May 2016 19:11:02 +0000 (15:11 -0400)]
Merge pull request #8458 from tommybobo/select2css-fix
CRM-18691 Select2 Height being squashed when defult is blank
Tommy Bobo [Thu, 26 May 2016 18:53:51 +0000 (14:53 -0400)]
CRM-18691 Select2 Height being squashed when defult is blank
Kurund Jalmi [Thu, 26 May 2016 11:07:36 +0000 (16:37 +0530)]
Merge pull request #8457 from yashodha/CRM-18676
CRM-18676: Incorrect status for pay later free membership
yashodha [Thu, 26 May 2016 09:45:00 +0000 (15:15 +0530)]
CRM-18676: Incorrect status for pay later free membership
----------------------------------------
* CRM-18676: Incorrect status for pay later free membership
https://issues.civicrm.org/jira/browse/CRM-18676
yashodha [Thu, 26 May 2016 09:04:29 +0000 (14:34 +0530)]
CRM-18676: Incorrect status for pay later free membership
----------------------------------------
* CRM-18676: Incorrect status for pay later free membership
https://issues.civicrm.org/jira/browse/CRM-18676
Tim Otten [Thu, 26 May 2016 06:47:18 +0000 (23:47 -0700)]
Merge pull request #8436 from civicrm/eileenmcnaughton-patch-1
Declaring required as false on timestamp fields causes allow null in …
Dilip Raj Baral [Mon, 23 May 2016 06:10:22 +0000 (11:40 +0530)]
CRM-17887 - Add a new setting `Financial Batch date`
https://issues.civicrm.org/jira/browse/CRM-17887
He's likely referencing the setting at Administer > Localization > Date Formats, Complete Date fields. Unfortunately, those settings don't include a convenient one for this purpose, since by default they include text names of months, etc. So, added a new field exclusively for Financial Batch.
jitendrapurohit [Wed, 25 May 2016 12:50:39 +0000 (18:20 +0530)]
CRM-18677 - Bugs with multivalued custom data displayed Inline.
yashodha [Wed, 25 May 2016 11:44:52 +0000 (17:14 +0530)]
string fixes
yashodha [Wed, 25 May 2016 10:58:59 +0000 (16:28 +0530)]
CRM-18139: Notification needed when using Batch Update of Participants via Profile (currently only when using Change Participant Status function)
----------------------------------------
* CRM-18139: Notification needed when using Batch Update of Participants via Profile (currently only when using Change Participant Status function)
https://issues.civicrm.org/jira/browse/CRM-18139
jitendrapurohit [Wed, 25 May 2016 09:42:25 +0000 (15:12 +0530)]
CRM18586 - add delete link and fix add more button
yashodha [Wed, 25 May 2016 08:45:43 +0000 (14:15 +0530)]
CRM-18139: Notification needed when using Batch Update of Participants via Profile (currently only when using Change Participant Status function)
----------------------------------------
* CRM-18139: Notification needed when using Batch Update of Participants via Profile (currently only when using Change Participant Status function)
https://issues.civicrm.org/jira/browse/CRM-18139
Tim Otten [Wed, 25 May 2016 06:29:45 +0000 (23:29 -0700)]
Merge pull request #8446 from totten/mollux-CRM-18510
CRM-18510 - Fix regression when searching for location types
Monish Deb [Wed, 25 May 2016 05:08:07 +0000 (10:38 +0530)]
Merge pull request #8443 from colemanw/CRM-17607
CRM-17607 - Add docx, odt, html document export functionality
Coleman Watts [Mon, 7 Mar 2016 02:08:36 +0000 (21:08 -0500)]
CRM-17607 - Fix document showing up as activity type
Coleman Watts [Wed, 24 Feb 2016 14:09:59 +0000 (09:09 -0500)]
CRM-17607 - Support multiple document formats for export
Coleman Watts [Wed, 17 Feb 2016 21:52:48 +0000 (16:52 -0500)]
CRM-17607 - Change PDF activity type label
Tim Otten [Wed, 25 May 2016 01:41:32 +0000 (18:41 -0700)]
CRM_Contact_BAO_Query - Extract method `prepareOrderBy()` (via PHPStorm)
The fixes on `searchQuery` are making a bad function even harder to read.
In keeping with https://wiki.civicrm.org/confluence/display/CRM/Toxic+Code+Protocol , we
need to some cleanup at the same time.
This was generated using PHPStorm's automated refactoring, "Extract Method".
Tim Otten [Wed, 25 May 2016 01:40:34 +0000 (18:40 -0700)]
CRM_Contact_BAO_QueryTest - Update assertion on ORDER BY to use backtick
Order by clauses are now properly escaped.
Tim Otten [Wed, 25 May 2016 01:01:18 +0000 (18:01 -0700)]
CRM_Contact_BAO_Query::searchQuery - Preserve $order until last minute (EVIL)
Building on https://gist.github.com/mollux/
7ffeb63f55ba0ba6180968d6d36f4745
This function does a lot of string-analysis on `$order`, and proper escaping
breaks this. However, the CRM_Utils_Type::escape() is quite clever about
validating and applying escaping.
eileen [Wed, 25 May 2016 00:21:28 +0000 (12:21 +1200)]
CRM-18673 fix merge handling of identical addresses
Coleman Watts [Sat, 5 Mar 2016 00:32:24 +0000 (19:32 -0500)]
CRM-17607 - Add phpoffice/phpword library
Mattias Michaux [Tue, 24 May 2016 22:13:34 +0000 (00:13 +0200)]
Fixed tests for loosened MysqlColumnNameOrAlias validation.
Mattias Michaux [Tue, 24 May 2016 22:04:38 +0000 (00:04 +0200)]
Fixed wrong dash.
projects / civicrm-core.git / log