projects
/
civicrm-core.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
CRM-19035 fix UI to be consistent in dstID & srcID handling.
[civicrm-core.git]
/
CRM
/
Dedupe
/
Merger.php
2016-07-12
eileen
CRM-19035 fix UI to be consistent in dstID & srcID...
blob
|
commitdiff
|
raw
2016-07-12
eileen
CRM-19035 clean up references to srcID & dstID
blob
|
commitdiff
|
raw
|
diff to current
2016-07-12
Eileen McNaughton
Merge pull request #8615 from bsilvern/crm-18805
blob
|
commitdiff
|
raw
|
diff to current
2016-07-11
Joe Murray
Merge pull request #8547 from xurizaemon/patch-2
blob
|
commitdiff
|
raw
|
diff to current
2016-07-10
Eileen McNaughton
Merge pull request #8634 from konadave/CRM-19007-master
blob
|
commitdiff
|
raw
|
diff to current
2016-07-01
Yashodha Chaku
Merge pull request #8617 from cividesk/CRM-18997-4.7
blob
|
commitdiff
|
raw
|
diff to current
2016-06-29
Yashodha Chaku
Merge pull request #8638 from eileenmcnaughton/notices
blob
|
commitdiff
|
raw
|
diff to current
2016-06-29
Eileen McNaughton
Merge pull request #8602 from eileenmcnaughton/master
blob
|
commitdiff
|
raw
|
diff to current
2016-06-28
Eileen McNaughton
Merge pull request #8427 from eileenmcnaughton/event_cart
blob
|
commitdiff
|
raw
|
diff to current
2016-06-26
Yashodha Chaku
Merge pull request #8529 from eileenmcnaughton/reports
blob
|
commitdiff
|
raw
|
diff to current
2016-06-26
Yashodha Chaku
Merge pull request #8456 from eileenmcnaughton/merge_perms
blob
|
commitdiff
|
raw
|
diff to current
2016-06-25
eileen
CRM-17597 test to attempt to replicate bug (could not...
blob
|
commitdiff
|
raw
|
diff to current
2016-06-25
eileen
CRM-18674 fix date merging for view_only custom fields
blob
|
commitdiff
|
raw
|
diff to current
2016-06-25
eileen
CRM-18685 Batch merge - custom data not treated as...
blob
|
commitdiff
|
raw
|
diff to current
2016-06-25
eileen
Cleanup a couple of unused vars
blob
|
commitdiff
|
raw
|
diff to current
2016-06-25
eileen
CRM-18681 respect api permissions flag on batch merge job
blob
|
commitdiff
|
raw
|
diff to current
2016-06-23
Eileen McNaughton
Merge pull request #8376 from mollux/CRM-18563_apifailu...
blob
|
commitdiff
|
raw
|
diff to current
2016-06-23
Eileen McNaughton
Merge pull request #8177 from herbdool/backdrop-install
blob
|
commitdiff
|
raw
|
diff to current
2016-06-22
Tim Otten
Merge pull request #8616 from totten/coldrunKacper...
blob
|
commitdiff
|
raw
|
diff to current
2016-06-21
Eileen McNaughton
Merge pull request #7047 from johanv/CRM-17430-dont_cha...
blob
|
commitdiff
|
raw
|
diff to current
2016-06-21
Eileen McNaughton
Merge pull request #8380 from mollux/CRM-18563_or_permi...
blob
|
commitdiff
|
raw
|
diff to current
2016-06-20
Monish Deb
Merge pull request #8471 from johanv/CRM-18697-export_b...
blob
|
commitdiff
|
raw
|
diff to current
2016-06-17
Eileen McNaughton
Merge pull request #8100 from cividesk/CRM-18362-4.7
blob
|
commitdiff
|
raw
|
diff to current
2016-06-17
Yashodha Chaku
Merge pull request #8551 from scardinius/crm-18815
blob
|
commitdiff
|
raw
|
diff to current
2016-06-13
Yashodha Chaku
Merge pull request #8346 from sqweets/auto-renew-filter...
blob
|
commitdiff
|
raw
|
diff to current
2016-06-08
Eileen McNaughton
Merge pull request #8420 from ineffyble/fix-membership...
blob
|
commitdiff
|
raw
|
diff to current
2016-06-08
Eileen McNaughton
Merge pull request #8470 from ankitjain28may/master
blob
|
commitdiff
|
raw
|
diff to current
2016-06-08
Eileen McNaughton
Merge pull request #8368 from mlutfy/master-crm18555
blob
|
commitdiff
|
raw
|
diff to current
2016-06-08
colemanw
Merge pull request #8347 from eileenmcnaughton/tidy-up
blob
|
commitdiff
|
raw
|
diff to current
2016-06-08
Eileen McNaughton
Merge pull request #8531 from PalanteJon/CRM-16888
blob
|
commitdiff
|
raw
|
diff to current
2016-06-07
colemanw
Merge pull request #8422 from colemanw/CRM-18586
blob
|
commitdiff
|
raw
|
diff to current
2016-06-07
colemanw
Merge pull request #8450 from jitendrapurohit/CRM-18586...
blob
|
commitdiff
|
raw
|
diff to current
2016-06-06
Yashodha Chaku
Merge pull request #8426 from Anjali2906/crm_18560_vali...
blob
|
commitdiff
|
raw
|
diff to current
2016-06-06
Eileen McNaughton
Merge pull request #8342 from rohankatkar/CRM18472NoticeFix
blob
|
commitdiff
|
raw
|
diff to current
2016-06-05
colemanw
Merge pull request #8475 from johanv/CRM-18696-addresse...
blob
|
commitdiff
|
raw
|
diff to current
2016-06-05
Eileen McNaughton
Merge pull request #8318 from AdamHillier/CRM-17657
blob
|
commitdiff
|
raw
|
diff to current
2016-06-05
Eileen McNaughton
Merge pull request #8408 from AdamHillier/bug-fix
blob
|
commitdiff
|
raw
|
diff to current
2016-06-05
Eileen McNaughton
Merge pull request #8435 from totten/master-regen-cms
blob
|
commitdiff
|
raw
|
diff to current
2016-06-05
Eileen McNaughton
Merge pull request #8421 from ineffyble/correctly-updat...
blob
|
commitdiff
|
raw
|
diff to current
2016-06-05
Eileen McNaughton
Merge pull request #8142 from monishdeb/CRM-17779
blob
|
commitdiff
|
raw
|
diff to current
2016-06-05
Mathieu Lutfy
Merge pull request #7797 from JKingsnorth/CRM-17977
blob
|
commitdiff
|
raw
|
diff to current
2016-06-05
colemanw
Merge pull request #8460 from colemanw/CRM-18660
blob
|
commitdiff
|
raw
|
diff to current
2016-06-05
Eileen McNaughton
Merge pull request #8233 from PalanteJon/CRM-18468
blob
|
commitdiff
|
raw
|
diff to current
2016-06-05
Eileen McNaughton
Merge pull request #7728 from andrew-cormick-dockery...
blob
|
commitdiff
|
raw
|
diff to current
2016-06-04
Eileen McNaughton
Merge pull request #8332 from TobiasLounsbury/CRM-17888...
blob
|
commitdiff
|
raw
|
diff to current
2016-06-04
Tim Otten
Merge pull request #8472 from cividesk/CRM-10230-4.7
blob
|
commitdiff
|
raw
|
diff to current
2016-06-03
Yashodha Chaku
Merge pull request #8430 from yashodha/CRM-18655
blob
|
commitdiff
|
raw
|
diff to current
2016-06-03
Yashodha Chaku
Merge pull request #8451 from yashodha/CRM-18139
blob
|
commitdiff
|
raw
|
diff to current
2016-06-03
Yashodha Chaku
Merge pull request #8477 from mpnordland/master
blob
|
commitdiff
|
raw
|
diff to current
2016-06-02
Yashodha Chaku
Merge pull request #8328 from mlutfy/master-crm18524
blob
|
commitdiff
|
raw
|
diff to current
2016-06-02
Tim Otten
Merge remote-tracking branch 'origin/4.7.8-rc' into...
blob
|
commitdiff
|
raw
|
diff to current
2016-05-26
Tim Otten
Merge pull request #8445 from eileenmcnaughton/merge_rc
blob
|
commitdiff
|
raw
|
diff to current
2016-05-25
Tim Otten
Merge pull request #8446 from totten/mollux-CRM-18510
blob
|
commitdiff
|
raw
|
diff to current
2016-05-25
eileen
CRM-18673 fix merge handling of identical addresses
blob
|
commitdiff
|
raw
|
diff to current
2016-05-21
Tim Otten
Merge pull request #8298 from colemanw/CRM-18286
blob
|
commitdiff
|
raw
|
diff to current
2016-05-21
Tim Otten
Merge pull request #7825 from torrance/editable-button...
blob
|
commitdiff
|
raw
|
diff to current
2016-05-20
Monish Deb
Merge pull request #7587 from totten/master-jobproc-2m
blob
|
commitdiff
|
raw
|
diff to current
2016-05-20
Monish Deb
Merge pull request #8416 from monishdeb/CRM-18322
blob
|
commitdiff
|
raw
|
diff to current
2016-05-20
Monish Deb
Merge pull request #8366 from kenwest/CRM-18528-b
blob
|
commitdiff
|
raw
|
diff to current
2016-05-20
Yashodha Chaku
Merge pull request #8349 from rajbdilip/CRM-18324
blob
|
commitdiff
|
raw
|
diff to current
2016-05-19
colemanw
Merge pull request #8338 from JKingsnorth/CRM-18526
blob
|
commitdiff
|
raw
|
diff to current
2016-05-19
Eileen McNaughton
Merge pull request #8251 from eileenmcnaughton/merge_tests
blob
|
commitdiff
|
raw
|
diff to current
2016-05-19
Monish Deb
Merge pull request #8284 from eileenmcnaughton/postal_code
blob
|
commitdiff
|
raw
|
diff to current
2016-05-19
Yashodha Chaku
Merge pull request #8145 from nielosz/master
blob
|
commitdiff
|
raw
|
diff to current
2016-05-19
Monish Deb
Merge pull request #8222 from eileenmcnaughton/CRM...
blob
|
commitdiff
|
raw
|
diff to current
2016-05-19
Eileen McNaughton
Merge pull request #8405 from eileenmcnaughton/custom_d...
blob
|
commitdiff
|
raw
|
diff to current
2016-05-19
Eileen McNaughton
Merge pull request #8189 from kenwest/CRM-18448
blob
|
commitdiff
|
raw
|
diff to current
2016-05-19
Eileen McNaughton
Merge pull request #8190 from kenwest/CRM-18449
blob
|
commitdiff
|
raw
|
diff to current
2016-05-19
eileen
CRM-18539: Permit criteria for batch merging (other...
blob
|
commitdiff
|
raw
|
diff to current
2016-05-19
eileen
CRM-18480 fix batch merge job to cope with new inabilit...
blob
|
commitdiff
|
raw
|
diff to current
2016-05-18
Eileen McNaughton
Merge pull request #8122 from JKingsnorth/CRM-18339
blob
|
commitdiff
|
raw
|
diff to current
2016-05-18
Eileen McNaughton
Merge pull request #8385 from eileenmcnaughton/no_dupe_...
blob
|
commitdiff
|
raw
|
diff to current
2016-05-18
Eileen McNaughton
Merge pull request #8286 from eileenmcnaughton/report_ui
blob
|
commitdiff
|
raw
|
diff to current
2016-05-18
Monish Deb
Merge pull request #8157 from eileenmcnaughton/CRM...
blob
|
commitdiff
|
raw
|
diff to current
2016-05-18
Eileen McNaughton
Merge pull request #8170 from eileenmcnaughton/activity
blob
|
commitdiff
|
raw
|
diff to current
2016-05-17
Monish Deb
Merge pull request #8140 from jitendrapurohit/CRM-18384
blob
|
commitdiff
|
raw
|
diff to current
2016-05-17
eileen
CRM-18546 Duplicate email addresses created when mergin...
blob
|
commitdiff
|
raw
|
diff to current
2016-05-17
Eileen McNaughton
Merge pull request #8365 from saurabhbatra96/CRM-18537
blob
|
commitdiff
|
raw
|
diff to current
2016-05-17
Eileen McNaughton
Merge pull request #8360 from eileenmcnaughton/prev_next
blob
|
commitdiff
|
raw
|
diff to current
2016-05-17
Eileen McNaughton
Update comments
blob
|
commitdiff
|
raw
|
diff to current
2016-05-17
Eileen McNaughton
Merge pull request #8299 from totten/master-reltype
blob
|
commitdiff
|
raw
|
diff to current
2016-05-16
eileen
CRM-18517 get conflicts dependent on mode
blob
|
commitdiff
|
raw
|
diff to current
2016-05-16
eileen
CRM-18517 remove code loop on batch merge process
blob
|
commitdiff
|
raw
|
diff to current
2016-05-16
eileen
CRM-18497 add first very basic test to job.merge
blob
|
commitdiff
|
raw
|
diff to current
2016-05-16
eileen
CRM-18443 add unit test & refactor code into smaller...
blob
|
commitdiff
|
raw
|
diff to current
2016-05-16
Monish Deb
Merge pull request #8372 from monishdeb/CRM-18519
blob
|
commitdiff
|
raw
|
diff to current
2016-05-16
Monish Deb
Merge pull request #8358 from monishdeb/CRM-18426
blob
|
commitdiff
|
raw
|
diff to current
2016-05-14
colemanw
Merge pull request #8302 from colemanw/CRM-18306
blob
|
commitdiff
|
raw
|
diff to current
2016-05-14
colemanw
Merge pull request #5903 from scardinius/master
blob
|
commitdiff
|
raw
|
diff to current
2016-05-14
colemanw
Merge pull request #7991 from fuzionnz/CRM-16898
blob
|
commitdiff
|
raw
|
diff to current
2016-05-14
colemanw
Merge pull request #8173 from eileenmcnaughton/master
blob
|
commitdiff
|
raw
|
diff to current
2016-05-14
colemanw
Merge pull request #8329 from mlutfy/master-crm17997
blob
|
commitdiff
|
raw
|
diff to current
2016-05-13
Monish Deb
Merge pull request #8362 from monishdeb/CRM-18488
blob
|
commitdiff
|
raw
|
diff to current
2016-05-13
Eileen McNaughton
Merge pull request #8249 from eileenmcnaughton/merge_code
blob
|
commitdiff
|
raw
|
diff to current
2016-05-13
Monish Deb
Merge pull request #8277 from eileenmcnaughton/pledge_r...
blob
|
commitdiff
|
raw
|
diff to current
2016-05-13
Eileen McNaughton
Merge pull request #8250 from eileenmcnaughton/tests
blob
|
commitdiff
|
raw
|
diff to current
2016-05-13
Yashodha Chaku
Merge pull request #8118 from scardinius/crm-18108
blob
|
commitdiff
|
raw
|
diff to current
2016-05-13
Eileen McNaughton
Merge pull request #8192 from JKingsnorth/CRM-18338
blob
|
commitdiff
|
raw
|
diff to current
2016-05-12
Eileen McNaughton
Merge pull request #8348 from eileenmcnaughton/no_require
blob
|
commitdiff
|
raw
|
diff to current
2016-05-12
Monish Deb
Merge pull request #8158 from eileenmcnaughton/CRM...
blob
|
commitdiff
|
raw
|
diff to current
next