vcs.fsf.org Git - civicrm-core.git/history - CRM/Core/Config/MagicMerge.php

[civicrm-core.git] / CRM / Core / Config / MagicMerge.php

2018-03-20	Eileen McNaughton	Merge pull request #11199 from twomice/CRM-21348_joomla...	blob \| commitdiff \| raw
2018-03-20	colemanw	Merge pull request #10783 from totten/master-angldr	blob \| commitdiff \| raw
2018-03-19	Eileen McNaughton	Merge pull request #10602 from agileware/CIVICRM-167	blob \| commitdiff \| raw
2018-03-19	Eileen McNaughton	Merge pull request #10403 from yashodha/CRM-20624	blob \| commitdiff \| raw
2018-03-19	Eileen McNaughton	Merge pull request #11727 from jitendrapurohit/CRM...	blob \| commitdiff \| raw
2018-03-15	Eileen McNaughton	Merge pull request #11813 from seanmadsen/add-survey...	blob \| commitdiff \| raw
2018-03-12	Eileen McNaughton	Merge pull request #11680 from jitendrapurohit/setting	blob \| commitdiff \| raw
2018-03-09	Tim Otten	Merge pull request #11791 from civicrm/4.7.31-rc	blob \| commitdiff \| raw
2018-03-06	Seamus Lee	Merge pull request #11773 from civicrm/4.7.31-rc	blob \| commitdiff \| raw
2018-03-06	Monish Deb	Merge pull request #11757 from eileenmcnaughton/manual	blob \| commitdiff \| raw
2018-03-06	Mathieu Lu	Merge pull request #11453 from colemanw/php55	blob \| commitdiff \| raw
2018-03-05	Eileen McNaughton	Merge pull request #11745 from agh1/0000-00-00	blob \| commitdiff \| raw
2018-03-05	Eileen McNaughton	Merge pull request #11691 from JKingsnorth/CRM-21773	blob \| commitdiff \| raw
2018-03-02	colemanw	Merge pull request #11630 from maitrepylos/master	blob \| commitdiff \| raw
2018-03-01	colemanw	Merge pull request #11735 from mukeshcompucorp/CRM...	blob \| commitdiff \| raw
2018-02-28	colemanw	Merge pull request #11742 from seanmadsen/NFC-CRM_PCP_F...	blob \| commitdiff \| raw
2018-02-27	Seamus Lee	Merge pull request #11702 from jmcclelland/pdf-receipt...	blob \| commitdiff \| raw
2018-02-27	Seamus Lee	Merge pull request #11712 from jitendrapurohit/CRM...	blob \| commitdiff \| raw
2018-02-27	Eileen McNaughton	Merge pull request #11728 from JMAConsulting/CRM-21809	blob \| commitdiff \| raw
2018-02-27	Monish Deb	Merge pull request #11642 from JKingsnorth/CRM-21739	blob \| commitdiff \| raw
2018-02-26	Eileen McNaughton	Merge pull request #11723 from mukeshcompucorp/CRM...	blob \| commitdiff \| raw
2018-02-26	colemanw	Merge pull request #11571 from magnolia61/CRM-21693_Sho...	blob \| commitdiff \| raw
2018-02-24	colemanw	Merge pull request #11688 from eileenmcnaughton/custom	blob \| commitdiff \| raw
2018-02-24	Seamus Lee	Merge pull request #11713 from yashodha/update-year	blob \| commitdiff \| raw
2018-02-23	yashodha	fix header	blob \| commitdiff \| raw
2018-02-23	colemanw	Merge pull request #11154 from agileware/CRM-20421	blob \| commitdiff \| raw \| diff to current
2018-02-18	colemanw	Merge pull request #11411 from mattwire/CRM-21558_case_...	blob \| commitdiff \| raw \| diff to current
2018-02-17	colemanw	Merge pull request #11608 from eileenmcnaughton/mailing...	blob \| commitdiff \| raw \| diff to current
2018-02-16	Monish Deb	Merge pull request #11252 from mattwire/CRM-21405_outbo...	blob \| commitdiff \| raw \| diff to current
2018-02-15	colemanw	Merge pull request #11585 from mukeshcompucorp/fix...	blob \| commitdiff \| raw \| diff to current
2018-02-14	Eileen McNaughton	Merge pull request #11622 from omarabuhussein/CRM-21733...	blob \| commitdiff \| raw \| diff to current
2018-02-14	colemanw	Merge pull request #11498 from magnolia61/CRM-21639_NOI...	blob \| commitdiff \| raw \| diff to current
2018-02-12	Eileen McNaughton	Merge pull request #11597 from seamuslee001/CRM-20996	blob \| commitdiff \| raw \| diff to current
2018-02-12	Eileen McNaughton	Merge pull request #11644 from omarabuhussein/CRM-21743...	blob \| commitdiff \| raw \| diff to current
2018-02-11	Eileen McNaughton	Merge pull request #11539 from eileenmcnaughton/payment	blob \| commitdiff \| raw \| diff to current
2018-02-08	Monish Deb	Merge pull request #11638 from ixiam/CRM-21343	blob \| commitdiff \| raw \| diff to current
2018-02-08	Monish Deb	Merge pull request #11461 from mattwire/tax_calcs_on_ed...	blob \| commitdiff \| raw \| diff to current
2018-02-08	Eileen McNaughton	Merge pull request #11636 from eileenmcnaughton/view_only	blob \| commitdiff \| raw \| diff to current
2018-02-07	Eileen McNaughton	Merge pull request #11631 from mattwire/CRM-20625_paypr...	blob \| commitdiff \| raw \| diff to current
2018-02-07	colemanw	Merge pull request #11621 from eileenmcnaughton/trait	blob \| commitdiff \| raw \| diff to current
2018-02-07	Eileen McNaughton	Merge pull request #11651 from civicrm/4.7.30-rc	blob \| commitdiff \| raw \| diff to current
2018-02-07	Eileen McNaughton	Merge pull request #11640 from tttp/fix-contrib-search	blob \| commitdiff \| raw \| diff to current
2018-02-07	colemanw	Merge pull request #11639 from aydun/CRM-21741-crmEdita...	blob \| commitdiff \| raw \| diff to current
2018-02-07	Monish Deb	Merge pull request #11540 from eileenmcnaughton/yahoo	blob \| commitdiff \| raw \| diff to current
2018-02-02	Frank J. Gómez	CRM-19784: Deprecated $config->geocoderMethod.	blob \| commitdiff \| raw \| diff to current
2018-02-01	Eileen McNaughton	Merge pull request #9746 from vedantrathore/master	blob \| commitdiff \| raw \| diff to current
2017-12-02	colemanw	Merge pull request #9648 from MegaphoneJon/CRM-19608	blob \| commitdiff \| raw \| diff to current
2017-11-29	colemanw	Merge pull request #10466 from kryptothesuperdog/master	blob \| commitdiff \| raw \| diff to current
2017-11-15	Mathieu Lu	Merge pull request #9739 from nditech/CRM-19915	blob \| commitdiff \| raw \| diff to current
2017-11-03	Eileen McNaughton	Merge pull request #10501 from jitendrapurohit/CRM...	blob \| commitdiff \| raw \| diff to current
2017-10-17	Yashodha Chaku	Merge pull request #11134 from deepak-srivastava/CRM...	blob \| commitdiff \| raw \| diff to current
2017-10-13	colemanw	Merge pull request #10486 from mickadoo/CRM-20710_get...	blob \| commitdiff \| raw \| diff to current
2017-10-04	Yashodha Chaku	Merge pull request #10412 from jitendrapurohit/notice-fix	blob \| commitdiff \| raw \| diff to current
2017-09-28	Eli Lisseck	Merge branch 'CRM-20460' into CRM-20460-4.7	blob \| commitdiff \| raw \| diff to current
2017-09-27	colemanw	Merge pull request #9925 from jmcclelland/CRM-20217	blob \| commitdiff \| raw \| diff to current
2017-09-26	Eileen McNaughton	Merge pull request #10435 from GinkgoFJG/CRM-20653	blob \| commitdiff \| raw \| diff to current
2017-09-12	Monish Deb	Merge pull request #10439 from jitendrapurohit/CRM...	blob \| commitdiff \| raw \| diff to current
2017-09-05	Eileen McNaughton	Merge pull request #9783 from mattwire/back_to_single_lang	blob \| commitdiff \| raw \| diff to current
2017-08-29	Eileen McNaughton	Merge pull request #9973 from lcdservices/CRM-19469	blob \| commitdiff \| raw \| diff to current
2017-08-23	Eileen McNaughton	Merge pull request #10405 from agh1/crm-19612	blob \| commitdiff \| raw \| diff to current
2017-08-16	Eileen McNaughton	Merge pull request #9410 from jmcclelland/CRM-19664	blob \| commitdiff \| raw \| diff to current
2017-08-09	colemanw	Merge pull request #10394 from JMAConsulting/DonotExport	blob \| commitdiff \| raw \| diff to current
2017-08-09	Eileen McNaughton	Merge pull request #10427 from mattwire/report_bounce_type	blob \| commitdiff \| raw \| diff to current
2017-07-31	Eileen McNaughton	Merge pull request #10340 from Stoob/master	blob \| commitdiff \| raw \| diff to current
2017-07-29	colemanw	Merge pull request #10383 from MegaphoneJon/unsupervise...	blob \| commitdiff \| raw \| diff to current
2017-07-17	Monish Deb	Merge pull request #10537 from PalanteJon/20754	blob \| commitdiff \| raw \| diff to current
2017-07-11	Monish Deb	Merge pull request #10431 from JMAConsulting/NoticeFixes-1	blob \| commitdiff \| raw \| diff to current
2017-07-11	Monish Deb	Merge pull request #10450 from JMAConsulting/CRM-20667	blob \| commitdiff \| raw \| diff to current
2017-06-26	colemanw	Merge pull request #9886 from JMAConsulting/CRM-20169	blob \| commitdiff \| raw \| diff to current
2017-06-26	colemanw	Merge pull request #10452 from JMAConsulting/CRM-20668	blob \| commitdiff \| raw \| diff to current
2017-06-26	colemanw	Merge pull request #10497 from JMAConsulting/CRM-20721	blob \| commitdiff \| raw \| diff to current
2017-06-26	colemanw	Merge pull request #10507 from lcdservices/CRM-20739	blob \| commitdiff \| raw \| diff to current
2017-06-26	Eileen McNaughton	Merge pull request #10492 from seamuslee001/CRM-20716	blob \| commitdiff \| raw \| diff to current
2017-06-23	colemanw	Merge pull request #10498 from JMAConsulting/CRM-20722	blob \| commitdiff \| raw \| diff to current
2017-06-23	colemanw	Merge pull request #10407 from JMAConsulting/CRM-19653	blob \| commitdiff \| raw \| diff to current
2017-06-21	Eileen McNaughton	Merge pull request #10306 from aydun/CRM-20525	blob \| commitdiff \| raw \| diff to current
2017-06-21	Yashodha Chaku	Merge pull request #10515 from yashodha/CRM-20741	blob \| commitdiff \| raw \| diff to current
2017-06-21	Eileen McNaughton	Merge pull request #10455 from JO0st/CRM-20670	blob \| commitdiff \| raw \| diff to current
2017-06-20	Eileen McNaughton	Merge pull request #10487 from mfb/CRM-20713	blob \| commitdiff \| raw \| diff to current
2017-06-20	Mathieu Lu	Merge pull request #10449 from jmcclelland/CRM-20666	blob \| commitdiff \| raw \| diff to current
2017-06-20	Mathieu Lu	Merge pull request #10432 from francescbassas/patch-11	blob \| commitdiff \| raw \| diff to current
2017-06-19	Eileen McNaughton	Merge pull request #10424 from twomice/CRM-20401_subscr...	blob \| commitdiff \| raw \| diff to current
2017-06-19	Monish Deb	Merge pull request #10447 from JMAConsulting/CRM-19478	blob \| commitdiff \| raw \| diff to current
2017-06-19	Monish Deb	Merge pull request #10521 from JMAConsulting/CRM-20495	blob \| commitdiff \| raw \| diff to current
2017-06-19	Monish Deb	Merge pull request #10457 from jitendrapurohit/CRM...	blob \| commitdiff \| raw \| diff to current
2017-06-19	Monish Deb	Merge pull request #10467 from JMAConsulting/CRM-20682	blob \| commitdiff \| raw \| diff to current
2017-06-17	Monish Deb	Merge pull request #10441 from JMAConsulting/CRM-20621	blob \| commitdiff \| raw \| diff to current
2017-06-17	Tim Otten	Merge pull request #10085 from totten/master-assets	blob \| commitdiff \| raw \| diff to current
2017-06-17	Mathieu Lu	Merge pull request #9790 from fliespl/patch-3	blob \| commitdiff \| raw \| diff to current
2017-06-16	Tim Otten	Merge pull request #10384 from seamuslee001/CRM-20561	blob \| commitdiff \| raw \| diff to current
2017-06-16	colemanw	Merge pull request #10390 from JMAConsulting/CRM-20611	blob \| commitdiff \| raw \| diff to current
2017-06-16	colemanw	Merge pull request #10397 from JMAConsulting/CRM-20620	blob \| commitdiff \| raw \| diff to current
2017-06-16	colemanw	Merge pull request #10443 from twomice/CRM-20660_total_...	blob \| commitdiff \| raw \| diff to current
2017-06-15	Eileen McNaughton	Merge pull request #10456 from elisseck/CRM-20672	blob \| commitdiff \| raw \| diff to current
2017-06-14	colemanw	Merge pull request #10465 from kryptothesuperdog/CRM...	blob \| commitdiff \| raw \| diff to current
2017-06-14	colemanw	Merge pull request #10333 from francescbassas/patch-10	blob \| commitdiff \| raw \| diff to current
2017-06-12	Eileen McNaughton	Merge pull request #10433 from JMAConsulting/CRM-20651	blob \| commitdiff \| raw \| diff to current
2017-06-12	Eileen McNaughton	Merge pull request #10453 from PalanteJon/CRM-19610...	blob \| commitdiff \| raw \| diff to current
2017-06-11	Tim Otten	Merge pull request #9779 from WeMoveEU/CRM-19963	blob \| commitdiff \| raw \| diff to current
2017-06-11	Tim Otten	Merge pull request #10227 from WeMoveEU/CRM-20309	blob \| commitdiff \| raw \| diff to current
next

RSS Atom