Yashodha Chaku [Thu, 12 May 2016 09:19:46 +0000 (14:49 +0530)]
Merge pull request #8356 from yashodha/4.7.CRM-15202
CRM-15202
yashodha [Thu, 12 May 2016 08:11:10 +0000 (13:41 +0530)]
CRM-15202: mailing summary report should have option to filter by groups included
----------------------------------------
* CRM-15202: mailing summary report should have option to filter by groups included
https://issues.civicrm.org/jira/browse/CRM-15202
yashodha [Thu, 12 May 2016 08:04:30 +0000 (13:34 +0530)]
Merge branch 'CRM-15202' of https://github.com/jmcclelland/civicrm-core into 4.7.CRM-15202
Yashodha Chaku [Wed, 11 May 2016 11:35:48 +0000 (17:05 +0530)]
Merge pull request #8125 from totten/master-civimail-perm
CRM-18400 - CRM_Mailing_Info - Restore workflow permissions
Monish Deb [Wed, 11 May 2016 08:31:21 +0000 (14:01 +0530)]
Merge pull request #8300 from monishdeb/CRM-18070
CRM-18070: Packaged eWAY classes not loaded for Event registration
twomice [Thu, 5 May 2016 09:07:28 +0000 (14:37 +0530)]
CRM-18070: Packaged eWAY classes not loaded for Event registration
Monish Deb [Wed, 11 May 2016 06:08:04 +0000 (11:38 +0530)]
Merge pull request #8334 from jitendrapurohit/CRM-18501
CRM-18501 - Mailing labels doesn't work for address type 'main'
colemanw [Tue, 10 May 2016 16:20:59 +0000 (12:20 -0400)]
Merge pull request #8313 from colemanw/CRM-18452
CRM-18452 - Fix navigation menu item permission search box
Monish Deb [Tue, 10 May 2016 14:59:01 +0000 (20:29 +0530)]
Merge pull request #8341 from rohankatkar/Webtests-master
CRM-18454: Webtests Fix
Web Access [Tue, 10 May 2016 13:08:55 +0000 (18:38 +0530)]
CRM-18454: Webtests Fix
Monish Deb [Tue, 10 May 2016 11:15:19 +0000 (16:45 +0530)]
Merge pull request #8323 from jitendrapurohit/CRM-18437
CRM-18437 -- No expand icons in manage groups screen
Monish Deb [Tue, 10 May 2016 09:26:13 +0000 (14:56 +0530)]
Merge pull request #8337 from jitendrapurohit/CRM-18474-minor
check for empty params too - CRM-18474
jitendrapurohit [Tue, 10 May 2016 08:56:45 +0000 (14:26 +0530)]
add empty() check for CRM-18474
jitendrapurohit [Tue, 10 May 2016 06:30:00 +0000 (12:00 +0530)]
CRM-18501 - Mailing labels doesn't work for address type 'main'
Yashodha Chaku [Tue, 10 May 2016 06:21:15 +0000 (11:51 +0530)]
Merge pull request #8325 from rajbdilip/CRM-17967
Allow contact image file name length during upload up to 255 characters long
Yashodha Chaku [Tue, 10 May 2016 05:05:48 +0000 (10:35 +0530)]
Merge pull request #8330 from mlutfy/master-crm18518-3
CRM-18518: More ts() fixes.
Mathieu Lutfy [Mon, 9 May 2016 21:37:29 +0000 (17:37 -0400)]
CRM-18518: More ts() fixes.
Dilip Raj Baral [Mon, 9 May 2016 14:31:22 +0000 (20:01 +0530)]
Update image_URL column size to 512
Rounded to nearest 2^n
Dilip Raj Baral [Mon, 9 May 2016 13:59:44 +0000 (19:29 +0530)]
Update image_URL column size to 512
Monish Deb [Mon, 9 May 2016 13:14:16 +0000 (18:44 +0530)]
Merge pull request #8324 from jitendrapurohit/CRM-18520
CRM-18520 - Wrong message after "unhold email" task on Contact Search.
Monish Deb [Mon, 9 May 2016 13:12:49 +0000 (18:42 +0530)]
Merge pull request #8306 from monishdeb/CRM-18490
CRM-18490: API does not return Address ID via API
Monish Deb [Mon, 9 May 2016 12:42:50 +0000 (18:12 +0530)]
Merge pull request #8305 from jitendrapurohit/CRM-18239
CRM-18239 - 'CiviCRM: view my contact' permission results in user bei…
jitendrapurohit [Mon, 9 May 2016 09:14:32 +0000 (14:44 +0530)]
CRM-18520 - replace row_count() with affectedRows()
minor fix
deb.monish [Fri, 6 May 2016 14:39:29 +0000 (20:09 +0530)]
CRM-18490: API does not return Address ID via API
Dilip Raj Baral [Mon, 9 May 2016 11:29:03 +0000 (16:59 +0530)]
Allow conact image file name length during upload up to 255 characters long
https://issues.civicrm.org/jira/browse/CRM-17967
Currently Add/Edit New Contact page restricts the length of the image file
to 60 characters.
jitendrapurohit [Mon, 9 May 2016 08:23:52 +0000 (13:53 +0530)]
CRM-18437 -- No expand icons in manage groups screen
minor fix
Monish Deb [Mon, 9 May 2016 10:03:33 +0000 (15:33 +0530)]
Merge pull request #8304 from jitendrapurohit/CRM-18474
CRM-18474 - Escape unicode characters to avoid json syntax errors
jitendrapurohit [Fri, 6 May 2016 10:52:58 +0000 (16:22 +0530)]
CRM-18474 - Escape unicode characters to avoid json syntax errors
replace by line break
colemanw [Mon, 9 May 2016 00:36:58 +0000 (20:36 -0400)]
Merge pull request #8320 from mlutfy/master-crm18518
CRM-18518: ts() string fixes.
Mathieu Lutfy [Sun, 8 May 2016 22:07:36 +0000 (18:07 -0400)]
CRM-18518: ts() string fixes.
Mathieu Lutfy [Sun, 8 May 2016 22:03:56 +0000 (18:03 -0400)]
CRM-18518: ts() string fixes.
Mathieu Lutfy [Sun, 8 May 2016 21:30:35 +0000 (17:30 -0400)]
CRM-18518: ts() string fixes.
Coleman Watts [Sat, 7 May 2016 22:27:45 +0000 (18:27 -0400)]
CRM-18452 - Fix navigation menu item permission search box
Monish Deb [Fri, 6 May 2016 19:03:32 +0000 (00:33 +0530)]
Merge pull request #8308 from laryn/patch-8
Simple spelling fix
Laryn - CEDC.org [Fri, 6 May 2016 18:27:17 +0000 (13:27 -0500)]
Simple spelling fix
jitendrapurohit [Fri, 6 May 2016 11:15:36 +0000 (16:45 +0530)]
CRM-18239 - 'CiviCRM: view my contact' permission results in user being able to edit themselves in CiviCRM
Yashodha Chaku [Fri, 6 May 2016 10:58:21 +0000 (16:28 +0530)]
Merge pull request #8166 from otetard/CRM-18432
CRM-18432: In CiviMail’s updateEmailResetDate(), exec the main query.
Tim Otten [Thu, 5 May 2016 23:42:23 +0000 (16:42 -0700)]
Merge pull request #8105 from herbdool/master
Added getUFLocale, setUFLocale methods to Backdrop class
Yashodha Chaku [Thu, 5 May 2016 09:09:17 +0000 (14:39 +0530)]
Merge pull request #8294 from yashodha/CRM-18154
CRM-18154: Profile custom field option: 'Include in multi-record list…
yashodha [Thu, 5 May 2016 07:44:35 +0000 (13:14 +0530)]
CRM-18154: change checkbox to advcheckbox to ensure unsetting works fine
----------------------------------------
* CRM-18154: Profile custom field option: "Include in multi-record listing" un-ticked, but still persists
https://issues.civicrm.org/jira/browse/CRM-18154
Yashodha Chaku [Thu, 5 May 2016 05:16:44 +0000 (10:46 +0530)]
Merge pull request #8230 from KarinG/CRM-18110-test
CRM-18110-test added test --amend
Tim Otten [Wed, 4 May 2016 21:21:22 +0000 (14:21 -0700)]
Merge remote-tracking branch 'origin/4.7.7-rc' into 4.7.7-rc-master-2016-05-04-14-21-20
Tim Otten [Wed, 4 May 2016 18:30:37 +0000 (11:30 -0700)]
Merge pull request #8265 from mollux/CRM-17983-v2
CRM-17983
Monish Deb [Wed, 4 May 2016 17:18:03 +0000 (22:48 +0530)]
Merge pull request #8296 from rohankatkar/CRM-18151
CRM-18151: npm test failing locally
Monish Deb [Wed, 4 May 2016 13:33:54 +0000 (19:03 +0530)]
Merge pull request #8295 from rohankatkar/master-webtest-fix
Webtests fix
Web Access [Wed, 4 May 2016 13:24:00 +0000 (18:54 +0530)]
CRM-18151
Web Access [Wed, 4 May 2016 13:20:34 +0000 (18:50 +0530)]
Webtests fix
yashodha [Wed, 4 May 2016 09:38:04 +0000 (15:08 +0530)]
CRM-18154: Profile custom field option: 'Include in multi-record listing' un-ticked, but still persists
----------------------------------------
* CRM-18154: Profile custom field option: "Include in multi-record listing" un-ticked, but still persists
https://issues.civicrm.org/jira/browse/CRM-18154
Yashodha Chaku [Wed, 4 May 2016 09:34:41 +0000 (15:04 +0530)]
Merge pull request #8281 from colemanw/CRM-18154
CRM-18154 - Fix checkboxes on profile field form
Monish Deb [Wed, 4 May 2016 06:53:52 +0000 (12:23 +0530)]
Merge pull request #8278 from jitendrapurohit/CRM-18472
CRM-18472 - Notice Fixes
Monish Deb [Wed, 4 May 2016 06:44:55 +0000 (12:14 +0530)]
Merge pull request #8044 from JKingsnorth/CRM-18320
CRM-18320: Fix URLs with ampersands in CiviMail
Mattias Michaux [Wed, 4 May 2016 05:41:13 +0000 (07:41 +0200)]
Fixed issue with ajax calls on custom field table tab on contact.
Mattias Michaux [Tue, 3 May 2016 19:19:08 +0000 (21:19 +0200)]
PHP warning fix.
Mattias Michaux [Tue, 3 May 2016 14:37:30 +0000 (16:37 +0200)]
Parially revert
19b8532d55bb35d3d471bbe859e5ca080e85324f to ensure queries are not broken.
Mattias Michaux [Tue, 3 May 2016 14:34:03 +0000 (16:34 +0200)]
Fixed forgotten rename.
Monish Deb [Tue, 3 May 2016 13:29:11 +0000 (18:59 +0530)]
Merge pull request #8287 from monishdeb/CRM-18476
CRM-18476: Invalid argument supplied for foreach() in CRM_Extension_Browser->_discoverRemote()
Yashodha Chaku [Tue, 3 May 2016 10:01:53 +0000 (15:31 +0530)]
Merge pull request #8285 from eileenmcnaughton/remove_fn
CRM-18491 Remove unused function CRM_Core_Report::dateDisplay
deb.monish [Tue, 3 May 2016 09:15:52 +0000 (14:45 +0530)]
CRM-18476: Invalid argument supplied for foreach() in CRM_Extension_Browser->_discoverRemote()
Monish Deb [Tue, 3 May 2016 05:39:22 +0000 (11:09 +0530)]
Merge pull request #8276 from jitendrapurohit/CRM-18487
CRM-18487 - max date should be the last date of the year
eileen [Tue, 3 May 2016 05:22:30 +0000 (17:22 +1200)]
CRM-18491 Remove unused function CRM_Core_Report::dateDisplay
Monish Deb [Tue, 3 May 2016 05:11:51 +0000 (10:41 +0530)]
Merge pull request #8274 from jitendrapurohit/webtestfixes
CRM-18454 - pass proper id for datepicker of core and custom field
Monish Deb [Tue, 3 May 2016 05:04:58 +0000 (10:34 +0530)]
Merge pull request #8279 from rohankatkar/CRM-18484-webtest
CRM-18484: Webtest
colemanw [Tue, 3 May 2016 03:28:30 +0000 (23:28 -0400)]
Merge pull request #8280 from lcdservices/CRM-18489
CRM-18489 suppress billing block if waitlist
Coleman Watts [Mon, 2 May 2016 23:24:12 +0000 (19:24 -0400)]
CRM-18154 - Fix checkboxes on profile field form
Brian Shaughnessy [Mon, 2 May 2016 15:11:11 +0000 (11:11 -0400)]
CRM-18489 suppress billing block if waitlist
Web Access [Mon, 2 May 2016 13:18:14 +0000 (18:48 +0530)]
Webtest-CRM-18484
jitendrapurohit [Mon, 2 May 2016 12:06:54 +0000 (17:36 +0530)]
CRM-18472 - Notice Fixes
Yashodha Chaku [Mon, 2 May 2016 09:50:20 +0000 (15:20 +0530)]
Merge pull request #8267 from yashodha/CRM-18484
CRM-18484 : Error thrown in Reports if one of the params for in betwe…
jitendrapurohit [Mon, 2 May 2016 06:19:03 +0000 (11:49 +0530)]
CRM-18454 - pass proper id for datepicker of core and custom field
Fix id of custom date field
jitendrapurohit [Mon, 2 May 2016 09:02:33 +0000 (14:32 +0530)]
CRM-18487 - max date should be the last date of the year
Mattias Michaux [Fri, 29 Apr 2016 19:04:31 +0000 (21:04 +0200)]
Fixed incorrect parameter.
Mattias Michaux [Fri, 29 Apr 2016 19:01:30 +0000 (21:01 +0200)]
Added forgotten changes.
Monish Deb [Fri, 29 Apr 2016 17:53:38 +0000 (23:23 +0530)]
Merge pull request #8271 from rohankatkar/Webtests
CRM-18454: WebTest fixes
Monish Deb [Fri, 29 Apr 2016 17:52:30 +0000 (23:22 +0530)]
Merge pull request #8272 from jitendrapurohit/webtestfixes
CRM-18454 - webtest fixes
jitendrapurohit [Fri, 29 Apr 2016 13:30:59 +0000 (19:00 +0530)]
CRM-18454 - webtest fixes
Web Access [Fri, 29 Apr 2016 13:16:03 +0000 (18:46 +0530)]
Test fixes
Webtests fixes
Yashodha Chaku [Fri, 29 Apr 2016 12:51:19 +0000 (18:21 +0530)]
Merge pull request #8268 from jitendrapurohit/CRM-18289
CRM-18289 - Generated data
jitendrapurohit [Fri, 29 Apr 2016 10:34:09 +0000 (16:04 +0530)]
CRM-18289 - Generated data
yashodha [Fri, 29 Apr 2016 08:55:41 +0000 (14:25 +0530)]
CRM-18484 : Error thrown in Reports if one of the params for in between filter is NULL
----------------------------------------
* CRM-18484: Error thrown in Reports if one of the params for in between filter is NULL
https://issues.civicrm.org/jira/browse/CRM-18484
Yashodha Chaku [Fri, 29 Apr 2016 08:33:31 +0000 (14:03 +0530)]
Merge pull request #8211 from KarinG/CRM-18463
CRM-18463 - Not in between filter - not working properly.
Monish Deb [Fri, 29 Apr 2016 07:16:36 +0000 (12:46 +0530)]
Merge pull request #8255 from jitendrapurohit/CRM-18472
CRM-18472: Warning fix on search builder and notice fix
Mattias Michaux [Fri, 29 Apr 2016 06:00:42 +0000 (08:00 +0200)]
Style fixes.
Mattias Michaux [Fri, 29 Apr 2016 05:50:35 +0000 (07:50 +0200)]
Added tests for <table>.<column> 64 character limit.
Mattias Michaux [Fri, 29 Apr 2016 05:45:10 +0000 (07:45 +0200)]
Removed obsolete MysqlColumnNameLoose validate and escape check.
Mattias Michaux [Wed, 27 Apr 2016 16:22:12 +0000 (18:22 +0200)]
Fixed incorrect regexes for <table>.<column> names + added warning in mysqlColumnNameLoose method.
Mattias Michaux [Wed, 27 Apr 2016 12:26:50 +0000 (14:26 +0200)]
Removed unnecessary parts of the Mysql regexes.
Mattias Michaux [Tue, 26 Apr 2016 12:32:55 +0000 (14:32 +0200)]
Typo fix in tests.
Mattias Michaux [Tue, 26 Apr 2016 12:11:55 +0000 (14:11 +0200)]
Adapted CRM_Utils_Sort code to use the validation and escaping.
Mattias Michaux [Tue, 26 Apr 2016 12:10:49 +0000 (14:10 +0200)]
Added tests + validate and escape checks for mysql order by.
Mattias Michaux [Tue, 26 Apr 2016 05:51:22 +0000 (07:51 +0200)]
Just discovered CRM_Utils_Type::escapeAll
Mattias Michaux [Tue, 26 Apr 2016 05:50:23 +0000 (07:50 +0200)]
Made correct distinction between validate and escape.
Mattias Michaux [Mon, 25 Apr 2016 21:44:24 +0000 (23:44 +0200)]
Extra ajax fixes.
Mattias Michaux [Mon, 25 Apr 2016 15:16:49 +0000 (17:16 +0200)]
First WIP for AJAX cleanup.
Monish Deb [Thu, 28 Apr 2016 16:39:15 +0000 (22:09 +0530)]
Merge pull request #8237 from monishdeb/CRM-18457
CRM-18457: Error on report form strlen() expects parameter 1 to be string
Yashodha Chaku [Thu, 28 Apr 2016 12:24:20 +0000 (17:54 +0530)]
Merge pull request #8224 from yashodha/CRM-18450
CRM-18450 : dmaster notice error
Yashodha Chaku [Thu, 28 Apr 2016 12:21:27 +0000 (17:51 +0530)]
Merge pull request #8253 from yashodha/CRM-18472
CRM-18472 : Notice fixes
Yashodha Chaku [Thu, 28 Apr 2016 12:17:52 +0000 (17:47 +0530)]
Merge pull request #8202 from agileware/master-crm-18356
CRM-18356: Fix incorrect logic Activity Report has when excluding NUL…
Yashodha Chaku [Thu, 28 Apr 2016 08:47:54 +0000 (14:17 +0530)]
Merge pull request #8206 from yashodha/fix.CRM-17893
CRM-17893: Cannot import custom field type Country
Tim Otten [Wed, 27 Apr 2016 20:38:12 +0000 (13:38 -0700)]
Merge pull request #8254 from eileenmcnaughton/4.7.7-rc
CRM-17984 getTree regression
Tim Otten [Wed, 27 Apr 2016 18:52:47 +0000 (11:52 -0700)]
CRM-17984 - CustomGroupTest - Fix style errors
There were problems in this line:
* The missing comma (required by Drupal style)
* The use of literal CtrlA causes phpcs to produce invalid output
projects / civicrm-core.git / log