|
|
108b272879
|
Merge branch 'coderbye' of https://github.com/FreeCodeCamp/freecodecamp into coderbye
Conflicts:
seed_data/coursewares.json
|
2015-02-14 15:51:37 -08:00 |
|
|
|
2a32f5f087
|
minor updates to coursewares.json
|
2015-02-14 15:50:47 -08:00 |
|
|
|
e3c9e42fce
|
showJS view now shows errors in a pretty format (kinda)
|
2015-02-14 18:43:45 -05:00 |
|
|
|
9ac19023d9
|
Show tests on html view
|
2015-02-14 18:31:32 -05:00 |
|
|
|
693b8fbb33
|
Forward progress, need to resolve script loading timing
|
2015-02-14 17:28:07 -05:00 |
|
|
|
fb971ab080
|
start adding test output to coursewares
|
2015-02-14 14:09:26 -08:00 |
|
|
|
31aafd300c
|
Removing a very buggy challenge
|
2015-02-14 15:54:51 -05:00 |
|
|
|
255d2654ea
|
fix an indentation issue in showHTML
|
2015-02-14 12:52:04 -08:00 |
|
|
|
8210cb927e
|
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp into coderbye
Conflicts:
seed_data/challenges.json
|
2015-02-14 12:32:50 -08:00 |
|
|
|
f0fff1e1b9
|
Merge pull request #94 from alex-dixon/master
Typos
|
2015-02-14 06:33:07 -05:00 |
|
|
|
5846a61955
|
Typos
|
2015-02-13 21:40:02 -08:00 |
|
|
|
a22e472fb2
|
update the showVideo view
|
2015-02-13 18:40:39 -08:00 |
|
|
|
efa4b2d9bc
|
Factor all challenges button out of showvideo
|
2015-02-13 21:07:56 -05:00 |
|
|
|
b5c0ad9942
|
Building out new challenge framework to allow controller to determine view type for challenge
|
2015-02-13 20:55:49 -05:00 |
|
|
|
0eededde36
|
merge master into coderbye
|
2015-02-13 16:56:09 -05:00 |
|
|
|
54901a4b9b
|
Remove special characters inserted from somewhere that were throwing off truncate challenges
|
2015-02-13 15:55:18 -05:00 |
|
|
|
cfec52c15b
|
Even more cleanup of truncate challenge
|
2015-02-13 15:53:29 -05:00 |
|
|
|
3bcf3d8d54
|
More fixes for truncate
|
2015-02-13 15:46:28 -05:00 |
|
|
|
01cddba50d
|
Fixed "truncate a string" test that was preventing users from completing the challenge
|
2015-02-13 15:05:53 -05:00 |
|
|
|
b691a35163
|
merge challenge entry point into challenge seed
|
2015-02-13 11:13:09 -08:00 |
|
|
|
bafba0b16f
|
make some copy changes reflecting our shift to coderbyte
|
2015-02-13 11:01:12 -08:00 |
|
|
|
a0427b3e18
|
Fix for bonfire to allow people to prototype objects properly but lose default insertion point injection (i.e. they will get an error if they forget to call their function
|
2015-02-13 12:14:12 -05:00 |
|
|
|
a9036408aa
|
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
|
2015-02-13 08:38:48 -08:00 |
|
|
|
ba03dd51fa
|
Slight reorder of bonfires
|
2015-02-13 09:03:34 -05:00 |
|
|
|
ae5fb1e3c2
|
Cleaning up bonfires.json
|
2015-02-13 09:01:39 -05:00 |
|
|
|
ef86867eeb
|
Merge branch 'master' into tmp
|
2015-02-13 08:59:12 -05:00 |
|
|
|
b3a8087e55
|
Merge pull request #86 from FreeCodeCamp/brndnb-easy-bonfires
Add 18 new bonfire challenges
|
2015-02-13 08:54:05 -05:00 |
|
|
|
542679c92d
|
WIP on master: 995ca3d Refactor moment scripts to only be included in live-pair-programming view instead of being required in layout-wide
|
2015-02-13 08:52:55 -05:00 |
|
|
|
2acc5b3f3c
|
index on master: 995ca3d Refactor moment scripts to only be included in live-pair-programming view instead of being required in layout-wide
|
2015-02-13 08:52:55 -05:00 |
|
|
|
2bbb19b6db
|
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
|
2015-02-12 23:06:19 -08:00 |
|
|
|
43da6d16ff
|
fix trello integration and make minor changes to courseware.json
|
2015-02-12 22:59:06 -08:00 |
|
|
|
995ca3d376
|
Refactor moment scripts to only be included in live-pair-programming view instead of being required in layout-wide
|
2015-02-13 00:24:57 -05:00 |
|
|
|
282cab19ce
|
Merge pull request #90 from Phazz/patch-1
Fix a typo in README
|
2015-02-13 00:13:23 -05:00 |
|
|
|
54b5870fc9
|
Merge pull request #91 from phlacin/automaticDating-livepair
Added Moment.js library and time logic to next Live session
|
2015-02-12 20:44:27 -08:00 |
|
|
|
2d447f0bb0
|
added automatic time logic to live-pair-programming page
|
2015-02-12 20:31:11 -08:00 |
|
|
|
f8f0c3454a
|
subtle completed challenge button for courseware and add completionMessage to coursewares
|
2015-02-12 16:48:35 -08:00 |
|
|
|
93f4f6aa19
|
resequence coursewares
|
2015-02-12 16:00:34 -08:00 |
|
|
|
51f75031de
|
add a bunch of padding and margin related courseware, and start bootstrap courseware
|
2015-02-12 15:21:48 -08:00 |
|
|
|
474c711935
|
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
|
2015-02-12 13:05:53 -08:00 |
|
|
|
05eec98071
|
Merge pull request #92 from alex-dixon/patch-1
Typos
|
2015-02-12 11:19:45 -05:00 |
|
|
|
c826ac2341
|
Typos
|
2015-02-12 04:04:18 -08:00 |
|
|
|
6455d80a6e
|
Added Moment.js library and added logic to the time for the next Live session.
|
2015-02-11 23:08:10 -08:00 |
|
|
|
23a0c33c81
|
add screen reader only copy
|
2015-02-11 22:31:57 -08:00 |
|
|
|
da4deb77ff
|
create box model and working test for padding and margin training
|
2015-02-11 17:13:00 -08:00 |
|
|
|
e0bb3b4fd7
|
add some additional coursewares
|
2015-02-11 15:18:54 -08:00 |
|
|
|
17809ebceb
|
fix a comma json typo that was crashing the branch
|
2015-02-11 13:00:33 -08:00 |
|
|
|
b2ff7da594
|
Fixing a typo
|
2015-02-11 22:48:45 +03:00 |
|
|
|
a5fea13ffe
|
Merge pull request #85 from FreeCodeCamp/brndnb-courseware-typos
Fix typos
|
2015-02-11 09:19:25 -08:00 |
|
|
|
7514e3fba6
|
Merge branch 'brndnb-courseware-typos' of https://github.com/FreeCodeCamp/freecodecamp into brndnb-courseware-typos
Conflicts:
seed_data/coursewares.json
|
2015-02-11 09:18:50 -08:00 |
|
|
|
adb094cf49
|
Merge pull request #88 from elimisteve/master
Check for Palindromes: Removed redundancy from description
|
2015-02-11 11:36:18 -05:00 |
|
