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

fix for #623 #626

Closed
wants to merge 29 commits into from
Closed

fix for #623 #626

wants to merge 29 commits into from

Conversation

dymen1
Copy link

@dymen1 dymen1 commented Mar 7, 2016

nepda and others added 29 commits November 21, 2013 16:16
@nepda
Issue 352, Unable to register user using PGSQL fixed.
222e264
@nepda
Array notation changed for old PHP version
a1e3fd4
@nepda
Try to make PHP CodeSniffer silent
d761f1b
@nepda
Fixes 364, changed formInput to generic $method = 'form' . ucfirst($e…
7f6b24f 
…lement->getAttribute('type')) to enable rendering of select and other form element types
@nepda
Issue 352, Unable to register user using PGSQL fixed.
254f478
@nepda
Array notation changed for old PHP version
6328333
@nepda
Try to make PHP CodeSniffer silent
f6275dc
@nepda
Fixes 364, changed formInput to generic $method = 'form' . ucfirst($e…
06a631c 
…lement->getAttribute('type')) to enable rendering of select and other form element types
@nepda
Merge branch 'master' of github.com:nepda/ZfcUser
637d7b8
@nepda
Added vendor and composer.lock to .gitignore
340a99d
@nepda
Merge branch 'master' of github.com:ZF-Commons/ZfcUser
319e5c8
@nepda
Merge branch 'master' of github.com:ZF-Commons/ZfcUser
ca56592 
Conflicts:
	src/ZfcUser/Authentication/Adapter/AdapterChainServiceFactory.php
	src/ZfcUser/Mapper/UserHydrator.php
	tests/ZfcUserTest/Authentication/Adapter/AdapterChainServiceFactoryTest.php
@nepda
Merge branch 'master' of github.com:ZF-Commons/ZfcUser
13d3a3c 
Conflicts:
	.gitignore
@nepda
Changed dev-master branch alias to 1.0.x
5a64857
@nepda
Undo changes
36c07c4
@nepda
Merge branch 'master' of github.com:ZF-Commons/ZfcUser
ebbfa5f 
Conflicts:
	.gitignore
	src/ZfcUser/Mapper/UserHydrator.php
@nepda
Merge branch 'zfc-master'
a114bbd
@nepda
Merge remote-tracking branch 'zfc/master'
b9a2dba
@nepda
Added PHP 7.0 to travis build config
7859d37
@nepda
Merge branch 'master' of github.com:nepda/ZfcUser
d0ad6cb
@nepda
Try to simple fix ZF-Commons#623
ee44e0d
@nepda
Fixed tests for ZF-Commons#623 (user service)
e59ba4c
@dymen1
Adds factories for Authentication Db Adapter and Db Storage, refactor…
6d21217 
…s UserControllerFactory and User Service Factory
@dymen1
Renames UserControllerFactory to User, to follow the module's used na…
99d7c27 
…ming conventions
@nepda
Merge branch 'dymen1-master'
dafa901
@dymen1
Updates Unit tests
8d55996
@dymen1
Updates and adds Unit tests for Adapter and Storage factories
a1142fc
@dymen1
Removes unused imports and added newlines for jenkins
ecd7e27
@nepda
Merge pull request #2 from dymen1/master
08613f3 
Added and updated Unit tests
@dymen1 dymen1 changed the title fix for https://github.com/ZF-Commons/ZfcUser/issues/623 fix for #623 Mar 7, 2016
@Danielss89
Copy link
Member

Looks like a merge or rebase gone wrong?
Also, this should probably be for the 1.x branch?

@dymen1 dymen1 closed this Mar 7, 2016
@dymen1
Copy link
Author

dymen1 commented Mar 7, 2016

@Danielss89 I am recreating my changes, this time on a correctly forked repo

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.

None yet
3 participants
@dymen1 @Danielss89 @nepda