570e8e5693
add local groups
2015-05-16 00:14:38 -07:00
2d981d833c
additional work on courseware
2015-05-15 23:34:20 -07:00
94abc6cf5b
Begin restructuring all Coursewares and Bonfires to one unified model and flow.
2015-05-16 00:39:43 -04:00
8981be2dca
add more courseware and a working submit route
2015-05-15 18:43:07 -07:00
be5ea93be5
add more local groups
2015-05-15 15:14:34 -07:00
80ceb15714
fix linkedin issue
2015-05-15 13:39:12 -07:00
1d1b1ef41f
rearrange local groups
2015-05-14 23:22:54 -07:00
8f6093296c
add additional cities
2015-05-14 23:21:02 -07:00
0e75d251b5
improvements to fieldguide with alex-dixon
2015-05-13 15:31:32 -07:00
f85e14079d
remove India region that is non functioanl
2015-05-13 13:49:36 -07:00
e58507f204
add local groups
2015-05-13 13:48:02 -07:00
48a9bcbb52
Merge branch 'master' into courseware
2015-05-13 13:37:54 -07:00
f6697394b9
add more local groups and India group
2015-05-13 12:46:05 -07:00
5569b26e18
add local groups and India group
2015-05-13 12:43:56 -07:00
5b21f71f64
add additional cities
2015-05-12 22:36:57 -07:00
e8e538b1fa
add additional coursewares
2015-05-12 19:44:40 -07:00
5cd87bc2a5
add new local groups
2015-05-12 18:19:37 -07:00
3ecf56d9fd
finish courseware 29
2015-05-12 17:09:13 -07:00
d2044eca06
add some additional coursewares to front end curriculum
2015-05-12 15:36:41 -07:00
39a23c133e
add local groups
2015-05-12 14:54:51 -07:00
682146b3f5
fix #443
2015-05-12 00:05:08 -07:00
4d0017a4d4
bower install jshint and build more coursewares
2015-05-11 23:40:04 -07:00
ab187f821a
add another local group
2015-05-11 18:36:39 -07:00
bfe3c96ba9
add more local groups
2015-05-11 17:56:36 -07:00
2091f65dfd
more courseware improvements
2015-05-11 14:27:29 -07:00
da9ac03a34
created a chai test for css attributes
2015-05-11 13:58:59 -07:00
b574bed0a1
start integrating html css coursewares
2015-05-11 13:43:12 -07:00
385573a36f
add local groups
2015-05-11 11:45:16 -07:00
2a449b2eb1
add code school angular back in
2015-05-10 23:25:55 -07:00
40a58ec7e7
add berkeley local group
2015-05-10 18:14:33 -07:00
0f83072c4e
add one more local group;
2015-05-10 17:52:25 -07:00
63d29827f3
update field guide
2015-05-10 17:45:32 -07:00
158785c605
update facebook groups
2015-05-10 12:26:57 -07:00
3b79bb6c03
add additional facebook groups
2015-05-10 03:25:52 -07:00
10c4cec293
update facebook groups
2015-05-09 23:20:35 -07:00
abc04c0065
Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp
2015-05-09 18:36:41 -07:00
cc90d97bdb
add code of conduct
2015-05-09 18:36:21 -07:00
6759b432e0
Merge pull request #438 from QuincyLarson/news-points
...
News points
2015-05-09 19:41:38 -04:00
760f01d2d5
Update coursewares.json
2015-05-09 19:39:39 -04:00
18645f7f91
Merge pull request #434 from terakilobyte/staging
...
Change jQuery challenge description slightly.
2015-05-09 19:38:10 -04:00
361b07c463
Merge pull request #432 from zapstar/fix-431
...
Added clarification to the search and replace bonfire (21)
2015-05-09 19:36:31 -04:00
47462991a4
add more facebook groups
2015-05-09 15:35:13 -07:00
c0f6c8d124
add new facebook groups
2015-05-09 13:31:45 -07:00
149c715cf7
Merge pull request #435 from QuincyLarson/facebook-groups
...
Facebook groups
2015-05-09 10:59:21 -07:00
b5747c7712
add facebook groups challenge, field guide and footer link
2015-05-09 10:52:02 -07:00
e7a8d14f5b
Change jQuery challenge description slightly. Closes #433
2015-05-08 20:50:13 -04:00
b6349d55b3
Use exacty wikipedia definition for smallest common multiple
2015-05-08 17:12:16 -04:00
8e8c1c67d1
Added clarification to Search and Replace bonfire
2015-05-08 23:26:41 +05:30
fe86c13947
finish updating field guides
2015-05-07 22:58:20 -07:00
8d2b82111b
refine field guides
2015-05-07 22:31:20 -07:00
c9e7b30867
fix privacy policy link and remove redundant field guide entry
2015-05-05 18:31:03 -07:00
52f7dcc96b
Merge remote-tracking branch 'upstream/staging'
...
Conflicts:
views/account/show.jade
2015-05-05 16:41:28 -07:00
f5a7195e42
add deploy a website without code field guide
2015-05-05 16:23:51 -07:00
c305f1f5cd
Fix typo and add tests for Arguments Optional
...
Add tests for the second argument and fix a typo.
2015-05-05 11:49:18 +02:00
714ff14ea8
fix typo in field guide
2015-05-03 22:43:23 -07:00
04ed00f4b7
fix #412
2015-05-02 18:55:27 -07:00
7cbcf46377
Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp
...
Conflicts:
app.js
views/challengeMap/show.jade
2015-05-01 23:12:56 -07:00
cbdba845df
Resolve merge conflicts
2015-05-02 00:41:38 -04:00
4729ef31b4
Get rid of duplicate field guide for mac keyboard shortcuts
2015-05-01 17:17:12 -04:00
2cb02176a4
more camper news improvements
2015-04-30 15:56:14 -07:00
cc13b325d6
fix some issues with @terakilobyte and beautify the camper news index view
2015-04-30 14:55:00 -07:00
164411e2c4
fix spelling of pinterest
2015-04-30 08:53:48 -07:00
0c1ba64a83
fix copy around git commits on basejumps
2015-04-29 22:13:03 -07:00
19a556af80
add videos to some challenges
2015-04-29 22:05:21 -07:00
a201633e09
improvements and fixes for our field guide. Add 20 day announcement modal
2015-04-29 15:31:49 -07:00
22f8cc2b65
improvements to field guide
2015-04-29 12:30:53 -07:00
ddb93897bc
Revert Mac keyboard shortcuts
2015-04-29 07:16:17 -07:00
7e7cdab867
field guide fixes for @zersiax
2015-04-28 22:54:55 -07:00
38525eb77a
make some minor improvements to the courseware.json file
2015-04-28 16:17:09 -07:00
0f4c13c234
improvements to basejump and zipline copy
2015-04-28 13:25:38 -07:00
5a6e2cc4bd
minor copy edits and improvements to seed files
2015-04-27 00:33:14 -07:00
dac45382e2
Merge branch 'master' into videos
...
Conflicts:
app.js
2015-04-26 22:52:06 -07:00
c50ce70749
minor updates to coursewares and field guides
2015-04-26 12:46:48 -07:00
941d261b7c
remove console.log statements, improve coursewares.json
2015-04-25 12:12:26 -07:00
7c8e5e60f4
Modification to script.
2015-04-25 12:44:34 -04:00
2fce595e89
Add story cleanup script to ensure all story links are proper.
2015-04-25 12:40:07 -04:00
e49c9ca87e
make some improvements to the field guide articles and move the bonfire styleguide into field guides
2015-04-24 21:30:22 -07:00
252f955285
Merge pull request #360 from benmcmahon100/patch-1
...
slight tidy and example
2015-04-24 20:58:32 -07:00
15ea7f3473
Merge pull request #363 from FreeCodeCamp/root
...
Root
2015-04-24 19:16:43 -04:00
8c10f4efcc
make improvements to coursewares.json
2015-04-24 13:57:50 -07:00
eaf81fd3f7
Closes #333
2015-04-24 16:04:25 -04:00
a6d5aa05d0
slight tidy and example
...
Replaced one occurrence of gitter with slack and added an example bit torrent client after someone pointed out in the help section that there was not guide to demonstrate how to do so.
2015-04-24 20:48:29 +01:00
bea77c580e
redirect user to bonfires if has completed waypoints but not bonfires gulp
2015-04-24 02:02:02 -07:00
f049ff8f27
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
2015-04-23 16:18:28 -07:00
ac611d61fb
minor copy fix
2015-04-23 16:04:42 -07:00
c2a78b1278
Fix for issue #349 : Zipline Copy Typo
2015-04-23 16:10:08 -05:00
26d84a21e0
fix issues with unauthenticated field guide browsing
2015-04-22 15:50:11 -07:00
f321d7f22f
Merge branch 'master' of heroku.com:freecodecamp
2015-04-22 07:46:20 -04:00
97173ccca7
add new challenge videos and update copy
2015-04-22 04:25:44 -07:00
34ac36a64a
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
2015-04-21 19:46:08 -07:00
2507b08768
archive future coursewares in seed_data file
2015-04-21 19:45:57 -07:00
92157ebdff
Merge pull request #311 from FreeCodeCamp/seek-and-destroy
...
Attempt to fix wording on seek and destroy bonfire issue #293
2015-04-21 22:28:14 -04:00
95543ace12
update the try mongo challenge
2015-04-20 22:39:01 -07:00
50c404d9be
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
2015-04-20 22:34:53 -07:00
e245b4d813
remove mongo course for now
2015-04-20 19:11:19 -07:00
c6b1bc79d3
make some improvements to our field guides
2015-04-20 18:51:24 -07:00
7cbd8e1c04
merge pr for unique story slugs
2015-04-20 00:28:55 -04:00
083cd7d710
Fix json for get 'started with ziplines' ziplines
2015-04-19 21:07:38 -04:00
d9ddda6cb9
record videos and add to courseware.json and field-guide.json
2015-04-19 16:28:11 -07:00
102550fd0b
update the symmetric difference challenge
2015-04-19 01:18:56 -07:00
07becee1c4
further improvements to courseware.json
2015-04-18 17:25:59 -07:00
d31031f92c
continue updating coursewares and field-guide
2015-04-18 17:10:18 -07:00
b671ab9817
move checkboxes to the left of the showVideo view
2015-04-18 15:00:31 -07:00
aacfb86e1f
improve challenge map look
2015-04-18 14:17:10 -07:00
11ece0fda1
fix courseware.json typo and make it easier to click checkboxes
2015-04-17 22:37:13 -07:00
8fbfae9554
further updates to basejumps
2015-04-17 19:05:18 -07:00
b1e92ddcd8
comment out non-twitter auth options and add pintrest clone to basejumps
2015-04-17 19:04:46 -07:00
fe31271ee5
add ziplines, basejumps and node school challenges to coursewares.json
2015-04-17 17:38:30 -07:00
820fbb99c7
finalize the way zipline and basejump challenges will look, fix twitch view
2015-04-17 15:01:08 -07:00
d10011acc3
Pull some useful changes from aborted branch
2015-04-16 23:54:26 -07:00
dbc99eafb6
Update chat link and copy.
2015-04-17 01:41:01 -04:00
b49d2fd343
Resolve merge conflicts using Webstorm's merge integration tool.
2015-04-17 00:11:13 -04:00
56e45ba9dd
resolve merge conflict
2015-04-15 18:35:06 -04:00
d20aa1cf3c
Merge pull request #288 from FreeCodeCamp/resources
...
Create Wiki controller to replace our static pages
2015-04-15 01:03:19 -07:00
d968524c69
attempt to fix wording on seek and destroy bonfire issue #293
2015-04-15 00:59:12 -07:00
993db11189
Merge branch 'nonprofit-show' of https://github.com/FreeCodeCamp/freecodecamp into nonprofit-show
2015-04-15 00:12:27 -07:00
22be5b90ba
more improvements to the basejump challenges
2015-04-15 00:12:16 -07:00
255a6b48be
Merge pull request #298 from aldraco/coursewaresErr
...
Issue #277 Fix- coursewares chai-jquery test issue
2015-04-14 23:43:38 -07:00
3748356079
Update user migration script to ensure user model validity.
2015-04-15 00:53:36 -04:00
ddb88643e0
Nathan's updates to the userMigration script'
2015-04-14 21:19:05 -07:00
e033f224bc
fix challenge map to redirect to nonprofits
2015-04-14 20:20:38 -07:00
e0aa084c7a
finish getting field-guide working and improve zipline show view
2015-04-14 20:12:47 -07:00
9c67d4988f
Add new currying challenge to bonfires and allow inspectlet through protective helmet
2015-04-14 23:04:54 -04:00
6b671f7d1c
Merge branch 'nonprofit-show' of https://github.com/FreeCodeCamp/freecodecamp into nonprofit-show
2015-04-14 19:39:51 -07:00
d1e4175624
additional work on basejumps
2015-04-14 13:43:10 -07:00
7912dc722d
Update bonfire challenge in courseware to encourage people not to try to complete all bonfires back to back, and not to worry if new bonfires are added.
2015-04-14 11:15:06 -04:00
77b5265fde
start creating the basejump instructions
2015-04-13 21:56:51 -05:00
324e7fcbd3
Merge remote-tracking branch 'upstream/nonprofit-show' into nonprofit-show
2015-04-13 21:31:02 -04:00
96ac90274d
Update User model to make migration easier and complete user migration script
2015-04-13 21:30:08 -04:00
11548bfcf9
add checkbox cross off effect to challenges and reword pairwise bonfire
2015-04-13 02:41:42 -04:00
83c14cccc4
continue work on user migration
2015-04-13 01:03:26 -04:00
e98f445444
update the challenge sequencing
2015-04-13 00:02:21 -04:00
f85804f270
start writing user migration for challenge completion
2015-04-12 02:07:01 -04:00
332d4f1875
refactor story.js mailer and remove some cruft
2015-04-09 17:50:10 -07:00
62cabd56ff
update camper news and chat challenges to have new videos and updated copy
2015-04-09 12:58:30 -07:00
3b7ea3d9a4
start work on challenge-migraiton
2015-04-08 18:03:06 -07:00
7da6f69cd8
start process of moving wiki over to field guide
2015-04-08 17:18:51 -07:00
29b4e3b970
get seed data seeding and improve application submitted button
2015-04-08 14:57:08 -07:00
c02fafa6a9
add status, turn hours into integer, create a directory view of all nonprofits
2015-04-08 14:36:05 -07:00
751d25219e
improve the wiki seed file and add strikethrough to read wikis
2015-04-07 22:33:49 -07:00
df4c698177
improve the challenge map
2015-04-07 12:45:31 -07:00
bd7c5310b1
improve the footer
2015-04-07 00:11:31 -07:00
407bc99061
Fixed chai-jquery tests for coursewares that were not catching correct entries for color attrs.
2015-04-06 09:54:49 -04:00
9d746f7d49
add zipline and basejump to portfolio view, and bonfires with solutions(not yet writing name to bonfireCompletion record on user
2015-04-05 00:01:51 -07:00
e6272d4c7e
Forgot comma on the end of the new entry to bonfireMDNlinks.js
2015-04-04 12:22:29 -04:00
543c79b67a
Updated from upstream
2015-04-04 12:16:00 -04:00
fa74a1b454
got show all nonprofits button working and improved nonprofit show view
2015-03-31 17:38:33 -07:00
003f6c6c0a
Updated language and added more test cases
2015-03-31 19:07:22 -04:00
f72774d412
minor wording improvement to a zipline.
2015-03-31 13:32:39 -07:00
46d185a503
added 5 new bonfires
2015-03-30 23:27:09 -04:00
Quincy Larson
terakilobyte
Thirumal Venkat
Victor Påhlsson
Alex Dixon
benmcmahon100
chilltrain
brndnb
Ashley Drake
Geoff Storbeck