Skip to content

Merge Dev to Master#22

Merged
marksanghoonkim merged 72 commits intomasterfrom
dev
Mar 16, 2016
Merged

Merge Dev to Master#22
marksanghoonkim merged 72 commits intomasterfrom
dev

Conversation

@marksanghoonkim
Copy link
Copy Markdown
Member

No description provided.

marksanghoonkim and others added 30 commits March 10, 2016 12:11
[docs] updates press-release
[add] setting up initial skeleton for project
[add] adds two sample routes
[setup] sets up ES6 compatability
[setup] Setting up simple react routing
[add] modifies index.js to render reactRouter routes
[add] adds simple nav bar with home and about page reactRoutes
[feature] renders AceEditor and CodePrompt in Home
marksanghoonkim and others added 28 commits March 15, 2016 11:30
[feat] adds ticking Timer with start/finish buttons
[feature] prevents easy copy/paste all, alerts when puzzle is completed
…n array of prompts and another file for getting a random prompt from the list and returning it
[adds] Added modularity to server.  Now there is a file that exports an array of prompts and another file for getting a random prompt from the list and returning it.
[fix] fixes get request to match server route and refactor ace editor code for CodePrompt
[feature] implements sending timerOn state to CodeEditor
[refactor] changes Timer.js to ES6
[fix] fixed bug when spamming start button
[feature] implements timer functionality with CodeEditor
[fix] removes highlight on CodePrompt load, renames to nimblecode
marksanghoonkim added a commit that referenced this pull request Mar 16, 2016
@marksanghoonkim marksanghoonkim merged commit 39ee083 into master Mar 16, 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.

4 participants