[REF] move formatting of conflict into markConflict function
[civicrm-core.git] / CRM / Utils /
2019-07-01 Eileen McNaughtonMerge pull request #14688 from eileenmcnaughton/revert
2019-07-01 colemanwMerge pull request #14671 from eileenmcnaughton/cust_field
2019-07-01 Eileen McNaughtonMerge pull request #14687 from eileenmcnaughton/matt
2019-07-01 Eileen McNaughtonMerge pull request #14244 from greenpeace-cee/fix-contr...
2019-07-01 Eileen McNaughtonMerge pull request #14587 from samuelsov/lab1058
2019-07-01 Matthew Wire (MJW... Deprecate some deprecated address functions: defaultCur...
2019-07-01 Eileen McNaughtonMerge pull request #14654 from JMAConsulting/dev-1079
2019-06-30 Eileen McNaughtonMerge pull request #14679 from colemanw/Improve
2019-06-29 Eileen McNaughtonMerge pull request #14677 from civicrm/5.15
2019-06-29 Eileen McNaughtonMerge pull request #14656 from eileenmcnaughton/ad_hoc_...
2019-06-28 Seamus LeeMerge pull request #14477 from eileenmcnaughton/part_de...
2019-06-28 Eileen McNaughtonMerge pull request #14669 from civicrm/5.15
2019-06-28 eileenStore header to statics in unit tests
2019-06-28 Seamus LeeMerge pull request #14256 from greenpeace-cee/innodb...
2019-06-28 Eileen McNaughtonMerge pull request #14664 from civicrm/5.15
2019-06-28 colemanwMerge pull request #14622 from eileenmcnaughton/recordp...
2019-06-26 Eileen McNaughtonMerge pull request #14642 from civicrm/5.15
2019-06-26 Eileen McNaughtonMerge pull request #14601 from seamuslee001/dev_core_1067
2019-06-25 Seamus LeeMerge pull request #14499 from mattwire/extract_getdefa...
2019-06-25 Seamus LeeMerge pull request #14597 from colemanw/Reset
2019-06-25 Eileen McNaughtonMerge pull request #14638 from civicrm/5.15
2019-06-25 Seamus LeeMerge pull request #14624 from eileenmcnaughton/force_d...
2019-06-25 Eileen McNaughtonMerge pull request #14632 from colemanw/datePicker
2019-06-25 Eileen McNaughtonMerge pull request #14630 from mlutfy/activityStatus
2019-06-25 Seamus LeeMerge pull request #14607 from seamuslee001/clear_memor...
2019-06-24 Seamus LeeMerge pull request #14627 from eileenmcnaughton/cont_date
2019-06-24 Eileen McNaughtonMerge pull request #14588 from colemanw/js
2019-06-24 Coleman WattsImprove utilities & tests for working with js notation
2019-06-24 colemanwMerge pull request #14602 from mattwire/event_selectedchild
2019-06-23 Eileen McNaughtonMerge pull request #14605 from eileenmcnaughton/cust_de...
2019-06-23 Seamus LeeMerge pull request #14619 from mattwire/pseudoconstant_...
2019-06-23 Eileen McNaughtonMerge pull request #14606 from eileenmcnaughton/format
2019-06-23 Seamus LeeMerge pull request #14594 from eileenmcnaughton/url_support
2019-06-22 Eileen McNaughtonMerge pull request #14580 from seamuslee001/convert_pre...
2019-06-22 Seamus LeeEnsure that contact groups caches are cleared if memory...
2019-06-22 Eileen McNaughtonMerge pull request #14584 from seamuslee001/contact_gro...
2019-06-21 Seamus LeeEnsure that if we are ever clearing keys from civicrm_c...
2019-06-21 Eileen McNaughtonMerge pull request #14592 from civicrm/5.15
2019-06-21 colemanwMerge pull request #14460 from eileenmcnaughton/ajax_test
2019-06-21 colemanwMerge pull request #14480 from JMAConsulting/core-553
2019-06-20 Mathieu LuMerge pull request #14578 from colemanw/i18n
2019-06-20 Seamus LeeMerge pull request #14519 from colemanw/submitOnce
2019-06-19 Yashodha ChakuMerge pull request #14585 from seamuslee001/primary_meb...
2019-06-19 Eileen McNaughtonMerge pull request #14586 from colemanw/Utils_JS
2019-06-19 Coleman WattsUtils_JS - add fn to get props of js object without...
2019-06-18 Seamus LeeMerge pull request #14579 from civicrm/5.15
2019-06-18 Seamus LeeMerge pull request #14562 from agileware/CIVICRM-1244
2019-06-17 Seamus LeeMerge pull request #14569 from pradpnayak/HardCodes
2019-06-17 Eileen McNaughtonMerge pull request #14543 from eileenmcnaughton/wtf_null
2019-06-17 Eileen McNaughtonMerge pull request #14566 from civicrm/5.15
2019-06-17 Eileen McNaughtonMerge pull request #14564 from seamuslee001/less_null_array
2019-06-17 Seamus LeeRemove more uses of CRM_Core_DAO:: that are unncessary
2019-06-16 Eileen McNaughtonMerge pull request #14557 from civicrm/5.15
2019-06-16 Eileen McNaughtonMerge pull request #14545 from demeritcowboy/temp-remov...
2019-06-15 Matthew WireMerge pull request #14443 from eileenmcnaughton/export
2019-06-15 Eileen McNaughtonMerge pull request #14549 from seamuslee001/master
2019-06-15 Seamus LeeMerge in 5.15
2019-06-15 Seamus LeeMerge pull request #14525 from seamuslee001/feature_tim...
2019-06-15 Seamus LeeMerge pull request #12929 from totten/master-theming-rb
2019-06-15 Seamus Leedev/core#1035 Add in new setting http_timeout to set...
2019-06-15 Tim OttenCRM-18792 - CRM_Core_Theme - Add helper for loading...
2019-06-14 Eileen McNaughtonMerge pull request #14547 from civicrm/5.15
2019-06-14 Seamus LeeMerge pull request #14540 from eileenmcnaughton/anettest
2019-06-14 Seamus LeeMerge pull request #14533 from eileenmcnaughton/deprecate
2019-06-14 Eileen McNaughtonMerge pull request #14537 from colemanw/jsDecode
2019-06-14 Eileen McNaughtonMerge pull request #14541 from civicrm/5.15
2019-06-14 Coleman WattsAdd CRM_Utils_JS::decode function for decoding js objects
2019-06-14 Eileen McNaughtonMerge pull request #14536 from civicrm/5.15
2019-06-14 Matthew WireMerge pull request #14512 from agh1/refactor-before...
2019-06-14 Eileen McNaughtonMerge pull request #14486 from seamuslee001/contributio...
2019-06-14 Seamus LeeMerge pull request #14528 from civicrm/5.15
2019-06-14 Seamus LeeMerge pull request #14505 from seamuslee001/legacy_psr1...
2019-06-13 Eileen McNaughtonMerge pull request #14501 from mattwire/attachment_desc...
2019-06-13 Seamus LeeMerge pull request #14513 from eileenmcnaughton/export_...
2019-06-13 Seamus LeeMerge pull request #14518 from colemanw/paymentEditFix
2019-06-13 Seamus LeeMerge pull request #14517 from eileenmcnaughton/test_fix
2019-06-13 Seamus LeeMerge pull request #14471 from eileenmcnaughton/tests
2019-06-13 Eileen McNaughtonMerge pull request #14520 from civicrm/5.15
2019-06-13 Eileen McNaughtonMerge pull request #14484 from seamuslee001/l18n_improv...
2019-06-13 colemanwMerge pull request #14154 from greenpeace-cee/fix-quick...
2019-06-13 Tim OttenMerge pull request #14516 from eileenmcnaughton/except
2019-06-13 Eileen McNaughtonMerge pull request #13966 from agileware/CIVICRM-1168
2019-06-13 colemanwMerge pull request #14250 from totten/master-select...
2019-06-13 eileenAdd PrematureExitException to support unit testing...
2019-06-13 colemanwMerge pull request #14506 from seamuslee001/lab_core_1039
2019-06-13 Eileen McNaughtonMerge pull request #14510 from totten/master-relax...
2019-06-13 Eileen McNaughtonMerge pull request #13959 from mlutfy/setMessageError
2019-06-13 Monish DebMerge pull request #14500 from mattwire/extract_recaptcha
2019-06-13 Seamus LeeMerge pull request #14492 from colemanw/sub_type
2019-06-12 Seamus LeeMerge pull request #14496 from mattwire/extract_overrid...
2019-06-12 Matthew WireMerge pull request #14444 from eileenmcnaughton/export_up
2019-06-12 Matthew WireMerge pull request #14436 from eileenmcnaughton/pay
2019-06-12 Matthew Wire (MJW... Deduplicate recaptcha handling
2019-06-12 Eileen McNaughtonMerge pull request #14498 from mattwire/extract_paypale...
2019-06-12 Eileen McNaughtonMerge pull request #14497 from mattwire/commentsandformat
2019-06-12 Monish DebMerge pull request #14474 from colemanw/placeholderUrl
2019-06-12 Eileen McNaughtonMerge pull request #14494 from colemanw/customPc
2019-06-12 Coleman WattsRemove asterisks from placeholder url
2019-06-12 colemanwMerge pull request #13916 from alifrumin/caserelstocore
2019-06-12 Matthew WireMerge pull request #14452 from eileenmcnaughton/payment...
next