Quincy Larson
|
b6fc2551d9
|
Merge branch 'interview' into staging
Conflicts:
app.js
controllers/challenge.js
seed/future-jquery-ajax-json.json
|
2015-06-14 01:02:39 -07:00 |
|
terakilobyte
|
25e500a457
|
Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging
|
2015-06-09 16:49:10 -04:00 |
|
terakilobyte
|
870c80d72d
|
Alter variable names in testing loop to avoid common collisions. Bump file version to force browser fetch.
|
2015-06-09 16:46:41 -04:00 |
|
Quincy Larson
|
b84d41bcd6
|
write tests for first 5 jquery challenges
|
2015-06-07 18:29:00 -07:00 |
|
Quincy Larson
|
6953cb6347
|
make the view even more compact
|
2015-06-06 22:55:24 -07:00 |
|
terakilobyte
|
7cfca0b5f8
|
Bump a delay on test runs and show pattern for expect tests
|
2015-06-06 23:58:27 -04:00 |
|
terakilobyte
|
5bcffa3ccb
|
Add necessary emmet js file
|
2015-06-06 20:17:35 -04:00 |
|
terakilobyte
|
e5a8c27e07
|
Add emmet functionality to html views
|
2015-06-06 20:10:47 -04:00 |
|
terakilobyte
|
f002e7c3f7
|
Always output tests in the order ran ignoring success or failure. Bump version numbers of framework files to force fresh browser fetches.
|
2015-06-04 22:35:42 -04:00 |
|
terakilobyte
|
193f9d16db
|
Set a refresh on codemirror instance rather than setting the cursor position. Closes #640
|
2015-05-28 19:51:42 -04:00 |
|
terakilobyte
|
131b9ad1b7
|
bump version numbers to force fresh browser fetch and suppress "editor is not defined". closes #
|
2015-05-28 14:13:31 -04:00 |
|
terakilobyte
|
718ae04f2f
|
Add ability to test editor contents. Ensures classes are implemented, closes # 684
|
2015-05-28 08:26:25 -04:00 |
|
terakilobyte
|
57fad7d923
|
proper fix for uncomment html challenge, improved codemirror performance
|
2015-05-27 15:29:31 -04:00 |
|
terakilobyte
|
6a2d365b9a
|
Update framework version, set cursor to line 15 on load to force full display. Closes #653
|
2015-05-27 14:40:06 -04:00 |
|
terakilobyte
|
cad39e1b5e
|
Fixes duplication bug in Firefox
|
2015-05-27 13:39:37 -04:00 |
|
terakilobyte
|
fa43dd1051
|
Unbind click handler on next-courseware-button to prevent repeated presses from advancing more than one challenge
|
2015-05-26 12:32:50 -04:00 |
|
terakilobyte
|
ff6e11433c
|
Update bonfire framework to know how to use chai.should()
|
2015-05-26 10:41:50 -04:00 |
|
terakilobyte
|
186d320d01
|
version updates to force browser fetch so buttons works
|
2015-05-26 09:14:10 -04:00 |
|
terakilobyte
|
6ce5ccf449
|
Rename framework file to force new browser fetching. Update view to remove unused vars
|
2015-05-26 02:31:10 -04:00 |
|
terakilobyte
|
1c4b40c8e6
|
Update to bonfires. Successfully completing triggers a save. "Paired with" form field moved to bonfire view. Controller hardened for checking pair as button is no longer disabled for unfound username
|
2015-05-25 17:27:27 -04:00 |
|
Berkeley Martinez
|
4ad757ebd5
|
Merge pull request #466 from terakilobyte/challenge-restructure
Challenge restructure
|
2015-05-21 00:12:52 -07:00 |
|
terakilobyte
|
5e918bdd7c
|
Remove bonfire and courseware controller, relying on all challenge related logic in challenge.js. Remove bonfire folder. Move necessary JS to coursewares folder and rename.
|
2015-05-20 22:31:20 -04:00 |
|
terakilobyte
|
16ca72f716
|
Update views for new variable names. Get profile view working. Update challenge map.
|
2015-05-20 21:50:31 -04:00 |
|
LumenTeun
|
7b9faabd32
|
Github => GitHub
|
2015-05-20 16:29:05 +02:00 |
|
terakilobyte
|
a174a1c630
|
Work on challenge flow from block to block, start refactoring the name courseware to challenges in main.js
|
2015-05-19 22:31:01 -04:00 |
|
Quincy Larson
|
ae70d0abd9
|
Merge branch 'courseware' into challenge-restructure
|
2015-05-18 23:33:03 -07:00 |
|
Quincy Larson
|
45d4954a43
|
fix script tag importing issue in coursewares
|
2015-05-18 22:25:48 -07:00 |
|
terakilobyte
|
e6851b22d8
|
Minor updates
|
2015-05-18 21:20:32 -04:00 |
|
Quincy Larson
|
68962d4d82
|
further improvements to coursewares and bonfires
|
2015-05-10 22:33:04 -07:00 |
|
Quincy Larson
|
d63b8f01be
|
improve bonfires and js coursewares
|
2015-05-10 21:59:55 -07:00 |
|
Quincy Larson
|
70503528d2
|
give user a point for submitting to news, remove broken javascript path, remove unnecessary empty js lib
|
2015-05-09 15:53:01 -07:00 |
|
terakilobyte
|
72339f9183
|
Set correct mime type in jailed. Set correct types on script imports in bonfire/show. Open helmet up to potentially unsafe levels by allowing "* unsafe-inline" in scriptSrc.
|
2015-05-06 14:06:10 -04:00 |
|
Quincy Larson
|
961096cf49
|
finish moving away from connectAssets
|
2015-05-03 16:45:34 -07:00 |
|
Quincy Larson
|
7b61e9daa2
|
More view beautification for mobile.
|
2015-04-30 15:19:38 -07:00 |
|
terakilobyte
|
b49d2fd343
|
Resolve merge conflicts using Webstorm's merge integration tool.
|
2015-04-17 00:11:13 -04:00 |
|
terakilobyte
|
9c67d4988f
|
Add new currying challenge to bonfires and allow inspectlet through protective helmet
|
2015-04-14 23:04:54 -04:00 |
|
Michael Q Larson
|
4d3337df32
|
Merge branch 'ziplines' into ux-improvements
Conflicts:
views/coursewares/showJS.jade
|
2015-03-28 00:24:41 -07:00 |
|
Michael Q Larson
|
f7f7fb39b9
|
start refactoring basejumps and ziplines to just be normal challenges, make all timestamps miliseconds
|
2015-03-27 14:36:17 -07:00 |
|
Michael Q Larson
|
09b812688e
|
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp into ux-improvements
Conflicts:
app.js
|
2015-03-25 14:20:34 -07:00 |
|
Berkeley Martinez
|
f246ef618c
|
Close web worker after completion
closes #257
|
2015-03-22 16:57:10 -07:00 |
|
Michael Q Larson
|
6e0da758e0
|
finish wiring in buttons and hotkeys
|
2015-03-22 01:38:04 -07:00 |
|
Nathan Leniz
|
ac511982a4
|
User facing challenge mentions now point to coursewares, remove completed view from account/show
|
2015-03-21 18:42:19 +09:00 |
|
Nathan Leniz
|
6ad7c22313
|
Working on codemirror display issue in html coursewares
|
2015-03-21 16:34:06 +09:00 |
|
Nathan Leniz
|
bf7d38e080
|
resolve conflict
|
2015-03-15 17:08:34 +09:00 |
|
Nathan Leniz
|
c609294e1f
|
force merge conflict for stream viewers
|
2015-03-15 17:06:05 +09:00 |
|
Michael Q Larson
|
191e38472e
|
make selected indenting and outdenting work on courseware HTML, JS and Bonfires
|
2015-03-14 15:07:05 -07:00 |
|
Michael Q Larson
|
6a9bfc5ebf
|
remove together.js and add a non-functioning submit form to the index view of news
|
2015-03-04 23:44:30 -08:00 |
|
Nathan Leniz
|
50b29eb2ba
|
Refactor error message from bonfire
|
2015-03-01 09:54:03 +09:00 |
|
Michael Q Larson
|
e0c82156a7
|
refactor layout.jade to have universal head, and customize together.js
|
2015-02-21 14:49:24 -08:00 |
|
Michael Q Larson
|
e5cfa147fa
|
attempt to use togetherjs
|
2015-02-21 14:22:46 -08:00 |
|