Berkeley Martinez
2aa611047f
Change full stack to back end
2015-12-14 13:19:30 -08:00
Quincy Larson
a553cbbb2b
add interviewing and nonprofit projects to map
2015-12-14 13:19:30 -08:00
Berkeley Martinez
0c4a780f54
Add logic to allow coming soon challenge to be seen and not used
2015-12-14 13:19:30 -08:00
Berkeley Martinez
fe8fe0ff0d
Fix lint error
2015-12-14 13:19:30 -08:00
Berkeley Martinez
5c2bdd974a
Add isComingSoon flag
2015-12-14 13:19:30 -08:00
Berkeley Martinez
9848aa8eab
Remove console.log
2015-12-14 13:19:30 -08:00
Berkeley Martinez
f7f587194d
Add superblock ordering
2015-12-14 13:19:30 -08:00
Berkeley Martinez
c87737a0c5
Remove 800 hour thingy
2015-12-14 13:19:30 -08:00
Berkeley Martinez
c736a5c00f
Use regex to hide hikes
...
Capitalize super block
2015-12-14 13:19:30 -08:00
Berkeley Martinez
8175fbb297
Remove console.log
2015-12-14 13:19:30 -08:00
Berkeley Martinez
8037ff9038
Remove hikes from map view
2015-12-14 13:19:30 -08:00
Berkeley Martinez
ab043d1c6d
Change map logic and view
2015-12-14 13:19:30 -08:00
Berkeley Martinez
75821c4db3
Change hikes order
2015-12-14 13:19:30 -08:00
Quincy Larson
6d911a70cd
Merge pull request #5119 from FreeCodeCamp/fix/commit-directory
...
Add new cert goals to commit
2015-12-11 18:46:48 -06:00
Berkeley Martinez
a8a73abea0
More changes to commit copy
2015-12-11 16:44:14 -08:00
Logan Tegman
74d5c0bf00
Merge pull request #5127 from Zenith-One/fix/forgot-password-error-message
...
Fix/forgot password error message
2015-12-10 15:13:33 -08:00
Craig Burton
275e3ad9ea
Fixed error message displayed when an error occurs while requesting a password reset
2015-12-10 09:21:21 -05:00
Quincy Larson
60789e0386
Merge branch 'fix/commit-directory' of https://github.com/freecodecamp/freecodecamp into fix/commit-directory
...
Conflicts:
server/views/commit/index.jade
2015-12-10 00:02:22 -06:00
Quincy Larson
473a77e0a2
update copy and improve look of commit and its directory
2015-12-10 00:01:09 -06:00
Harsha
a443c2bd37
Go to next step is enabled after user finishes step challenge
2015-12-09 20:25:43 -05:00
Logan Tegman
0dbf56e23a
Merge pull request #5117 from FreeCodeCamp/landing-change
...
Update landing icons and copy to reflect React and D3
2015-12-09 14:38:50 -08:00
Logan Tegman
33b1ba08f1
Merge pull request #5090 from FreeCodeCamp/fix/bonfire-not-saving
...
Fix remove bonfire save endpoint
2015-12-09 14:20:10 -08:00
Berkeley Martinez
1464adc350
Add new cert goals to backend
2015-12-09 14:19:37 -08:00
Quincy Larson
3b320c8852
improve look of commit views
2015-12-09 15:39:36 -06:00
Quincy Larson
5d1ab89a1a
Merge branch 'staging' of https://github.com/freecodecamp/freecodecamp into staging
2015-12-09 15:01:17 -06:00
Quincy Larson
8c06293df3
update json for commit
2015-12-09 14:59:56 -06:00
Quincy Larson
66431753b3
Merge branch 'add/commitnonprofit' of https://github.com/CodeNonprofit/FreeCodeCamp into CodeNonprofit-add/commitnonprofit
2015-12-09 14:14:21 -06:00
Quincy Larson
747dbfe750
update landing icons
2015-12-09 14:13:18 -06:00
Michael D. Johnson
aea2eaf2e7
Added 3 new nonprofits to Commit
2015-12-09 14:27:02 -05:00
Berkeley Martinez
0f75aa3b88
Add freecatphotoapp to csp
2015-12-09 11:02:06 -08:00
Berkeley Martinez
9822cc67f9
Reduce header size
...
This is needed to move to cloudFlare
2015-12-09 10:56:40 -08:00
Berkeley Martinez
f709ee30ee
Fix for completedDate missing
2015-12-08 16:17:45 -08:00
Berkeley Martinez
579c569d15
Fix remove bonfire save endpoint
...
fix completedChallenge saving solution
remove unnecessary code.
2015-12-08 16:17:45 -08:00
Berkeley Martinez
9774638d43
Fix waypoints are not bonfires
2015-12-08 16:17:45 -08:00
Rex Schrader
6b7a314205
Merge pull request #5076 from FreeCodeCamp/update-ziplines
...
Update ZIpline and Basejump code review instructions, remove gist export
2015-12-08 16:13:58 -08:00
Rex Schrader
da491ed374
Merge pull request #5088 from LenaBarinova/fix/free-code-camp-map
...
Challenge numbering in Map fixed to work properly on IE.
2015-12-08 15:47:42 -08:00
Harsha
d3f1829931
step challenge button block in mobile version fixed
2015-12-08 17:45:30 -05:00
Quincy Larson
025a1269eb
remove additional gist button
2015-12-08 14:34:05 -06:00
JelenaBarinova
96375bb643
Challenge numbering in Map fixed to work properly on IE.
2015-12-08 11:46:35 -08:00
Berkeley Martinez
5270f0e42e
Make tag replacement more robust
...
Some challenges are incorrectly saved with no solutions
2015-12-08 11:30:47 -08:00
Quincy Larson
9409945ee7
Merge branch 'staging' into update-ziplines
...
Conflicts:
client/commonFramework/bindings.js
2015-12-08 01:17:03 -06:00
Quincy Larson
92928b552b
update user stories and sharing instructions for basejumps and ziplines
2015-12-07 00:51:37 -06:00
Arsen Melikyan
029cd52e80
Some common code improvements
2015-12-06 13:26:02 +04:00
Berkeley Martinez
3462ba791e
Fix camper news submit
2015-12-04 19:23:06 -08:00
Berkeley Martinez
85510a2fd8
Remove directives from views
2015-12-04 18:24:09 -08:00
Quincy Larson
676ef0e253
finish qa-ing removal of angular
2015-12-04 19:21:19 -06:00
Quincy Larson
7e9d65675a
Merge branch 'master' into remove-angular
...
Conflicts:
bower.json
client/main.js
server/views/coursewares/showZiplineOrBasejump.jade
server/views/partials/scripts.jade
2015-12-04 18:49:38 -06:00
Harsha
5b376e106c
Fixes previous step issue in one-step-challenges
2015-11-30 23:29:07 -05:00
Berkeley Martinez
04db6744b9
Fix code output logic
...
Fix codemirror url paths
2015-11-29 16:28:32 -08:00
Berkeley Martinez
9532a80f26
Correct typos
2015-11-29 16:28:32 -08:00
Berkeley Martinez
e8d9e31a47
Fix bad ctrl enter logic
2015-11-29 16:28:32 -08:00
Berkeley Martinez
4bdf1b2854
Add gulp build of commonFramework
2015-11-29 16:27:14 -08:00
Berkeley Martinez
29f90505b7
More refactoring
2015-11-29 16:27:14 -08:00
Berkeley Martinez
748f7ab93f
Progress towards refactoring
2015-11-29 16:21:04 -08:00
Berkeley Martinez
87fa38182e
bundle vendor files
2015-11-29 16:20:17 -08:00
Quincy Larson
d4fde2a98a
create the fastest site on the internet
2015-11-25 10:23:35 -06:00
roelver
44f581c13b
Keep submitted url - closes #4319
2015-11-23 16:02:07 +01:00
Berkeley Martinez
f8d68bcfa2
Hotfix revert heat-map offset
2015-11-20 11:24:02 -08:00
Berkeley Martinez
37f91d0bd7
Merge pull request #4581 from QuincyLarson/fix/links-view
...
Improve look of links page
2015-11-19 23:38:42 -08:00
Berkeley Martinez
022ed56af9
Merge pull request #4578 from FreeCodeCamp/feature/reddit-ad
...
Add reddit notice to map view
2015-11-19 23:36:53 -08:00
Quincy Larson
66d384c4c9
Improve look of links page
2015-11-20 01:25:49 -06:00
Quincy Larson
f8b8580e8b
add reddit ad to map
2015-11-20 00:55:37 -06:00
Berkeley Martinez
6f62868f44
Change order of links on links
2015-11-19 22:46:36 -08:00
Quincy Larson
9d08c1702e
update navbar, remove footer, create links page
2015-11-19 22:46:36 -08:00
Berkeley Martinez
854e937a20
Merge pull request #4450 from bugron/fix/feed-content-type
...
Set RSS feed correct content-type
2015-11-19 19:52:29 -08:00
Berkeley Martinez
3b63e406ed
Fix jobs order should be descend by post date
2015-11-19 17:31:00 -08:00
SaintPeter
86e4165c4c
Step Challenge - Prev from end, x/y step display
2015-11-16 21:57:35 -08:00
Arsen Melikyan
b88caa80be
fix rss feed content type
2015-11-15 11:39:30 +04:00
Quincy Larson
debfb07ab8
Merge branch 'staging' of https://github.com/freecodecamp/freecodecamp into staging
2015-11-13 17:15:23 -08:00
Quincy Larson
0695860434
improve styling of completed challenges table
2015-11-13 17:08:51 -08:00
Berkeley Martinez
ddd85d507b
Merge pull request #4400 from FreeCodeCamp/fix/update-labs
...
Update labs and improve jobs
2015-11-13 13:02:09 -08:00
Rex Schrader
3b5b9dfcdc
Merge pull request #4242 from bugron/feature/rss-feed-for-camper-news
...
Adds RSS feed for Camper News
2015-11-13 11:28:41 -08:00
Quincy Larson
61ffb55a3d
Merge branch 'staging' into fix/update-labs
...
Conflicts:
common/app/routes/Jobs/components/Jobs.jsx
2015-11-12 16:38:30 -08:00
Quincy Larson
ffbac22511
update labs
2015-11-12 16:35:37 -08:00
Arsen Melikyan
e2a4f5468d
adds rss feed for camper news
2015-11-11 22:27:48 +04:00
Matthias Kern
f14009833c
add a mobile portfolio view.
2015-11-11 17:25:06 +02:00
Berkeley Martinez
1b512330af
Merge pull request #4277 from ltegman/fix/unauthenticated-next-challenge-button-4262
...
Fix The Next Challenge link not working for unauthenticated users.
2015-11-10 17:39:15 -08:00
Logan Tegman
c65be452b5
Fix The Next Challenge link not working for unauthenticated users.
...
Closes #4262
2015-11-10 16:42:05 -08:00
Rex Schrader
4751ea5e1e
Merge pull request #4279 from FreeCodeCamp/feature/challenge-dev-mode
...
Feature in dev mode always pull from disk
2015-11-10 10:19:10 -08:00
Berkeley Martinez
42ab1d70fd
Remove unnecessary unary operator
2015-11-10 09:59:49 -08:00
Berkeley Martinez
7d43ddab0b
Merge branch 'fix-cal-heatmap' of https://github.com/terakilobyte/freecodecamp into terakilobyte-fix-cal-heatmap
2015-11-10 09:30:57 -08:00
Berkeley Martinez
1619a09da2
Add helpful error message if no filename
2015-11-09 22:37:16 -08:00
Berkeley Martinez
d095fd5d90
Feature in dev mode always pull from disk
2015-11-09 17:27:56 -08:00
Berkeley Martinez
8fe3a075bf
Hotfix fix basejump-zipline completion
2015-11-08 20:05:12 -08:00
terakilobyte
969204e2c8
Removes debugging statements
2015-11-07 16:40:36 -05:00
terakilobyte
d6cea74447
Offsets user displayed time to server timezone(EST) for the heatmap
2015-11-07 13:26:58 -08:00
Logan Tegman
2667b574bf
Fixes small bugs
...
+ With MDNLinks and bonfireExecute being run on step challenges.
+ Return when common isn't loaded in reBindModals instead of throwing.
2015-11-07 13:00:44 -08:00
Berkeley Martinez
328e75812a
Fix lint issues with gist saving
2015-11-06 17:48:17 -08:00
Berkeley Martinez
5dbfbfcf57
Add head/tail to challenge spec.
...
Lint EVERYTHING!
2015-11-06 17:32:01 -08:00
Logan Tegman
5b4eafe751
Merge pull request #3995 from bugron/feature/save-bonfire-solution-as-github-gist
...
Save bonfire's solution as a GitHub gist
2015-11-06 17:21:01 -08:00
Aniruddh Agarwal
81c74f4209
Merge pull request #4136 from FreeCodeCamp/greenkeeper-update-all
...
Update all dependencies 🌴
2015-11-06 10:53:26 +08:00
Berkeley Martinez
00fcdc9bc1
Fix news username query should be case insensitive
2015-11-05 17:06:13 -08:00
Berkeley Martinez
325e121d4e
Merge branch 'feature/find-posted-news-by-username' of https://github.com/bugron/FreeCodeCamp into bugron-feature/find-posted-news-by-username
2015-11-05 16:46:29 -08:00
Berkeley Martinez
085fc2fe72
Fix loopback explorer issue
2015-11-05 16:41:19 -08:00
Berkeley Martinez
c7d6426728
Merge pull request #4200 from FreeCodeCamp/fix/update-landing
...
Fix landing and nonprofits page
2015-11-05 16:14:11 -08:00
Quincy Larson
5430ccc3be
fix landing and nonprofit
2015-11-05 13:38:09 -08:00
Arsen Melikyan
8a5e12f6f3
find users news by typing their usernames in search box and fix FF CSS issue
2015-11-04 22:28:13 +04:00
Arsen Melikyan
59bd917a2c
save bonfire solution as a gist and fix search issue button query string
2015-11-04 15:48:20 +04:00
Berkeley Martinez
1f16b0f79a
Fix story search not closing connections
...
Now story search will use loopbacks mongo connection
to do search
2015-11-04 00:15:45 -08:00
Berkeley Martinez
a8b61f566d
Merge pull request #4156 from FreeCodeCamp/testimonial-update
...
Testimonial update and landing page improvement
2015-11-03 22:15:18 -08:00
Berkeley Martinez
692f577eb3
Fix linting issue
2015-11-03 21:54:42 -08:00
Logan Tegman
9bc6048a8d
Merge pull request #4122 from junhaoyap/feature/command-key
...
The cmd and ctrl button now both trigger events
2015-11-03 21:26:09 -08:00
junhaoyap
64ab919613
Make cmd and ctrl both trigger events
2015-11-03 20:59:07 -08:00
Quincy Larson
9995a73e6d
update testimonials
2015-11-03 17:58:47 -08:00
Quincy Larson
8931626bff
update map ad to prevent default when clicked
2015-11-03 17:44:03 -08:00
Quincy Larson
e064416dca
Update testimonial views
2015-11-03 17:39:02 -08:00
Quincy Larson
672b529f31
update challenge completion rate
2015-11-03 17:38:27 -08:00
Quincy Larson
559822485d
update landing page
2015-11-03 17:37:58 -08:00
Berkeley Martinez
406a821c34
Merge pull request #4094 from ltegman/fix/half-way-club-link-3934
...
Fix Half Way Club Gitter Link
2015-11-03 13:06:51 -08:00
Logan Tegman
0e4f85e8ea
Merge pull request #4120 from terakilobyte/newFlags
...
Adds 'new' callouts to top level challenge blocks
2015-11-02 20:47:24 -08:00
Logan Tegman
a028059aaf
Fix Half Way Club Gitter Link
...
Closes #3934
2015-11-02 18:20:44 -08:00
Arsen Melikyan
10ca69391f
fixes incorrect collection name in getStories function
2015-11-02 20:25:06 +04:00
Berkeley Martinez
41c8a97417
Merge pull request #4125 from FreeCodeCamp/update-ad
...
add medium ad to replace reddit one
2015-11-02 00:11:52 -08:00
Quincy Larson
d77d78a3b2
Merge branch 'staging' into feature/jobs
...
Conflicts:
seed/jobs.json
2015-11-02 00:07:16 -08:00
Quincy Larson
89b92c87cc
add medium ad to replace reddit one
2015-11-01 23:43:24 -08:00
Berkeley Martinez
0546e34abf
Merge pull request #4124 from FreeCodeCamp/update-titles
...
update page titles and sitemap
2015-11-01 23:35:07 -08:00
terakilobyte
502f7f83ba
Adds 'new' callouts to top level challenge block links if all challenges
...
all challenges in that block are new.
2015-11-01 19:36:28 -08:00
terakilobyte
c30f7f0795
Addresses lint errors
2015-11-01 17:45:01 -08:00
terakilobyte
16f97913be
Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging
2015-11-01 17:28:28 -08:00
Berkeley Martinez
254e0cdbf3
Merge pull request #3984 from ltegman/fix/ctrl-enter-works-when-not-logged-in-3900
...
Fix Ctrl-Enter doesn't work when not logged in.
2015-11-01 17:27:55 -08:00
terakilobyte
af30d4d56e
Implements a 'releasedOn' flag and marks challenges less than 30 days old as NEW https://www.dropbox.com/s/43un2a908ldktpl/Screenshot%202015-11-01%2017.06.53.png
2015-11-01 17:26:26 -08:00
Berkeley Martinez
f7530701ca
Change step challenge button layout
2015-10-31 22:48:42 -07:00
Berkeley Martinez
7532094abc
Merge branch 'feature/add-back-button-to-step-challenges' of https://github.com/bugron/FreeCodeCamp into bugron-feature/add-back-button-to-step-challenges
2015-10-31 22:22:39 -07:00
Berkeley Martinez
e5449ee65f
Fix linting errors
2015-10-31 22:13:18 -07:00
Arsen Melikyan
ab83f6d5fa
adds back button for step challenges
2015-10-31 17:24:05 +04:00
Quincy Larson
0fefac1090
update page titles and sitemap
2015-10-31 02:59:09 -07:00
Quincy Larson
03f189b260
add reddit add and update landing map stats
2015-10-30 23:39:11 -07:00
Berkeley Martinez
a8f2bb1b50
Fix font
2015-10-30 12:55:13 -07:00
Berkeley Martinez
c354ddf1ac
Expose jobs board to production.
2015-10-29 17:55:42 -07:00
Berkeley Martinez
134a3a52e8
Fix lint issue
2015-10-29 17:10:31 -07:00
Berkeley Martinez
e1a398597d
Prevent binding attacks
2015-10-29 17:10:30 -07:00
Berkeley Martinez
568d1ef1d2
Add promo model
2015-10-29 17:10:29 -07:00
Berkeley Martinez
25464c4f9e
Add jobs behind beta flag
2015-10-29 17:10:28 -07:00
Berkeley Martinez
c6c1d7dac4
Add redirects
2015-10-29 17:10:28 -07:00
Berkeley Martinez
ede8da38ba
Filter unpaid, unapproved and filled jobs
...
Fix missing key in react array
2015-10-29 17:10:27 -07:00
Berkeley Martinez
da26f19cde
Adds paypal button and completes the number of views
2015-10-29 17:10:26 -07:00
Logan Tegman
7fd5174fe0
Fix Ctrl-Enter doesn't work when not logged in.
...
Closes #3900
First time contributing real code, so please let me know any critiques or style changes I should make.
2015-10-29 00:13:20 -07:00
Berkeley Martinez
6613ed95cf
Merge pull request #3910 from FreeCodeCamp/clementine
...
Clementine waypoint is ready
2015-10-28 12:29:31 -07:00
Quincy Larson
fd7451e233
Merge branch 'staging' into improve-early-challenges
...
Conflicts:
seed/challenges/basic-javascript.json
seed/challenges/bootstrap.json
seed/challenges/html5-and-css.json
seed/challenges/object-oriented-and-functional-programming.json
2015-10-28 02:20:09 -07:00
Quincy Larson
63f56c94b8
continue refining waypoints
2015-10-27 17:49:58 -07:00
Jonathan
5597d0efe3
Update README.md
...
Fixed small typo on the first line: changed "due" to "do."
2015-10-26 19:28:33 -04:00
Quincy Larson
baaae041eb
add the FCC leaderboard to the labs json
2015-10-26 11:39:45 -07:00
Quincy Larson
dc26195395
finish clementine challenge for now
2015-10-25 23:28:53 -07:00
Quincy Larson
ac4a71a229
fix signin button to use signin instead of login for path
2015-10-25 21:46:54 -07:00
Ben McMahon
0f7b9add2f
Merge pull request #3868 from FreeCodeCamp/fix/javascript-linting
...
Fix linting in JavaScript editor
2015-10-24 00:05:53 +01:00
Berkeley Martinez
756efcd9fb
Fix linting in JavaScript editor
2015-10-23 15:38:51 -07:00
Quincy Larson
2ac70458b0
remove unnecessary bullet point from Camper News view
2015-10-23 14:28:27 -07:00
Quincy Larson
4910118366
update flash message
2015-10-23 14:12:09 -07:00
Quincy Larson
1db84d1455
Merge branch 'staging' into feature/block-camper-news
2015-10-23 14:08:19 -07:00
Berkeley Martinez
c13bdb65e5
Add camper must be auth with gitub to post to news
2015-10-21 22:05:27 -07:00
Berkeley Martinez
43155e85e8
Merge pull request #3848 from FreeCodeCamp/feature/nonprofit-ids
...
Feature/nonprofit ids
2015-10-21 21:41:48 -07:00
Quincy Larson
cbeacbb50c
Revert "further work to make challenges and news navigation consistent across mobile and desktop"
...
This reverts commit 286d0c06c4
.
2015-10-21 21:32:30 -07:00
Quincy Larson
1dc0e868b9
update nonprofit files and delete old commented code
2015-10-21 21:30:47 -07:00
Quincy Larson
5077f74ca1
start updating HTML challenge styling
2015-10-21 17:42:01 -07:00
Quincy Larson
286d0c06c4
further work to make challenges and news navigation consistent across mobile and desktop
2015-10-21 12:33:35 -07:00
Berkeley Martinez
7f86c71cb2
Merge pull request #3800 from QuincyLarson/tshirt-improvement
...
update tshirt banner
2015-10-20 11:33:27 -07:00
Quincy Larson
7f2f3885f8
change blog links to lead to medium subdomain
2015-10-19 21:55:29 -07:00
Quincy Larson
3d63b8b020
update tshirt banner
2015-10-18 19:03:01 -07:00
noinkling
b1a5f517a2
Move time text out of icon element on map page
2015-10-17 18:40:49 +13:00
Berkeley Martinez
af654aebdc
Hot fix for chat close button
2015-10-16 20:23:24 -07:00
Quincy Larson
4589b9ae39
add conditional buttons for mobile gitter
2015-10-16 16:45:38 -07:00
Berkeley Martinez
5b9c534bff
Fix logic on zipline/basejumps
2015-10-16 16:30:44 -07:00
Berkeley Martinez
1b75d041c1
Fix logic on basejump/ziplines
2015-10-16 16:20:34 -07:00
Berkeley Martinez
12eeef2f41
Add chat room titles
2015-10-16 16:10:45 -07:00
Berkeley Martinez
35219cdce3
Add main chat window on nav bar chat click
2015-10-16 11:57:33 -07:00
Berkeley Martinez
a0182957e7
Add chat to challenges!
2015-10-16 10:37:35 -07:00
Berkeley Martinez
745f059eeb
hotfix prevent server from starting twice
2015-10-14 23:49:32 -07:00
Quincy Larson
c552b6d05b
Merge pull request #3748 from FreeCodeCamp/feature/add-ga-social-tracking
...
Add google analytics tracking
2015-10-14 21:57:44 -07:00
Quincy Larson
6955615690
Merge pull request #3746 from FreeCodeCamp/fix/morgan-reporting-order
...
Change order of information in morgan reporting
2015-10-14 21:49:03 -07:00
Quincy Larson
e8b39648e2
Merge pull request #3745 from FreeCodeCamp/fix/ssl-redirect-rev
...
Remove rev helper use in ssl redirect
2015-10-14 21:48:51 -07:00
Quincy Larson
cf45d2b01f
update landing page and stories
2015-10-14 21:42:29 -07:00
Berkeley Martinez
7c0d801d63
Add google analytics tracking
2015-10-14 21:26:22 -07:00
Berkeley Martinez
aceb1dd9e6
Change order of information in morgan reporting
2015-10-14 20:51:38 -07:00
Berkeley Martinez
3ae7da38a3
Remove rev helper use in ssl redirect
2015-10-14 20:41:36 -07:00
Quincy Larson
99db9eaf33
Merge branch 'staging' into success-stories
2015-10-14 20:00:11 -07:00
Berkeley Martinez
3e828ba266
Merge pull request #3727 from QuincyLarson/estimates
...
Time estimates for each block of challenge (by popular request)
2015-10-13 15:49:39 -07:00
Berkeley Martinez
7424d85f09
Merge pull request #3728 from FreeCodeCamp/update-step-challenges
...
Update step challenges
2015-10-13 15:05:03 -07:00
Quincy Larson
2bbb3e98db
Merge pull request #3716 from FreeCodeCamp/feature/jobs
...
Update loopback, ThunderCats and RxJS.
2015-10-13 14:43:56 -07:00
Quincy Larson
407bd16aaf
make additional improvements and fixes to step challenges
2015-10-13 10:04:44 -07:00
Quincy Larson
8da93ddea9
add spacing and nowrap to ensure time stays on single line
2015-10-12 23:02:24 -07:00
Quincy Larson
f30239fb6c
add time estimates to challenge blocks on map
2015-10-12 22:56:10 -07:00
Quincy Larson
3dee03d38b
add more stories and clean up css
2015-10-12 01:22:11 -07:00
Berkeley Martinez
7b444b15dc
Update loopback, ThunderCats and RxJS.
...
closes #2929
2015-10-11 17:35:46 -07:00
uwaseem
21c78f9f96
Removed an extra m from the word commit
2015-10-11 17:41:27 +08:00
Berkeley Martinez
749357933d
Merge pull request #3669 from FreeCodeCamp/fix/challenge-sequence
...
Fix mis-sequence of challenges and fix some quick issues campers reported about challenges
2015-10-09 19:43:00 -07:00
Quincy Larson
c2da02bf8a
improve copy on button
2015-10-09 19:33:15 -07:00
Berkeley Martinez
91df8cba6f
Merge pull request #3666 from FreeCodeCamp/fix/commit
...
update look of commit
2015-10-08 17:26:07 -07:00
Berkeley Martinez
fcd7e096b2
Fix alt attribute
2015-10-08 17:25:47 -07:00
Quincy Larson
da29152783
Merge branch 'fix/commit' of https://github.com/freecodecamp/freecodecamp into fix/commit
...
Conflicts:
server/views/commit/index.jade
2015-10-08 17:21:30 -07:00
Quincy Larson
6fafbdf441
improve stories view
2015-10-08 17:05:42 -07:00
Berkeley Martinez
e62375516b
Add commit button functionality
2015-10-08 17:00:15 -07:00
Quincy Larson
66120a60b8
update look of commit
2015-10-08 16:29:43 -07:00
Quincy Larson
920d9ba403
Merge pull request #3655 from FreeCodeCamp/fix/remove-unused-endpoint
...
Remove unused jobs-form endpoint
2015-10-08 15:31:09 -07:00
Quincy Larson
ce57a13a88
Merge pull request #3657 from FreeCodeCamp/fix/harded-certs
...
Harden showCert against errors
2015-10-08 15:30:13 -07:00
Berkeley Martinez
0dc35f2b0a
Fix show certs to anon user
...
closes #3648
2015-10-08 09:02:35 -07:00
Berkeley Martinez
ba88def035
Harden showCert against errors
2015-10-08 08:48:52 -07:00
Berkeley Martinez
76618efcd0
Remove unused jobs-form endpoint
2015-10-08 08:12:48 -07:00
Berkeley Martinez
1695a760ef
Fix check for _id as well as id during certification
2015-10-07 16:30:51 -07:00
Berkeley Martinez
155f9359a1
Fix default dollar amount incorrectly set
2015-10-07 14:37:48 -07:00
Berkeley Martinez
0cb8c6c58b
hot patch/ prevent dedube
2015-10-07 06:05:33 -07:00
Berkeley Martinez
f9d616a4a6
Merge pull request #3626 from QuincyLarson/fix/learn-button
...
fix learn button
2015-10-07 02:40:00 -07:00
Quincy Larson
066b2ac7f9
fix learn button
2015-10-07 02:35:23 -07:00
Berkeley Martinez
c6914fa205
Fix small typo on certification challenge
2015-10-07 02:22:04 -07:00
Berkeley Martinez
f2679810a9
fix some typos in commit and getting started
2015-10-07 02:11:23 -07:00
Quincy Larson
cdbd052b35
Merge branch 'staging' into clementine
2015-10-07 01:29:15 -07:00
Quincy Larson
1f7141c523
Merge branch 'staging' into clementine
2015-10-07 01:28:41 -07:00
Berkeley Martinez
0f6cdf8be1
Merge pull request #3615 from FreeCodeCamp/feature/commit
...
Add feature Commit
2015-10-07 01:23:24 -07:00
Berkeley Martinez
a906b8f411
Fix firstChallenge var should point to new first challenge
2015-10-07 01:14:33 -07:00
Quincy Larson
adfbdd7f9f
more style improvements
2015-10-07 01:06:36 -07:00
Quincy Larson
f7500c4bb0
improve style
2015-10-07 00:44:46 -07:00
Quincy Larson
a1b574f768
update camper portfolio page
2015-10-07 00:41:43 -07:00
Quincy Larson
cd964425f7
add t-shirt banner
2015-10-07 00:41:42 -07:00
Berkeley Martinez
241ca8097d
Fix link errors in randomAPIs
2015-10-07 00:28:42 -07:00
Berkeley Martinez
7a4f5d752c
Move labs/stories to server/resources
...
Rename stories to testimonials to reduce confusion
2015-10-07 00:26:17 -07:00
Quincy Larson
ea827fda37
Remove unnecessary dangling class
2015-10-07 00:17:18 -07:00
Quincy Larson
4f26d82f65
add labs and stories
2015-10-07 00:17:18 -07:00
Quincy Larson
56673d429d
add labs
2015-10-07 00:17:17 -07:00
Quincy Larson
febdc5b0cc
hide more info button
2015-10-07 00:17:17 -07:00
Berkeley Martinez
92b9f71532
Add commit directory page
2015-10-07 00:05:26 -07:00
Berkeley Martinez
f5966c0959
Change redirect and text on commit
2015-10-06 23:33:17 -07:00
Berkeley Martinez
3273593b9c
Change order of edit buttons on profile
2015-10-06 23:32:31 -07:00
Berkeley Martinez
364f79818f
Fix dynamic commit link
2015-10-06 23:26:15 -07:00
Berkeley Martinez
44fd85dff8
Add ability to filter beta challenges from production
...
This PR adds the ability to test out challenges in beta
without fear that they will leak to production servers.
In development all challenges will display.
In production all challenges marked 'isBeta' will be filtered out
except in the case the environmental variable `BETA` is set ture,
in which case all challenges will display.
2015-10-06 22:37:08 -07:00
Berkeley Martinez
2864f607cc
Add on certification, complete goal and stop pledge
2015-10-06 21:12:40 -07:00
Berkeley Martinez
49c06b266e
Add complete commit endpoint
2015-10-06 19:51:19 -07:00
Berkeley Martinez
0b716c0057
Add stop commit functionality
2015-10-06 19:51:19 -07:00
Berkeley Martinez
d132978df9
Add ability to edit commit
2015-10-06 19:51:19 -07:00
Berkeley Martinez
362efd4365
Add display on user profile when user commits
2015-10-06 19:51:19 -07:00
Berkeley Martinez
c8da944caf
Add logic to load nonprofit on query
...
Add logic to model update
2015-10-06 19:51:19 -07:00
Berkeley Martinez
bc6a9c6db2
Add redirect to user page on submit
2015-10-06 19:51:19 -07:00
Berkeley Martinez
d1c0276f4e
fix spiffy up the commit form
2015-10-06 19:51:19 -07:00
Berkeley Martinez
3f96490aff
Add pledge model
2015-10-06 19:51:19 -07:00
Quincy Larson
914f2ef0b8
Merge pull request #3611 from FreeCodeCamp/fix/replace-script-tag-in-url
...
Fix replace script tags in URL
2015-10-06 16:48:37 -07:00
Quincy Larson
b1d8814aed
remove angular from views
2015-10-06 16:43:46 -07:00
Berkeley Martinez
33e8f35bbf
Fix replace script tags in URL
...
Replace script tags in URL with fcc tags.
This prevents some xss bugs blocking code from running
in the iFrame.
2015-10-06 16:39:15 -07:00
Quincy Larson
60d059f71e
remove angular from bower file and scripts
2015-10-06 16:17:31 -07:00
Quincy Larson
b8dc81214d
Merge branch 'staging' into remove-angular
...
Conflicts:
server/boot/user.js
server/views/account/show.jade
2015-10-06 16:00:59 -07:00
Quincy Larson
ebe0165fba
Merge pull request #3601 from FreeCodeCamp/fix/user-certs-edge-cases
...
Fix/user certs edge cases
2015-10-05 22:43:39 -07:00
Quincy Larson
d78d7a3fa1
Merge branch 'staging' of https://github.com/freecodecamp/freecodecamp into staging
2015-10-05 22:43:17 -07:00
Quincy Larson
9a0505f782
add github linking enforcement
2015-10-05 22:42:42 -07:00
Berkeley Martinez
e6afda62c7
Add 5 dollar option to commit
2015-10-05 22:19:56 -07:00
Berkeley Martinez
e16efc832c
Move commit to separate router
2015-10-05 22:19:56 -07:00
Quincy Larson
f02b3ffd4c
update commit copy
2015-10-05 22:19:56 -07:00
Quincy Larson
68b12caf48
minor improvements to onboarding and create skeleton commit page
2015-10-05 22:19:55 -07:00
Quincy Larson
84eb5ac810
Merge pull request #3596 from FreeCodeCamp/fix/500-out-of-range-bug
...
Fix 500 out of range bug when completing last challenge
2015-10-05 22:15:26 -07:00
Quincy Larson
c27e5bf6c4
start adding clementine challenge
2015-10-05 21:57:15 -07:00
Berkeley Martinez
85f2c005cd
fix shareable challenges solution undefined
...
During challenges when a user tries to navigate to a challenge
and hits the name redirect, the solution is filled with
undefined starting the user with an empty box.
This PR fixes the issue by ignoring the solution param
if it is empty
2015-10-05 20:18:52 -07:00
Berkeley Martinez
188da02ffc
Fix disable cert
...
Disable certificate when user is locked to the public
or when they haven't signed academic honesty
2015-10-05 20:00:25 -07:00
Berkeley Martinez
202d0fa068
Fix add to completed challenges on cert verify
2015-10-05 19:58:44 -07:00
Quincy Larson
34efc43f6a
update copy of certificate flows
2015-10-05 17:18:35 -07:00
Berkeley Martinez
8f84596142
Fix 500 out of range bug when completing last challenge
2015-10-05 16:38:58 -07:00
Berkeley Martinez
8c48626f03
Add certification page
2015-10-05 15:55:50 -07:00
Berkeley Martinez
5c3973c365
Fix last completed logic bug
...
This PR fixes a regression introduced in an earlier patch
2015-10-02 10:50:35 -07:00
Berkeley Martinez
a90fdf1e0c
Fix check for existence
2015-10-01 23:58:56 -07:00
Berkeley Martinez
ee35fe075c
Feature show Waypoints on user profile page
...
This PR also fixes some bugs in lockedDown mode
2015-10-01 23:03:52 -07:00
Berkeley Martinez
6c305dbc67
feature make completedChallenges uniq
...
now when users complete a challenge, it will instead update the
last save if it exists.
2015-10-01 22:19:26 -07:00
Berkeley Martinez
d0528ec768
fix re-encode uri during redirect
2015-10-01 21:11:15 -07:00
Berkeley Martinez
8a1a7f238d
fix undefined username and remove old function
...
fix many bugs and undefined
fix linting errors
2015-10-01 21:03:28 -07:00
Quincy Larson
d8fd63fb87
Merge branch 'staging' into merge-account-page
2015-10-01 20:39:56 -07:00
Quincy Larson
b197358056
make one page profile with bonfire solution urls
2015-09-30 21:04:16 -07:00
Berkeley Martinez
5de6837959
Merge pull request #3548 from FreeCodeCamp/converge-bonfires
...
refactor all Bonfire tests to use assert and have friendly messages
2015-09-30 19:47:20 -07:00
Quincy Larson
dca179c2c5
Merge branch 'staging' into converge-bonfires
...
Conflicts:
seed/challenges/basic-bonfires.json
seed/challenges/intermediate-bonfires.json
2015-09-30 19:06:28 -07:00
Quincy Larson
416a866ec0
add step based challenge to framework
2015-09-30 13:26:06 -07:00
Quincy Larson
03675ef0a6
finish QAing basic and intermediate bonfires
2015-09-30 01:33:07 -07:00
Quincy Larson
ab204c654e
fix search results formatting for mobile and desktop camper news
2015-09-29 22:52:19 -07:00
Quincy Larson
242351e0e4
Merge pull request #3541 from FreeCodeCamp/fix/last-challenge-name
...
fix check for existance when getting last challenge
2015-09-29 22:37:57 -07:00
Berkeley Martinez
cdf8c6a54c
fix check for existance when getting last challenge
2015-09-29 22:12:02 -07:00
Quincy Larson
ee9827ea58
fix issues with get-started and remove pair button
2015-09-29 17:59:16 -07:00
Quincy Larson
31f9b7d707
Merge pull request #3530 from FreeCodeCamp/map-share
...
add facebook sharing to map on completed challenges
2015-09-28 20:08:06 -07:00
Berkeley Martinez
c7d68932ce
Show share button from last completed
2015-09-28 19:47:45 -07:00
Berkeley Martinez
6a5bea67f7
set last completed block in map view
2015-09-28 19:20:29 -07:00
Quincy Larson
1ff55374db
improve facebook sharing copy
2015-09-28 19:04:44 -07:00
Quincy Larson
91efd5940d
add facebook sharing to map on completed challenges
...
remove twitter share from non-bonfire challenges
2015-09-28 17:35:25 -07:00
Quincy Larson
7900628d2a
Merge pull request #3525 from FreeCodeCamp/feature/jobs
...
intermediate pull
2015-09-28 17:35:13 -07:00
Quincy Larson
27f231e72f
refactor tests to show same message when passing and failing
2015-09-27 23:22:06 -07:00
Quincy Larson
3e25b3a6bc
improve button html
2015-09-27 21:52:13 -07:00
Quincy Larson
e74533a727
add lockdown mode toggling
2015-09-27 17:08:56 -07:00
Quincy Larson
85a5766546
update the tshirt campaign text
2015-09-27 16:25:34 -07:00
Quincy Larson
5b5b37adff
fix tshirt version 2 not submitting properly bug
2015-09-27 14:00:55 -07:00
Quincy Larson
d08c3e5a88
Merge pull request #3514 from FreeCodeCamp/tshirt
...
Tshirt voting mechanism
2015-09-27 11:06:26 -07:00
Quincy Larson
a64a46cff1
don't show tshirt voting to brand new users
2015-09-27 11:05:44 -07:00
Quincy Larson
ccf5504537
add tshirt voting mechanism
2015-09-27 10:49:44 -07:00
Quincy Larson
0634926af0
add t-shirts to view
2015-09-27 01:44:09 -07:00
Berkeley Martinez
c985a0f16e
Merge pull request #3478 from FreeCodeCamp/remove-emails
...
remove email address from stories
2015-09-23 18:11:13 -07:00
Quincy Larson
de976c18ba
remove email address from stories
2015-09-23 15:20:45 -07:00
Berkeley Martinez
bf95314830
fix prevent redirect to /news/hot
2015-09-23 15:05:27 -07:00
Quincy Larson
29dab96b9b
Merge pull request #3475 from FreeCodeCamp/fix/redirect-whitelist
...
fix only allow redirects on whitelist
2015-09-23 14:55:10 -07:00
Berkeley Martinez
baab92e3a0
fix only allow redirects on whitelist
2015-09-23 14:54:08 -07:00
Quincy Larson
04bdb9677e
Merge pull request #3356 from leonfeng/fix/gooleapis
...
Replace Google-hosted scripts with cdnjs equivalents
2015-09-23 14:53:58 -07:00
Quincy Larson
51af4e4b0d
Merge branch 'google-cdns' into remove-angular
...
Conflicts:
server/boot/user.js
server/views/account/show.jade
server/views/account/signin.jade
server/views/coursewares/showBonfire.jade
server/views/coursewares/showZiplineOrBasejump.jade
server/views/partials/scripts.jade
2015-09-23 09:56:01 -07:00
Quincy Larson
51e5c54f81
update CDNs to be non-google
2015-09-23 09:17:13 -07:00
Berkeley Martinez
e579cbd778
update to react-router 1.0.0-rc1
2015-09-21 12:54:33 -07:00
Berkeley Martinez
39fdd637d5
fix load fonts through css
...
attempt to cache font files and load after dom init
resulted in a visible jitter when fonts transitioned.
2015-09-21 12:16:10 -07:00
Leon Feng
a682009025
Replace Google-hosted scripts with cdnjs equivalents
2015-09-19 08:55:04 +08:00
Berkeley Martinez
2fee89b0e6
fix invisible div blocking run button
...
bootstrap classes stack on smaller screens if breakpoints are not
met. This fix removes the smaller screen classes that forced divs
that would otherwise stack to instead overlay each other. This is
the cause of the run button being blocks on smaller screens as a
col that should stack to the bottom was instead being pushed to
top.
closes #1466
2015-09-17 12:42:31 -07:00
Berkeley Martinez
723b490932
load lato font after dom ready
2015-09-17 09:57:27 -07:00
Berkeley Martinez
38d76ec3bb
split fonts into two separate files
2015-09-17 00:06:01 -07:00
Berkeley Martinez
04727620e4
Merge branch 'leonfeng-enhancement-3311' of https://github.com/leonfeng/FreeCodeCamp into fix/fonts
2015-09-16 23:50:24 -07:00
Leon Feng
6e53b8701d
Replace Google Fonts with locally served fonts
2015-09-17 04:53:33 +08:00
Anton Strömkvist
81cede35b4
Merge pull request #3325 from bugron/fix/news-no_results_found-padding
...
Fixes position of 'No Results Found' text
2015-09-16 22:21:09 +02:00
Arsen Melikyan
d302e7e16c
fixes position of 'No Results Found' text
2015-09-15 22:32:51 +04:00
Arsen Melikyan
829257194d
removes the checkbox and improves a condition
2015-09-15 20:27:36 +04:00
Berkeley Martinez
f659141746
Merge pull request #3292 from FreeCodeCamp/improve-map
...
adjust map font size and simplify Facebook share call to action
2015-09-14 14:15:50 -07:00
Quincy Larson
118c71e57e
fix css issue and use bower instead of files
2015-09-14 14:05:43 -07:00
Quincy Larson
e107b0e005
Merge branch 'feature/enlarge-images' of https://github.com/bugron/FreeCodeCamp into bugron-feature/enlarge-images
2015-09-14 13:43:34 -07:00
bugron
c6e3c89b7c
adds ability to 1-click expand images
2015-09-14 21:10:28 +04:00
Quincy Larson
953df6826b
fix merge conflicts
2015-09-14 00:02:42 -07:00
Quincy Larson
957a5329e5
adjust map font size and simplify Facebook share call to action
2015-09-13 20:26:33 -07:00
Berkeley Martinez
9fd22e8264
remove unnecessary class
2015-09-12 18:51:44 -07:00
Berkeley Martinez
044571a8be
Merge branch 'ahstro-3258' of https://github.com/ahstro/freecodecamp into ahstro-ahstro-3258
2015-09-12 18:27:25 -07:00
ahstro
7f6bcaa704
Include code in issue + issue body improvements
...
This creates an auto-checked checkbox next to the 'Create my GitHub
issue'-button that, when checked, includes the camper's code in the body
sent to GitHub when creating a new issue.
Also includes some general improvements to how the way the issue
creation is handled and how the output looks.
2015-09-13 01:54:26 +02:00
Berkeley Martinez
ee92c923d7
Merge pull request #3254 from FreeCodeCamp/more-info
...
Reorient Search and Submit buttons on Camper News
2015-09-12 13:20:36 -07:00
Quincy Larson
4cd5168aac
reorient search and submit buttons to look more conventional
2015-09-11 23:30:10 -07:00
Berkeley Martinez
dfed1538c7
render individual job on request and window transition
2015-09-10 16:27:10 -07:00
Berkeley Martinez
e3ac50a0d5
remove old manifest file on request in dev
2015-09-10 16:27:09 -07:00
Berkeley Martinez
cd4ee10838
add job subroutes
2015-09-10 16:27:08 -07:00
Quincy Larson
0391faf5a2
fix meta tags for facebook
2015-09-09 23:05:58 -07:00
Berkeley Martinez
0791c99945
remove commit garbage
2015-09-09 20:47:46 -07:00
Berkeley Martinez
ca50f8250f
Merge pull request #3217 from QuincyLarson/signin-copy
...
improve signin page copy and move twitter to bottom of list
2015-09-09 20:41:59 -07:00
Quincy Larson
d02ad70913
Merge pull request #3205 from FreeCodeCamp/feature/ctrl-enter-submit
...
add ctrl enter press to submit on modal
2015-09-09 20:40:02 -07:00
Berkeley Martinez
40f53fc7c8
Merge pull request #3216 from QuincyLarson/unauthenticated-buttons
...
Help, Pair and Bug buttons for unauthenticated campers
2015-09-09 20:38:36 -07:00
Berkeley Martinez
7ab36aa785
Merge pull request #3207 from QuincyLarson/fb-share
...
Fb share button on map
2015-09-09 20:28:05 -07:00
Berkeley Martinez
5490557592
Merge pull request #3041 from QuincyLarson/meta
...
Update meta tags and copy
2015-09-09 20:20:32 -07:00
Quincy Larson
08907b8ddb
improve signin page copy and move twitter to bottom of list
2015-09-09 19:55:23 -07:00
Quincy Larson
c70fe77952
Merge branch 'staging' into unauthenticated-buttons
...
Conflicts:
server/views/coursewares/showVideo.jade
server/views/coursewares/showZiplineOrBasejump.jade
2015-09-09 19:54:13 -07:00
Quincy Larson
ee9a2d681f
make help, pair, bug buttons accessible to unauthenticated campers
2015-09-09 19:51:24 -07:00
Berkeley Martinez
d3e77f1282
add ctrl enter press to submit on modal
...
this adds the ability for a camper to press ctrl + enter to submit
a challenge while the challenge completion modal is open
2015-09-09 19:33:01 -07:00
Berkeley Martinez
a5f30414ab
Merge pull request #3206 from QuincyLarson/more-info
...
remove unnecessary elipses from more info buttons
2015-09-09 18:59:56 -07:00
Quincy Larson
4d427f8318
simplify modal animations and close #2792
2015-09-09 18:55:20 -07:00
Quincy Larson
0eeb6891f7
Merge branch 'staging' into fb-share
2015-09-09 13:47:54 -07:00
Quincy Larson
501bd51e8b
remove unnecessary elipses from more info buttons
2015-09-09 13:38:18 -07:00
Quincy Larson
2896cee8f5
simplify fb-share call to action and minimize sizze
2015-09-09 00:10:36 -07:00
Quincy Larson
cfba4edb29
add further code to be QAd after sleeping
2015-09-08 23:48:11 -07:00
Quincy Larson
c4c9068950
start refactoring account view into show view
2015-09-08 22:52:32 -07:00
Berkeley Martinez
b2d04ec7c5
remove save to user on return individual user
2015-09-08 22:41:03 -07:00
Berkeley Martinez
9cc862e9a6
add learn button functionality
...
learn button looks for current challenge in localStorage
if not present sends user to map
2015-09-08 22:31:20 -07:00
Berkeley Martinez
184ba1fa37
add challengeId to localStorage
...
remove unneeded current challenge route
2015-09-08 22:18:25 -07:00
Quincy Larson
f0a4924671
start refactoring next challenge logic
2015-09-08 21:45:53 -07:00
Quincy Larson
1e82165ed2
add learn button back in and fix redirect loop associated with it
2015-09-08 21:15:18 -07:00
Berkeley Martinez
f42b671e17
Merge pull request #3119 from bugron/bugron-bring_br_back
...
Removes unnecessary 'negative-15' class
2015-09-08 07:25:17 -07:00
bugron
8fd99e3350
removes unnecessary class
2015-09-08 16:30:44 +04:00
Quincy Larson
5502aba817
further revisions to simplify bug modal
2015-09-07 08:18:44 -07:00
Quincy Larson
e7e6bbb174
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-09-07 07:56:25 -07:00
Quincy Larson
e49bcece7d
Merge branch 'bugron-bug_btn_enhancement_merged' of https://github.com/bugron/FreeCodeCamp into bugron-bugron-bug_btn_enhancement_merged
2015-09-07 07:25:14 -07:00
Quincy Larson
73ef8b9d2b
fix a view bug
2015-09-06 03:12:59 -07:00
bugron
46a83b42a1
removes the checkbox at all
2015-09-06 11:40:06 +04:00
Quincy Larson
4c22d061df
start working on fb-share
2015-09-04 18:36:28 -07:00
Quincy Larson
79a396b9c8
Merge branch 'patch-1' of https://github.com/tcyrus/FreeCodeCamp into staging
...
Conflicts:
server/views/coursewares/showHTML.jade
2015-09-04 14:26:56 -07:00
Timothy Cyrus
f8a5d0d7ba
Update showHTML.jade
...
Fix Styling issue with Submit Button based on showJS.jade and showBonfire.jade
2015-09-04 14:11:52 -04:00
Quincy Larson
57e1fbf781
update copy in views
2015-09-03 18:35:42 -07:00