fixed merge conflicts
[civicrm-core.git] / tests / phpunit / WebTest / Export / ContactTest.php
2015-09-01 Kurund Jalmifixed merge conflicts
2015-09-01 Dave GreenbergMerge pull request #6645 from lcdservices/CRM-17122
2015-08-31 Kurund JalmiMerge remote-tracking branch 'upstream/4.6' into 4...
2015-08-28 colemanwMerge pull request #6519 from joannechester/CRM-17033
2015-08-27 Dave GreenbergMerge pull request #6432 from deepak-srivastava/dedupe...
2015-08-26 Monish DebMerge pull request #6500 from LevityNL/master
2015-08-26 Dave GreenbergMerge pull request #6444 from PalanteJon/CRM-16981
2015-08-26 Eileen McNaughtonMerge pull request #6539 from joannechester/CRM-16185...
2015-08-24 Kurund JalmiMerge remote-tracking branch 'upstream/4.6' into 4...
2015-08-20 Eileen McNaughtonMerge pull request #6522 from eileenmcnaughton/CRM...
2015-08-19 Eileen McNaughtonMerge pull request #6523 from eileenmcnaughton/CRM...
2015-08-18 Tim OttenMerge branch 'getting_started' of https://github.com...
2015-08-18 Tim OttenMerge pull request #6496 from totten/master-regen-leak
2015-08-17 Tim OttenMerge pull request #6493 from eileenmcnaughton/CRM...
2015-08-17 Tim OttenMerge pull request #6499 from mlutfy/47-crm17025
2015-08-16 Kurund JalmiMerge pull request #6517 from kurund/version-fixes
2015-08-16 Kurund Jalmiversion fixes
2015-08-16 Kurund JalmiMerge remote-tracking branch 'upstream/4.6' into 4...
2015-08-16 joannechesterfirst go at action menu changes
2015-08-14 Tim OttenMerge pull request #6293 from JoeMurray/patch-1
2015-08-12 Tim OttenMerge pull request #6457 from GinkgoFJG/angular_snippets
2015-08-12 Kurund JalmiMerge remote-tracking branch 'upstream/4.6' into 4...
2015-08-11 Coleman WattsMerge branch '4.6' into master
2015-08-11 Coleman WattsMerge branch '4.6' into master
2015-08-10 Coleman WattsMerge https://github.com/civicrm/civicrm-core/pull...
2015-08-10 Kurund JalmiMerge remote-tracking branch 'upstream/4.6' into 4...
2015-08-10 Monish DebMerge pull request #6037 from colemanw/CRM-16512
2015-08-10 Eileen McNaughtonMerge pull request #6450 from civicrm/4.6
2015-08-06 Kurund JalmiMerge remote-tracking branch 'upstream/4.6' into 4...
2015-08-06 Eileen McNaughtonMerge pull request #6424 from seamuslee001/4.6-CRM...
2015-08-03 Tim OttenMerge remote-tracking branch 'origin/4.6' into 4.6...
2015-08-03 Kurund JalmiMerge remote-tracking branch 'upstream/4.6' into 4...
2015-07-30 Kurund JalmiMerge remote-tracking branch 'upstream/4.6' into 4...
2015-07-30 colemanwMerge pull request #6353 from eileenmcnaughton/master
2015-07-29 colemanwMerge pull request #6332 from colemanw/CRM-11856
2015-07-29 colemanwMerge pull request #6347 from colemanw/CRM-16809
2015-07-29 Monish DebMerge pull request #6340 from jitendrapurohit/CRM-16752
2015-07-29 Dave GreenbergMerge pull request #6314 from joannechester/patch-4
2015-07-29 sunilreverted changes
2015-07-29 joannechesterCRM-16876 Change country name to uppercase
2015-07-24 Kurund JalmiMerge pull request #5473 from aydun/CRM-16160
2015-07-10 Kurund JalmiMerge pull request #5680 from elinw/restauthenticationj...
2015-07-08 Eileen McNaughtonMerge pull request #6059 from johanv/CRM-16701-saved_se...
2015-07-08 colemanwMerge pull request #5654 from yourcelf/master
2015-07-08 Kurund JalmiMerge pull request #5614 from JKingsnorth/CRM-16270
2015-07-08 Kurund JalmiMerge pull request #5605 from sfe-ev/fix-upgrade-option...
2015-07-08 Kurund JalmiMerge pull request #6043 from AronNovak/rest-array
2015-07-08 Kurund JalmiMerge pull request #6045 from AronNovak/CMSUser
2015-07-03 colemanwMerge pull request #6111 from colemanw/CRM-11856
2015-07-02 Tim OttenMerge branch 'onlyjob-master'
2015-07-02 Dave GreenbergMerge pull request #6122 from marcov4lente/CRM-16789
2015-07-02 colemanwMerge pull request #6125 from colemanw/CRM-16426-2
2015-07-01 Eileen McNaughtonMerge pull request #6088 from eileenmcnaughton/CRM...
2015-06-30 Dave GreenbergMerge pull request #5839 from seamuslee001/CRM-9764-4-6
2015-06-30 Monish DebMerge pull request #6101 from eileenmcnaughton/monish
2015-06-29 Dave GreenbergMerge pull request #6091 from davecivicrm/CRM-16747
2015-06-29 kurundMerge remote-tracking branch 'upstream/4.6' into 4...
2015-06-28 Monish DebMerge pull request #6095 from jitendrapurohit/webtestfixes
2015-06-28 Monish DebMerge pull request #6096 from sudhabisht/4.6QA
2015-06-28 Monish DebMerge pull request #6094 from rohankatkar/Webtest--4.6
2015-06-28 Yashodha ChakuMerge pull request #6100 from yashodha/webtest
2015-06-28 yashodhaskipping webtests that are working locally and not...
2015-06-19 Dave GreenbergMerge pull request #5252 from JKingsnorth/CRM-10551
2015-04-13 kurundMerge remote-tracking branch 'upstream/4.5' into 4...
2015-04-11 colemanwMerge pull request #5513 from mallezie/contact-select...
2015-04-06 kurundMerge remote-tracking branch 'upstream/4.5' into 4...
2015-04-03 colemanwMerge pull request #5536 from totten/4.5-httpclient
2015-04-02 colemanwMerge pull request #5550 from civicrm/4.5
2015-03-30 Tim OttenMerge pull request #5499 from colemanw/CRM-16155
2015-03-30 Eileen McNaughtonMerge pull request #5488 from eileenmcnaughton/CRM...
2015-03-30 Coleman WattsMerge branch 4.6 into master
2015-03-30 Coleman WattsMerge branch 4.5 into 4.6
2015-03-27 Dave GreenbergMerge pull request #5453 from colemanw/CRM-16148
2015-03-27 Coleman WattsUpdate copyright date in comments
2015-03-27 Coleman WattsMerge branch 4.5 into 4.6
2015-03-23 Coleman WattsMerge branch '4.5' of https://github.com/civicrm/civicr...
2015-03-23 kurundMerge remote-tracking branch 'upstream/4.5' into 4...
2015-03-17 Eileen McNaughtonMerge pull request #5344 from eileenmcnaughton/CRM...
2015-03-16 kurundMerge remote-tracking branch 'upstream/4.5' into 4...
2015-03-13 Dave GreenbergMerge pull request #5362 from ShiveringSquirrel/patch-1
2015-03-13 colemanwMerge pull request #5380 from colemanw/CRM-15932
2015-03-13 colemanwMerge pull request #5322 from colemanw/CRM-15932
2015-03-12 Coleman WattsMerge branch '4.5' into 4.6
2015-03-12 Coleman WattsMerge branch '4.6' into master
2015-03-12 colemanwMerge pull request #5364 from colemanw/CRM-16085
2015-03-12 Monish DebMerge pull request #5361 from rohankatkar/webtest-4.6
2015-03-11 Web AccessWebtest fixes
2015-03-09 kurundMerge remote-tracking branch 'upstream/4.5' into 4...
2015-03-06 Tim OttenMerge commit '1ebbf8bfc16f4' into 4.5-missing-prs
2015-03-04 kurundMerge remote-tracking branch 'upstream/4.5' into 4...
2015-03-03 kurundMerge remote-tracking branch 'upstream/4.5' into 4...
2015-03-02 kurundMerge remote-tracking branch 'upstream/4.5' into 4...
2015-02-25 kurundMerge remote-tracking branch 'upstream/4.5' into 4...
2015-02-25 Tim OttenMerge remote-tracking branch 'origin/4.5' into 4.5...
2015-02-16 Coleman WattsMerge branch 4.5 into master
2015-02-16 kurundMerge remote-tracking branch 'upstream/4.5' into 4...
2015-02-09 kurundMerge remote-tracking branch 'upstream/4.5' into 4...
2015-02-03 Coleman WattsMerge branch 4.5 into master
2015-02-02 colemanwMerge pull request #5057 from cividesk/CRM-15901-4.5
2015-02-02 kurundMerge remote-tracking branch 'upstream/4.5' into 4...
next