Skip to content

Gustavo master #54

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
Merged
merged 49 commits into from
Feb 9, 2016
Merged

Gustavo master #54

merged 49 commits into from
Feb 9, 2016

Conversation

@luismesas
Copy link
Member

@luismesas luismesas commented Feb 8, 2016

No description provided.

igznicolasjaremek and others added 30 commits March 17, 2015 11:45
@igznicolasjaremek
Added fixtures script to add users to DB
1f08eaf
@igznicolasjaremek
Merge branch 'cipher-users'
49deffa
Merge branch 'master' of https://github.com/thegameofcode/cipherlayer
e43a703
@igznicolasjaremek
Added env var for default password. Added default password for users.
01f6def
added x-user-id header on directproxy request
2fdd81e
Merge remote-tracking branch 'upstream/master' into upstream-changes
9267a81
added verify old password functionality
50918ce
temporally skipped tests userAppVersion
1aca4bb
Revert "Added middleware "userAppVersion" (update user info with his …
9ca1c3e 
…app version)"

This reverts commit fdcc89d.

Conflicts:
	src/cipherlayer.js
	src/middlewares/userAppVersion.js
	tests/userAppVersion.js
Merge branch 'master' of https://github.com/thegameofcode/cipherlayer
bbdcbf5
merged upstream master
89a7a57
fixed package and removed log
fef9adf
@igznicolasjaremek
Added configuration parameter to define externalNotifications service…
9fc9a9c 
… email endpoint.
@igznicolasjaremek
Updated tests for new configuration.
ca8d1ee
@igznicolasjaremek
Made JSON validator mandatory. Improved configuration file format.
ba61f47
@igznicolasjaremek
Resetted hostnames for db and redis in config sample.
16cc102
Merge pull request #1 from IGZgustavomarin/feature/improved-configura…
7a3ad33 
…tion

Feature/improved configuration
add support to transfer a list of allowedHeaders in the configuration
14cbf9f
@igznicolasjaremek
ADDED optional configuration to redirect to URL on email confirmation…
f1e01d8 
… endpoint.
Merge pull request #2 from IGZgustavomarin/feature/redirect-after-signup
ab4b620 
ADDED optional configuration to redirect to URL on email confirmation…
@igznicolasjaremek
Added from field to email endpoints.
971abde
Merge pull request #3 from IGZgustavomarin/feature/add-email-from-field
01bf244 
Added from field to email endpoints.
@igznicolasjaremek
Removed buggy debug line causing a timeout error.
3a6214d
@igznicolasjaremek
Merge pull request #4 from IGZgustavomarin/fix/broken-password-validate
b3503ca 
Removed buggy debug line causing a timeout error.
@igznicolasjaremek
Added begin/end characters to username lookup expression for exact ma…
4a075bd 
…tch.
@igznicolasjaremek
Added Cucumber and Mocha tests to ensure the exact match during user …
6bddeb3 
…lookup.
Merge pull request #5 from IGZgustavomarin/fix/username-lookup-regex
75e0ddc 
Added begin/end characters to username lookup expression for exact ma…
merged upstream
b23caa8
Merge pull request #6 from IGZgustavomarin/merged-upstream
d4274e2 
Merged upstream
added configurable email field
d2f9dac
igznicolasjaremek and others added 19 commits January 28, 2016 17:45
@igznicolasjaremek
Fixed security vulnerability and profile schema loader.
1ac06b6
different approach to remove password from body
5bd13a6
fixed redis key to avoid undefined values
a34e694
added autologin after email verification
8ed779b
Merge pull request #7 from IGZgustavomarin/feature/login-with-verific…
af9eef4 
…ation-code

added autologin after email verification
@igznicolasjaremek
Stringify body in prepareOptions middleware only if body exists, in o…
12566c3 
…rder to avoid sending a body with content equal to ""
Merge pull request #8 from IGZgustavomarin/fix/prepare-options-body
c59293d 
Stringify body in prepareOptions middleware only if body exists, in o…
@igznicolasjaremek
Added public endpoint to check email availability.
ee430d2
Merge pull request #9 from IGZgustavomarin/feature/email-available
d08e263 
Added public endpoint to check email availability.
WIP login with facebook
2ab164a
@igznicolasjaremek
Added tests for facebook auth endpoint. Fixed auth endpoint. Updated …
8886af1 
…config file to support facebook auth.
Merge pull request #11 from IGZgustavomarin/feature/facebook-login
a9bed32 
Feature/facebook login
hotfix config facebook
8e8811b
@igznicolasjaremek
Added test for facebook login in case email is missing from request b…
628a6e8 
…ody.
@igznicolasjaremek
Updated missing email facebook auth test case.
09542ce
Merge pull request #12 from IGZgustavomarin/fix/facebook-login
7e62f7f 
Added test for facebook login in case email is missing from request b…
@luismesas
indent refactor
4f55f22
@luismesas
Merged Gustavo branch with master branch
aab45e2
@luismesas
added verbose option to coveralls script
097fc71
luismesas added a commit that referenced this pull request Feb 9, 2016
@luismesas
Merge pull request #54 from thegameofcode/gustavo-master
b9d28e8 
Gustavo master
@luismesas luismesas merged commit b9d28e8 into master Feb 9, 2016
@luismesas luismesas deleted the gustavo-master branch February 9, 2016 01:37
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.

3 participants

@luismesas @igznicolasjaremek