CRM-18518: Trivial translation string fix. #8327
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
mlutfy
commented
May 9, 2016
•
mlutfy
commented
- CRM-18518: Translation string fixes for 4.7
|
(this was merged already in 4.7, but I had forgotten this one for 4.6) |
nganivet
added a commit
to cividesk/civicrm-core
that referenced
this pull request
Aug 18, 2016
commit 38f546cd535baea2eafb64263a5896e35f6ff546
Author: sunil <esunil.pawar@gmail.com>
Date: Fri Aug 5 22:35:34 2016 +0530
Temparory fix for dbg webform soft contribution
commit 5fbdaad9df5a04b8224077caaa7024c019d055da
Author: Nicolas Ganivet <nicolas@cividesk.com>
Date: Wed Aug 3 23:06:18 2016 -0600
CRM-14720: add length clause
commit 7df0c30e37a163bf59d22c3bc5b4397f57faaa95
Author: Nicolas Ganivet <nicolas@cividesk.com>
Date: Wed Aug 3 13:48:23 2016 -0600
CRM-14720: do not use round() on postal codes as there are non numeric in the database.
commit 9c205e47acbfa381546635ffd822f2dce4a7ea3b
Author: sunil <esunil.pawar@gmail.com>
Date: Thu Jul 28 12:33:10 2016 +0530
Removed current employer from event selector
commit a428566a99fea51795f53b49631614f17a9bb2b0
Author: sunil <esunil.pawar@gmail.com>
Date: Thu Jul 28 00:47:27 2016 +0530
Fixed issue with Paypal standard ipn
commit 064c531c9ee0180aae506ea56fe5692948aeb41c
Author: sunil <esunil.pawar@gmail.com>
Date: Mon Jul 25 19:27:34 2016 +0530
CRM-19102 backported changes to 4.6
commit d43d609bb15f9b9828956bed0dd2c341a7e9b750
Author: sunil <esunil.pawar@gmail.com>
Date: Tue Jul 19 17:49:57 2016 +0530
fixed issue with 0 membership payment amount while renewing membership offline
commit 1bb4e21b54c26a1c6de9d57ad6cab71873b6799a
Author: sunil <esunil.pawar@gmail.com>
Date: Thu Jun 23 16:17:15 2016 +0530
Contact registered as test can not registered for live in backend
commit 89046f529b432cea55ce88fc8a709c988a1c0844
Author: sunil <esunil.pawar@gmail.com>
Date: Thu Jun 23 14:57:00 2016 +0530
CRM-18997 DB error, incorrect truncating multibyte string
commit 1363f28f96cd4afc922ebfe95675beb3f908da40
Author: Nicolas Ganivet <nicolas@cividesk.com>
Date: Tue Jun 21 21:43:56 2016 -0600
Cleaner with variable initialized.
commit f14ea1ce2d56043d3101dab06cf38452d8fecfda
Author: Nicolas Ganivet <nicolas@cividesk.com>
Date: Tue Jun 21 09:50:44 2016 -0600
Fix issue with email sent message displayed when checkbox has not been clicked in back-end membership edit screen.
commit 50e298e9d19f70a5fef4f0b383ff5aa46095b1a9
Author: sunil <esunil.pawar@gmail.com>
Date: Tue Jun 14 19:52:35 2016 +0530
Fixed issue with contact alias when smary group created using relationship is used in search alongwith relationship search
commit e087b10d0eb886bbda10426784d886999a156683
Merge: 35da65e 2028a85
Author: sunil <esunil.pawar@gmail.com>
Date: Mon Jun 13 20:28:59 2016 +0530
merged civicrm Tag 4.6.18 to standalone plus branch
commit 2028a85b3e438e27bf608b231d3072cf916b9d29
Merge: c691b3f b4f9495
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Mon Jun 6 13:27:00 2016 -0600
Merge pull request #8517 from colemanw/noResults
css/civicrmNavigation.css
commit c691b3fb0033f6468498a3f497b7f91840b404cb
Merge: c8884ee 45f3f3d
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Mon Jun 6 13:14:17 2016 -0600
Merge pull request #8512 from systopia/CRM-17235-4.6.13
LTS patch for CRM-17235
commit b4f949575617fb2838184209cfae15ca95318df3
Author: Coleman Watts <coleman@civicrm.org>
Date: Sun Jun 5 15:54:33 2016 -0600
CRM-18652 - Improve style of no-results item
Conflicts:
css/civicrmNavigation.css
commit c8884ee7f0715e592425c1098e704043ed0ed982
Merge: bb2cefc 601c679
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Mon Jun 6 11:05:29 2016 -0600
Merge pull request #8515 from eileenmcnaughton/pdf
Pdf
commit 601c6793bc87f128660a8a0525d7b4a39837b8a0
Author: Tim Otten <totten@civicrm.org>
Date: Fri May 20 20:58:26 2016 -0700
CRM-16898 - Replace debug code in html5lib
commit 6e428f7942fb4ced37a75016b5094a4620659f07
Author: Tim Otten <totten@civicrm.org>
Date: Fri May 20 20:49:51 2016 -0700
Revert "CRM-16898. Remove debugging in html5lib."
This reverts commit 693cb3279584278ccbb3eaa1394999c7a69d7bf6.
commit 35da65ed7aa26fb24d98d7f40c13b127e5fb3ba9
Author: sunil <esunil.pawar@gmail.com>
Date: Mon Jun 6 18:19:07 2016 +0530
Backported mailing label changed to 4.6, CRM-18501
commit 6dbddaaf833c1651c4058e6c52d32d5a905c1053
Author: sunil <esunil.pawar@gmail.com>
Date: Mon Jun 6 14:22:10 2016 +0530
report error for cron job
commit bb2cefc65f5d4b87eca027fd064b4e620b944072
Merge: 36e47da 000a2da
Author: colemanw <coleman@civicrm.org>
Date: Sun Jun 5 20:57:40 2016 -0600
Merge pull request #8505 from rollox/patch-3
CRM-18743 - Undefined variable $order
commit 000a2da283acfb170fe2d302addb020c3e6ce30e
Author: rollox <rollox@users.noreply.github.com>
Date: Mon Jun 6 01:27:42 2016 +0100
CRM-18743 - Undefined variable $order
Fix notice/error "Undefined variable: order in CRM_Contact_BAO_Query->prepareOrderBy()" on user/# screen if the viewed user page is linked to a contact record in Civi.
Also submitted to master.
commit 36e47dadd2e89498231e4d3cb4e2b8a47cd73e48
Merge: 0e9b1e4 5fc7fc6
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Sun Jun 5 17:18:45 2016 -0600
Merge pull request #8468 from eileenmcnaughton/groups46
CRM-18683 fix handling on UTC time in smart groups
commit 0e9b1e489796ac67ae262b13029bb1ad937ad17b
Merge: 809a133 555e789
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Sun Jun 5 14:54:50 2016 -0600
Merge pull request #8496 from seamuslee001/CRM-18652-46
CRM-18652 4.6 backport Show no results label in quick search
commit 5fc7fc6f860ee4101cbce37089838d09d62475f2
Author: eileen <emcnaughton@wikimedia.org>
Date: Sun Jun 5 13:46:30 2016 -0600
CRM-18683 follow up change to xml (also in master)
This circumvents a bug in DAO code generation
commit 809a133551368e962b470f9b2274183ccb37d901
Merge: 50e4ca9 585b682
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Sun Jun 5 12:53:31 2016 -0600
Merge pull request #8492 from seamuslee001/CRM-18708
CRM-18708: subtype custom field import issue
commit 50e4ca9ee5fb854e8784e4ebe71b96abcec6449c
Merge: 6c1321d d578a04
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Sun Jun 5 09:46:27 2016 -0600
Merge pull request #8070 from sunilpawar/CRM-18349-4.6
CRM 18349
commit 606dfab68ba109dfdde75659484603873d36bf4f
Author: eileenmcnaugton <eileen@fuzion.co.nz>
Date: Mon May 23 10:02:31 2016 +1200
CRM-18683 4.6.17 ver of upgrade script
commit 1443004d5c36b16e913d7728ef41e9325a4b0f6e
Author: eileenmcnaugton <eileen@fuzion.co.nz>
Date: Mon May 16 11:18:27 2016 +1200
CRM-18142 fix use of uninidexed TIMESTAMPDIFF function
This removes function comparisons in favour of direct comparisons on cache date functions
Conflicts:
CRM/Contact/BAO/GroupContactCache.php
Civi/ActionSchedule/RecipientBuilder.php
commit 99c22a45c66c88bea0e330f7e5f1ca1d3d2a74f1
Author: eileen <emcnaughton@wikimedia.org>
Date: Sun May 8 09:18:10 2016 +1000
CRM-18516 Convert the date fields relating to group caching & acl caching timestamp
Conflicts:
CRM/Upgrade/Incremental/sql/4.7.8.mysql.tpl
xml/schema/ACL/Cache.xml
commit 555e789d98df45c551a98ab0247c8a5965eb45f8
Author: Seamus Lee <seamuslee001@gmail.com>
Date: Sun Jun 5 17:48:20 2016 +1000
CRM-18652 fix bug found in testing
commit c62e51e42a0aa125647a554d0b283f5e7c3af009
Author: Effy Elden <git@effy.is>
Date: Mon May 23 10:32:17 2016 -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
commit e2e91b0e97b91bc40687921d9feb239e5184ade3
Author: Effy Elden <git@effy.is>
Date: Sun May 22 01:19:32 2016 -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
commit 6c1321df0c9be3b28e45711a1462220332856814
Merge: c625f52 8ecb371
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Sun Jun 5 02:24:01 2016 -0600
Merge pull request #8489 from GinkgoFJG/CRM-18753
CRM-18753: Missing class results in 500 error when extensions make API requests
commit c625f52400c59128b24dc87f98737862a19f559c
Merge: fd1297d 0787ca3
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Sun Jun 5 00:45:35 2016 -0600
Merge pull request #8234 from PalanteJon/CRM-18468-4.6
LTS: CRM-18468 - Recurring Contributions - don't use mid for subscrip…
commit fd1297d70a7adbebeb07ef792c3f78718741f46a
Merge: cf7e4a3 2cdf351
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Sun Jun 5 00:26:47 2016 -0600
Merge pull request #8073 from cividesk/CRM-18353-4.6
CRM-18353 skip url from IDS check
commit 585b68211a12220387316a6f98e29f469a443a22
Author: root <nishant.bhorodia@gmail.com>
Date: Thu Jun 2 17:38:17 2016 +0530
CRM-18708: subtype custom field import issue
commit 8ecb3713b94f3412e364dc951c0ea5b9f2b95916
Author: Frank J. Gómez <frank@ginkgostreet.com>
Date: Sat Jun 4 23:51:06 2016 -0600
CRM-18753: Decremented version number to match the current version.
commit ffa309c98916eaa165892937d76d029e87fdfb4f
Author: Frank J. Gómez <frank@ginkgostreet.com>
Date: Sat Jun 4 23:49:51 2016 -0600
CRM-18753: Add class left out of previous backporting efforts.
commit cf7e4a3805f8d7eecc8afcd0b95765afd472f07c
Merge: 9f8323a 908a088
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Sat Jun 4 23:22:33 2016 -0600
Merge pull request #8473 from cividesk/CRM-10230-4.6
CRM-10230 Custom fields text type with limited length not validated
commit 9f8323ab4eb1b7bf04b56abc4b88799e417fd298
Merge: c2c51a3 b302769
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Sat Jun 4 22:56:38 2016 -0600
Merge pull request #7731 from andrew-cormick-dockery/CRM-17959-46
CRM-17959 - allow URL to be redirected if the queue ID is invalid but…
commit a3dfefcc6b6836a602ad9f07f0a532aa26d250d6
Author: sunil <esunil.pawar@gmail.com>
Date: Fri Jun 3 10:33:58 2016 +0530
Merge Fix for custom search order by in contribution details report
commit c2c51a386d13f3cf8028cd1dc2eaaa991ed62951
Author: CiviCRM <info@civicrm.org>
Date: Wed Jun 1 21:28:15 2016 -0700
Update version to 4.6.18
commit a3e067500b2ec629a70c15a6d8c79e33ac1ac351
Merge: eb3fb79 e50c742
Author: Tim Otten <totten@civicrm.org>
Date: Wed Jun 1 20:16:14 2016 -0700
Merge pull request #8340 from jitendrapurohit/CRM-18239
CRM-18239 - 4.6 fix CiviCRM: view my contact permission results in us…
commit 908a08814b50086a72a03f6910ea04e02a4964bb
Author: sunil <esunil.pawar@gmail.com>
Date: Tue May 31 12:02:36 2016 +0530
CRM-10230 Custom fields text type with limited length not validated
commit 33bab724f289c19a8f56cbc56524c1c7d4f8b252
Author: sunil <esunil.pawar@gmail.com>
Date: Tue May 31 11:39:05 2016 +0530
CRM-10230 Custom fields text type with limited length not validated
commit eb3fb7962903732ca76352dbb58a50a9010cac19
Merge: a05198e 15af819
Author: colemanw <coleman@civicrm.org>
Date: Fri May 27 18:19:18 2016 -0400
Merge pull request #8453 from agh1/CRM-17690-4.6
Needless civicrm_grant join causes problems
commit a05198e127eb14c6d9582e343a21f769a2a144eb
Merge: 7d97e6e f533b21
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Fri May 27 17:35:56 2016 +1200
Merge pull request #8462 from eileenmcnaughton/hack
CRM-18684 fix fatal error by backporting 4.7 hack
commit f533b210d762cf1a1ec419209a41c151863f9bf7
Author: eileenmcnaugton <eileen@fuzion.co.nz>
Date: Fri May 27 16:24:50 2016 +1200
CRM-18684 fix fatal error by backporting 4.7 hack
commit 7d97e6ea09794930dd30af316c7bb80ab95daeed
Author: joshgowans <josh@civicrm.org>
Date: Thu May 26 13:39:07 2016 -0600
Update success.tpl (#8459)
* Update success.tpl
Change in upgrade message text
commit 15af819b7093504c682e7338fb7b37fc1948483a
Author: jitendrapurohit <jitendra.purohit@webaccessglobal.com>
Date: Fri Dec 11 14:14:42 2015 +0530
CRM-17690 - Grant fields being retrieved by default when completely irrelevant
commit 09d160a9cf300360e73d26a45c8ad0b7af9060a3
Merge: c3a567f 3c97294
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Wed May 25 22:25:38 2016 +1200
Merge pull request #8326 from mollux/CRM-18510-4.6
CRM-18510 Backport 4.7 changes.
commit c3a567f269bb25983797f037b8f90a91918dd327
Merge: 7c5404f 092bb89
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Wed May 25 22:12:16 2016 +1200
Merge pull request #8448 from seamuslee001/CRM-18474-46
CRM-18474 - Port fix for excluding dodgy characters from CiviMail Body text
commit 3c972945880cb14189cc9e0b9db867e40ebd9dee
Author: Mattias Michaux <mattias.michaux@gmail.com>
Date: Wed May 25 09:45:31 2016 +0200
backport of 4.7.
commit 092bb89b6be4e9ab38678547f64f096f5ea8e144
Author: Seamus Lee <seamuslee001@gmail.com>
Date: Wed May 25 05:58:27 2016 +0000
Port Fix for CRM-18474 to 4.6
commit 7c5404f24f1abef75c20bb041d9b16bb2ddf4b32
Merge: b59afcf e49aeef
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Wed May 25 12:33:28 2016 +1200
Merge pull request #8444 from eileenmcnaughton/hook
CRM-18672 CiviMail New Mailing won't load
commit e49aeefeff5769aed983b3abbfea457d78a5ceb5
Author: eileen <emcnaughton@wikimedia.org>
Date: Wed May 25 10:41:49 2016 +1200
CRM-18672 CiviMail New Mailing won't load
commit b59afcfb7bddf5329d82b734dca9e2e91c9a72fb
Merge: 0ca4e9d e8f5008
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Tue May 24 09:52:08 2016 +1200
Merge pull request #8345 from eileenmcnaughton/api
API code sync 4.7 to 4.6
commit 0ca4e9d2112d25894fedc61bdb724637e8349c51
Merge: eb35ce5 2762ed0
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Mon May 23 17:44:39 2016 +1200
Merge pull request #8339 from yashodha/CRM-18521
CRM-18521
commit eb35ce5af9798e63f12aefea2313fe244625aa44
Merge: fc8b134 0704cce
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Mon May 23 17:43:12 2016 +1200
Merge pull request #8429 from civicrm/revert-7626-4.6-case-rel
Revert "CRM-17342 - Case Managed Entities - Don't recreate disabled relationship types"
commit 0704ccefea24c0623cacb86be1b085126db0d402
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Mon May 23 16:41:43 2016 +1200
Revert "CRM-17342 - Case Managed Entities - Don't recreate disabled relationship types"
commit fc8b134676429457e521f34eb5d6d0ac6972a261
Merge: c11e4aa 8540c52
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Mon May 23 16:40:14 2016 +1200
Merge pull request #8401 from eileenmcnaughton/testa
Improve test error reporting & sync test with master
commit c11e4aaf15956295d5317d17870f2eb89893b4a5
Merge: bb7fa5f 6efb52f
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Mon May 23 13:43:05 2016 +1200
Merge pull request #8428 from eileenmcnaughton/4.6-minor
4.6 code synchronisation
commit 8540c5260bf52216e3b66282ce0c5d9dd46f6fb0
Author: eileen <emcnaughton@wikimedia.org>
Date: Wed May 11 17:01:53 2016 +1200
Improve test error reporting & sync test with master
commit bb7fa5f93bdeb5b06a301e70f97e97a3bfe36f50
Merge: 49a8fd5 d470caf
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Mon May 23 13:06:58 2016 +1200
Merge pull request #7824 from torrance/editable-button-fix
Ensure editable buttons don't sit underneath other page elements.
commit e8f50084dab14f4209d25445a4a288ab0cf9074e
Author: eileen <emcnaughton@wikimedia.org>
Date: Wed May 11 08:40:41 2016 +1200
API code sync 4.7 to 4.6
commit 49a8fd5155d030953991798633100e3ab196eedb
Merge: 2d3b98e b1a9177
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Mon May 23 11:03:31 2016 +1200
Merge pull request #7626 from totten/4.6-case-rel
CRM-17342 - Case Managed Entities - Don't recreate disabled relationship types
commit 6efb52f730707454fe0b0ce8e9e6406e0c558a99
Author: eileenmcnaugton <eileen@fuzion.co.nz>
Date: Mon May 23 10:42:17 2016 +1200
Port back default on OptionGroup
commit 859a7a950748cdfdfb613420dd5c8b93461cc37e
Author: eileen <emcnaughton@wikimedia.org>
Date: Tue May 17 13:05:23 2016 +1200
Add tests for Ensure OptionGroup exists fn & fix optionValueExists to accept ID
The option_group_id field accepts name or id so use that.
Conflicts:
CRM/Core/BAO/OptionValue.php
p
commit 579d017d17048901017a7015087783732b5b0db3
Author: eileenmcnaugton <eileen@fuzion.co.nz>
Date: Mon May 16 10:05:53 2016 +1200
Comment fixes & formatting
commit 3a4d998a5412637d05508442b7879326220199c5
Author: eileenmcnaugton <eileen@fuzion.co.nz>
Date: Mon May 16 15:51:05 2016 +1200
Preliminary tidy up on test class
Conflicts:
tests/phpunit/CRM/Contact/BAO/GroupContactCacheTest.php
commit 2d3b98efe58a4fb9974c4c1096c6a222200f0f4e
Merge: cafa0d8 a64ebe9
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Mon May 23 09:19:36 2016 +1200
Merge pull request #8398 from yashodha/4.6.CRM-18046
CRM-18046: Search link in AB Testing report erroneously requires view…
commit cafa0d87b68cdd9fccf985e6ea5bd692a9fc6f12
Merge: 0345843 63febf2
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Sun May 22 13:00:56 2016 +1200
Merge pull request #8282 from galgeek/patch-3
Use mailing template subject in 4.6
commit 0345843260673974c5bd6bad98b128ec92d6c3f5
Merge: 3053712 a301ef9
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Sun May 22 13:00:32 2016 +1200
Merge pull request #8283 from galgeek/patch-4
handle more better date formats in 4.6
commit 3053712910059bf2d8891a11b82d646393bb062a
Merge: c743e2e c4f091d
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Sat May 21 21:54:22 2016 +1200
Merge pull request #8203 from agileware/4.6-crm-18356
CRM-18356: Fix incorrect logic Activity Report has when excluding NUL…
commit c743e2ed5e59cecf10d9cd7cdca639e6b211e441
Merge: 9ec64fc 91cfc2a
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Sat May 21 21:53:01 2016 +1200
Merge pull request #8247 from eileenmcnaughton/triggerport
CRM-15078: make sure logging schema is updated on extension installation
commit 9ec64fcc22762d2b11fb652f82102192a60f5e6a
Merge: f5d5b14 81e99d5
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Sat May 21 18:45:50 2016 +1200
Merge pull request #8382 from eileenmcnaughton/report
CRM-18519 Add 'standard' contact report fields to contribution detail…
commit f5d5b140dc3529ccb4cbc700573ddcf2954e00a8
Merge: 8da55ff 1c5cd83
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Sat May 21 18:07:43 2016 +1200
Merge pull request #8333 from TobiasLounsbury/CRM-17888-4.6-freq-unit
CRM-17888: Updated frequency_unit to type T_STRING
commit 8da55ff434967a42c041137c524ecbdf003d2137
Merge: f64c6c7 c705b2f
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Fri May 20 14:35:10 2016 +1200
Merge pull request #8412 from seamuslee001/CRM-18504
CRM-18504 Fix validation error when contact subtype is disabled
commit c705b2f4c84351a375949ebaaf83ed2727904eef
Author: Eileen Mcnaughton <eileen@fuzion.co.nz>
Date: Thu May 19 21:53:27 2016 +0000
Fix validation error when contact subtype is disabled
commit f64c6c79d757dbca6ae5ab8d4d51b226d38d8ca9
Merge: 78087d5 b6e2f1b
Author: colemanw <coleman@civicrm.org>
Date: Thu May 19 15:58:21 2016 -0400
Merge pull request #8411 from mollux/CRM-18589-4.6
CRM-18589 Drastically reduce memory usage during tests.
commit b6e2f1b35ea78579f8cb228564f970a1e72b0681
Author: Mattias Michaux <mattias.michaux@gmail.com>
Date: Thu May 19 17:26:52 2016 +0200
Drasticly reduce memory usage during tests.
commit 78087d5c5788337bd250dea48e2606cc533bbd5e
Merge: cda932b a146f84
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Thu May 19 21:29:16 2016 +1200
Merge pull request #8395 from monishdeb/CRM-18405
CRM-18405: Backport master fix
commit cda932b7408fb699cf1f89218cd3fcc15a921719
Merge: a864626 ba9580e
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Thu May 19 21:28:59 2016 +1200
Merge pull request #8403 from eileenmcnaughton/cust_tree
CRM-18504: Fix error in validating sub type by entity
commit a86462670d100e52aa5055c4d1fd212c5c7a3e79
Merge: 1811d4f 6dca8d6
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Thu May 19 13:22:37 2016 +1200
Merge pull request #8397 from seamuslee001/CRM-18559
CRM-18559 sync functions from master which seem to resolve this in th…
commit ba9580e468031f3f6d1a72ed554d46dbeb9686fa
Author: eileen <emcnaughton@wikimedia.org>
Date: Thu May 19 09:31:39 2016 +1200
Port tests from master
commit d00d2569965e1bb74ac7abfebc22d0ee8a6672ee
Author: JKingsnorth <john@johnkingsnorth.co.uk>
Date: Wed May 18 03:31:16 2016 +1200
CRM-18504: Fix error in validating sub type by entity
commit 1811d4fe727a603710341dd31dbb3c32188b2708
Merge: 2067d42 ecdc789
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Thu May 19 08:21:43 2016 +1200
Merge pull request #8393 from agileware/4.6-crm-18290
CRM-18290: Edits to activities are not saved in CiviCase
commit 45f3f3d24394e718d15a12e48503fc7a1eb161c9
Author: systopia <endres@systopia.de>
Date: Wed May 18 15:31:31 2016 +0200
proposed workaround for CRM-17235
commit a64ebe97631b592afce0cf98cbd7764c897fb948
Author: yashodha <yashodha.chaku@webaccessglobal.com>
Date: Wed May 18 16:41:59 2016 +0530
CRM-18046: Search link in AB Testing report erroneously requires view all contacts permission
----------------------------------------
* CRM-18046: Search link in AB Testing report erroneously requires view all contacts permission
https://issues.civicrm.org/jira/browse/CRM-18046
commit 6dca8d6fb0c536076588b3ba15ad2ee409bfbcf6
Author: Seamus Lee <seamuslee001@gmail.com>
Date: Wed May 18 08:02:06 2016 +0000
CRM-18559 sync functions from master which seem to resolve this in the same but more elegant way
commit a146f84aaf8cd9a870ff3bc9516a768a1194f874
Author: deb.monish <monish.deb@webaccessglobal.com>
Date: Wed May 18 12:48:03 2016 +0530
CRM-18405: Backport master fix
commit ecdc78923bf172f6d6b1b1dda7d781ff094a3567
Author: yashodha <yashodha.chaku@webaccessglobal.com>
Date: Fri Mar 25 14:16:45 2016 +0530
CRM-18290: Edits to activities are not saved in CiviCase
----------------------------------------
* CRM-18290: Edits to activities are not saved in CiviCase
https://issues.civicrm.org/jira/browse/CRM-18290
commit 2067d429020b028965e7e9245b6030e7ba9fcb74
Merge: 3d70419 ae50399
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Wed May 18 08:14:16 2016 +1200
Merge pull request #8388 from davejenx/CRM-18567
CRM-18567 - stristr was called with arguments in wrong order, causing…
commit 3d70419a433de7ec7c2266735a9ebc42d4c243ed
Merge: b90b7d8 5445ce7
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Wed May 18 01:46:45 2016 +1200
Merge pull request #8373 from davejenx/CRM-18559
CRM-18559 - the value returned from validateSubTypeByEntity() does no…
commit ae50399db9c3dc234247a48bb8145599a1db27d1
Author: Dave Jenkins <davej+git@circle-interactive.co.uk>
Date: Tue May 17 14:30:52 2016 +0100
CRM-18567 - stristr was called with arguments in wrong order, causing not to be exploded correctly when comma-separated.
commit c63f252786d6bfda9e2811744131bdb1e07f14fa
Author: sunil <esunil.pawar@gmail.com>
Date: Tue May 17 13:35:33 2016 +0530
custom table missing in from clause
commit 81e99d5144414b6ab174fed70909409af23f13ca
Author: eileen <emcnaughton@wikimedia.org>
Date: Mon May 9 14:34:47 2016 +1000
CRM-18519 Add 'standard' contact report fields to contribution detail report
commit ecffdbc0156a0eaf80cfa143fff3c6046ac66f5f
Author: sunil <esunil.pawar@gmail.com>
Date: Mon May 16 22:49:49 2016 +0530
set location block to parse street address
commit 5445ce73a38013223b002268d33a6a401dc176d3
Author: Dave Jenkins <davej+git@circle-interactive.co.uk>
Date: Mon May 16 17:53:32 2016 +0100
CRM-18559 - the value returned from validateSubTypeByEntity() does not include value separators, so they need to be added for the query.
commit bb49c78dda00c1a64a82a448d4693f5c0eac6c92
Author: root <root@sai.ops.cividesk.com>
Date: Mon May 16 10:36:50 2016 +0000
CRM-15967 - Fix profile state/province sort
commit b90b7d807bf9b885f02ce54581bf99bba3edef34
Author: Chris Burgess <chris@giantrobot.co.nz>
Date: Thu Mar 17 20:41:40 2016 +1300
CRM-16898. Remove debugging in html5lib.
commit e50c742af453f3edf3e13279c552fd5071bd677a
Author: jitendrapurohit <jitendra.purohit@webaccessglobal.com>
Date: Tue May 10 18:02:33 2016 +0530
CRM-18239 - 4.6 fix CiviCRM: view my contact permission results in user being able to edit themselves in CiviCRM
commit 2762ed02ffd3166f4d5918c0b72e13935448e0ba
Author: yashodha <yashodha.chaku@webaccessglobal.com>
Date: Tue May 10 16:48:05 2016 +0530
CRM-18521: Search results table, 'Select all' checkbox gives 'mark_x_201 is not of the type Integer'
----------------------------------------
* CRM-18521: Search results table, "Select all" checkbox gives "mark_x_201 is not of the type Integer"
https://issues.civicrm.org/jira/browse/CRM-18521
commit a37375d72492448711a243305babc8e45e3eb176
Author: yashodha <yashodha.chaku@webaccessglobal.com>
Date: Tue May 10 16:27:41 2016 +0530
CRM-18521: Search results table, 'Select all' checkbox gives 'mark_x_201 is not of the type Integer'
----------------------------------------
* CRM-18521: Search results table, "Select all" checkbox gives "mark_x_201 is not of the type Integer"
https://issues.civicrm.org/jira/browse/CRM-18521
commit 1c5cd83f1872d8bc9eaf39f9edd4272a3ef4fc7b
Author: Tobias Lounsbury <tobiaslounsbury@gmail.com>
Date: Mon May 9 17:41:59 2016 -0700
CRM-17888: Updated frequency_unit to type T_STRING
commit c54622dc1f6a09d7354098956da55712c92f02c7
Merge: e12ec0e 4eb10b5
Author: Mathieu Lutfy <mathieu@bidon.ca>
Date: Mon May 9 17:32:23 2016 -0400
Merge pull request #8327 from mlutfy/46-crm18518-1
CRM-18518: Trivial translation string fix.
commit 4eb10b5719e48e2a4f1b277862f205efcda74a07
Author: Mathieu Lutfy <mathieu@bidon.ca>
Date: Mon May 9 12:39:03 2016 -0400
CRM-18518: Trivial translation string fix.
commit e12ec0e07f77a4d49c31eff47d0836778adae14c
Merge: 87ae7fa 4b386806
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Mon May 9 14:20:29 2016 +1000
Merge pull request #8297 from eileenmcnaughton/api
Api 4.6
commit 87ae7fa4b4a72d004925211f75cae073a6db886a
Merge: 44725d6 67541ea
Author: colemanw <coleman@civicrm.org>
Date: Sun May 8 21:53:47 2016 -0400
Merge pull request #8321 from mlutfy/46-crm18518
CRM-18518: ts() string fixes.
commit 4b3868064b17afb785bf21f4fb33ef12aca79d16
Author: eileen <emcnaughton@wikimedia.org>
Date: Mon May 9 08:23:46 2016 +1000
Further changes to sync with 4.7
The changes affect 2 function signatures but in minor ways and add 2 functions
commit 62829d5e69d2147581cffe77ea1a95fc89b2b2cb
Author: eileen <emcnaughton@wikimedia.org>
Date: Mon May 9 08:13:40 2016 +1000
Towards syncing 4.6 api with 4.7, no changes, only new code
commit 67541ea706692c2c5ae43e085ab011eaf00c8ae6
Author: Mathieu Lutfy <mathieu@bidon.ca>
Date: Sun May 8 17:49:06 2016 -0400
CRM-18518: ts() string fixes.
commit 44725d60205e4183c5c357aa0fc5441046de3c66
Merge: 3d2a8cf 2c5b401
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Mon May 9 07:20:46 2016 +1000
Merge pull request #8262 from seamuslee001/CRM-17693-46-2
CRM-17693 backport to 4.6 increasing default export field sizes to 25…
commit 3d2a8cf4d69a4d11fbd4391ff2f8e5fb2a7c7702
Merge: 0de909d 65f9161
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Sun May 8 22:25:38 2016 +1000
Merge pull request #8290 from mollux/types
Add extra Mysql types and rules + tests similar to 4.7
commit 0de909df30f21cc8a440d8c1eddaf5e3476459b5
Author: CiviCRM <info@civicrm.org>
Date: Wed May 4 14:05:25 2016 -0700
Update version to 4.6.17
commit dcf53fa10e07004becc5415823c78b78bb547f17
Merge: 234ac7a fe55f63
Author: Tim Otten <totten@civicrm.org>
Date: Wed May 4 11:17:57 2016 -0700
Merge pull request #8291 from totten/4.6-17952
(Backport) CRM-17952 - Escape HTML in body_text field on "Headers, Footers, and Automated Messages"
commit fe55f63ef3ee1e86b5393c333d89b51938124ed8
Author: Mattias Michaux <mattias.michaux@gmail.com>
Date: Thu Mar 17 20:14:12 2016 +1300
CRM-17952. Escape HTML in body_text field on "Headers, Footers, and Automated Messages"
commit 65f916166c212fe8cba9a09b677870550fb0f688
Author: Mattias Michaux <mattias.michaux@gmail.com>
Date: Tue May 3 23:01:08 2016 +0200
Whitespace fixes.
commit 22c5ca5428da5640e393e03a807d0b524839f5bf
Author: Mattias Michaux <mattias.michaux@gmail.com>
Date: Tue May 3 22:54:24 2016 +0200
Added validate check to CRM_Utils_Sort sort name.
commit f82f7ac94a68732798ea87b7180bf3080481cd7e
Author: Mattias Michaux <mattias.michaux@gmail.com>
Date: Tue May 3 22:53:59 2016 +0200
Added extra Mysql types and rules + tests similar to 4.7
commit a301ef9f7ba4d2ba6dba51e3e202e45cfe8e60a4
Author: Barbara Miller <galgeek@users.noreply.github.com>
Date: Mon May 2 18:33:32 2016 -0700
handle more better date formats in 4.6
this is the same issue as https://issues.civicrm.org/jira/browse/CRM-13063 but in a different location, Contribution.php's _assignMesssageVariablesToTemplate
already submitted and accepted for 4.7: https://github.com/civicrm/civicrm-core/commit/5bab7daf82c8005c92527fd8f3a76f0bb4f315a6
commit 63febf2c91a5be4ff7f4468299f5910ee0eb0ba4
Author: Barbara Miller <galgeek@users.noreply.github.com>
Date: Mon May 2 18:25:07 2016 -0700
Use mailing template subject in 4.6
A fix for https://issues.civicrm.org/jira/browse/CRM-17548 for 4.6.
Already included in 4.7.6: https://github.com/civicrm/civicrm-core/commit/ab0f580c8b5407474c482ea20ca668563385e816
commit 234ac7a8a383b7450b0188da6cc99d6056b54354
Merge: 5b7809a 35d8514
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Tue May 3 00:18:30 2016 +1200
Merge pull request #8275 from mollux/CRM-17983-4.6
CRM-17983 4.6
commit 35d85145232bf9cc102f1cf1fd092ca3b1fdcdc9
Author: Mattias Michaux <mattias.michaux@gmail.com>
Date: Mon May 2 10:46:11 2016 +0200
Typo fix.
commit d55e491e1f49358948a906f008294fe875f994e4
Author: Mattias Michaux <mattias.michaux@gmail.com>
Date: Mon May 2 10:39:13 2016 +0200
Cleanup to have same behaviour as 4.7.
commit 24deeb3567a4f03d04126d486e64b39c917e083b
Author: Mattias Michaux <mattias.michaux@gmail.com>
Date: Mon May 2 10:37:08 2016 +0200
Fixed 2 other issues.
commit dc72bb357cfe6ac03d98bafd1551ca7a36f258af
Author: Mattias Michaux <mattias.michaux@gmail.com>
Date: Fri Apr 29 00:31:41 2016 +0200
Bare minimum patch for 4.6
commit 5b7809ae04ba3649d2cbb67a43f4883666bcee67
Merge: f8ca48a 6c242dc
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Fri Apr 29 14:08:24 2016 +1200
Merge pull request #8263 from seamuslee001/CRM-17983-46-titlefix
CRM-17983 Fix error in data type as found by Dave
commit 6c242dc5b325694de5bff2f219f82884e064fbbe
Author: Seamus Lee <seamuslee001@gmail.com>
Date: Thu Apr 28 22:02:01 2016 +0000
CRM-17983 Fix error in data type as found by Dave
commit 2c5b4015b3348a3eab8bf23728db92730fafc62d
Author: Seamus Lee <seamuslee001@gmail.com>
Date: Wed Apr 27 23:19:06 2016 +0000
CRM-17693 backport to 4.6 increasing default export field sizes to 255 for varchar columns
commit f8ca48a71a7d01d586d15d1b8fdc483afab25ad7
Merge: 50c8776 cec5b0b
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Thu Apr 28 11:15:33 2016 +1200
Merge pull request #8252 from eileenmcnaughton/regression
CRM-18469, CRM-17984 - getTree regression on multiple integers separa…
commit cec5b0b986a77bea695214cb564be1ceee1fed37
Author: Tim Otten <totten@civicrm.org>
Date: Wed Apr 27 11:52:47 2016 -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
commit f617ec77695255855915340e80c8a655dfac6236
Author: sunil <esunil.pawar@gmail.com>
Date: Wed Apr 27 20:42:32 2016 +0530
override civicrm extension cache dir path
commit 2bb43fd37224c69374bd75058f1869d697a8cd74
Author: eileenmcnaugton <eileen@fuzion.co.nz>
Date: Wed Apr 27 20:13:41 2016 +1200
Further custom tree regression fix, where the label does not match the name the name is the key to use
commit f5293e7cc559ba89feb4bbd41672dba277e30e0a
Author: eileenmcnaugton <eileen@fuzion.co.nz>
Date: Wed Apr 27 19:37:02 2016 +1200
CRM-18469, CRM-17984 - getTree regression on multiple integers separated by the cnrtl char
commit 50c877601d0c0d879df3bc9a5d6218c23ec24cf1
Merge: c5eeace 60246a5
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Wed Apr 27 17:25:54 2016 +1200
Merge pull request #8248 from eileenmcnaughton/pass_by_ref
Pass by ref - fix for strict warning regression picked up on the RC
commit 60246a55e57501dbc7e87f27172f984e3982b488
Author: eileen <emcnaughton@wikimedia.org>
Date: Wed Apr 27 10:51:31 2016 +1200
Further pass-by-ref fixes following on from customGroup signature change
Change-Id: I4398472485f27165b197f00bf36d518509681242
commit 4c11c4b960d19dfeb2e9e95dda1670793e33de60
Author: Tim Otten <totten@civicrm.org>
Date: Tue Apr 26 12:24:21 2016 -0700
CRM-18469, CRM-17984 - getTree - No more pass by reference
Change-Id: Ia2eb6d2bf64055dc546d2b73ec3ce310846a40f5
commit 91cfc2a6cdde9574e6c9590c8eec26e37ffa3634
Author: David Knoll <david@davidknoll.me.uk>
Date: Sun Oct 11 12:18:35 2015 +0100
CRM-15078: make sure logging schema is updated on extension installation
commit 0787ca3c49736015e6c3474ddee3e2ae5ceb63de
Author: Jon goldberg <jon@palantetech.coop>
Date: Mon Apr 25 18:40:12 2016 -0400
LTS: CRM-18468 - Recurring Contributions - don't use mid for subscription details if you can use crid
commit c5eeace42080193303278b4ce6a7fc6c8fe92007
Merge: db6b28e 8454b52
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Mon Apr 25 08:20:29 2016 +1200
Merge pull request #8221 from eileenmcnaughton/s
Ports from master
commit 8454b521ff124e8ea1b3dec65943a12971cf614d
Author: eileenmcnaugton <eileen@fuzion.co.nz>
Date: Wed Apr 20 22:10:38 2016 +1200
CRM-17983 fix for contactRelationships query
commit 39c8d3feac803a3a0e0cb00d2f5f14e3544a3040
Author: eileenmcnaugton <eileen@fuzion.co.nz>
Date: Sun Apr 24 15:17:27 2016 +1200
CRM-17983, CRM-18401. Input validation
commit f79e4e87d106b8fc8607944df904ad93d91b5915
Author: Eileen <eileen@fuzion.co.nz>
Date: Fri Apr 22 09:24:48 2016 +0000
Fix Strict warning discovered in testing
commit 4655809e457eb1df9c8d49868932365deff848dc
Author: Eileen <eileen@fuzion.co.nz>
Date: Fri Apr 22 09:01:41 2016 +0000
CRM-5507 CRM-17984 fix regression when subType var is not leaking
commit d17193abafafbe9775069c32b5f494248dcdc3c9
Author: Eileen <eileen@fuzion.co.nz>
Date: Fri Apr 22 06:24:31 2016 +0000
Fix the RC regrsision
commit 347064f7dc0a2cf0a2d6315ddb4a59b6e722f494
Author: Eileen <eileen@fuzion.co.nz>
Date: Fri Apr 22 06:10:44 2016 +0000
CRM-17984 test to demonstrate breakage
Conflicts:
CRM/Core/BAO/CustomGroup.php
commit 34b1144ca679007e9e1842228a8b04fd74e748df
Author: Tim Otten <totten@civicrm.org>
Date: Fri Apr 22 20:55:38 2016 -0700
CRM-17983, CRM-18401 - Swap loose/strict escaping
The old names suggested that loose checking (`MysqlColumnName`) should be
the norm, and strict checking (`MysqlColumnNameStrict`) the exception.
Rather, strict should be the norm.
This also has a functional affect switching the new
`defaultSortAndPagerParams()` to use strict behavior.
commit 3ba1dc9343814da27c23ab8de6eb3e5cbd64c3d7
Author: Chris Burgess <chris@giantrobot.co.nz>
Date: Fri Apr 22 17:48:37 2016 +1200
CRM-17983, CRM-18401. Input validation.
commit 474e211d5ae36b8fdff35dfccac9741f40e7e1f4
Author: Mattias Michaux <mattias.michaux@gmail.com>
Date: Thu Apr 21 00:44:27 2016 +0200
Minimal check to validate relationship params.
Conflicts:
CRM/Contact/Page/AJAX.php
commit db6b28e0c9d3e02650748c87d2e87f2360feee23
Merge: 8568e1e 2d5cef9
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Sat Apr 23 14:46:12 2016 +1200
Merge pull request #8212 from KarinG/CRM-18463-4.6
CRM-18463-4.6 - Not in between filter - not working properly.
commit 2d5cef9bb084fb28397edf6604438ed7b1a1e0ec
Author: KarinG <karin@semper-it.com>
Date: Fri Apr 22 10:50:57 2016 -0600
CRM-18463-4.6 - Not in between filter - not working properly.
commit 8568e1ea798e2dcad49bfa120995a00a9a6805f0
Merge: a2976d5 d70600e
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Fri Apr 22 20:30:54 2016 +1200
Merge pull request #8183 from eileenmcnaughton/sub_type
CRM-17984. Ensure input for subtype is valid; if not then do not use …
commit c4f091dedfae56f274985090d744d468f91b35e2
Author: Francis Whittle <francis@agileware.com.au>
Date: Fri Apr 22 15:29:16 2016 +1000
CRM-18356: Fix incorrect logic Activity Report has when excluding NULL / NOT NULL filters in 'where' method.
----------------------------------------
* CRM-18356: Activity Reports show null Target Name fields incorrectly for some Activities
https://issues.civicrm.org/jira/browse/CRM-18356
commit d70600e480e606cee0e9bed809456356e760456e
Author: Chris Burgess <chris@giantrobot.co.nz>
Date: Mon Apr 11 21:07:02 2016 +1200
CRM-17984. Ensure input for subtype is valid; if not then do not use it to filter custom fields.
commit bca5a70fa18def65ee8c48b7770a532faaa707a5
Author: sunil <esunil.pawar@gmail.com>
Date: Tue Apr 19 17:27:36 2016 +0530
PCP : hide login link for anonymous user on standalone plus instance
commit a2976d503780f7e53cf24b624bd8faadfaf8511a
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Tue Apr 19 11:37:53 2016 +1200
Enotice fix for test env (#8156)
commit 3f7df5902facad68489e225b504a887c2b45eb91
Author: Andrew Perry <me@andrewperry.com.au>
Date: Sat Apr 16 12:04:05 2016 +1000
CRM-17846 - Fixing lock name to be less than 64 characters for MySQL 5.7 compatibility (#7984)
* CRM-17846 - Fixing lock name to be less than 64 characters for MySQL 5.7 compatibility - 4.6LTS
* Removing spaces to make Jenkins happy
* Applying MySQL Lock fix contribution from Eileen
* Fixing spacing to keep Jenkins happy
* Use 4.6 version settings call
commit ef518f6c5143599b0ee70db69e1e1d16100e7c20
Author: Jitendra Purohit <jitendra.purohit@webaccessglobal.com>
Date: Thu Apr 14 14:30:19 2016 +0530
CRM-18364: Reply-To field depopulates when saving then continuing a draft mailing (#8137)
commit f369c1ba5c7dfb6ddc87c0911c88d57cca4ee2b2
Author: Laryn - CEDC.org <laryn@cedc.org>
Date: Wed Apr 13 05:46:00 2016 -0500
CRM-17361 - Fix Address fields when used in Contact get api (#8093)
* CRM-17361 -- Extend Contact getoptions to include Address fields
* CRM-17361 -- Extend Contact getoptions to include Address fields
* CRM-17361 -- Extend Contact getoptions to include Address fields
* CRM-17361 -- Extend Contact getoptions to include Address fields
* CRM-17361 -- Extend Contact getoptions to include Address fields
commit ecb1700c60b2ecd312df5d61899e3d9771a52168
Author: sunil <esunil.pawar@gmail.com>
Date: Fri Apr 8 21:44:35 2016 +0530
check duplicate line item before insert: changed object name
commit 133102149315e56df3625811d5ed4c22f4ffc351
Author: sunil <esunil.pawar@gmail.com>
Date: Fri Apr 8 21:41:33 2016 +0530
check duplicate line item before insert
commit 450891f732f6428b4c2523ca89c341dc44109a05
Author: sunil <esunil.pawar@gmail.com>
Date: Fri Apr 8 10:51:49 2016 +0530
CRM-18362 get current local for navigation menu
commit 4404f4366e3797378390ac800bf02327a21060c7
Author: CiviCRM <info@civicrm.org>
Date: Wed Apr 6 06:52:43 2016 -0700
Update version to 4.6.16
commit 0a9b56c0015d2653c8754a9401d6ad958877bfc3
Merge: 1f049e4 e665f22
Author: Monish Deb <monish.deb@webaccessglobal.com>
Date: Wed Apr 6 17:59:11 2016 +0530
Merge pull request #8090 from pradpnayak/CRM-16617-4-6
--CRM-16617, code fixing for install, changed the parameters of function
commit e665f22a6abbdab64b41b5be053224b6875341e2
Author: Pradeep Nayak <pradpnayak@gmail.com>
Date: Wed Apr 6 02:27:36 2016 +0530
--CRM-16617, code fixing for install, changed the parameters of function
Conflicts:
CRM/Core/DAO.php
commit 2cdf351ece027627e00edfdb585a2df0a0e53461
Author: sunil <esunil.pawar@gmail.com>
Date: Sun Apr 3 14:36:02 2016 +0530
skip url from IDS check
commit d578a04e0efb5a196cb1b9227c95000afb03446c
Author: sunil <esunil.pawar@gmail.com>
Date: Sat Apr 2 15:00:18 2016 +0530
check element contain display word, fix for CRM-18349
commit 7d7a429cf6bff11f79fccfa1864217d61c43dee0
Author: sunil <esunil.pawar@gmail.com>
Date: Thu Mar 31 19:01:48 2016 +0530
added .mrconfig
commit 1f049e46bf14957441cb28e15256c73030017128
Merge: 16a1472 3b251a1
Author: colemanw <coleman@civicrm.org>
Date: Wed Mar 30 13:46:27 2016 -0400
Merge pull request #6707 from pradpnayak/CRM-16617
[pending core team review] CRM-16617
commit 70f2d306e91e6ec837b9000b0668cd24e01dc46e
Author: sunil <esunil.pawar@gmail.com>
Date: Tue Mar 29 14:06:23 2016 +0530
separated logic of updating uf match table for langauge change for mulitlingual setup
commit 16a14728333cf5014819f768c01e671a91e04e98
Merge: 507ac36 29acc44
Author: Monish Deb <monish.deb@webaccessglobal.com>
Date: Tue Mar 29 13:13:05 2016 +0530
Merge pull request #8011 from agh1/multi-paypal-ipn
CRM-18107 PayPal Standard IPN fails with multiple processors
commit 507ac36207bbca2df9f684d1da92638f1c4899f5
Merge: f986e7a e51357e
Author: Yashodha Chaku <yashodha.chaku@webaccessglobal.com>
Date: Wed Mar 23 14:05:29 2016 +0530
Merge pull request #8014 from cividesk/CRM-18280-4.6
Fix for CRM-18280
commit f986e7a1e293144f5cdaef4328394d5cf5fc3681
Merge: 7ed0aed 23a8613
Author: Monish Deb <monish.deb@webaccessglobal.com>
Date: Wed Mar 23 13:50:05 2016 +0530
Merge pull request #7929 from eileenmcnaughton/CRM-18156
CRM-18156 don't false positive on security update available
commit 7ed0aed6c92615a48fda1d637616342fb41585a4
Merge: 81807f0 62fe8f6
Author: Monish Deb <monish.deb@webaccessglobal.com>
Date: Wed Mar 23 10:36:22 2016 +0530
Merge pull request #7939 from seamuslee001/CRM-18181-46
CRM-18181 Get all mailings that use mailings that an acled user can see
commit e51357e713746996491abd36791280660a01fed4
Author: Nicolas Ganivet <nicolas@cividesk.com>
Date: Tue Mar 22 21:11:07 2016 -0600
Fix for CRM-18280
commit 8b4823a8b3947372f41ccf1c612670b1a470df1c
Author: Nicolas Ganivet <nicolas@cividesk.com>
Date: Tue Mar 22 21:11:07 2016 -0600
Fix for CRM-18280
commit 75b734340ebdd724be77689e72ad6e7b9478d053
Author: doijadsachin <sachindoijad@gmail.com>
Date: Tue Mar 22 22:48:49 2016 +0530
Added new coloum supplimental address for report page
commit 29acc4416040bacaf6d7951ba0d4950b473b61e7
Author: Andrew Hunt <andrew@aghstrategies.com>
Date: Mon Mar 21 18:20:19 2016 -0400
CRM-18107 PayPal Standard IPN fails if payment processor id != payment processor type id
commit 5e05f1b2f7dc69303406fff36b303064cc6937fa
Author: sunil <esunil.pawar@gmail.com>
Date: Mon Mar 21 16:55:35 2016 +0530
for standalone plus, do not delete civicrm entry in role_permission table
commit 81807f02031c8e01e4e5ad1cc4f69fb77fc992bf
Merge: b7c849d c893e27
Author: Yashodha Chaku <yashodha.chaku@webaccessglobal.com>
Date: Mon Mar 21 10:34:31 2016 +0530
Merge pull request #7994 from laryn/patch-6
Reproduce CRM-18092 fix for 4.6
commit b7c849d9639729cbf09cd0e9ba3557ec64c4013f
Merge: 66bc01a d9132be
Author: colemanw <coleman@civicrm.org>
Date: Fri Mar 18 20:23:05 2016 -0400
Merge pull request #8003 from PalanteJon/CRM-18264-4.6
CRM-18264 - Fix potential upgrade crash when adding Getting Started d…
commit d9132becce1044f293e5e1cc4b464da054bc6145
Author: Jon goldberg <jon@palantetech.coop>
Date: Fri Mar 18 15:45:53 2016 -0400
CRM-18264 - Fix potential upgrade crash when adding Getting Started dashlet
commit c893e27cd0e0a9c0d4c5131e9df8b41274b4aed7
Author: Laryn <laryn@cedc.org>
Date: Fri Mar 18 09:33:34 2016 -0500
Trying again on the indentation.
commit 3a8de50f907b0263755d5c55568818555200d664
Author: Laryn <laryn@cedc.org>
Date: Fri Mar 18 09:13:25 2016 -0500
Fixing indentation
commit 66bc01a26f71c6bee650f5634e17bee5fedd5034
Merge: 0405135 bba5837
Author: colemanw <coleman@civicrm.org>
Date: Fri Mar 18 09:06:37 2016 -0400
Merge pull request #8000 from monishdeb/CRM-16210
CRM-16210 fix backporting to 4.6
commit bba5837efe2662f7cceccc5f7e684b528a8a28cf
Author: deb.monish <monish.deb@webaccessglobal.com>
Date: Fri Mar 18 12:46:23 2016 +0530
CRM-16210 fix backporting to 4.6
commit 0ddc10b7d95b3d0268856dd5c61c89c967f7ebbe
Author: Laryn <laryn@cedc.org>
Date: Thu Mar 17 11:36:08 2016 -0500
Reproduce CRM-18092 fix for 4.6
Reproduce this fix for 4.6
https://github.com/civicrm/civicrm-core/commit/0f578135c6f9d151fd2e4fef230ec0f91418224b
commit 040513573c82cb20bf4acb7926698cb17bdad8ab
Merge: a6ec36b 5a0b91a
Author: Yashodha Chaku <yashodha.chaku@webaccessglobal.com>
Date: Tue Mar 15 16:01:55 2016 +0530
Merge pull request #7870 from JKingsnorth/CRM-18109-4.6
CRM-18109 (4.6) towards removal of unindexed queries
commit a6ec36b1a3eaa463378f1d04954517d93af5351e
Merge: 2ae6adb 6d0e92a
Author: Yashodha Chaku <yashodha.chaku@webaccessglobal.com>
Date: Mon Mar 14 10:19:35 2016 +0530
Merge pull request #7958 from JMAConsulting/CRM-18204-4.6
Crm 18204 4.6
commit 2ae6adbd38b047c2d8cf9d4b4871394d4c8f4d5d
Merge: 355c832 3fb5a62
Author: Monish Deb <monish.deb@webaccessglobal.com>
Date: Fri Mar 11 19:44:37 2016 +0530
Merge pull request #7964 from jitendrapurohit/CRM-18209
CRM-18209 - show payment fields if other-amount already contains a va…
commit 3fb5a625e00e7059d5133114731c39a7541d8784
Author: jitendrapurohit <jitendra.purohit@webaccessglobal.com>
Date: Fri Mar 11 16:04:45 2016 +0530
CRM-18209 - show payment fields if other-amount already contains a valid amount
commit 6d0e92a1db8bcbd745b4e3241960bc427659e754
Author: Pradeep Nayak <pradpnayak@gmail.com>
Date: Fri Mar 11 14:10:25 2016 +0530
--CRM-18204, modified code to use checkProfileType function
commit b5575962259e589a2f7d93e22e595719c8ebaff6
Author: Pradeep Nayak <pradpnayak@gmail.com>
Date: Thu Mar 10 19:26:41 2016 +0530
CRM-18204, removed extra action for 4.6
----------------------------------------
* CRM-18204: Enables use of Mixed Profile for create mode
https://issues.civicrm.org/jira/browse/CRM-18204
commit f3170f3cd4be94866c2841caad1f680f2baa3126
Author: Pradeep Nayak <pradpnayak@gmail.com>
Date: Thu Mar 10 19:19:53 2016 +0530
--CRM-18204, remove Create mode, Edit mode, listing mode and HMTL form snippet links if uf group type is not contact
commit 7eec7312986b282ca5532567d7bb139a188d54ad
Author: Pradeep Nayak <pradpnayak@gmail.com>
Date: Thu Mar 10 19:18:52 2016 +0530
CRM-18204, used contact type and contact sub type for checking uf group type
----------------------------------------
* CRM-18204: Enables use of Mixed Profile for create mode
https://issues.civicrm.org/jira/browse/CRM-18204
Conflicts:
CRM/UF/Page/Group.php
commit 1bfe8a73d7b79274a349497f809c8cef478d9c21
Author: Pradeep Nayak <pradpnayak@gmail.com>
Date: Thu Mar 10 19:15:47 2016 +0530
CRM-18204, used contact type and contact sub type for checking uf group type
----------------------------------------
* CRM-18204: Enables use of Mixed Profile for create mode
https://issues.civicrm.org/jira/browse/CRM-18204
commit 1ec943b4c2fd67bc608b2606417326ac0b383d17
Merge: 6f66bdc 9ca5639
Author: sunil <esunil.pawar@gmail.com>
Date: Thu Mar 10 16:20:52 2016 +0530
merged civicrm Tag 4.6.14 to standalone plus branch
commit 355c83230610ffc284ed6148226014a37236357d
Merge: 2ef560c 83e9591
Author: colemanw <coleman@civicrm.org>
Date: Wed Mar 9 15:38:25 2016 -0500
Merge pull request #7275 from agh1/petition-custom-fields
[fixed-for-master] Survey custom fields in petition UI
commit 62fe8f639df316f63ceca69aa20fc8f8ab5e5a73
Author: Seamus Lee <seamuslee001@gmail.com>
Date: Wed Mar 9 02:09:03 2016 +0000
Ensure that we are only running the Mailings query when we have found mailings
commit 7399332937235cdf8c73e2138613a83aaec6ec23
Author: Seamus Lee <seamuslee001@gmail.com>
Date: Tue Mar 8 01:03:39 2016 +0000
CRM-18181 Get all mailings that use mailings that an acled user can see
commit 6f66bdc8fb4cd17fa1dad46df6b07dbad3348e38
Author: sunil <esunil.pawar@gmail.com>
Date: Mon Mar 7 17:04:07 2016 +0530
avoid updating user record in UF match if language not changed
commit a7ca0099cd9e5b6e7fed8c090fd2f88b0008e955
Author: sunil <esunil.pawar@gmail.com>
Date: Mon Mar 7 14:35:17 2016 +0530
Fixed with membership type load on membership search form
commit 4400e3ff38288a041e0ea2300234758c148ce842
Author: sunil <esunil.pawar@gmail.com>
Date: Mon Mar 7 14:34:56 2016 +0530
check membership exist before deleting it
commit 2ef560c996b269933adac6c6bdb5d726f0191c4f
Merge: e1b875a 43a8679
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Mon Mar 7 14:21:29 2016 +1300
Merge pull request #7930 from eileenmcnaughton/4.6
CRM-18091 disambiguate TRUE as not meaning 'backtrace'
commit 43a86794ed7c6e8e7f6be21716c6835d892f1584
Author: eileen <emcnaughton@wikimedia.org>
Date: Wed Feb 24 11:57:10 2016 +1300
CRM-18091 disambiguate TRUE as not meaning 'backtrace'
commit 23a8613b3591fec18435427e9e06d00984c0556b
Author: eileenmcnaugton <eileen@fuzion.co.nz>
Date: Mon Mar 7 13:43:51 2016 +1300
CRM-18156 don't false positive on security update available
commit e1b875af7f109cc7969dce00cb4d7eeece472554
Merge: 75a94ac da12acc
Author: colemanw <coleman@civicrm.org>
Date: Fri Mar 4 11:44:55 2016 -0500
Merge pull request #7911 from agh1/merge-screen-close-tag-46
CRM-15789 - contact merge: restore </div> that was accidentally deleted
commit 75a94acc36c3f6427d02b389848d1faf218332aa
Merge: 7ca239c 9abd368
Author: Monish Deb <monish.deb@webaccessglobal.com>
Date: Fri Mar 4 11:27:37 2016 +0530
Merge pull request #7912 from seamuslee001/CRM-18155-46
CRM-18155 Remove membership_type_id from legacyConvertFormValues
commit 9abd36889703982b8d9f975a0ed1872343d9558f
Author: Seamus Lee <seamuslee001@gmail.com>
Date: Fri Mar 4 01:33:10 2016 +0000
CRM-18155 Remove membership_type_id from legacyConvertFormValues
commit da12acc869e1068bdacd16238caa50f50117b445
Author: Andrew Hunt <andrew@aghstrategies.com>
Date: Thu Mar 3 17:37:20 2016 -0500
CRM-15789 - contact merge: restore </div> that was accidentally deleted
----------------------------------------
* CRM-15789: Add icons to submit buttons
https://issues.civicrm.org/jira/browse/CRM-15789
commit 7ca239c7fc489bb746ff61119fd009e11856e3d1
Merge: 0efe35e d6402ea
Author: Monish Deb <monish.deb@webaccessglobal.com>
Date: Thu Mar 3 15:06:59 2016 +0530
Merge pull request #7896 from cividesk/CRM-18130-4.6
CRM-18130: Custom CSS URL not working if aliased or rewritten
commit 0efe35e9ee3fe2a87c089161f27f81f3cfb486eb
Author: CiviCRM <info@civicrm.org>
Date: Wed Mar 2 01:37:05 2016 -0800
Update version to 4.6.15
commit 9ca56392ccbd31a04542946ed33dab43e8791b3a
Merge: a533994 69b7825
Author: Yashodha Chaku <yashodha.chaku@webaccessglobal.com>
Date: Wed Mar 2 12:53:25 2016 +0530
Merge pull request #7897 from totten/4.6-tcpdf
CRM-18098. Move TCPDF from packages to composer.
commit 69b782545b66b66ce4974bf0fdec317d88e57050
Author: Tim Otten <totten@civicrm.org>
Date: Mon Feb 29 18:24:22 2016 -0800
CRM-18098 - composer.json - Add tcpdf to include_path (remove me later)
This provides backward-compatibility with extensions that call
`require_once 'tcpdf/tcpdf.php'`.
This notation is deprecated, and we should remove tcpdf from the include-path in the future.
commit f09f0e85579460fc75e41ac225b754b84baf9d00
Author: Tim Otten <totten@civicrm.org>
Date: Mon Feb 29 17:58:18 2016 -0800
CRM-18098 - TCPDF - Re-include "Times New Roman"
It was present in `civicrm-packages`, and someone might miss it if we take it away.
commit ef280e3c5a947cc399d9034be299743e66013d89
Author: Tim Otten <totten@civicrm.org>
Date: Mon Feb 29 17:54:13 2016 -0800
CRM-18098 - TCPDF - Remove unnecessary require_once
With CRM-18098, we can use the autoloader. And the require_once doesn't
work because the file is no longer in the include_path.
commit 66b96e77a048f38680f8f05c9f521403db43967c
Author: Chris Burgess <chris@giantrobot.co.nz>
Date: Tue Mar 1 11:22:04 2016 +1300
CRM-18098. Update composer.lock
commit 6004b57faa293041f33bb86a4d2ed3044f6cfcdd
Author: Chris Burgess <chris@giantrobot.co.nz>
Date: Tue Mar 1 10:02:37 2016 +1300
CRM-18098. Call tcpdf-cleanup.sh from composer.
commit 0be4f2532340763f4da832154634cc63b7413ba2
Author: Chris Burgess <chris@giantrobot.co.nz>
Date: Fri Feb 26 03:20:41 2016 +1300
CRM-18098. Move TCPDF from packages to composer.
commit a533994b23b8cff0638dd3b228ec0e9567b34f88
Merge: 424a67c d2bbca2
Author: Tim Otten <totten@civicrm.org>
Date: Tue Mar 1 15:53:26 2016 -0800
Merge pull request #7890 from totten/4.6-api-key
CRM-18112 - Additional permission for editing "api_key"
commit d6402ea3796a6c8075b53a7b7415e0e2429646d7
Author: Nicolas Ganivet <nicolas@cividesk.com>
Date: Tue Mar 1 13:00:37 2016 -0700
CRM-18130: Custom CSS URL not working if aliased or rewritten
commit df34043cb7a10c97c255c8fa2e8e3efdc20fb3d3
Merge: 1d21fd8 bd13c8f
Author: Nicolas Ganivet <nicolas@cividesk.com>
Date: Tue Mar 1 13:01:14 2016 -0700
Merge branch '4.6-standalone-plus' of https://github.com/cividesk/civicrm-core into 4.6-standalone-plus
commit 1d21fd8df3979c96e90e4641f222fb70736f1ed6
Author: Nicolas Ganivet <nicolas@cividesk.com>
Date: Tue Mar 1 13:00:37 2016 -0700
CRM-18130: Custom CSS URL not working if aliased or rewritten
commit 424a67ca6fe57169e94e26ba8b086278a68f9e5f
Merge: 38d1819 8de443a
Author: Monish Deb <monish.deb@webaccessglobal.com>
Date: Tue Mar 1 14:04:36 2016 +0530
Merge pull request #7840 from monishdeb/CRM-18026
CRM-18026 fix
commit d2bbca23295a89a6646495307bec016b4a1561e3
Author: Tim Otten <totten@civicrm.org>
Date: Fri Feb 26 12:07:08 2016 -0800
CRM-18112 - Additional permission for editing "api_key"
commit 5a0b91a694857ea7cbb87d0515a47196cc3aad68
Author: eileen <emcnaughton@wikimedia.org>
Date: Sun Feb 28 18:06:04 2016 +1300
CRM-18109 fix to earlier commit on this issue
Signed-off-by: JKingsnorth <john@johnkingsnorth.co.uk>
commit 38d181901899858dbb32e1319435ee23098b82e3
Merge: 447d67d 52882db
Author: Yashodha Chaku <yashodha.chaku@webaccessglobal.com>
Date: Mon Feb 29 09:39:27 2016 +0530
Merge pull request #7829 from seamuslee001/CRM-18066-46
CRM-18066 Include Display name as an option on CIviCRM relationship reports
commit 447d67de48fbb8c378b8fb75ff0b8d66d492b62c
Merge: 0b43a58 6ef22d1
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Mon Feb 29 15:15:40 2016 +1300
Merge pull request #7869 from JKingsnorth/CRM-17464-4.6
CRM-17464 remove deadlock inducing query (4.6)
commit bd13c8f0ae0bab3f13aa1a65cab764933ecb0c34
Author: sunil <esunil.pawar@gmail.com>
Date: Thu Feb 25 22:54:28 2016 +0530
changed data type in report for Frequency Unit
commit b38b568a0eb431b5c548df5585cc44d914332e0f
Author: eileenmcnaugton <eileen@fuzion.co.nz>
Date: Fri Feb 19 19:13:19 2016 +1300
CRM-18109 towards removal of unindexed queries
Signed-off-by: JKingsnorth <john@johnkingsnorth.co.uk>
commit 6ef22d16dc449453930fb8216dfc6841a7f6ff12
Author: eileenmcnaugton <eileen@fuzion.co.nz>
Date: Thu Oct 29 21:26:04 2015 +1300
CRM-17464 remove deadlock inducing query
Signed-off-by: JKingsnorth <john@johnkingsnorth.co.uk>
commit 7751723463e9dffa1d16503b86853045b879b25c
Author: sunil <esunil.pawar@gmail.com>
Date: Wed Feb 24 13:01:45 2016 +0530
fixed issue relationship custom file field
commit 0b43a586439ff2be29d3884b18cb736a97b78138
Merge: a124bf4 66c6cd7
Author: colemanw <coleman@civicrm.org>
Date: Mon Feb 22 17:44:26 2016 -0500
Merge pull request #7838 from monishdeb/CRM-18063
CRM-18063 fix, exclude contact type and tags from legacy format list
commit a124bf481bf1110e5cb40b299bc9c674831c512d
Merge: 944b4cf aeeebee
Author: colemanw <coleman@civicrm.org>
Date: Mon Feb 22 11:37:34 2016 -0500
Merge pull request #7820 from colemanw/CRM-18049
CRM-18049 - Backport api campaign permissions
commit 8de443aab04581440f57f89c1546652d9e943c18
Author: deb.monish <monish.deb@webaccessglobal.com>
Date: Mon Feb 22 16:16:43 2016 +0530
CRM-18026 fix
commit 66c6cd7a1bc2eff247e97892f0493f8c8778d6e1
Author: deb.monish <monish.deb@webaccessglobal.com>
Date: Mon Feb 22 12:05:11 2016 +0530
CRM-18063 fix, exclude contact type and tags from legacy format list
commit 52882db4dabe42802c054dbf61ba06d95d9d13cd
Author: Seamus Lee <seamuslee001@gmail.com>
Date: Thu Feb 18 20:12:03 2016 +0000
Include Display name as an option on CIviCRM relationship reports
commit d470caf768e108dab07eba090668c61a46c41fd7
Author: Torrance <torrance123@gmail.com>
Date: Thu Feb 18 16:35:05 2016 +1300
Ensure editable buttons don't sit underneath other page elements.
commit 944b4cfdd270d0ba0a1affad5901e663161fd29c
Author: CiviCRM <info@civicrm.org>
Date: Tue Feb 16 23:58:44 2016 -0800
Update version to 4.6.14
commit 1d3c2a47936bba1eaf2513194be3ad7512fd99e9
Merge: 8f36695 ad7920a
Author: colemanw <coleman@civicrm.org>
Date: Tue Feb 16 21:15:33 2016 -0500
Merge pull request #7808 from JKingsnorth/CRM-18019-4.6
CRM-18019: Fix regression with views display of custom fields
commit aeeebeea1eb7d0673bf5b63c464c7aa05c74d60a
Author: Coleman Watts <coleman@civicrm.org>
Date: Tue Feb 16 17:51:07 2016 -0500
CRM-18049 - Backport api campaign permissions
commit ad7920a6d78d4c203346cd845d25d82632ddc156
Author: JKingsnorth <john@johnkingsnorth.co.uk>
Date: Tue Feb 16 15:13:16 2016 +0000
CRM-18019-4.6: Better solution for fixing array
commit 8f36695e2bceed4f70373039c754f4dfaf5e5188
Author: Coleman Watts <coleman@civicrm.org>
Date: Mon Feb 15 09:48:57 2016 -0500
CRM-18034 Fix pass by reference
commit bd231523717157ff59d0d778d6422f3cd05328b4
Author: JKingsnorth <john@johnkingsnorth.co.uk>
Date: Mon Feb 15 12:02:55 2016 +0000
CRM-18019: Fix regression with views display of custom fields
commit c5c9825ab5762c5d6565ceeca645bd793f254e7f
Merge: 6e9cf11 cbcfead
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Mon Feb 15 17:25:32 2016 +1300
Merge pull request #7805 from eileenmcnaughton/CRM-17718-install
CRM-17718 installments should NOT be mandatory on recur edit page
commit 6e9cf1107e4f455f3e9ff06015fd71a6c403a9ea
Merge: 8d3275a 2202830
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Mon Feb 15 17:23:33 2016 +1300
Merge pull request #7804 from eileenmcnaughton/CRM-17718
CRM-17718 update repeattransaction to accept contribution_recur_id in…
commit cbcfeadb3d49d50ee90f0f176116490ca82c072f
Author: eileenmcnaugton <eileen@fuzion.co.nz>
Date: Mon Feb 15 13:13:05 2016 +1300
CRM-17718 installments should NOT be mandatory on recur edit page - this change is in 4.7 already
commit 2202830d465fb188c5b4a5563fde1a2c250ae40e
Author: eileenmcnaughton <eileen@fuzion.co.nz>
Date: Wed Dec 16 17:04:19 2015 +0000
CRM-17718 update repeattransaction to permit the financial_type_id to be passed in
Conflicts:
CRM/Contribute/BAO/Contribution.php
CRM/Contribute/BAO/ContributionRecur.php
commit 5d484a2548f54a4d61ec2a02ec70e77070c69d7c
Author: eileenmcnaughton <eileen@fuzion.co.nz>
Date: Wed Dec 16 16:25:37 2015 +0000
CRM-17718 update repeattransaction to accept contribution_recur_id instead of original_contribution_id
wq
I feel like passing in the contribution_recur_id actually makes more sense - the internals of which contribution is repeated should be 'core business' & consistent across processors.
Importantly it has been set here to repeat the latest rather than the earliest which is not as good as saving such things as line items against the recurring transaction but
better than using the earliest - ie. pick up changes over time
Conflicts:
tests/phpunit/api/v3/ContributionTest.php
commit 6f8b2d88c06186450c4688f927417cc8698085d3
Author: sunil <esunil.pawar@gmail.com>
Date: Sun Feb 14 16:23:46 2016 +0530
removed $ variable
commit 3b251a18f7a38d3257b6627d6e7a535bbe5edaba
Author: Pradeep Nayak <pradpnayak@gmail.com>
Date: Mon Feb 8 20:42:48 2016 +0530
CRM-16617, fixed checkstyle jenkin error
----------------------------------------
* CRM-16617:
https://issues.civicrm.org/jira/browse/CRM-16617
commit 45b8252d0e5f1ea70e8b700c1d287d5749e576ff
Author: Pradeep Nayak <pradpnayak@gmail.com>
Date: Mon Feb 8 20:29:59 2016 +0530
--CRM-16617, added unit test
commit 9069b9bd60e939d41d03aa5e9f63eb93a6a8e7c0
Author: Pradeep Nayak <pradpnayak@gmail.com>
Date: Mon Feb 8 20:29:29 2016 +0530
--CRM-16617, moved function to DAO
commit 8d3275a5b73e332f7c75d0702f006858fe48bd8d
Merge: 3ec7590 ba02a0a
Author: Monish Deb <monish.deb@webaccessglobal.com>
Date: Fri Feb 12 18:34:08 2016 +0530
Merge pull request #7793 from seamuslee001/CRM-18021-46
CRM-18021 Add in report viewing option for ab tests
commit 3ec75900ca125749e1f94a151f3ec253e99f18c2
Merge: 88e5391 1aa8728
Author: Monish Deb <monish.deb@webaccessglobal.com>
Date: Fri Feb 12 18:30:52 2016 +0530
Merge pull request #7795 from PalanteJon/CRM-17029
Crm-17029 4.6 - fix Add to Group profile setting doesn't work in petitions
commit 27cf842f29e6598e39a2e506bd33218b96fbcda1
Author: sunil <esunil.pawar@gmail.com>
Date: Fri Feb 12 15:54:27 2016 +0530
fixed issue with Recaptcha and wkhtmltopdfPath overwrite
commit 88e53911b83f4997581bf0a896ac1acf8fe565da
Merge: 3051c90 347ca10
Author: Monish Deb <monish.deb@webaccessglobal.com>
Date: Fri Feb 12 12:27:50 2016 +0530
Merge pull request #7621 from agileware/4.6-crm-17848
CRM-17848: Round tax amount when calculated for contribution pages.
commit 326d41d94282a07fb2bffcb9babe05930a0ec325
Author: sunil <esunil.pawar@gmail.com>
Date: Fri Feb 12 12:27:07 2016 +0530
fixed issue recaptcha overwrite
commit 1861f4ae52f5290005be5ad484a6e56f0658d6d8
Author: Nicolas Ganivet <nicolas@cividesk.com>
Date: Thu Feb 11 22:55:11 2016 -0700
Contact/relationship: added contact ids, reviewed terminology
commit 66eb277c248ccddea3248f40e908e261435db8c7
Author: Nicolas Ganivet <nicolas@cividesk.com>
Date: Thu Feb 11 20:10:27 2016 -0700
Contact/relationship report: final layout
commit 097872d0c6ef8045164f1edef8c82f855496e012
Author: Nicolas Ganivet <nicolas@cividesk.com>
Date: Thu Feb 11 19:24:21 2016 -0700
Contact/relationship report: reorder and change grouping
commit 1aa87286bcc2879406be4b6b9c5a1877def84a7d
Author: Jon goldberg <jon@palantetech.coop>
Date: Thu Feb 11 18:17:59 2016 -0500
CRM-17029 - fix notices
commit 17f6fdd0580b052dd212f64d3815e5af9037a11a
Author: Jon goldberg <jon@palantetech.coop>
Date: Thu Feb 11 17:49:50 2016 -0500
CRM-17029 - Add to Group profile setting wasn't working on petitions
commit ba02a0abff869be4fe6e9c0fa37f412b48c3d523
Author: Seamus Lee <seamuslee001@gmail.com>
Date: Thu Feb 11 10:15:58 2016 +0000
CRM-18021 Add in report viewing option for ab tests
commit 330b9d3262cdc36da7ddf656e6aafad9e3265d89
Author: sunil <esunil.pawar@gmail.com>
Date: Thu Feb 11 22:04:00 2016 +0530
worked on mailer setting overwrite
commit 3051c902ad169e55c677dacc8d5a887496e15043
Merge: 4659d9a c57460c
Author: colemanw <coleman@civicrm.org>
Date: Thu Feb 11 10:10:02 2016 -0500
Merge pull request #7790 from JKingsnorth/CRM-18019-4.6
CRM-18019: Fix display of checkbox values on event confirmation page
commit eccd943a006d83fb53df1526707f9e41bd66abb1
Author: sunil <esunil.pawar@gmail.com>
Date: Thu Feb 11 17:48:58 2016 +0530
fixed issue with mailer setting overwrite
commit c57460c04b6c7632e41294e8138f2776e9fe2175
Author: JKingsnorth <john@johnkingsnorth.co.uk>
Date: Thu Feb 11 12:03:05 201…
nganivet
added a commit
to cividesk/civicrm-core
that referenced
this pull request
Sep 28, 2016
commit 38f546cd535baea2eafb64263a5896e35f6ff546
Author: sunil <esunil.pawar@gmail.com>
Date: Fri Aug 5 22:35:34 2016 +0530
Temparory fix for dbg webform soft contribution
commit 5fbdaad9df5a04b8224077caaa7024c019d055da
Author: Nicolas Ganivet <nicolas@cividesk.com>
Date: Wed Aug 3 23:06:18 2016 -0600
CRM-14720: add length clause
commit 7df0c30e37a163bf59d22c3bc5b4397f57faaa95
Author: Nicolas Ganivet <nicolas@cividesk.com>
Date: Wed Aug 3 13:48:23 2016 -0600
CRM-14720: do not use round() on postal codes as there are non numeric in the database.
commit 9c205e47acbfa381546635ffd822f2dce4a7ea3b
Author: sunil <esunil.pawar@gmail.com>
Date: Thu Jul 28 12:33:10 2016 +0530
Removed current employer from event selector
commit a428566a99fea51795f53b49631614f17a9bb2b0
Author: sunil <esunil.pawar@gmail.com>
Date: Thu Jul 28 00:47:27 2016 +0530
Fixed issue with Paypal standard ipn
commit 064c531c9ee0180aae506ea56fe5692948aeb41c
Author: sunil <esunil.pawar@gmail.com>
Date: Mon Jul 25 19:27:34 2016 +0530
CRM-19102 backported changes to 4.6
commit d43d609bb15f9b9828956bed0dd2c341a7e9b750
Author: sunil <esunil.pawar@gmail.com>
Date: Tue Jul 19 17:49:57 2016 +0530
fixed issue with 0 membership payment amount while renewing membership offline
commit 1bb4e21b54c26a1c6de9d57ad6cab71873b6799a
Author: sunil <esunil.pawar@gmail.com>
Date: Thu Jun 23 16:17:15 2016 +0530
Contact registered as test can not registered for live in backend
commit 89046f529b432cea55ce88fc8a709c988a1c0844
Author: sunil <esunil.pawar@gmail.com>
Date: Thu Jun 23 14:57:00 2016 +0530
CRM-18997 DB error, incorrect truncating multibyte string
commit 1363f28f96cd4afc922ebfe95675beb3f908da40
Author: Nicolas Ganivet <nicolas@cividesk.com>
Date: Tue Jun 21 21:43:56 2016 -0600
Cleaner with variable initialized.
commit f14ea1ce2d56043d3101dab06cf38452d8fecfda
Author: Nicolas Ganivet <nicolas@cividesk.com>
Date: Tue Jun 21 09:50:44 2016 -0600
Fix issue with email sent message displayed when checkbox has not been clicked in back-end membership edit screen.
commit 50e298e9d19f70a5fef4f0b383ff5aa46095b1a9
Author: sunil <esunil.pawar@gmail.com>
Date: Tue Jun 14 19:52:35 2016 +0530
Fixed issue with contact alias when smary group created using relationship is used in search alongwith relationship search
commit e087b10d0eb886bbda10426784d886999a156683
Merge: 35da65e 2028a85
Author: sunil <esunil.pawar@gmail.com>
Date: Mon Jun 13 20:28:59 2016 +0530
merged civicrm Tag 4.6.18 to standalone plus branch
commit 2028a85b3e438e27bf608b231d3072cf916b9d29
Merge: c691b3f b4f9495
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Mon Jun 6 13:27:00 2016 -0600
Merge pull request #8517 from colemanw/noResults
css/civicrmNavigation.css
commit c691b3fb0033f6468498a3f497b7f91840b404cb
Merge: c8884ee 45f3f3d
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Mon Jun 6 13:14:17 2016 -0600
Merge pull request #8512 from systopia/CRM-17235-4.6.13
LTS patch for CRM-17235
commit b4f949575617fb2838184209cfae15ca95318df3
Author: Coleman Watts <coleman@civicrm.org>
Date: Sun Jun 5 15:54:33 2016 -0600
CRM-18652 - Improve style of no-results item
Conflicts:
css/civicrmNavigation.css
commit c8884ee7f0715e592425c1098e704043ed0ed982
Merge: bb2cefc 601c679
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Mon Jun 6 11:05:29 2016 -0600
Merge pull request #8515 from eileenmcnaughton/pdf
Pdf
commit 601c6793bc87f128660a8a0525d7b4a39837b8a0
Author: Tim Otten <totten@civicrm.org>
Date: Fri May 20 20:58:26 2016 -0700
CRM-16898 - Replace debug code in html5lib
commit 6e428f7942fb4ced37a75016b5094a4620659f07
Author: Tim Otten <totten@civicrm.org>
Date: Fri May 20 20:49:51 2016 -0700
Revert "CRM-16898. Remove debugging in html5lib."
This reverts commit 693cb3279584278ccbb3eaa1394999c7a69d7bf6.
commit 35da65ed7aa26fb24d98d7f40c13b127e5fb3ba9
Author: sunil <esunil.pawar@gmail.com>
Date: Mon Jun 6 18:19:07 2016 +0530
Backported mailing label changed to 4.6, CRM-18501
commit 6dbddaaf833c1651c4058e6c52d32d5a905c1053
Author: sunil <esunil.pawar@gmail.com>
Date: Mon Jun 6 14:22:10 2016 +0530
report error for cron job
commit bb2cefc65f5d4b87eca027fd064b4e620b944072
Merge: 36e47da 000a2da
Author: colemanw <coleman@civicrm.org>
Date: Sun Jun 5 20:57:40 2016 -0600
Merge pull request #8505 from rollox/patch-3
CRM-18743 - Undefined variable $order
commit 000a2da283acfb170fe2d302addb020c3e6ce30e
Author: rollox <rollox@users.noreply.github.com>
Date: Mon Jun 6 01:27:42 2016 +0100
CRM-18743 - Undefined variable $order
Fix notice/error "Undefined variable: order in CRM_Contact_BAO_Query->prepareOrderBy()" on user/# screen if the viewed user page is linked to a contact record in Civi.
Also submitted to master.
commit 36e47dadd2e89498231e4d3cb4e2b8a47cd73e48
Merge: 0e9b1e4 5fc7fc6
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Sun Jun 5 17:18:45 2016 -0600
Merge pull request #8468 from eileenmcnaughton/groups46
CRM-18683 fix handling on UTC time in smart groups
commit 0e9b1e489796ac67ae262b13029bb1ad937ad17b
Merge: 809a133 555e789
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Sun Jun 5 14:54:50 2016 -0600
Merge pull request #8496 from seamuslee001/CRM-18652-46
CRM-18652 4.6 backport Show no results label in quick search
commit 5fc7fc6f860ee4101cbce37089838d09d62475f2
Author: eileen <emcnaughton@wikimedia.org>
Date: Sun Jun 5 13:46:30 2016 -0600
CRM-18683 follow up change to xml (also in master)
This circumvents a bug in DAO code generation
commit 809a133551368e962b470f9b2274183ccb37d901
Merge: 50e4ca9 585b682
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Sun Jun 5 12:53:31 2016 -0600
Merge pull request #8492 from seamuslee001/CRM-18708
CRM-18708: subtype custom field import issue
commit 50e4ca9ee5fb854e8784e4ebe71b96abcec6449c
Merge: 6c1321d d578a04
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Sun Jun 5 09:46:27 2016 -0600
Merge pull request #8070 from sunilpawar/CRM-18349-4.6
CRM 18349
commit 606dfab68ba109dfdde75659484603873d36bf4f
Author: eileenmcnaugton <eileen@fuzion.co.nz>
Date: Mon May 23 10:02:31 2016 +1200
CRM-18683 4.6.17 ver of upgrade script
commit 1443004d5c36b16e913d7728ef41e9325a4b0f6e
Author: eileenmcnaugton <eileen@fuzion.co.nz>
Date: Mon May 16 11:18:27 2016 +1200
CRM-18142 fix use of uninidexed TIMESTAMPDIFF function
This removes function comparisons in favour of direct comparisons on cache date functions
Conflicts:
CRM/Contact/BAO/GroupContactCache.php
Civi/ActionSchedule/RecipientBuilder.php
commit 99c22a45c66c88bea0e330f7e5f1ca1d3d2a74f1
Author: eileen <emcnaughton@wikimedia.org>
Date: Sun May 8 09:18:10 2016 +1000
CRM-18516 Convert the date fields relating to group caching & acl caching timestamp
Conflicts:
CRM/Upgrade/Incremental/sql/4.7.8.mysql.tpl
xml/schema/ACL/Cache.xml
commit 555e789d98df45c551a98ab0247c8a5965eb45f8
Author: Seamus Lee <seamuslee001@gmail.com>
Date: Sun Jun 5 17:48:20 2016 +1000
CRM-18652 fix bug found in testing
commit c62e51e42a0aa125647a554d0b283f5e7c3af009
Author: Effy Elden <git@effy.is>
Date: Mon May 23 10:32:17 2016 -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
commit e2e91b0e97b91bc40687921d9feb239e5184ade3
Author: Effy Elden <git@effy.is>
Date: Sun May 22 01:19:32 2016 -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
commit 6c1321df0c9be3b28e45711a1462220332856814
Merge: c625f52 8ecb371
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Sun Jun 5 02:24:01 2016 -0600
Merge pull request #8489 from GinkgoFJG/CRM-18753
CRM-18753: Missing class results in 500 error when extensions make API requests
commit c625f52400c59128b24dc87f98737862a19f559c
Merge: fd1297d 0787ca3
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Sun Jun 5 00:45:35 2016 -0600
Merge pull request #8234 from PalanteJon/CRM-18468-4.6
LTS: CRM-18468 - Recurring Contributions - don't use mid for subscrip…
commit fd1297d70a7adbebeb07ef792c3f78718741f46a
Merge: cf7e4a3 2cdf351
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Sun Jun 5 00:26:47 2016 -0600
Merge pull request #8073 from cividesk/CRM-18353-4.6
CRM-18353 skip url from IDS check
commit 585b68211a12220387316a6f98e29f469a443a22
Author: root <nishant.bhorodia@gmail.com>
Date: Thu Jun 2 17:38:17 2016 +0530
CRM-18708: subtype custom field import issue
commit 8ecb3713b94f3412e364dc951c0ea5b9f2b95916
Author: Frank J. Gómez <frank@ginkgostreet.com>
Date: Sat Jun 4 23:51:06 2016 -0600
CRM-18753: Decremented version number to match the current version.
commit ffa309c98916eaa165892937d76d029e87fdfb4f
Author: Frank J. Gómez <frank@ginkgostreet.com>
Date: Sat Jun 4 23:49:51 2016 -0600
CRM-18753: Add class left out of previous backporting efforts.
commit cf7e4a3805f8d7eecc8afcd0b95765afd472f07c
Merge: 9f8323a 908a088
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Sat Jun 4 23:22:33 2016 -0600
Merge pull request #8473 from cividesk/CRM-10230-4.6
CRM-10230 Custom fields text type with limited length not validated
commit 9f8323ab4eb1b7bf04b56abc4b88799e417fd298
Merge: c2c51a3 b302769
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Sat Jun 4 22:56:38 2016 -0600
Merge pull request #7731 from andrew-cormick-dockery/CRM-17959-46
CRM-17959 - allow URL to be redirected if the queue ID is invalid but…
commit a3dfefcc6b6836a602ad9f07f0a532aa26d250d6
Author: sunil <esunil.pawar@gmail.com>
Date: Fri Jun 3 10:33:58 2016 +0530
Merge Fix for custom search order by in contribution details report
commit c2c51a386d13f3cf8028cd1dc2eaaa991ed62951
Author: CiviCRM <info@civicrm.org>
Date: Wed Jun 1 21:28:15 2016 -0700
Update version to 4.6.18
commit a3e067500b2ec629a70c15a6d8c79e33ac1ac351
Merge: eb3fb79 e50c742
Author: Tim Otten <totten@civicrm.org>
Date: Wed Jun 1 20:16:14 2016 -0700
Merge pull request #8340 from jitendrapurohit/CRM-18239
CRM-18239 - 4.6 fix CiviCRM: view my contact permission results in us…
commit 908a08814b50086a72a03f6910ea04e02a4964bb
Author: sunil <esunil.pawar@gmail.com>
Date: Tue May 31 12:02:36 2016 +0530
CRM-10230 Custom fields text type with limited length not validated
commit 33bab724f289c19a8f56cbc56524c1c7d4f8b252
Author: sunil <esunil.pawar@gmail.com>
Date: Tue May 31 11:39:05 2016 +0530
CRM-10230 Custom fields text type with limited length not validated
commit eb3fb7962903732ca76352dbb58a50a9010cac19
Merge: a05198e 15af819
Author: colemanw <coleman@civicrm.org>
Date: Fri May 27 18:19:18 2016 -0400
Merge pull request #8453 from agh1/CRM-17690-4.6
Needless civicrm_grant join causes problems
commit a05198e127eb14c6d9582e343a21f769a2a144eb
Merge: 7d97e6e f533b21
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Fri May 27 17:35:56 2016 +1200
Merge pull request #8462 from eileenmcnaughton/hack
CRM-18684 fix fatal error by backporting 4.7 hack
commit f533b210d762cf1a1ec419209a41c151863f9bf7
Author: eileenmcnaugton <eileen@fuzion.co.nz>
Date: Fri May 27 16:24:50 2016 +1200
CRM-18684 fix fatal error by backporting 4.7 hack
commit 7d97e6ea09794930dd30af316c7bb80ab95daeed
Author: joshgowans <josh@civicrm.org>
Date: Thu May 26 13:39:07 2016 -0600
Update success.tpl (#8459)
* Update success.tpl
Change in upgrade message text
commit 15af819b7093504c682e7338fb7b37fc1948483a
Author: jitendrapurohit <jitendra.purohit@webaccessglobal.com>
Date: Fri Dec 11 14:14:42 2015 +0530
CRM-17690 - Grant fields being retrieved by default when completely irrelevant
commit 09d160a9cf300360e73d26a45c8ad0b7af9060a3
Merge: c3a567f 3c97294
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Wed May 25 22:25:38 2016 +1200
Merge pull request #8326 from mollux/CRM-18510-4.6
CRM-18510 Backport 4.7 changes.
commit c3a567f269bb25983797f037b8f90a91918dd327
Merge: 7c5404f 092bb89
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Wed May 25 22:12:16 2016 +1200
Merge pull request #8448 from seamuslee001/CRM-18474-46
CRM-18474 - Port fix for excluding dodgy characters from CiviMail Body text
commit 3c972945880cb14189cc9e0b9db867e40ebd9dee
Author: Mattias Michaux <mattias.michaux@gmail.com>
Date: Wed May 25 09:45:31 2016 +0200
backport of 4.7.
commit 092bb89b6be4e9ab38678547f64f096f5ea8e144
Author: Seamus Lee <seamuslee001@gmail.com>
Date: Wed May 25 05:58:27 2016 +0000
Port Fix for CRM-18474 to 4.6
commit 7c5404f24f1abef75c20bb041d9b16bb2ddf4b32
Merge: b59afcf e49aeef
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Wed May 25 12:33:28 2016 +1200
Merge pull request #8444 from eileenmcnaughton/hook
CRM-18672 CiviMail New Mailing won't load
commit e49aeefeff5769aed983b3abbfea457d78a5ceb5
Author: eileen <emcnaughton@wikimedia.org>
Date: Wed May 25 10:41:49 2016 +1200
CRM-18672 CiviMail New Mailing won't load
commit b59afcfb7bddf5329d82b734dca9e2e91c9a72fb
Merge: 0ca4e9d e8f5008
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Tue May 24 09:52:08 2016 +1200
Merge pull request #8345 from eileenmcnaughton/api
API code sync 4.7 to 4.6
commit 0ca4e9d2112d25894fedc61bdb724637e8349c51
Merge: eb35ce5 2762ed0
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Mon May 23 17:44:39 2016 +1200
Merge pull request #8339 from yashodha/CRM-18521
CRM-18521
commit eb35ce5af9798e63f12aefea2313fe244625aa44
Merge: fc8b134 0704cce
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Mon May 23 17:43:12 2016 +1200
Merge pull request #8429 from civicrm/revert-7626-4.6-case-rel
Revert "CRM-17342 - Case Managed Entities - Don't recreate disabled relationship types"
commit 0704ccefea24c0623cacb86be1b085126db0d402
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Mon May 23 16:41:43 2016 +1200
Revert "CRM-17342 - Case Managed Entities - Don't recreate disabled relationship types"
commit fc8b134676429457e521f34eb5d6d0ac6972a261
Merge: c11e4aa 8540c52
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Mon May 23 16:40:14 2016 +1200
Merge pull request #8401 from eileenmcnaughton/testa
Improve test error reporting & sync test with master
commit c11e4aaf15956295d5317d17870f2eb89893b4a5
Merge: bb7fa5f 6efb52f
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Mon May 23 13:43:05 2016 +1200
Merge pull request #8428 from eileenmcnaughton/4.6-minor
4.6 code synchronisation
commit 8540c5260bf52216e3b66282ce0c5d9dd46f6fb0
Author: eileen <emcnaughton@wikimedia.org>
Date: Wed May 11 17:01:53 2016 +1200
Improve test error reporting & sync test with master
commit bb7fa5f93bdeb5b06a301e70f97e97a3bfe36f50
Merge: 49a8fd5 d470caf
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Mon May 23 13:06:58 2016 +1200
Merge pull request #7824 from torrance/editable-button-fix
Ensure editable buttons don't sit underneath other page elements.
commit e8f50084dab14f4209d25445a4a288ab0cf9074e
Author: eileen <emcnaughton@wikimedia.org>
Date: Wed May 11 08:40:41 2016 +1200
API code sync 4.7 to 4.6
commit 49a8fd5155d030953991798633100e3ab196eedb
Merge: 2d3b98e b1a9177
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Mon May 23 11:03:31 2016 +1200
Merge pull request #7626 from totten/4.6-case-rel
CRM-17342 - Case Managed Entities - Don't recreate disabled relationship types
commit 6efb52f730707454fe0b0ce8e9e6406e0c558a99
Author: eileenmcnaugton <eileen@fuzion.co.nz>
Date: Mon May 23 10:42:17 2016 +1200
Port back default on OptionGroup
commit 859a7a950748cdfdfb613420dd5c8b93461cc37e
Author: eileen <emcnaughton@wikimedia.org>
Date: Tue May 17 13:05:23 2016 +1200
Add tests for Ensure OptionGroup exists fn & fix optionValueExists to accept ID
The option_group_id field accepts name or id so use that.
Conflicts:
CRM/Core/BAO/OptionValue.php
p
commit 579d017d17048901017a7015087783732b5b0db3
Author: eileenmcnaugton <eileen@fuzion.co.nz>
Date: Mon May 16 10:05:53 2016 +1200
Comment fixes & formatting
commit 3a4d998a5412637d05508442b7879326220199c5
Author: eileenmcnaugton <eileen@fuzion.co.nz>
Date: Mon May 16 15:51:05 2016 +1200
Preliminary tidy up on test class
Conflicts:
tests/phpunit/CRM/Contact/BAO/GroupContactCacheTest.php
commit 2d3b98efe58a4fb9974c4c1096c6a222200f0f4e
Merge: cafa0d8 a64ebe9
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Mon May 23 09:19:36 2016 +1200
Merge pull request #8398 from yashodha/4.6.CRM-18046
CRM-18046: Search link in AB Testing report erroneously requires view…
commit cafa0d87b68cdd9fccf985e6ea5bd692a9fc6f12
Merge: 0345843 63febf2
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Sun May 22 13:00:56 2016 +1200
Merge pull request #8282 from galgeek/patch-3
Use mailing template subject in 4.6
commit 0345843260673974c5bd6bad98b128ec92d6c3f5
Merge: 3053712 a301ef9
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Sun May 22 13:00:32 2016 +1200
Merge pull request #8283 from galgeek/patch-4
handle more better date formats in 4.6
commit 3053712910059bf2d8891a11b82d646393bb062a
Merge: c743e2e c4f091d
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Sat May 21 21:54:22 2016 +1200
Merge pull request #8203 from agileware/4.6-crm-18356
CRM-18356: Fix incorrect logic Activity Report has when excluding NUL…
commit c743e2ed5e59cecf10d9cd7cdca639e6b211e441
Merge: 9ec64fc 91cfc2a
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Sat May 21 21:53:01 2016 +1200
Merge pull request #8247 from eileenmcnaughton/triggerport
CRM-15078: make sure logging schema is updated on extension installation
commit 9ec64fcc22762d2b11fb652f82102192a60f5e6a
Merge: f5d5b14 81e99d5
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Sat May 21 18:45:50 2016 +1200
Merge pull request #8382 from eileenmcnaughton/report
CRM-18519 Add 'standard' contact report fields to contribution detail…
commit f5d5b140dc3529ccb4cbc700573ddcf2954e00a8
Merge: 8da55ff 1c5cd83
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Sat May 21 18:07:43 2016 +1200
Merge pull request #8333 from TobiasLounsbury/CRM-17888-4.6-freq-unit
CRM-17888: Updated frequency_unit to type T_STRING
commit 8da55ff434967a42c041137c524ecbdf003d2137
Merge: f64c6c7 c705b2f
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Fri May 20 14:35:10 2016 +1200
Merge pull request #8412 from seamuslee001/CRM-18504
CRM-18504 Fix validation error when contact subtype is disabled
commit c705b2f4c84351a375949ebaaf83ed2727904eef
Author: Eileen Mcnaughton <eileen@fuzion.co.nz>
Date: Thu May 19 21:53:27 2016 +0000
Fix validation error when contact subtype is disabled
commit f64c6c79d757dbca6ae5ab8d4d51b226d38d8ca9
Merge: 78087d5 b6e2f1b
Author: colemanw <coleman@civicrm.org>
Date: Thu May 19 15:58:21 2016 -0400
Merge pull request #8411 from mollux/CRM-18589-4.6
CRM-18589 Drastically reduce memory usage during tests.
commit b6e2f1b35ea78579f8cb228564f970a1e72b0681
Author: Mattias Michaux <mattias.michaux@gmail.com>
Date: Thu May 19 17:26:52 2016 +0200
Drasticly reduce memory usage during tests.
commit 78087d5c5788337bd250dea48e2606cc533bbd5e
Merge: cda932b a146f84
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Thu May 19 21:29:16 2016 +1200
Merge pull request #8395 from monishdeb/CRM-18405
CRM-18405: Backport master fix
commit cda932b7408fb699cf1f89218cd3fcc15a921719
Merge: a864626 ba9580e
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Thu May 19 21:28:59 2016 +1200
Merge pull request #8403 from eileenmcnaughton/cust_tree
CRM-18504: Fix error in validating sub type by entity
commit a86462670d100e52aa5055c4d1fd212c5c7a3e79
Merge: 1811d4f 6dca8d6
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Thu May 19 13:22:37 2016 +1200
Merge pull request #8397 from seamuslee001/CRM-18559
CRM-18559 sync functions from master which seem to resolve this in th…
commit ba9580e468031f3f6d1a72ed554d46dbeb9686fa
Author: eileen <emcnaughton@wikimedia.org>
Date: Thu May 19 09:31:39 2016 +1200
Port tests from master
commit d00d2569965e1bb74ac7abfebc22d0ee8a6672ee
Author: JKingsnorth <john@johnkingsnorth.co.uk>
Date: Wed May 18 03:31:16 2016 +1200
CRM-18504: Fix error in validating sub type by entity
commit 1811d4fe727a603710341dd31dbb3c32188b2708
Merge: 2067d42 ecdc789
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Thu May 19 08:21:43 2016 +1200
Merge pull request #8393 from agileware/4.6-crm-18290
CRM-18290: Edits to activities are not saved in CiviCase
commit 45f3f3d24394e718d15a12e48503fc7a1eb161c9
Author: systopia <endres@systopia.de>
Date: Wed May 18 15:31:31 2016 +0200
proposed workaround for CRM-17235
commit a64ebe97631b592afce0cf98cbd7764c897fb948
Author: yashodha <yashodha.chaku@webaccessglobal.com>
Date: Wed May 18 16:41:59 2016 +0530
CRM-18046: Search link in AB Testing report erroneously requires view all contacts permission
----------------------------------------
* CRM-18046: Search link in AB Testing report erroneously requires view all contacts permission
https://issues.civicrm.org/jira/browse/CRM-18046
commit 6dca8d6fb0c536076588b3ba15ad2ee409bfbcf6
Author: Seamus Lee <seamuslee001@gmail.com>
Date: Wed May 18 08:02:06 2016 +0000
CRM-18559 sync functions from master which seem to resolve this in the same but more elegant way
commit a146f84aaf8cd9a870ff3bc9516a768a1194f874
Author: deb.monish <monish.deb@webaccessglobal.com>
Date: Wed May 18 12:48:03 2016 +0530
CRM-18405: Backport master fix
commit ecdc78923bf172f6d6b1b1dda7d781ff094a3567
Author: yashodha <yashodha.chaku@webaccessglobal.com>
Date: Fri Mar 25 14:16:45 2016 +0530
CRM-18290: Edits to activities are not saved in CiviCase
----------------------------------------
* CRM-18290: Edits to activities are not saved in CiviCase
https://issues.civicrm.org/jira/browse/CRM-18290
commit 2067d429020b028965e7e9245b6030e7ba9fcb74
Merge: 3d70419 ae50399
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Wed May 18 08:14:16 2016 +1200
Merge pull request #8388 from davejenx/CRM-18567
CRM-18567 - stristr was called with arguments in wrong order, causing…
commit 3d70419a433de7ec7c2266735a9ebc42d4c243ed
Merge: b90b7d8 5445ce7
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Wed May 18 01:46:45 2016 +1200
Merge pull request #8373 from davejenx/CRM-18559
CRM-18559 - the value returned from validateSubTypeByEntity() does no…
commit ae50399db9c3dc234247a48bb8145599a1db27d1
Author: Dave Jenkins <davej+git@circle-interactive.co.uk>
Date: Tue May 17 14:30:52 2016 +0100
CRM-18567 - stristr was called with arguments in wrong order, causing not to be exploded correctly when comma-separated.
commit c63f252786d6bfda9e2811744131bdb1e07f14fa
Author: sunil <esunil.pawar@gmail.com>
Date: Tue May 17 13:35:33 2016 +0530
custom table missing in from clause
commit 81e99d5144414b6ab174fed70909409af23f13ca
Author: eileen <emcnaughton@wikimedia.org>
Date: Mon May 9 14:34:47 2016 +1000
CRM-18519 Add 'standard' contact report fields to contribution detail report
commit ecffdbc0156a0eaf80cfa143fff3c6046ac66f5f
Author: sunil <esunil.pawar@gmail.com>
Date: Mon May 16 22:49:49 2016 +0530
set location block to parse street address
commit 5445ce73a38013223b002268d33a6a401dc176d3
Author: Dave Jenkins <davej+git@circle-interactive.co.uk>
Date: Mon May 16 17:53:32 2016 +0100
CRM-18559 - the value returned from validateSubTypeByEntity() does not include value separators, so they need to be added for the query.
commit bb49c78dda00c1a64a82a448d4693f5c0eac6c92
Author: root <root@sai.ops.cividesk.com>
Date: Mon May 16 10:36:50 2016 +0000
CRM-15967 - Fix profile state/province sort
commit b90b7d807bf9b885f02ce54581bf99bba3edef34
Author: Chris Burgess <chris@giantrobot.co.nz>
Date: Thu Mar 17 20:41:40 2016 +1300
CRM-16898. Remove debugging in html5lib.
commit e50c742af453f3edf3e13279c552fd5071bd677a
Author: jitendrapurohit <jitendra.purohit@webaccessglobal.com>
Date: Tue May 10 18:02:33 2016 +0530
CRM-18239 - 4.6 fix CiviCRM: view my contact permission results in user being able to edit themselves in CiviCRM
commit 2762ed02ffd3166f4d5918c0b72e13935448e0ba
Author: yashodha <yashodha.chaku@webaccessglobal.com>
Date: Tue May 10 16:48:05 2016 +0530
CRM-18521: Search results table, 'Select all' checkbox gives 'mark_x_201 is not of the type Integer'
----------------------------------------
* CRM-18521: Search results table, "Select all" checkbox gives "mark_x_201 is not of the type Integer"
https://issues.civicrm.org/jira/browse/CRM-18521
commit a37375d72492448711a243305babc8e45e3eb176
Author: yashodha <yashodha.chaku@webaccessglobal.com>
Date: Tue May 10 16:27:41 2016 +0530
CRM-18521: Search results table, 'Select all' checkbox gives 'mark_x_201 is not of the type Integer'
----------------------------------------
* CRM-18521: Search results table, "Select all" checkbox gives "mark_x_201 is not of the type Integer"
https://issues.civicrm.org/jira/browse/CRM-18521
commit 1c5cd83f1872d8bc9eaf39f9edd4272a3ef4fc7b
Author: Tobias Lounsbury <tobiaslounsbury@gmail.com>
Date: Mon May 9 17:41:59 2016 -0700
CRM-17888: Updated frequency_unit to type T_STRING
commit c54622dc1f6a09d7354098956da55712c92f02c7
Merge: e12ec0e 4eb10b5
Author: Mathieu Lutfy <mathieu@bidon.ca>
Date: Mon May 9 17:32:23 2016 -0400
Merge pull request #8327 from mlutfy/46-crm18518-1
CRM-18518: Trivial translation string fix.
commit 4eb10b5719e48e2a4f1b277862f205efcda74a07
Author: Mathieu Lutfy <mathieu@bidon.ca>
Date: Mon May 9 12:39:03 2016 -0400
CRM-18518: Trivial translation string fix.
commit e12ec0e07f77a4d49c31eff47d0836778adae14c
Merge: 87ae7fa 4b386806
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Mon May 9 14:20:29 2016 +1000
Merge pull request #8297 from eileenmcnaughton/api
Api 4.6
commit 87ae7fa4b4a72d004925211f75cae073a6db886a
Merge: 44725d6 67541ea
Author: colemanw <coleman@civicrm.org>
Date: Sun May 8 21:53:47 2016 -0400
Merge pull request #8321 from mlutfy/46-crm18518
CRM-18518: ts() string fixes.
commit 4b3868064b17afb785bf21f4fb33ef12aca79d16
Author: eileen <emcnaughton@wikimedia.org>
Date: Mon May 9 08:23:46 2016 +1000
Further changes to sync with 4.7
The changes affect 2 function signatures but in minor ways and add 2 functions
commit 62829d5e69d2147581cffe77ea1a95fc89b2b2cb
Author: eileen <emcnaughton@wikimedia.org>
Date: Mon May 9 08:13:40 2016 +1000
Towards syncing 4.6 api with 4.7, no changes, only new code
commit 67541ea706692c2c5ae43e085ab011eaf00c8ae6
Author: Mathieu Lutfy <mathieu@bidon.ca>
Date: Sun May 8 17:49:06 2016 -0400
CRM-18518: ts() string fixes.
commit 44725d60205e4183c5c357aa0fc5441046de3c66
Merge: 3d2a8cf 2c5b401
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Mon May 9 07:20:46 2016 +1000
Merge pull request #8262 from seamuslee001/CRM-17693-46-2
CRM-17693 backport to 4.6 increasing default export field sizes to 25…
commit 3d2a8cf4d69a4d11fbd4391ff2f8e5fb2a7c7702
Merge: 0de909d 65f9161
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Sun May 8 22:25:38 2016 +1000
Merge pull request #8290 from mollux/types
Add extra Mysql types and rules + tests similar to 4.7
commit 0de909df30f21cc8a440d8c1eddaf5e3476459b5
Author: CiviCRM <info@civicrm.org>
Date: Wed May 4 14:05:25 2016 -0700
Update version to 4.6.17
commit dcf53fa10e07004becc5415823c78b78bb547f17
Merge: 234ac7a fe55f63
Author: Tim Otten <totten@civicrm.org>
Date: Wed May 4 11:17:57 2016 -0700
Merge pull request #8291 from totten/4.6-17952
(Backport) CRM-17952 - Escape HTML in body_text field on "Headers, Footers, and Automated Messages"
commit fe55f63ef3ee1e86b5393c333d89b51938124ed8
Author: Mattias Michaux <mattias.michaux@gmail.com>
Date: Thu Mar 17 20:14:12 2016 +1300
CRM-17952. Escape HTML in body_text field on "Headers, Footers, and Automated Messages"
commit 65f916166c212fe8cba9a09b677870550fb0f688
Author: Mattias Michaux <mattias.michaux@gmail.com>
Date: Tue May 3 23:01:08 2016 +0200
Whitespace fixes.
commit 22c5ca5428da5640e393e03a807d0b524839f5bf
Author: Mattias Michaux <mattias.michaux@gmail.com>
Date: Tue May 3 22:54:24 2016 +0200
Added validate check to CRM_Utils_Sort sort name.
commit f82f7ac94a68732798ea87b7180bf3080481cd7e
Author: Mattias Michaux <mattias.michaux@gmail.com>
Date: Tue May 3 22:53:59 2016 +0200
Added extra Mysql types and rules + tests similar to 4.7
commit a301ef9f7ba4d2ba6dba51e3e202e45cfe8e60a4
Author: Barbara Miller <galgeek@users.noreply.github.com>
Date: Mon May 2 18:33:32 2016 -0700
handle more better date formats in 4.6
this is the same issue as https://issues.civicrm.org/jira/browse/CRM-13063 but in a different location, Contribution.php's _assignMesssageVariablesToTemplate
already submitted and accepted for 4.7: https://github.com/civicrm/civicrm-core/commit/5bab7daf82c8005c92527fd8f3a76f0bb4f315a6
commit 63febf2c91a5be4ff7f4468299f5910ee0eb0ba4
Author: Barbara Miller <galgeek@users.noreply.github.com>
Date: Mon May 2 18:25:07 2016 -0700
Use mailing template subject in 4.6
A fix for https://issues.civicrm.org/jira/browse/CRM-17548 for 4.6.
Already included in 4.7.6: https://github.com/civicrm/civicrm-core/commit/ab0f580c8b5407474c482ea20ca668563385e816
commit 234ac7a8a383b7450b0188da6cc99d6056b54354
Merge: 5b7809a 35d8514
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Tue May 3 00:18:30 2016 +1200
Merge pull request #8275 from mollux/CRM-17983-4.6
CRM-17983 4.6
commit 35d85145232bf9cc102f1cf1fd092ca3b1fdcdc9
Author: Mattias Michaux <mattias.michaux@gmail.com>
Date: Mon May 2 10:46:11 2016 +0200
Typo fix.
commit d55e491e1f49358948a906f008294fe875f994e4
Author: Mattias Michaux <mattias.michaux@gmail.com>
Date: Mon May 2 10:39:13 2016 +0200
Cleanup to have same behaviour as 4.7.
commit 24deeb3567a4f03d04126d486e64b39c917e083b
Author: Mattias Michaux <mattias.michaux@gmail.com>
Date: Mon May 2 10:37:08 2016 +0200
Fixed 2 other issues.
commit dc72bb357cfe6ac03d98bafd1551ca7a36f258af
Author: Mattias Michaux <mattias.michaux@gmail.com>
Date: Fri Apr 29 00:31:41 2016 +0200
Bare minimum patch for 4.6
commit 5b7809ae04ba3649d2cbb67a43f4883666bcee67
Merge: f8ca48a 6c242dc
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Fri Apr 29 14:08:24 2016 +1200
Merge pull request #8263 from seamuslee001/CRM-17983-46-titlefix
CRM-17983 Fix error in data type as found by Dave
commit 6c242dc5b325694de5bff2f219f82884e064fbbe
Author: Seamus Lee <seamuslee001@gmail.com>
Date: Thu Apr 28 22:02:01 2016 +0000
CRM-17983 Fix error in data type as found by Dave
commit 2c5b4015b3348a3eab8bf23728db92730fafc62d
Author: Seamus Lee <seamuslee001@gmail.com>
Date: Wed Apr 27 23:19:06 2016 +0000
CRM-17693 backport to 4.6 increasing default export field sizes to 255 for varchar columns
commit f8ca48a71a7d01d586d15d1b8fdc483afab25ad7
Merge: 50c8776 cec5b0b
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Thu Apr 28 11:15:33 2016 +1200
Merge pull request #8252 from eileenmcnaughton/regression
CRM-18469, CRM-17984 - getTree regression on multiple integers separa…
commit cec5b0b986a77bea695214cb564be1ceee1fed37
Author: Tim Otten <totten@civicrm.org>
Date: Wed Apr 27 11:52:47 2016 -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
commit f617ec77695255855915340e80c8a655dfac6236
Author: sunil <esunil.pawar@gmail.com>
Date: Wed Apr 27 20:42:32 2016 +0530
override civicrm extension cache dir path
commit 2bb43fd37224c69374bd75058f1869d697a8cd74
Author: eileenmcnaugton <eileen@fuzion.co.nz>
Date: Wed Apr 27 20:13:41 2016 +1200
Further custom tree regression fix, where the label does not match the name the name is the key to use
commit f5293e7cc559ba89feb4bbd41672dba277e30e0a
Author: eileenmcnaugton <eileen@fuzion.co.nz>
Date: Wed Apr 27 19:37:02 2016 +1200
CRM-18469, CRM-17984 - getTree regression on multiple integers separated by the cnrtl char
commit 50c877601d0c0d879df3bc9a5d6218c23ec24cf1
Merge: c5eeace 60246a5
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Wed Apr 27 17:25:54 2016 +1200
Merge pull request #8248 from eileenmcnaughton/pass_by_ref
Pass by ref - fix for strict warning regression picked up on the RC
commit 60246a55e57501dbc7e87f27172f984e3982b488
Author: eileen <emcnaughton@wikimedia.org>
Date: Wed Apr 27 10:51:31 2016 +1200
Further pass-by-ref fixes following on from customGroup signature change
Change-Id: I4398472485f27165b197f00bf36d518509681242
commit 4c11c4b960d19dfeb2e9e95dda1670793e33de60
Author: Tim Otten <totten@civicrm.org>
Date: Tue Apr 26 12:24:21 2016 -0700
CRM-18469, CRM-17984 - getTree - No more pass by reference
Change-Id: Ia2eb6d2bf64055dc546d2b73ec3ce310846a40f5
commit 91cfc2a6cdde9574e6c9590c8eec26e37ffa3634
Author: David Knoll <david@davidknoll.me.uk>
Date: Sun Oct 11 12:18:35 2015 +0100
CRM-15078: make sure logging schema is updated on extension installation
commit 0787ca3c49736015e6c3474ddee3e2ae5ceb63de
Author: Jon goldberg <jon@palantetech.coop>
Date: Mon Apr 25 18:40:12 2016 -0400
LTS: CRM-18468 - Recurring Contributions - don't use mid for subscription details if you can use crid
commit c5eeace42080193303278b4ce6a7fc6c8fe92007
Merge: db6b28e 8454b52
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Mon Apr 25 08:20:29 2016 +1200
Merge pull request #8221 from eileenmcnaughton/s
Ports from master
commit 8454b521ff124e8ea1b3dec65943a12971cf614d
Author: eileenmcnaugton <eileen@fuzion.co.nz>
Date: Wed Apr 20 22:10:38 2016 +1200
CRM-17983 fix for contactRelationships query
commit 39c8d3feac803a3a0e0cb00d2f5f14e3544a3040
Author: eileenmcnaugton <eileen@fuzion.co.nz>
Date: Sun Apr 24 15:17:27 2016 +1200
CRM-17983, CRM-18401. Input validation
commit f79e4e87d106b8fc8607944df904ad93d91b5915
Author: Eileen <eileen@fuzion.co.nz>
Date: Fri Apr 22 09:24:48 2016 +0000
Fix Strict warning discovered in testing
commit 4655809e457eb1df9c8d49868932365deff848dc
Author: Eileen <eileen@fuzion.co.nz>
Date: Fri Apr 22 09:01:41 2016 +0000
CRM-5507 CRM-17984 fix regression when subType var is not leaking
commit d17193abafafbe9775069c32b5f494248dcdc3c9
Author: Eileen <eileen@fuzion.co.nz>
Date: Fri Apr 22 06:24:31 2016 +0000
Fix the RC regrsision
commit 347064f7dc0a2cf0a2d6315ddb4a59b6e722f494
Author: Eileen <eileen@fuzion.co.nz>
Date: Fri Apr 22 06:10:44 2016 +0000
CRM-17984 test to demonstrate breakage
Conflicts:
CRM/Core/BAO/CustomGroup.php
commit 34b1144ca679007e9e1842228a8b04fd74e748df
Author: Tim Otten <totten@civicrm.org>
Date: Fri Apr 22 20:55:38 2016 -0700
CRM-17983, CRM-18401 - Swap loose/strict escaping
The old names suggested that loose checking (`MysqlColumnName`) should be
the norm, and strict checking (`MysqlColumnNameStrict`) the exception.
Rather, strict should be the norm.
This also has a functional affect switching the new
`defaultSortAndPagerParams()` to use strict behavior.
commit 3ba1dc9343814da27c23ab8de6eb3e5cbd64c3d7
Author: Chris Burgess <chris@giantrobot.co.nz>
Date: Fri Apr 22 17:48:37 2016 +1200
CRM-17983, CRM-18401. Input validation.
commit 474e211d5ae36b8fdff35dfccac9741f40e7e1f4
Author: Mattias Michaux <mattias.michaux@gmail.com>
Date: Thu Apr 21 00:44:27 2016 +0200
Minimal check to validate relationship params.
Conflicts:
CRM/Contact/Page/AJAX.php
commit db6b28e0c9d3e02650748c87d2e87f2360feee23
Merge: 8568e1e 2d5cef9
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Sat Apr 23 14:46:12 2016 +1200
Merge pull request #8212 from KarinG/CRM-18463-4.6
CRM-18463-4.6 - Not in between filter - not working properly.
commit 2d5cef9bb084fb28397edf6604438ed7b1a1e0ec
Author: KarinG <karin@semper-it.com>
Date: Fri Apr 22 10:50:57 2016 -0600
CRM-18463-4.6 - Not in between filter - not working properly.
commit 8568e1ea798e2dcad49bfa120995a00a9a6805f0
Merge: a2976d5 d70600e
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Fri Apr 22 20:30:54 2016 +1200
Merge pull request #8183 from eileenmcnaughton/sub_type
CRM-17984. Ensure input for subtype is valid; if not then do not use …
commit c4f091dedfae56f274985090d744d468f91b35e2
Author: Francis Whittle <francis@agileware.com.au>
Date: Fri Apr 22 15:29:16 2016 +1000
CRM-18356: Fix incorrect logic Activity Report has when excluding NULL / NOT NULL filters in 'where' method.
----------------------------------------
* CRM-18356: Activity Reports show null Target Name fields incorrectly for some Activities
https://issues.civicrm.org/jira/browse/CRM-18356
commit d70600e480e606cee0e9bed809456356e760456e
Author: Chris Burgess <chris@giantrobot.co.nz>
Date: Mon Apr 11 21:07:02 2016 +1200
CRM-17984. Ensure input for subtype is valid; if not then do not use it to filter custom fields.
commit bca5a70fa18def65ee8c48b7770a532faaa707a5
Author: sunil <esunil.pawar@gmail.com>
Date: Tue Apr 19 17:27:36 2016 +0530
PCP : hide login link for anonymous user on standalone plus instance
commit a2976d503780f7e53cf24b624bd8faadfaf8511a
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Tue Apr 19 11:37:53 2016 +1200
Enotice fix for test env (#8156)
commit 3f7df5902facad68489e225b504a887c2b45eb91
Author: Andrew Perry <me@andrewperry.com.au>
Date: Sat Apr 16 12:04:05 2016 +1000
CRM-17846 - Fixing lock name to be less than 64 characters for MySQL 5.7 compatibility (#7984)
* CRM-17846 - Fixing lock name to be less than 64 characters for MySQL 5.7 compatibility - 4.6LTS
* Removing spaces to make Jenkins happy
* Applying MySQL Lock fix contribution from Eileen
* Fixing spacing to keep Jenkins happy
* Use 4.6 version settings call
commit ef518f6c5143599b0ee70db69e1e1d16100e7c20
Author: Jitendra Purohit <jitendra.purohit@webaccessglobal.com>
Date: Thu Apr 14 14:30:19 2016 +0530
CRM-18364: Reply-To field depopulates when saving then continuing a draft mailing (#8137)
commit f369c1ba5c7dfb6ddc87c0911c88d57cca4ee2b2
Author: Laryn - CEDC.org <laryn@cedc.org>
Date: Wed Apr 13 05:46:00 2016 -0500
CRM-17361 - Fix Address fields when used in Contact get api (#8093)
* CRM-17361 -- Extend Contact getoptions to include Address fields
* CRM-17361 -- Extend Contact getoptions to include Address fields
* CRM-17361 -- Extend Contact getoptions to include Address fields
* CRM-17361 -- Extend Contact getoptions to include Address fields
* CRM-17361 -- Extend Contact getoptions to include Address fields
commit ecb1700c60b2ecd312df5d61899e3d9771a52168
Author: sunil <esunil.pawar@gmail.com>
Date: Fri Apr 8 21:44:35 2016 +0530
check duplicate line item before insert: changed object name
commit 133102149315e56df3625811d5ed4c22f4ffc351
Author: sunil <esunil.pawar@gmail.com>
Date: Fri Apr 8 21:41:33 2016 +0530
check duplicate line item before insert
commit 450891f732f6428b4c2523ca89c341dc44109a05
Author: sunil <esunil.pawar@gmail.com>
Date: Fri Apr 8 10:51:49 2016 +0530
CRM-18362 get current local for navigation menu
commit 4404f4366e3797378390ac800bf02327a21060c7
Author: CiviCRM <info@civicrm.org>
Date: Wed Apr 6 06:52:43 2016 -0700
Update version to 4.6.16
commit 0a9b56c0015d2653c8754a9401d6ad958877bfc3
Merge: 1f049e4 e665f22
Author: Monish Deb <monish.deb@webaccessglobal.com>
Date: Wed Apr 6 17:59:11 2016 +0530
Merge pull request #8090 from pradpnayak/CRM-16617-4-6
--CRM-16617, code fixing for install, changed the parameters of function
commit e665f22a6abbdab64b41b5be053224b6875341e2
Author: Pradeep Nayak <pradpnayak@gmail.com>
Date: Wed Apr 6 02:27:36 2016 +0530
--CRM-16617, code fixing for install, changed the parameters of function
Conflicts:
CRM/Core/DAO.php
commit 2cdf351ece027627e00edfdb585a2df0a0e53461
Author: sunil <esunil.pawar@gmail.com>
Date: Sun Apr 3 14:36:02 2016 +0530
skip url from IDS check
commit d578a04e0efb5a196cb1b9227c95000afb03446c
Author: sunil <esunil.pawar@gmail.com>
Date: Sat Apr 2 15:00:18 2016 +0530
check element contain display word, fix for CRM-18349
commit 7d7a429cf6bff11f79fccfa1864217d61c43dee0
Author: sunil <esunil.pawar@gmail.com>
Date: Thu Mar 31 19:01:48 2016 +0530
added .mrconfig
commit 1f049e46bf14957441cb28e15256c73030017128
Merge: 16a1472 3b251a1
Author: colemanw <coleman@civicrm.org>
Date: Wed Mar 30 13:46:27 2016 -0400
Merge pull request #6707 from pradpnayak/CRM-16617
[pending core team review] CRM-16617
commit 70f2d306e91e6ec837b9000b0668cd24e01dc46e
Author: sunil <esunil.pawar@gmail.com>
Date: Tue Mar 29 14:06:23 2016 +0530
separated logic of updating uf match table for langauge change for mulitlingual setup
commit 16a14728333cf5014819f768c01e671a91e04e98
Merge: 507ac36 29acc44
Author: Monish Deb <monish.deb@webaccessglobal.com>
Date: Tue Mar 29 13:13:05 2016 +0530
Merge pull request #8011 from agh1/multi-paypal-ipn
CRM-18107 PayPal Standard IPN fails with multiple processors
commit 507ac36207bbca2df9f684d1da92638f1c4899f5
Merge: f986e7a e51357e
Author: Yashodha Chaku <yashodha.chaku@webaccessglobal.com>
Date: Wed Mar 23 14:05:29 2016 +0530
Merge pull request #8014 from cividesk/CRM-18280-4.6
Fix for CRM-18280
commit f986e7a1e293144f5cdaef4328394d5cf5fc3681
Merge: 7ed0aed 23a8613
Author: Monish Deb <monish.deb@webaccessglobal.com>
Date: Wed Mar 23 13:50:05 2016 +0530
Merge pull request #7929 from eileenmcnaughton/CRM-18156
CRM-18156 don't false positive on security update available
commit 7ed0aed6c92615a48fda1d637616342fb41585a4
Merge: 81807f0 62fe8f6
Author: Monish Deb <monish.deb@webaccessglobal.com>
Date: Wed Mar 23 10:36:22 2016 +0530
Merge pull request #7939 from seamuslee001/CRM-18181-46
CRM-18181 Get all mailings that use mailings that an acled user can see
commit e51357e713746996491abd36791280660a01fed4
Author: Nicolas Ganivet <nicolas@cividesk.com>
Date: Tue Mar 22 21:11:07 2016 -0600
Fix for CRM-18280
commit 8b4823a8b3947372f41ccf1c612670b1a470df1c
Author: Nicolas Ganivet <nicolas@cividesk.com>
Date: Tue Mar 22 21:11:07 2016 -0600
Fix for CRM-18280
commit 75b734340ebdd724be77689e72ad6e7b9478d053
Author: doijadsachin <sachindoijad@gmail.com>
Date: Tue Mar 22 22:48:49 2016 +0530
Added new coloum supplimental address for report page
commit 29acc4416040bacaf6d7951ba0d4950b473b61e7
Author: Andrew Hunt <andrew@aghstrategies.com>
Date: Mon Mar 21 18:20:19 2016 -0400
CRM-18107 PayPal Standard IPN fails if payment processor id != payment processor type id
commit 5e05f1b2f7dc69303406fff36b303064cc6937fa
Author: sunil <esunil.pawar@gmail.com>
Date: Mon Mar 21 16:55:35 2016 +0530
for standalone plus, do not delete civicrm entry in role_permission table
commit 81807f02031c8e01e4e5ad1cc4f69fb77fc992bf
Merge: b7c849d c893e27
Author: Yashodha Chaku <yashodha.chaku@webaccessglobal.com>
Date: Mon Mar 21 10:34:31 2016 +0530
Merge pull request #7994 from laryn/patch-6
Reproduce CRM-18092 fix for 4.6
commit b7c849d9639729cbf09cd0e9ba3557ec64c4013f
Merge: 66bc01a d9132be
Author: colemanw <coleman@civicrm.org>
Date: Fri Mar 18 20:23:05 2016 -0400
Merge pull request #8003 from PalanteJon/CRM-18264-4.6
CRM-18264 - Fix potential upgrade crash when adding Getting Started d…
commit d9132becce1044f293e5e1cc4b464da054bc6145
Author: Jon goldberg <jon@palantetech.coop>
Date: Fri Mar 18 15:45:53 2016 -0400
CRM-18264 - Fix potential upgrade crash when adding Getting Started dashlet
commit c893e27cd0e0a9c0d4c5131e9df8b41274b4aed7
Author: Laryn <laryn@cedc.org>
Date: Fri Mar 18 09:33:34 2016 -0500
Trying again on the indentation.
commit 3a8de50f907b0263755d5c55568818555200d664
Author: Laryn <laryn@cedc.org>
Date: Fri Mar 18 09:13:25 2016 -0500
Fixing indentation
commit 66bc01a26f71c6bee650f5634e17bee5fedd5034
Merge: 0405135 bba5837
Author: colemanw <coleman@civicrm.org>
Date: Fri Mar 18 09:06:37 2016 -0400
Merge pull request #8000 from monishdeb/CRM-16210
CRM-16210 fix backporting to 4.6
commit bba5837efe2662f7cceccc5f7e684b528a8a28cf
Author: deb.monish <monish.deb@webaccessglobal.com>
Date: Fri Mar 18 12:46:23 2016 +0530
CRM-16210 fix backporting to 4.6
commit 0ddc10b7d95b3d0268856dd5c61c89c967f7ebbe
Author: Laryn <laryn@cedc.org>
Date: Thu Mar 17 11:36:08 2016 -0500
Reproduce CRM-18092 fix for 4.6
Reproduce this fix for 4.6
https://github.com/civicrm/civicrm-core/commit/0f578135c6f9d151fd2e4fef230ec0f91418224b
commit 040513573c82cb20bf4acb7926698cb17bdad8ab
Merge: a6ec36b 5a0b91a
Author: Yashodha Chaku <yashodha.chaku@webaccessglobal.com>
Date: Tue Mar 15 16:01:55 2016 +0530
Merge pull request #7870 from JKingsnorth/CRM-18109-4.6
CRM-18109 (4.6) towards removal of unindexed queries
commit a6ec36b1a3eaa463378f1d04954517d93af5351e
Merge: 2ae6adb 6d0e92a
Author: Yashodha Chaku <yashodha.chaku@webaccessglobal.com>
Date: Mon Mar 14 10:19:35 2016 +0530
Merge pull request #7958 from JMAConsulting/CRM-18204-4.6
Crm 18204 4.6
commit 2ae6adbd38b047c2d8cf9d4b4871394d4c8f4d5d
Merge: 355c832 3fb5a62
Author: Monish Deb <monish.deb@webaccessglobal.com>
Date: Fri Mar 11 19:44:37 2016 +0530
Merge pull request #7964 from jitendrapurohit/CRM-18209
CRM-18209 - show payment fields if other-amount already contains a va…
commit 3fb5a625e00e7059d5133114731c39a7541d8784
Author: jitendrapurohit <jitendra.purohit@webaccessglobal.com>
Date: Fri Mar 11 16:04:45 2016 +0530
CRM-18209 - show payment fields if other-amount already contains a valid amount
commit 6d0e92a1db8bcbd745b4e3241960bc427659e754
Author: Pradeep Nayak <pradpnayak@gmail.com>
Date: Fri Mar 11 14:10:25 2016 +0530
--CRM-18204, modified code to use checkProfileType function
commit b5575962259e589a2f7d93e22e595719c8ebaff6
Author: Pradeep Nayak <pradpnayak@gmail.com>
Date: Thu Mar 10 19:26:41 2016 +0530
CRM-18204, removed extra action for 4.6
----------------------------------------
* CRM-18204: Enables use of Mixed Profile for create mode
https://issues.civicrm.org/jira/browse/CRM-18204
commit f3170f3cd4be94866c2841caad1f680f2baa3126
Author: Pradeep Nayak <pradpnayak@gmail.com>
Date: Thu Mar 10 19:19:53 2016 +0530
--CRM-18204, remove Create mode, Edit mode, listing mode and HMTL form snippet links if uf group type is not contact
commit 7eec7312986b282ca5532567d7bb139a188d54ad
Author: Pradeep Nayak <pradpnayak@gmail.com>
Date: Thu Mar 10 19:18:52 2016 +0530
CRM-18204, used contact type and contact sub type for checking uf group type
----------------------------------------
* CRM-18204: Enables use of Mixed Profile for create mode
https://issues.civicrm.org/jira/browse/CRM-18204
Conflicts:
CRM/UF/Page/Group.php
commit 1bfe8a73d7b79274a349497f809c8cef478d9c21
Author: Pradeep Nayak <pradpnayak@gmail.com>
Date: Thu Mar 10 19:15:47 2016 +0530
CRM-18204, used contact type and contact sub type for checking uf group type
----------------------------------------
* CRM-18204: Enables use of Mixed Profile for create mode
https://issues.civicrm.org/jira/browse/CRM-18204
commit 1ec943b4c2fd67bc608b2606417326ac0b383d17
Merge: 6f66bdc 9ca5639
Author: sunil <esunil.pawar@gmail.com>
Date: Thu Mar 10 16:20:52 2016 +0530
merged civicrm Tag 4.6.14 to standalone plus branch
commit 355c83230610ffc284ed6148226014a37236357d
Merge: 2ef560c 83e9591
Author: colemanw <coleman@civicrm.org>
Date: Wed Mar 9 15:38:25 2016 -0500
Merge pull request #7275 from agh1/petition-custom-fields
[fixed-for-master] Survey custom fields in petition UI
commit 62fe8f639df316f63ceca69aa20fc8f8ab5e5a73
Author: Seamus Lee <seamuslee001@gmail.com>
Date: Wed Mar 9 02:09:03 2016 +0000
Ensure that we are only running the Mailings query when we have found mailings
commit 7399332937235cdf8c73e2138613a83aaec6ec23
Author: Seamus Lee <seamuslee001@gmail.com>
Date: Tue Mar 8 01:03:39 2016 +0000
CRM-18181 Get all mailings that use mailings that an acled user can see
commit 6f66bdc8fb4cd17fa1dad46df6b07dbad3348e38
Author: sunil <esunil.pawar@gmail.com>
Date: Mon Mar 7 17:04:07 2016 +0530
avoid updating user record in UF match if language not changed
commit a7ca0099cd9e5b6e7fed8c090fd2f88b0008e955
Author: sunil <esunil.pawar@gmail.com>
Date: Mon Mar 7 14:35:17 2016 +0530
Fixed with membership type load on membership search form
commit 4400e3ff38288a041e0ea2300234758c148ce842
Author: sunil <esunil.pawar@gmail.com>
Date: Mon Mar 7 14:34:56 2016 +0530
check membership exist before deleting it
commit 2ef560c996b269933adac6c6bdb5d726f0191c4f
Merge: e1b875a 43a8679
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Mon Mar 7 14:21:29 2016 +1300
Merge pull request #7930 from eileenmcnaughton/4.6
CRM-18091 disambiguate TRUE as not meaning 'backtrace'
commit 43a86794ed7c6e8e7f6be21716c6835d892f1584
Author: eileen <emcnaughton@wikimedia.org>
Date: Wed Feb 24 11:57:10 2016 +1300
CRM-18091 disambiguate TRUE as not meaning 'backtrace'
commit 23a8613b3591fec18435427e9e06d00984c0556b
Author: eileenmcnaugton <eileen@fuzion.co.nz>
Date: Mon Mar 7 13:43:51 2016 +1300
CRM-18156 don't false positive on security update available
commit e1b875af7f109cc7969dce00cb4d7eeece472554
Merge: 75a94ac da12acc
Author: colemanw <coleman@civicrm.org>
Date: Fri Mar 4 11:44:55 2016 -0500
Merge pull request #7911 from agh1/merge-screen-close-tag-46
CRM-15789 - contact merge: restore </div> that was accidentally deleted
commit 75a94acc36c3f6427d02b389848d1faf218332aa
Merge: 7ca239c 9abd368
Author: Monish Deb <monish.deb@webaccessglobal.com>
Date: Fri Mar 4 11:27:37 2016 +0530
Merge pull request #7912 from seamuslee001/CRM-18155-46
CRM-18155 Remove membership_type_id from legacyConvertFormValues
commit 9abd36889703982b8d9f975a0ed1872343d9558f
Author: Seamus Lee <seamuslee001@gmail.com>
Date: Fri Mar 4 01:33:10 2016 +0000
CRM-18155 Remove membership_type_id from legacyConvertFormValues
commit da12acc869e1068bdacd16238caa50f50117b445
Author: Andrew Hunt <andrew@aghstrategies.com>
Date: Thu Mar 3 17:37:20 2016 -0500
CRM-15789 - contact merge: restore </div> that was accidentally deleted
----------------------------------------
* CRM-15789: Add icons to submit buttons
https://issues.civicrm.org/jira/browse/CRM-15789
commit 7ca239c7fc489bb746ff61119fd009e11856e3d1
Merge: 0efe35e d6402ea
Author: Monish Deb <monish.deb@webaccessglobal.com>
Date: Thu Mar 3 15:06:59 2016 +0530
Merge pull request #7896 from cividesk/CRM-18130-4.6
CRM-18130: Custom CSS URL not working if aliased or rewritten
commit 0efe35e9ee3fe2a87c089161f27f81f3cfb486eb
Author: CiviCRM <info@civicrm.org>
Date: Wed Mar 2 01:37:05 2016 -0800
Update version to 4.6.15
commit 9ca56392ccbd31a04542946ed33dab43e8791b3a
Merge: a533994 69b7825
Author: Yashodha Chaku <yashodha.chaku@webaccessglobal.com>
Date: Wed Mar 2 12:53:25 2016 +0530
Merge pull request #7897 from totten/4.6-tcpdf
CRM-18098. Move TCPDF from packages to composer.
commit 69b782545b66b66ce4974bf0fdec317d88e57050
Author: Tim Otten <totten@civicrm.org>
Date: Mon Feb 29 18:24:22 2016 -0800
CRM-18098 - composer.json - Add tcpdf to include_path (remove me later)
This provides backward-compatibility with extensions that call
`require_once 'tcpdf/tcpdf.php'`.
This notation is deprecated, and we should remove tcpdf from the include-path in the future.
commit f09f0e85579460fc75e41ac225b754b84baf9d00
Author: Tim Otten <totten@civicrm.org>
Date: Mon Feb 29 17:58:18 2016 -0800
CRM-18098 - TCPDF - Re-include "Times New Roman"
It was present in `civicrm-packages`, and someone might miss it if we take it away.
commit ef280e3c5a947cc399d9034be299743e66013d89
Author: Tim Otten <totten@civicrm.org>
Date: Mon Feb 29 17:54:13 2016 -0800
CRM-18098 - TCPDF - Remove unnecessary require_once
With CRM-18098, we can use the autoloader. And the require_once doesn't
work because the file is no longer in the include_path.
commit 66b96e77a048f38680f8f05c9f521403db43967c
Author: Chris Burgess <chris@giantrobot.co.nz>
Date: Tue Mar 1 11:22:04 2016 +1300
CRM-18098. Update composer.lock
commit 6004b57faa293041f33bb86a4d2ed3044f6cfcdd
Author: Chris Burgess <chris@giantrobot.co.nz>
Date: Tue Mar 1 10:02:37 2016 +1300
CRM-18098. Call tcpdf-cleanup.sh from composer.
commit 0be4f2532340763f4da832154634cc63b7413ba2
Author: Chris Burgess <chris@giantrobot.co.nz>
Date: Fri Feb 26 03:20:41 2016 +1300
CRM-18098. Move TCPDF from packages to composer.
commit a533994b23b8cff0638dd3b228ec0e9567b34f88
Merge: 424a67c d2bbca2
Author: Tim Otten <totten@civicrm.org>
Date: Tue Mar 1 15:53:26 2016 -0800
Merge pull request #7890 from totten/4.6-api-key
CRM-18112 - Additional permission for editing "api_key"
commit d6402ea3796a6c8075b53a7b7415e0e2429646d7
Author: Nicolas Ganivet <nicolas@cividesk.com>
Date: Tue Mar 1 13:00:37 2016 -0700
CRM-18130: Custom CSS URL not working if aliased or rewritten
commit df34043cb7a10c97c255c8fa2e8e3efdc20fb3d3
Merge: 1d21fd8 bd13c8f
Author: Nicolas Ganivet <nicolas@cividesk.com>
Date: Tue Mar 1 13:01:14 2016 -0700
Merge branch '4.6-standalone-plus' of https://github.com/cividesk/civicrm-core into 4.6-standalone-plus
commit 1d21fd8df3979c96e90e4641f222fb70736f1ed6
Author: Nicolas Ganivet <nicolas@cividesk.com>
Date: Tue Mar 1 13:00:37 2016 -0700
CRM-18130: Custom CSS URL not working if aliased or rewritten
commit 424a67ca6fe57169e94e26ba8b086278a68f9e5f
Merge: 38d1819 8de443a
Author: Monish Deb <monish.deb@webaccessglobal.com>
Date: Tue Mar 1 14:04:36 2016 +0530
Merge pull request #7840 from monishdeb/CRM-18026
CRM-18026 fix
commit d2bbca23295a89a6646495307bec016b4a1561e3
Author: Tim Otten <totten@civicrm.org>
Date: Fri Feb 26 12:07:08 2016 -0800
CRM-18112 - Additional permission for editing "api_key"
commit 5a0b91a694857ea7cbb87d0515a47196cc3aad68
Author: eileen <emcnaughton@wikimedia.org>
Date: Sun Feb 28 18:06:04 2016 +1300
CRM-18109 fix to earlier commit on this issue
Signed-off-by: JKingsnorth <john@johnkingsnorth.co.uk>
commit 38d181901899858dbb32e1319435ee23098b82e3
Merge: 447d67d 52882db
Author: Yashodha Chaku <yashodha.chaku@webaccessglobal.com>
Date: Mon Feb 29 09:39:27 2016 +0530
Merge pull request #7829 from seamuslee001/CRM-18066-46
CRM-18066 Include Display name as an option on CIviCRM relationship reports
commit 447d67de48fbb8c378b8fb75ff0b8d66d492b62c
Merge: 0b43a58 6ef22d1
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Mon Feb 29 15:15:40 2016 +1300
Merge pull request #7869 from JKingsnorth/CRM-17464-4.6
CRM-17464 remove deadlock inducing query (4.6)
commit bd13c8f0ae0bab3f13aa1a65cab764933ecb0c34
Author: sunil <esunil.pawar@gmail.com>
Date: Thu Feb 25 22:54:28 2016 +0530
changed data type in report for Frequency Unit
commit b38b568a0eb431b5c548df5585cc44d914332e0f
Author: eileenmcnaugton <eileen@fuzion.co.nz>
Date: Fri Feb 19 19:13:19 2016 +1300
CRM-18109 towards removal of unindexed queries
Signed-off-by: JKingsnorth <john@johnkingsnorth.co.uk>
commit 6ef22d16dc449453930fb8216dfc6841a7f6ff12
Author: eileenmcnaugton <eileen@fuzion.co.nz>
Date: Thu Oct 29 21:26:04 2015 +1300
CRM-17464 remove deadlock inducing query
Signed-off-by: JKingsnorth <john@johnkingsnorth.co.uk>
commit 7751723463e9dffa1d16503b86853045b879b25c
Author: sunil <esunil.pawar@gmail.com>
Date: Wed Feb 24 13:01:45 2016 +0530
fixed issue relationship custom file field
commit 0b43a586439ff2be29d3884b18cb736a97b78138
Merge: a124bf4 66c6cd7
Author: colemanw <coleman@civicrm.org>
Date: Mon Feb 22 17:44:26 2016 -0500
Merge pull request #7838 from monishdeb/CRM-18063
CRM-18063 fix, exclude contact type and tags from legacy format list
commit a124bf481bf1110e5cb40b299bc9c674831c512d
Merge: 944b4cf aeeebee
Author: colemanw <coleman@civicrm.org>
Date: Mon Feb 22 11:37:34 2016 -0500
Merge pull request #7820 from colemanw/CRM-18049
CRM-18049 - Backport api campaign permissions
commit 8de443aab04581440f57f89c1546652d9e943c18
Author: deb.monish <monish.deb@webaccessglobal.com>
Date: Mon Feb 22 16:16:43 2016 +0530
CRM-18026 fix
commit 66c6cd7a1bc2eff247e97892f0493f8c8778d6e1
Author: deb.monish <monish.deb@webaccessglobal.com>
Date: Mon Feb 22 12:05:11 2016 +0530
CRM-18063 fix, exclude contact type and tags from legacy format list
commit 52882db4dabe42802c054dbf61ba06d95d9d13cd
Author: Seamus Lee <seamuslee001@gmail.com>
Date: Thu Feb 18 20:12:03 2016 +0000
Include Display name as an option on CIviCRM relationship reports
commit d470caf768e108dab07eba090668c61a46c41fd7
Author: Torrance <torrance123@gmail.com>
Date: Thu Feb 18 16:35:05 2016 +1300
Ensure editable buttons don't sit underneath other page elements.
commit 944b4cfdd270d0ba0a1affad5901e663161fd29c
Author: CiviCRM <info@civicrm.org>
Date: Tue Feb 16 23:58:44 2016 -0800
Update version to 4.6.14
commit 1d3c2a47936bba1eaf2513194be3ad7512fd99e9
Merge: 8f36695 ad7920a
Author: colemanw <coleman@civicrm.org>
Date: Tue Feb 16 21:15:33 2016 -0500
Merge pull request #7808 from JKingsnorth/CRM-18019-4.6
CRM-18019: Fix regression with views display of custom fields
commit aeeebeea1eb7d0673bf5b63c464c7aa05c74d60a
Author: Coleman Watts <coleman@civicrm.org>
Date: Tue Feb 16 17:51:07 2016 -0500
CRM-18049 - Backport api campaign permissions
commit ad7920a6d78d4c203346cd845d25d82632ddc156
Author: JKingsnorth <john@johnkingsnorth.co.uk>
Date: Tue Feb 16 15:13:16 2016 +0000
CRM-18019-4.6: Better solution for fixing array
commit 8f36695e2bceed4f70373039c754f4dfaf5e5188
Author: Coleman Watts <coleman@civicrm.org>
Date: Mon Feb 15 09:48:57 2016 -0500
CRM-18034 Fix pass by reference
commit bd231523717157ff59d0d778d6422f3cd05328b4
Author: JKingsnorth <john@johnkingsnorth.co.uk>
Date: Mon Feb 15 12:02:55 2016 +0000
CRM-18019: Fix regression with views display of custom fields
commit c5c9825ab5762c5d6565ceeca645bd793f254e7f
Merge: 6e9cf11 cbcfead
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Mon Feb 15 17:25:32 2016 +1300
Merge pull request #7805 from eileenmcnaughton/CRM-17718-install
CRM-17718 installments should NOT be mandatory on recur edit page
commit 6e9cf1107e4f455f3e9ff06015fd71a6c403a9ea
Merge: 8d3275a 2202830
Author: Eileen McNaughton <eileen@mcnaughty.com>
Date: Mon Feb 15 17:23:33 2016 +1300
Merge pull request #7804 from eileenmcnaughton/CRM-17718
CRM-17718 update repeattransaction to accept contribution_recur_id in…
commit cbcfeadb3d49d50ee90f0f176116490ca82c072f
Author: eileenmcnaugton <eileen@fuzion.co.nz>
Date: Mon Feb 15 13:13:05 2016 +1300
CRM-17718 installments should NOT be mandatory on recur edit page - this change is in 4.7 already
commit 2202830d465fb188c5b4a5563fde1a2c250ae40e
Author: eileenmcnaughton <eileen@fuzion.co.nz>
Date: Wed Dec 16 17:04:19 2015 +0000
CRM-17718 update repeattransaction to permit the financial_type_id to be passed in
Conflicts:
CRM/Contribute/BAO/Contribution.php
CRM/Contribute/BAO/ContributionRecur.php
commit 5d484a2548f54a4d61ec2a02ec70e77070c69d7c
Author: eileenmcnaughton <eileen@fuzion.co.nz>
Date: Wed Dec 16 16:25:37 2015 +0000
CRM-17718 update repeattransaction to accept contribution_recur_id instead of original_contribution_id
wq
I feel like passing in the contribution_recur_id actually makes more sense - the internals of which contribution is repeated should be 'core business' & consistent across processors.
Importantly it has been set here to repeat the latest rather than the earliest which is not as good as saving such things as line items against the recurring transaction but
better than using the earliest - ie. pick up changes over time
Conflicts:
tests/phpunit/api/v3/ContributionTest.php
commit 6f8b2d88c06186450c4688f927417cc8698085d3
Author: sunil <esunil.pawar@gmail.com>
Date: Sun Feb 14 16:23:46 2016 +0530
removed $ variable
commit 3b251a18f7a38d3257b6627d6e7a535bbe5edaba
Author: Pradeep Nayak <pradpnayak@gmail.com>
Date: Mon Feb 8 20:42:48 2016 +0530
CRM-16617, fixed checkstyle jenkin error
----------------------------------------
* CRM-16617:
https://issues.civicrm.org/jira/browse/CRM-16617
commit 45b8252d0e5f1ea70e8b700c1d287d5749e576ff
Author: Pradeep Nayak <pradpnayak@gmail.com>
Date: Mon Feb 8 20:29:59 2016 +0530
--CRM-16617, added unit test
commit 9069b9bd60e939d41d03aa5e9f63eb93a6a8e7c0
Author: Pradeep Nayak <pradpnayak@gmail.com>
Date: Mon Feb 8 20:29:29 2016 +0530
--CRM-16617, moved function to DAO
commit 8d3275a5b73e332f7c75d0702f006858fe48bd8d
Merge: 3ec7590 ba02a0a
Author: Monish Deb <monish.deb@webaccessglobal.com>
Date: Fri Feb 12 18:34:08 2016 +0530
Merge pull request #7793 from seamuslee001/CRM-18021-46
CRM-18021 Add in report viewing option for ab tests
commit 3ec75900ca125749e1f94a151f3ec253e99f18c2
Merge: 88e5391 1aa8728
Author: Monish Deb <monish.deb@webaccessglobal.com>
Date: Fri Feb 12 18:30:52 2016 +0530
Merge pull request #7795 from PalanteJon/CRM-17029
Crm-17029 4.6 - fix Add to Group profile setting doesn't work in petitions
commit 27cf842f29e6598e39a2e506bd33218b96fbcda1
Author: sunil <esunil.pawar@gmail.com>
Date: Fri Feb 12 15:54:27 2016 +0530
fixed issue with Recaptcha and wkhtmltopdfPath overwrite
commit 88e53911b83f4997581bf0a896ac1acf8fe565da
Merge: 3051c90 347ca10
Author: Monish Deb <monish.deb@webaccessglobal.com>
Date: Fri Feb 12 12:27:50 2016 +0530
Merge pull request #7621 from agileware/4.6-crm-17848
CRM-17848: Round tax amount when calculated for contribution pages.
commit 326d41d94282a07fb2bffcb9babe05930a0ec325
Author: sunil <esunil.pawar@gmail.com>
Date: Fri Feb 12 12:27:07 2016 +0530
fixed issue recaptcha overwrite
commit 1861f4ae52f5290005be5ad484a6e56f0658d6d8
Author: Nicolas Ganivet <nicolas@cividesk.com>
Date: Thu Feb 11 22:55:11 2016 -0700
Contact/relationship: added contact ids, reviewed terminology
commit 66eb277c248ccddea3248f40e908e261435db8c7
Author: Nicolas Ganivet <nicolas@cividesk.com>
Date: Thu Feb 11 20:10:27 2016 -0700
Contact/relationship report: final layout
commit 097872d0c6ef8045164f1edef8c82f855496e012
Author: Nicolas Ganivet <nicolas@cividesk.com>
Date: Thu Feb 11 19:24:21 2016 -0700
Contact/relationship report: reorder and change grouping
commit 1aa87286bcc2879406be4b6b9c5a1877def84a7d
Author: Jon goldberg <jon@palantetech.coop>
Date: Thu Feb 11 18:17:59 2016 -0500
CRM-17029 - fix notices
commit 17f6fdd0580b052dd212f64d3815e5af9037a11a
Author: Jon goldberg <jon@palantetech.coop>
Date: Thu Feb 11 17:49:50 2016 -0500
CRM-17029 - Add to Group profile setting wasn't working on petitions
commit ba02a0abff869be4fe6e9c0fa37f412b48c3d523
Author: Seamus Lee <seamuslee001@gmail.com>
Date: Thu Feb 11 10:15:58 2016 +0000
CRM-18021 Add in report viewing option for ab tests
commit 330b9d3262cdc36da7ddf656e6aafad9e3265d89
Author: sunil <esunil.pawar@gmail.com>
Date: Thu Feb 11 22:04:00 2016 +0530
worked on mailer setting overwrite
commit 3051c902ad169e55c677dacc8d5a887496e15043
Merge: 4659d9a c57460c
Author: colemanw <coleman@civicrm.org>
Date: Thu Feb 11 10:10:02 2016 -0500
Merge pull request #7790 from JKingsnorth/CRM-18019-4.6
CRM-18019: Fix display of checkbox values on event confirmation page
commit eccd943a006d83fb53df1526707f9e41bd66abb1
Author: sunil <esunil.pawar@gmail.com>
Date: Thu Feb 11 17:48:58 2016 +0530
fixed issue with mailer setting overwrite
commit c57460c04b6c7632e41294e8138f2776e9fe2175
Author: JKingsnorth <john@johnkingsnorth.co.uk>
Date: Thu Feb 11 12:03:05 201…
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.