Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated master branch with 4.1.7-preview release #325

Merged
merged 287 commits into from
Mar 14, 2017
Merged

Updated master branch with 4.1.7-preview release #325

merged 287 commits into from
Mar 14, 2017

Conversation

Hadis-Knj
Copy link

  • Merged dev into master
  • fixed readme formmatting

Hadis-Fard and others added 30 commits December 9, 2016 13:05
fixed Github #182, empty bound output parameters
e7fd159
@ulvii
Fixing the issue with buffered result sets, when connection option is…
28bd839 
… set to utf8. See issue #192
@ulvii
removing new lines
505aa31
@ulvii
Replcaing SQLSRV_ENCODING ( CP_UTF8) with SQLSRV_ENCODING_UTF8
380931f
@ulvii
Replcaing SQLSRV_ENCODING ( CP_UTF8) with SQLSRV_ENCODING_UTF8
0b50a11
Merge pull request #201 from ulvii/issue#192
6497c23 
Issue#192
Merge remote-tracking branch 'upstream/PHP-7.0' into issue#182Windows
0879273
fixed tab and spacing
47e13b3
@ulvii
Merge pull request #205 from Hadis-Fard/issue#182Windows
9f678e6 
Issue#182 windows
updated the code structure
4c42a9a
deleted pdo_sqlsrv obsolete folder
a841571
Updated pdo driver source code path
8ebae46
added pdo shared folder
4fb02c3
updated sqlsrv and pdo_sqlsrv config.w32 to get the dir name dynamically
86dd9ef
deleted shared folder inside pdo
0762fa3
@v-dareck
Initial AppVeyor CI test build.
9f74ef7
@v-dareck
Remove AppVeyor whitelist for testing.
88cdf11
@v-dareck
Fix source file path.
1032432
@v-kigos
Update pdo_util.cpp
65df054
Merge pull request #221 from v-kigos/PHP-7.0
7b02154 
Updateed ODBC version in error messages
Merge branch 'PHP-7.0' of https://github.com/Microsoft/msphpsql into …
f592745 
…HEAD
changed tab to spaces
80783a5
fixed indentations
c9b85d9
fixed indentations
90e9e31
moved templates to driver folder
73cd9c8
@yitam
Merge pull request #227 from Hadis-Fard/PHP-7.0
a6243a9 
Updated code structure and config.w32
@v-dareck
Merge branch 'PHP-7.0' into AppVeyorBuild
eca1f15
@v-dareck
Enable build matrix for different SQL Server versions.
dd804fd
@yitam
fixed the limit for row count
365220a
Merge pull request #236 from yitam/rowCountWin
c6554bb 
fixed the limit for row count
Hadis Kakanejadi Fard and others added 28 commits March 3, 2017 18:25
added client info tests
4532c72
Merge pull request #313 from david-puglielli/update_appveyor
75d1f22 
appveyor.yml now outputs details of failing tests
@yitam
Merge pull request #315 from Hadis-Fard/dev
7640373 
updated versioning to semantic versioning
@ulvii
Merge pull request #314 from yitam/locale
9d7a792 
changed locale for mac
added versioning notes
c40f2d7
updated precedence order example
cbafb6e
@yukiwongky
added 4.1.7 to changedlog
5763680
updated PECL package version
91f27c0
@yukiwongky
Update CHANGELOG.md
bd9c739
@yukiwongky
Update CHANGELOG.md
27b97b2
@yukiwongky
Update CHANGELOG.md
f6a35a3
@yitam
Merge pull request #316 from Hadis-Fard/dev
74551e8 
Version number doc
Merge pull request #317 from v-kaywon/changelog_7.1.7
03ec838 
added 4.1.7 to changedlog
@yitam
part 1 with utf8 data
aeacaf7
MAC OS X announcement
867ca5c
@yitam
part 2 testing diff API
85391e6
@yitam
part 3 testing rowCount
e53ca83
@yitam
part 4 fetching various types
45ea247
@yitam
part 5 new sqlsrv tests
194f37f
@yitam
removed redundant tests
9f91c81
@yitam
fixed some tests
497797e
@yitam
modified a failing test
a10fe30
@yukiwongky
Merge pull request #320 from yitam/addNewTests
5ccbda8 
Uploaded some more tests
@yitam
one more test
5795e0e
@yukiwongky
Merge pull request #322 from yitam/addNewTests
a76e14e 
one more test
@ulvii
Mac instructions (#319)
9bd42e4 
* Initial Mac instructions

* Add pecl install for mac

* Changing instructions for loading the drivers

* Updating apache install intructions for MAC

* Adding Mac related notes

* Minor cleanup

* appveyor.yml now outputs details of failing tests

* updated versioning to semantic versioning #282

* Update README.md

* changed locale for mac

* added client info tests

* added versioning notes

* updated precedence order example

* added 4.1.7 to changedlog

* updated PECL package version

* Update CHANGELOG.md

* Update CHANGELOG.md

* Update CHANGELOG.md

* MAC OS X announcement

* Updating Mac Apache Instructions. Also removing the step of manually adding drivers to the ini file.

* Adding php7.1-xml installation

* Apache config for Mac

* Fixing Apache config

* Update PECL instructions
Merge branch 'master' into dev with ours strategy
7dcca69
Fixed headers formatting
65d3e50
@coveralls
Copy link

Coverage Status

Coverage increased (+11.9%) to 55.038% when pulling 65d3e50 on Hadis-Fard:master into 2d9a444 on Microsoft:master.

@ulvii ulvii merged commit 531b574 into microsoft:master Mar 14, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@Hadis-Knj @coveralls @ulvii @v-dareck @v-kigos @yitam @david-puglielli @meet-bhagdev @yukiwongky