colemanw [Mon, 10 Oct 2016 21:27:07 +0000 (17:27 -0400)]
Merge pull request #9125 from colemanw/CRM-19363
CRM-19363 - Add price_set api permission checks
colemanw [Mon, 10 Oct 2016 14:54:18 +0000 (10:54 -0400)]
Merge pull request #9198 from colemanw/CRM-19448-fix
CRM-19448 - Test fixes
colemanw [Mon, 10 Oct 2016 14:51:01 +0000 (10:51 -0400)]
Merge pull request #1 from seamuslee001/CRM-19448
Further test fixes
Seamus Lee [Sun, 9 Oct 2016 23:19:29 +0000 (10:19 +1100)]
Further test fixes
colemanw [Sun, 9 Oct 2016 21:25:29 +0000 (17:25 -0400)]
Merge pull request #9197 from seamuslee001/4.7.12-rc
4.7.12 rc
Coleman Watts [Sun, 9 Oct 2016 21:09:56 +0000 (17:09 -0400)]
CRM-19448 - Test fixes
colemanw [Sun, 9 Oct 2016 20:41:00 +0000 (16:41 -0400)]
Merge pull request #9186 from colemanw/CRM-18953
CRM-18953 - Update dashboard widget to use aggregated news feed
deb.monish [Thu, 29 Sep 2016 19:22:57 +0000 (00:52 +0530)]
minor change
deb.monish [Thu, 29 Sep 2016 12:23:25 +0000 (17:53 +0530)]
Additional fix for Joomla
deb.monish [Mon, 26 Sep 2016 21:46:29 +0000 (03:16 +0530)]
CRM-18483: Paypal Std transaction failure fix
deb.monish [Tue, 27 Sep 2016 13:07:06 +0000 (18:37 +0530)]
Revert CRM-18159 fix [4.7.8 REGRESSION]
colemanw [Sun, 9 Oct 2016 20:25:40 +0000 (16:25 -0400)]
Merge pull request #9174 from colemanw/CRM-19448
CRM-19448 - Extend api permissions to cover entity_table/entity_id
Coleman Watts [Fri, 7 Oct 2016 15:53:36 +0000 (11:53 -0400)]
CRM-18953 - Update dashboard widget to use aggregated news feed
Yashodha Chaku [Fri, 7 Oct 2016 10:05:18 +0000 (15:35 +0530)]
Merge pull request #9160 from monishdeb/CRM-19294
CRM-19294: Unable to upload files via a contribution page
Yashodha Chaku [Fri, 7 Oct 2016 10:03:32 +0000 (15:33 +0530)]
Merge pull request #9185 from jitendrapurohit/CRM-19352-notice-fix
CRM-19352-notice fix
jitendrapurohit [Fri, 7 Oct 2016 05:51:11 +0000 (11:21 +0530)]
CRM-19352-notice fix
Yashodha Chaku [Fri, 7 Oct 2016 04:42:44 +0000 (10:12 +0530)]
Merge pull request #9164 from jitendrapurohit/CRM-19352
CRM-19352 - Improve performance of multi-valued custom records
Monish Deb [Thu, 6 Oct 2016 20:58:00 +0000 (02:28 +0530)]
Merge pull request #9182 from frederickgzmn/patch-2
CRM-19465 - Capitalization displaying contries when in mailing mode
Frederic Guzman [Thu, 6 Oct 2016 20:05:19 +0000 (16:05 -0400)]
Spaces incorrect
Frederic Guzman [Thu, 6 Oct 2016 19:59:30 +0000 (15:59 -0400)]
Applying similar corrections in file and checkstyle result
Monish Deb [Thu, 6 Oct 2016 17:02:13 +0000 (22:32 +0530)]
Merge pull request #9152 from samuelsov/47-crm16352
CRM-16352 - add language filter support for mass mailing
Monish Deb [Thu, 6 Oct 2016 16:55:29 +0000 (22:25 +0530)]
Merge pull request #8972 from liedekef/customfields
CRM-19300 : allow external id for custom fields import
Franky Van Liedekerke [Thu, 6 Oct 2016 15:07:09 +0000 (17:07 +0200)]
small code optimization
Samuel Vanhove [Thu, 6 Oct 2016 14:36:50 +0000 (10:36 -0400)]
CRM-16352 missing ts + placeholder
Samuel Vanhove [Fri, 30 Sep 2016 17:28:22 +0000 (13:28 -0400)]
CRM-16352 - civilint errors
Samuel Vanhove [Fri, 30 Sep 2016 17:04:24 +0000 (13:04 -0400)]
CRM-16352 - genCode to reflect the add of column language in mailing table
Samuel Vanhove [Fri, 30 Sep 2016 17:03:03 +0000 (13:03 -0400)]
CRM-16352 - improve browsing by language
Mathieu Lutfy [Sat, 25 Jul 2015 15:14:26 +0000 (11:14 -0400)]
CRM-16352: Mailing language in Browse.tpl
Mathieu Lutfy [Sat, 25 Jul 2015 15:07:01 +0000 (11:07 -0400)]
CRM-16352: Allow to define the language of Mailings (for tokens).
Frederic Guzman [Thu, 6 Oct 2016 14:29:38 +0000 (10:29 -0400)]
UTF "-" 8
Frederic Guzman [Thu, 6 Oct 2016 14:16:14 +0000 (10:16 -0400)]
CRM-19465 - Capitalization displaying contries when in mailing mode
Avoiding possible issues with special characters.
Yashodha Chaku [Thu, 6 Oct 2016 14:00:59 +0000 (19:30 +0530)]
Merge pull request #9170 from tschuettler/CRM-19454
CRM-19454 - Fix unset of localised columns in custom searches
jitendrapurohit [Thu, 6 Oct 2016 10:04:12 +0000 (15:34 +0530)]
improve performance for action links and add button
Monish Deb [Thu, 6 Oct 2016 06:37:17 +0000 (12:07 +0530)]
Merge pull request #8476 from samuelsov/CRM-16355-2
CRM-16355 - reminders in multilingual sites fix
colemanw [Wed, 5 Oct 2016 15:48:12 +0000 (11:48 -0400)]
Merge pull request #9155 from JMAConsulting/CRM-19438
CRM-19438, fixed for memcached issue, since it returns string rather …
Monish Deb [Wed, 5 Oct 2016 12:12:49 +0000 (17:42 +0530)]
Merge pull request #9159 from liedekef/patch-1
CRM-19445: Allow to search on membership ID
jitendrapurohit [Wed, 5 Oct 2016 10:40:09 +0000 (16:10 +0530)]
Fix performance on table display
Monish Deb [Wed, 5 Oct 2016 09:38:16 +0000 (15:08 +0530)]
Merge pull request #9145 from tschuettler/CRM-19245-v2
CRM-19245 - Wrap title and description on manage group page
Monish Deb [Wed, 5 Oct 2016 08:02:46 +0000 (13:32 +0530)]
Merge pull request #9169 from jitendrapurohit/CRM-19452
CRM-19452 - remove common fields only if profile is not configured fo…
Monish Deb [Wed, 5 Oct 2016 08:01:58 +0000 (13:31 +0530)]
Merge pull request #9150 from jitendrapurohit/CRM-19427
CRM-19427 - set deductible amount at price field option level
Coleman Watts [Tue, 4 Oct 2016 23:57:17 +0000 (19:57 -0400)]
dashboard.css - add max-device-width to media
Coleman Watts [Tue, 4 Oct 2016 23:56:04 +0000 (19:56 -0400)]
CRM-19448 - Extend api permissions to cover entity_table/entity_id
colemanw [Tue, 4 Oct 2016 14:30:51 +0000 (10:30 -0400)]
Merge pull request #9157 from seamuslee001/admin_form_regions
CRM-19440 add regions to contribution page admin forms
jitendrapurohit [Tue, 4 Oct 2016 11:55:44 +0000 (17:25 +0530)]
CRM-19452 - remove common fields only if profile is not configured for onbehalf/honor
Thomas Schüttler [Tue, 4 Oct 2016 11:44:28 +0000 (13:44 +0200)]
CRM-19454 - Fix unset of localised columns in custom searches
----------------------------------------
* CRM-19454: Unset of localised columns fails in some custom searches
https://issues.civicrm.org/jira/browse/CRM-19454
Franky Van Liedekerke [Mon, 3 Oct 2016 20:58:44 +0000 (22:58 +0200)]
Use better form field to select membership id
colemanw [Mon, 3 Oct 2016 18:12:56 +0000 (14:12 -0400)]
Merge pull request #9147 from monishdeb/CRM-18027
CRM-18027: No credit card transaction details after 4.7 update
Franky Van Liedekerke [Mon, 3 Oct 2016 17:25:24 +0000 (19:25 +0200)]
Add label-tags around the label
deb.monish [Mon, 3 Oct 2016 14:49:40 +0000 (20:19 +0530)]
Add unit test
deb.monish [Fri, 30 Sep 2016 10:36:08 +0000 (16:06 +0530)]
CRM-18027: No credit card transaction details after 4.7 update
colemanw [Mon, 3 Oct 2016 14:48:57 +0000 (10:48 -0400)]
Merge pull request #9158 from fuzionnz/CRM-19444
CRM-19444. Make queues less noisy when operating normally.
jitendrapurohit [Mon, 3 Oct 2016 11:50:41 +0000 (17:20 +0530)]
CRM-19352 - custom multi performance very slow
deb.monish [Mon, 3 Oct 2016 11:37:29 +0000 (17:07 +0530)]
additional changes
jitendrapurohit [Fri, 30 Sep 2016 13:28:04 +0000 (18:58 +0530)]
include unit test
Yashodha Chaku [Mon, 3 Oct 2016 09:59:00 +0000 (15:29 +0530)]
Merge pull request #9154 from colemanw/CRM-19368
CRM-19368 - Fix invalid argument foreach and undefined index
deb.monish [Mon, 3 Oct 2016 07:39:27 +0000 (13:09 +0530)]
additional changes to support onbehalf and honoree profile
deb.monish [Fri, 30 Sep 2016 11:18:47 +0000 (16:48 +0530)]
CRM-19294: Unable to upload files via a contribution page
Yashodha Chaku [Mon, 3 Oct 2016 07:01:44 +0000 (12:31 +0530)]
Merge pull request #9146 from tschuettler/CRM-19434
CRM-19434 - fix notice errors for child groups
jitendrapurohit [Fri, 30 Sep 2016 12:22:32 +0000 (17:52 +0530)]
CRM-19427 - set deductible amount at price field option level
Franky Van Liedekerke [Sun, 2 Oct 2016 22:51:10 +0000 (00:51 +0200)]
Allow to search on membership ID
Franky Van Liedekerke [Sun, 2 Oct 2016 22:48:44 +0000 (00:48 +0200)]
Allow to search on membership ID
Chris Burgess [Sun, 2 Oct 2016 21:28:35 +0000 (10:28 +1300)]
CRM-19444. Make queues less noisy when operating normally.
Andrew Hunt [Sun, 2 Oct 2016 16:23:23 +0000 (12:23 -0400)]
Allow API Navigation.get with parent_id (#9153)
* CRM-19437 - Navigation API: allow integer ID as filter for parent_id
* CRM-19437 Navigation API: changes after GenCode.php
* CRM-19437 Navigation API: test for get by parent
Michael McAndrew [Sun, 2 Oct 2016 16:19:59 +0000 (17:19 +0100)]
Michaelmcandrew safe dbname (#9148)
* Update index.php
better name for DB name safety check function.
* Update DAO.php
* adding - to help text
* updating test for testRequireSafeDBName
Seamus Lee [Sat, 1 Oct 2016 23:12:02 +0000 (10:12 +1100)]
CRM-19440 add regions to contribution page admin forms
kenwest [Fri, 30 Sep 2016 22:38:18 +0000 (08:38 +1000)]
CRM-18543 Deleting email address or phone of CiviMail recipient hangs job (#8355)
* CRM-18543 Deleting email address or phone of CiviMail recipient causes job to hang
* CRM-18543 Deleting email address or phone of CiviMail recipient causes job to hang
colemanw [Fri, 30 Sep 2016 22:13:23 +0000 (18:13 -0400)]
Merge pull request #9078 from eileenmcnaughton/activity_edit
CRM-19391 Editing recurring activities (incorrectly) requires access …
Pradeep Nayak [Fri, 30 Sep 2016 21:50:15 +0000 (03:20 +0530)]
CRM-19438, fixed for memcached issue, since it returns string rather NULL
----------------------------------------
* CRM-19438: Entries in financial item not recorded properly when created via offline Membership form
https://issues.civicrm.org/jira/browse/CRM-19438
colemanw [Fri, 30 Sep 2016 21:45:51 +0000 (17:45 -0400)]
Merge pull request #9141 from twomice/CRM-19414_extensions_get_api_details
Fix CRM-19414.
Coleman Watts [Fri, 30 Sep 2016 20:52:26 +0000 (16:52 -0400)]
CRM-19368 - Fix invalid argument foreach and undefined index
spalmstr [Fri, 30 Sep 2016 15:42:22 +0000 (16:42 +0100)]
CRM-19368 - Correcting many comment errors.
Tim Otten [Fri, 30 Sep 2016 17:46:56 +0000 (13:46 -0400)]
Merge pull request #9143 from TobiasLounsbury/CRM-19432-wizard-enhancements
CRM-19432: crmUiWizard Enhancements
Thomas Schüttler [Fri, 30 Sep 2016 10:40:03 +0000 (12:40 +0200)]
CRM-19434 - fix notice errors for child groups
----------------------------------------
* CRM-19434: Manage Group page notice errors for child groups
https://issues.civicrm.org/jira/browse/CRM-19434
Thomas Schüttler [Fri, 30 Sep 2016 08:33:58 +0000 (10:33 +0200)]
CRM-19245 - Wrap title and description on manage group page
----------------------------------------
* CRM-19245: Text no longer wraps in name and description fields on Manage Groups page
https://issues.civicrm.org/jira/browse/CRM-19245
Monish Deb [Fri, 30 Sep 2016 04:58:16 +0000 (10:28 +0530)]
Merge pull request #9142 from agh1/change-participant-status
Explain more clearly when changing participant status sends email
Tim Otten [Fri, 30 Sep 2016 01:08:24 +0000 (21:08 -0400)]
Merge pull request #7683 from totten/master-16514-tests
CRM-19415, CRM-16514 - Add tests for limit_to use-cases
Eileen McNaughton [Thu, 29 Sep 2016 21:56:08 +0000 (10:56 +1300)]
Merge pull request #9144 from seamuslee001/paypal_test_inactive
Mark Paypal Test as incomplete for now & CRM-19351 Fix Missing method call
Seamus Lee [Thu, 29 Sep 2016 21:18:18 +0000 (07:18 +1000)]
Fix 2nd php fatal
Seamus Lee [Thu, 29 Sep 2016 20:59:28 +0000 (06:59 +1000)]
CRM-19351 Add in missing getFormattedBillingAddressFieldsFromParameters
Seamus Lee [Thu, 29 Sep 2016 20:17:29 +0000 (06:17 +1000)]
Mark Paypal Test as incomplete for now
colemanw [Thu, 29 Sep 2016 19:33:13 +0000 (15:33 -0400)]
Merge pull request #8990 from JKingsnorth/CRM-19230
CRM-19230: Fix groupBy for mailing summary report
Tobias Lounsbury [Thu, 29 Sep 2016 19:31:28 +0000 (12:31 -0700)]
CRM-9432: Cleaned up paste errors and variable inline documentation
Tobias Lounsbury [Thu, 29 Sep 2016 19:26:30 +0000 (12:26 -0700)]
CRM-19432: Updated crmUiWizardStep destroy code so that it triggers off an event that is within the digest cycle
colemanw [Thu, 29 Sep 2016 19:25:56 +0000 (15:25 -0400)]
Merge pull request #9018 from eileenmcnaughton/CRM-19351
CRM-19351 Standardise calls to assign billing details to the template
Tobias Lounsbury [Thu, 29 Sep 2016 19:25:37 +0000 (12:25 -0700)]
CRM-19432: Added class passthrough for crmUiWizardStep
Tobias Lounsbury [Thu, 29 Sep 2016 19:24:46 +0000 (12:24 -0700)]
CRM-19432: Added class passtrhough for crmUiWizard nav items
colemanw [Thu, 29 Sep 2016 19:02:01 +0000 (15:02 -0400)]
Merge pull request #9139 from GinkgoFJG/CRM-19425
Catch exceptions and pass data back to the client instead of allowing…
Alan Dixon [Thu, 29 Sep 2016 18:54:37 +0000 (14:54 -0400)]
CRM-16923: find the payment processor id from the recurring record (#9097)
* CRM-16923: find the payment processor id from the recurring record
* CRM-16923 Get the recur id in a more reliable way
Chris Burgess [Thu, 29 Sep 2016 17:14:51 +0000 (06:14 +1300)]
Add test for format of Contact,get with return=group (#9140)
* Add test for format of Contact,get with return=groups.
CRM-19426
* Correct test structure, missed in previous commit.
CRM-19426.
* Rename test to better fit with other testContactGetFoo methods.
CRM-19426.
colemanw [Thu, 29 Sep 2016 17:13:18 +0000 (13:13 -0400)]
Merge pull request #9098 from colemanw/CRM-19403
CRM-19403 - Pass extra data back to entityRef widget when creating new contact
Coleman Watts [Thu, 29 Sep 2016 17:10:07 +0000 (13:10 -0400)]
CRM-19403 - Cleaner approach to passing extra data from profiles
Coleman Watts [Thu, 22 Sep 2016 20:14:34 +0000 (16:14 -0400)]
CRM-19403 - Pass extra data back to entityRef widget when creating new contact
Yashodha Chaku [Thu, 29 Sep 2016 14:58:07 +0000 (20:28 +0530)]
Merge pull request #9123 from mlutfy/master-crm19419
CRM-19419: Add API test for option.language in multilingual.
Andrew Hunt [Thu, 29 Sep 2016 14:31:17 +0000 (10:31 -0400)]
CRM-19429 - CiviEvent: clarify text for when email is sent on status change
Andrew Hunt [Thu, 29 Sep 2016 14:16:03 +0000 (10:16 -0400)]
CRM-19429 - CiviEvent: don't imply participant status always sends emails
Mathieu Lutfy [Thu, 29 Sep 2016 13:01:30 +0000 (09:01 -0400)]
CRM-19419: Add API test for option.language in multilingual (use callAPISuccess instead of civicrm_api3).
Yashodha Chaku [Thu, 29 Sep 2016 08:10:12 +0000 (13:40 +0530)]
Merge pull request #9135 from tschuettler/CRM-19424
CRM-19424 - Weekday names if week does not start on Sunday
Allen Shaw [Thu, 29 Sep 2016 06:11:13 +0000 (01:11 -0500)]
CRM-19414: fixed civilint errors.
Monish Deb [Thu, 29 Sep 2016 05:58:49 +0000 (11:28 +0530)]
Merge pull request #9133 from jitendrapurohit/CRM-19410
CRM-19410 - Save Custom Data and Expose formrule on inline edit addre…
Yashodha Chaku [Thu, 29 Sep 2016 05:12:21 +0000 (10:42 +0530)]
Merge pull request #9134 from jitendrapurohit/CRM-19423
CRM-19423 - Move required behavior of mail_format to formrule
projects / civicrm-core.git / log