Skip to content
This repository was archived by the owner on Feb 18, 2025. It is now read-only.

Conversation

@radazzouz
Copy link
Contributor

This PR resolves issue #101.

Rad Azzouz and others added 30 commits May 14, 2015 23:43
…on the iPhone

Signed-off-by: Diego <ghecho@gmail.com>

Conflicts:
	Demos/App Demo for iOS/App Demo for iOS/Base.lproj/Main.storyboard

Fix for merge conflicts

Fix layout issue on the iPhone in the Swift and Objective-C version
Update constraints for iPhone screen so the "Sign Up" button is visible
# Conflicts:
#	Demos/App Demo for iOS Swift/App Demo for iOS Swift/LoginViewController.swift
#	Demos/WebView Demo for iOS Swift/WebView Demo for iOS Swift/WebViewController.swift
# Conflicts:
#	Demos/App Demo for iOS Swift/App Demo for iOS Swift/LoginViewController.swift
Rad Azzouz added 21 commits August 12, 2015 15:49
… readme.

Looks good locally. Let's see how Github renders it. Might revert the commit.
…e in the readme."

This reverts commit 1ddbeee.

No way of running Javascript in the Github README.
@radazzouz radazzouz self-assigned this Sep 11, 2015
@radazzouz radazzouz added done and removed in review labels Sep 14, 2015
radazzouz pushed a commit that referenced this pull request Sep 14, 2015
Added Swift (2.0) demo apps
@radazzouz radazzouz merged commit aaa4099 into master Sep 14, 2015
@radazzouz radazzouz deleted the swift2.0 branch September 14, 2015 14:54
@radazzouz radazzouz mentioned this pull request Sep 16, 2015
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants