Skip to content

User controller tests #1

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.

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

Merged
merged 7 commits into from
Dec 21, 2016
Merged

User controller tests #1

merged 7 commits into from
Dec 21, 2016

Conversation

jure
Copy link

@jure jure commented Dec 20, 2016

Does two things:

  1. updates your master branch with upstream master
  2. adds UserController tests

lenart and others added 6 commits November 21, 2016 23:34
Allow users to specify a different address which is used to mask parse
requests for verifying email and resetting password. This is how Parse.com
used to allow customers to gain control over page content, styling etc.

On the destination page javascript is used to check the link in the request
and embed the parse server page using IFRAME.
@lenart lenart changed the base branch from master to frame-url December 21, 2016 08:41
@lenart
Copy link
Owner

lenart commented Dec 21, 2016

Thanks for your PR. I had to do some voodoo in order to move all my changes and your PR into a separate branch (frame-url) but hopefully everything still works as expected ;)

@lenart lenart merged commit c87399c into lenart:frame-url Dec 21, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants