CRM-18685 Batch merge - custom data not treated as a conflict - resulting in dataloss
[civicrm-core.git] / CRM / Event /
2016-06-24 colemanwMerge pull request #8562 from JMAConsulting/CRM-16189-4
2016-06-24 Tim OttenMerge branch 'loading-components-in-disabled-extension...
2016-06-23 Eileen McNaughtonMerge pull request #8555 from fuzionnz/CRM-18830
2016-06-23 Eileen McNaughtonMerge pull request #8376 from mollux/CRM-18563_apifailu...
2016-06-23 Eileen McNaughtonMerge pull request #8177 from herbdool/backdrop-install
2016-06-23 Eileen McNaughtonMerge pull request #8612 from nishant-bhorodia/CRM...
2016-06-23 colemanwMerge pull request #8564 from JMAConsulting/CRM-16189-6
2016-06-22 Tim OttenMerge pull request #8616 from totten/coldrunKacper...
2016-06-22 Eileen McNaughtonMerge pull request #8508 from eileenmcnaughton/revert_dates
2016-06-22 Eileen McNaughtonMerge pull request #8563 from JMAConsulting/CRM-16189-5
2016-06-21 Eileen McNaughtonMerge pull request #7047 from johanv/CRM-17430-dont_cha...
2016-06-21 Eileen McNaughtonMerge pull request #8380 from mollux/CRM-18563_or_permi...
2016-06-21 Eileen McNaughtonMerge pull request #8509 from josephlacey/CRM-18665
2016-06-21 Eileen McNaughtonMerge pull request #8494 from kcristiano/CRM-18221
2016-06-20 Monish DebMerge pull request #8471 from johanv/CRM-18697-export_b...
2016-06-17 Eileen McNaughtonMerge pull request #8100 from cividesk/CRM-18362-4.7
2016-06-17 Yashodha ChakuMerge pull request #8551 from scardinius/crm-18815
2016-06-13 Yashodha ChakuMerge pull request #8346 from sqweets/auto-renew-filter...
2016-06-13 Monish DebMerge pull request #8543 from monishdeb/CRM-18399
2016-06-12 colemanwMerge pull request #8533 from eileenmcnaughton/membersh...
2016-06-12 deb.monishadditional fix for event and optimisation
2016-06-11 Eileen McNaughtonMerge pull request #8498 from eileenmcnaughton/ajax
2016-06-10 Eileen McNaughtonMerge pull request #8546 from JMAConsulting/CRM-18807
2016-06-10 Pradeep NayakCRM-18807, fixed fatal error when saving participant
2016-06-10 Monish DebMerge pull request #8526 from jitendrapurohit/CRM-18706
2016-06-08 Eileen McNaughtonMerge pull request #8420 from ineffyble/fix-membership...
2016-06-08 Eileen McNaughtonMerge pull request #8470 from ankitjain28may/master
2016-06-08 Eileen McNaughtonMerge pull request #8368 from mlutfy/master-crm18555
2016-06-08 Yashodha ChakuMerge pull request #8524 from yashodha/CRM-18554
2016-06-08 colemanwMerge pull request #8347 from eileenmcnaughton/tidy-up
2016-06-08 Eileen McNaughtonMerge pull request #8528 from eileenmcnaughton/membersh...
2016-06-08 Eileen McNaughtonMerge pull request #8531 from PalanteJon/CRM-16888
2016-06-07 eileenCRM-18701 first round refactor towards removing amount_...
2016-06-07 eileenCRM-18701 minor, tangental tidy up
2016-06-07 colemanwMerge pull request #8422 from colemanw/CRM-18586
2016-06-07 colemanwMerge pull request #8450 from jitendrapurohit/CRM-18586...
2016-06-06 Yashodha ChakuMerge pull request #8426 from Anjali2906/crm_18560_vali...
2016-06-06 Joseph LaceyCRM-18665 Fixing bug where event subtype doesn't reload...
2016-06-06 Eileen McNaughtonMerge pull request #8342 from rohankatkar/CRM18472NoticeFix
2016-06-05 colemanwMerge pull request #8475 from johanv/CRM-18696-addresse...
2016-06-05 Eileen McNaughtonMerge pull request #8318 from AdamHillier/CRM-17657
2016-06-05 Eileen McNaughtonMerge pull request #8408 from AdamHillier/bug-fix
2016-06-05 Eileen McNaughtonMerge pull request #8435 from totten/master-regen-cms
2016-06-05 Eileen McNaughtonMerge pull request #8421 from ineffyble/correctly-updat...
2016-06-05 Eileen McNaughtonMerge pull request #8142 from monishdeb/CRM-17779
2016-06-05 Mathieu LutfyMerge pull request #7797 from JKingsnorth/CRM-17977
2016-06-05 colemanwMerge pull request #8460 from colemanw/CRM-18660
2016-06-05 Eileen McNaughtonMerge pull request #8233 from PalanteJon/CRM-18468
2016-06-05 Eileen McNaughtonMerge pull request #7728 from andrew-cormick-dockery...
2016-06-04 Eileen McNaughtonMerge pull request #8332 from TobiasLounsbury/CRM-17888...
2016-06-04 Tim OttenMerge pull request #8472 from cividesk/CRM-10230-4.7
2016-06-03 Yashodha ChakuMerge pull request #8482 from JKingsnorth/CRM-18739
2016-06-03 Yashodha ChakuMerge pull request #8481 from yashodha/CRM-18699
2016-06-03 Yashodha ChakuMerge pull request #8430 from yashodha/CRM-18655
2016-06-03 Yashodha ChakuMerge pull request #8451 from yashodha/CRM-18139
2016-06-02 Yashodha ChakuMerge pull request #8328 from mlutfy/master-crm18524
2016-05-25 yashodhastring fixes
2016-05-25 yashodhaCRM-18139: Notification needed when using Batch Update...
2016-05-25 yashodhaCRM-18139: Notification needed when using Batch Update...
2016-05-25 Tim OttenMerge pull request #8446 from totten/mollux-CRM-18510
2016-05-22 Tim OttenMerge pull request #7586 from nielosz/configure-recent
2016-05-21 Tim OttenMerge pull request #8298 from colemanw/CRM-18286
2016-05-21 Tim OttenMerge pull request #7825 from torrance/editable-button...
2016-05-21 Tim OttenMerge pull request #8370 from eileenmcnaughton/groups
2016-05-21 Eileen McNaughtonMerge pull request #8417 from seamuslee001/CRM-18504-47
2016-05-20 Monish DebMerge pull request #8415 from monishdeb/CRM-18159
2016-05-20 Monish DebMerge pull request #7587 from totten/master-jobproc-2m
2016-05-20 Monish DebMerge pull request #8416 from monishdeb/CRM-18322
2016-05-20 deb.monishCRM-18322: notice fix on participant search
2016-05-20 Monish DebMerge pull request #8366 from kenwest/CRM-18528-b
2016-05-20 Yashodha ChakuMerge pull request #8349 from rajbdilip/CRM-18324
2016-05-19 Tim OttenCRM-16642 - Rename `refreshCache` to `flushCache`
2016-05-19 eileenmcnaugtonCRM-16642 Switch to opportunisticCacheRefresh calls.
2016-05-19 colemanwMerge pull request #8338 from JKingsnorth/CRM-18526
2016-05-19 Monish DebMerge pull request #8284 from eileenmcnaughton/postal_code
2016-05-19 Yashodha ChakuMerge pull request #8145 from nielosz/master
2016-05-19 Monish DebMerge pull request #8222 from eileenmcnaughton/CRM...
2016-05-19 Eileen McNaughtonMerge pull request #8405 from eileenmcnaughton/custom_d...
2016-05-19 Eileen McNaughtonMerge pull request #8189 from kenwest/CRM-18448
2016-05-19 Eileen McNaughtonMerge pull request #8190 from kenwest/CRM-18449
2016-05-19 Eileen McNaughtonMerge pull request #8404 from eileenmcnaughton/recur_test
2016-05-18 Eileen McNaughtonMerge pull request #8122 from JKingsnorth/CRM-18339
2016-05-18 Eileen McNaughtonMerge pull request #8286 from eileenmcnaughton/report_ui
2016-05-18 Monish DebMerge pull request #8157 from eileenmcnaughton/CRM...
2016-05-18 Eileen McNaughtonMerge pull request #8170 from eileenmcnaughton/activity
2016-05-17 Monish DebMerge pull request #8140 from jitendrapurohit/CRM-18384
2016-05-17 JKingsnorthNFC Move comments
2016-05-17 JKingsnorthCRM-18397: Remove unnecessary check and add comments...
2016-05-14 colemanwMerge pull request #8302 from colemanw/CRM-18306
2016-05-14 colemanwMerge pull request #5903 from scardinius/master
2016-05-14 colemanwMerge pull request #7991 from fuzionnz/CRM-16898
2016-05-14 colemanwMerge pull request #8173 from eileenmcnaughton/master
2016-05-13 Eileen McNaughtonMerge pull request #8249 from eileenmcnaughton/merge_code
2016-05-13 Monish DebMerge pull request #8277 from eileenmcnaughton/pledge_r...
2016-05-13 Eileen McNaughtonMerge pull request #8250 from eileenmcnaughton/tests
2016-05-13 Yashodha ChakuMerge pull request #8118 from scardinius/crm-18108
2016-05-13 Eileen McNaughtonMerge pull request #8192 from JKingsnorth/CRM-18338
2016-05-12 Eileen McNaughtonMerge pull request #8348 from eileenmcnaughton/no_require
2016-05-12 Monish DebMerge pull request #8158 from eileenmcnaughton/CRM...
2016-05-12 yashodhaMerge branch 'CRM-15202' of https://github.com/jmcclell...
next