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
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
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
3ae7da38a3
Remove rev helper use in ssl redirect
2015-10-14 20:41:36 -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
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
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
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
Berkeley Martinez
155f9359a1
Fix default dollar amount incorrectly set
2015-10-07 14:37:48 -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
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
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
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
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
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
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
c27e5bf6c4
start adding clementine challenge
2015-10-05 21:57:15 -07:00
Berkeley Martinez
8c48626f03
Add certification page
2015-10-05 15:55:50 -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
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
ee9827ea58
fix issues with get-started and remove pair button
2015-09-29 17:59:16 -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
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
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
Quincy Larson
de976c18ba
remove email address from stories
2015-09-23 15:20:45 -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
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
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
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
Quincy Larson
30aafd4185
update meta and other references to new short tagline
2015-09-02 17:42:18 -07:00
Quincy Larson
4b6cb490b7
update meta tags
2015-09-02 17:37:23 -07:00
bugron
887722d5c8
checkbox is now checked by default
2015-09-01 17:13:16 +04:00
bugron
8fdacb7e34
This commit extends 'Bug' button's functionality
2015-09-01 07:18:44 +04:00
jameskopacz
70b769cc6a
Updated text to "Submit and go to next challenge"
2015-08-30 23:49:21 -05:00
jameskopacz
c036e00f53
Updated challenge submit button text from "Submit" to "Go to my next challenge"
2015-08-30 23:17:22 -05:00
Florian Beijers
a3b54e3e63
added a space in the sr-only span for challenge map so it doesn't run together and fixed a typo on the getting started page
2015-08-30 12:43:27 +02:00
benmcmahon100
71b6e21e77
Added the accessibility fix and added the hack to fix the challenge complete modal
2015-08-30 00:31:07 +01:00
Berkeley Martinez
702dbeceab
change Run code button to Run tests
...
Changes run button copy
closes #2846
2015-08-29 09:30:47 -07:00
Berkeley Martinez
f0b953eb66
fix typo js challenges view
2015-08-29 01:05:07 -07:00
Berkeley Martinez
6c48395868
separate main manifest generation from sub manifests
...
in dev mode always pull manifest on each request
add manifest build to gulp build task
add react bundle to manifest generation
2015-08-28 15:56:58 -07:00
Berkeley Martinez
376b58cc15
combine sandbox into commonFramework
...
a @benmcmahon suggestion
2015-08-27 12:37:41 -07:00
Berkeley Martinez
306c441ae7
add revisioning to js/css files to break caching
...
This moves the location of javascript files, commonFramework,
iFrameScript, sandbox, plugin, and all the less files.
On gulp or gulp build these files are moved and revisioned.
Places where they are references in jade/html are now removed and
replaced with the use of a helper function `rev`. This function will
take the required file and return a string referencing the revisioned
file. This should alleviate the need for hard refreshing and will break
caches when files change, so fixes for firefox caching issue as well.
NOTE: @benmcmahon @quincylarson, This means files will need to be build
on the server in production before doing a server restart/reload
In production: 'npm run build' To build and revision js/css files
`gulp` and `gulp build` will used in development
npm install also needs to be run in production on initial deploy
2015-08-26 23:30:33 -07:00
Berkeley Martinez
39f636ae91
add loader to challenge submit
2015-08-26 15:17:38 -07:00
benmcmahon100
7c3f650521
Bump up cFW version number to ensure eveyone is on te latest version
2015-08-26 22:37:54 +01:00
Berkeley Martinez
2c9ed16b7a
fix only submit on user click
2015-08-26 13:09:38 -07:00
benmcmahon100
306551848c
Update cFW version no
2015-08-26 20:45:50 +01:00
benmcmahon100
a63d6bd00b
Fixed my stupid mistake that almost killed the server again
2015-08-26 20:22:29 +01:00
benmcmahon100
695ad48778
Fixed version number
2015-08-26 12:26:01 +01:00
benmcmahon100
9f9f151a6f
Re add init run
2015-08-26 12:24:44 +01:00
benmcmahon100
8cdd49e7f1
Fix caching issue with frameworks
2015-08-26 01:13:17 +01:00
Berkeley Martinez
851af506b5
Merge pull request #2691 from QuincyLarson/alt-text
...
Add more alt text to onboarding page.
2015-08-25 15:21:44 -07:00
Berkeley Martinez
14d1d1db02
fix left panel jitter jump
2015-08-25 14:49:19 -07:00
benmcmahon100
b1b07a5b9e
Fixed major Fudge up with challenges without functions
2015-08-25 22:25:00 +01:00
Quincy Larson
56b18f313b
update get-started alt text
2015-08-25 14:23:47 -07:00
Ben McMahon
c913e9bbf7
Merge pull request #2679 from FreeCodeCamp/staging
...
update framework to remove merge conflicts
2015-08-25 19:41:29 +01:00
benmcmahon100
14cc6a7cef
Final touch up to the framework before merge
2015-08-25 19:28:13 +01:00
Quincy Larson
50f1705cbc
start updating alt text
2015-08-25 08:59:42 -07:00
Quincy Larson
a94c919374
update cost calculator
2015-08-24 19:19:47 -07:00
Berkeley Martinez
67681d41f6
Merge pull request #2487 from bugron/bugron-news_more_btn_fix
...
Fixes info buttons' text in Camper News search results
2015-08-24 11:12:12 -07:00
benmcmahon100
1477f56f97
Merge of the frameworks: the desolation of the views
2015-08-23 22:26:02 +01:00
benmcmahon100
ede956e1d6
Merge of the frameworks: an unexpected merge
2015-08-23 21:59:29 +01:00
Isabell Long
d85eded058
Consistently capitalize GitHub in the account settings text
...
- Also remove the capital D from Delete in the confirmation line—it's
not the start of a sentence.
2015-08-23 13:52:14 +01:00
benmcmahon100
38397fa5f7
Fixed help modal part 3: the modal strikes back
2015-08-22 23:18:10 +01:00
Quincy Larson
73eb6ec2d1
kind of got the modals working - Ben will finish this
2015-08-22 12:10:08 -07:00
Arsen Melikyan
37b4530df2
Fixes info buttons' text in Camper News search results
...
In Camper News search results "more info..." buttons' text changes to "more info.more info...". This commit fixes that.
2015-08-22 17:11:44 +04:00
Quincy Larson
ebb84c9e75
more refinement to simplified profile view
2015-08-21 22:53:38 -07:00
Quincy Larson
d49b303de3
update look of profile
2015-08-21 22:52:09 -07:00
benmcmahon100
901f1a977d
Merge remote-tracking branch 'origin/staging' into staging
2015-08-22 00:59:34 +01:00
benmcmahon100
38a73e392f
Deactivated scroll locking
2015-08-22 00:59:21 +01:00
Berkeley Martinez
0f3acc629c
fix profile linking
2015-08-21 16:09:07 -07:00
Quincy Larson
adc50b764d
uncomment social linking
2015-08-20 19:52:48 -07:00
benmcmahon100
d52a2d8da0
Attempt to sorta fix the scroll locker resetting
2015-08-20 16:48:46 +01:00
Quincy Larson
538e48e237
start updating showZiplineOrBasejump view to function post-angular
2015-08-19 17:56:44 -07:00
Quincy Larson
23b7c4f20f
remove difficulty from bonfires to make things look more consistent
2015-08-19 17:56:14 -07:00
Quincy Larson
a92db3bbf1
remove angular from universal head
2015-08-19 17:44:18 -07:00
Quincy Larson
1dadc48aea
remove angular from user account creation flows
2015-08-19 15:55:40 -07:00
benmcmahon100
f4eecc9127
Merge pull request #1993 from kurzninja/patch-4
...
Potentially missing ;
2015-08-19 21:30:09 +01:00
Quincy Larson
04c9d376f7
remove server maintenance warnings
2015-08-18 23:48:31 -07:00
Berkeley Martinez
bc84a25ff9
add message on emergency maintenance
2015-08-18 23:07:06 -07:00
Berkeley Martinez
478ed3c522
fix should toString userId's
2015-08-18 15:23:26 -07:00
Quincy Larson
9dcf284825
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-08-18 15:21:38 -07:00
Quincy Larson
b4ae49f915
add challenge type to beginning of challenge in map
2015-08-18 15:21:26 -07:00
Quincy Larson
b667a776ea
add bonfires back in but now they are only visible to their creators
2015-08-18 14:53:18 -07:00
Berkeley Martinez
b2f4e520cb
fix account link failure now flashes
2015-08-18 14:48:52 -07:00
benmcmahon100
366b9e98a7
Merge remote-tracking branch 'origin/staging' into staging
2015-08-18 19:32:04 +01:00
Quincy Larson
0d0528a743
fix LinkedIn link in footer
2015-08-18 11:22:59 -07:00
benmcmahon100
6de1f49a1f
Temp fix for buttons on modals and bonfires exec on load
2015-08-18 19:21:34 +01:00
Berkeley Martinez
112972cfdd
fix enables email login
2015-08-18 01:32:37 -07:00
Brett Guillory
c5d07b9e05
Potentially missing ;
...
My browser was throwing an error:
```Uncaught SyntaxError: missing ) after argument list```
That pointed to this line in the console as far as I could tell.
If this is a fix, w00t. If not, ignore this.
2015-08-17 22:05:16 -05:00
Berkeley Martinez
495aac8233
remove part of note about email signin
2015-08-17 19:21:57 -07:00
benmcmahon100
fe102bdf51
fix #1840
2015-08-17 14:04:12 +01:00
Ionut Costica
c39189eab0
Fix for Issue #1828
2015-08-17 15:04:53 +03:00
Quincy Larson
07dd58d65b
update copy and remove bug warnings
2015-08-16 23:43:57 -07:00
Quincy Larson
2634569e60
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-08-16 19:34:44 -07:00
Quincy Larson
21cbbc2233
Update warning messages
2015-08-16 19:34:23 -07:00
benmcmahon100
3be62c5374
Fixed the script issues
2015-08-17 00:04:20 +01:00
Quincy Larson
dfc557f9e6
move refactor all non-jquery JS to load last
2015-08-16 13:49:43 -07:00
Quincy Larson
de10e77645
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-08-16 11:02:33 -07:00
Quincy Larson
454e59939e
add wiki to tops of pages
2015-08-16 11:02:22 -07:00
Berkeley Martinez
de7eb3d440
fix email password reset
2015-08-16 09:54:59 -07:00
Quincy Larson
58d86ce2dc
hide linking buttons
2015-08-16 06:07:38 -07:00
Quincy Larson
edb58f6890
add authentication back in
2015-08-16 05:47:13 -07:00
Quincy Larson
63d506c14f
remove beta warning
2015-08-16 04:06:01 -07:00
Quincy Larson
e3404c6564
minor improvements and bug fixes to stories
2015-08-15 14:13:21 -07:00
Berkeley Martinez
bcdda9c62a
fix unexpected syntax error on map
2015-08-14 18:25:34 -07:00
Berkeley Martinez
acf48aa403
show jobs in dev
...
remove old jobs stuff
2015-08-13 15:41:30 -07:00
Quincy Larson
0a8855fb11
Merge branch 'OOPF' of github.com:FreeCodeCamp/freecodecamp into staging
2015-08-13 14:36:41 -07:00
Quincy Larson
1b7195fbc1
replace RSAP with read-search-ask and replace AWS gifs with Imgur
2015-08-13 00:56:05 -07:00
Quincy Larson
bf2db5ff62
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-08-12 21:25:11 -07:00
Quincy Larson
99d0a58049
update the look of onboarding and change RSAP to RSA
2015-08-12 21:24:57 -07:00
Quincy Larson
315b78fb69
update copy on onboarding
2015-08-12 20:27:46 -07:00
Berkeley Martinez
fc29c1fd9b
linking accounts now works.
...
bug, need to change how loopback generates provider string.
2015-08-12 20:10:11 -07:00
Quincy Larson
8cdc545f71
minor ux improvement to onboarding
2015-08-12 18:25:43 -07:00
benmcmahon100
7910f0ae2c
Revised scroll-locker layout. iPhone preview causing some styling issues that will require th dynamic resizing of the preview to fix which may impact the quality of the display
2015-08-13 01:20:12 +01:00
Quincy Larson
43e3dc8914
Finish onboarding page
2015-08-10 21:55:13 -07:00
Berkeley Martinez
341d931833
fix streak show days
2015-08-10 21:01:37 -07:00
Quincy Larson
7bfe61731b
give a user a brownie point when they start
2015-08-10 20:55:01 -07:00
Quincy Larson
853c728d9c
improve get-started view and fix duplicate bonfire issue
2015-08-10 20:13:13 -07:00
Quincy Larson
d67c049d5b
make onboarding page the default homepage for authenticated users
2015-08-10 17:40:13 -07:00
Quincy Larson
a44622af82
Merge branch 'staging' into onboarding
2015-08-10 15:42:07 -07:00
Quincy Larson
f8665324ad
simplify user account and profile system for github locking
2015-08-10 15:37:49 -07:00
Quincy Larson
add87ae801
start simplifying account page
2015-08-10 15:10:38 -07:00
Quincy Larson
d7e824ebbe
done adding static images
2015-08-10 00:44:37 -07:00
Quincy Larson
d56ecd1979
add a bunch of new images to onboarding
2015-08-10 00:42:33 -07:00
Berkeley Martinez
1d724f145e
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into staging
2015-08-09 22:58:46 -07:00
Berkeley Martinez
967f92e6f4
fix challenge naming scheme
2015-08-09 22:46:44 -07:00
Quincy Larson
13f08bf037
Merge branch 'staging' into onboarding
2015-08-09 22:00:26 -07:00
Quincy Larson
f3028b0e6a
continue work on get-started
2015-08-09 21:59:49 -07:00
Quincy Larson
4ed041c0db
update curriculum structure again
2015-08-09 21:26:26 -07:00
Quincy Larson
e0bd8c6dd2
remove pair programming Bonfire warm up challenge
2015-08-09 17:03:49 -07:00
Quincy Larson
0994dbaabe
finalize copy on get-started
2015-08-08 22:46:21 -07:00
Quincy Larson
5fb1df0d55
start onboarding page
2015-08-08 16:13:23 -07:00
Berkeley Martinez
013d983c2e
add github refresh button
2015-08-07 18:29:56 -07:00
Berkeley Martinez
611098ba09
if user is github cool navbar links to account show page
2015-08-07 18:26:18 -07:00
Berkeley Martinez
71a02ed8b7
update all instances of progressTimestamp to check for objects
2015-08-07 13:32:30 -07:00
Berkeley Martinez
0ce81bbabb
fix email sign should not require username
2015-08-05 19:29:17 -07:00
Berkeley Martinez
a838a4097d
fix clicking on image or points always takes you to /account
2015-08-05 19:12:54 -07:00
Berkeley Martinez
07e9bbf00a
add link to github waypoint to non github cool campers
2015-08-05 13:54:48 -07:00
Quincy Larson
3c4142c92c
fix profile update button
2015-08-04 18:43:40 -07:00
Quincy Larson
3551cefb3d
simplify account.jade view for github integration
2015-08-04 18:29:05 -07:00
Quincy Larson
5f2ec0aeae
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp i:wq
...
nto staging
2015-08-04 15:10:15 -07:00
Quincy Larson
7246945b42
remove bonfires from campers' public portfolios
2015-08-04 15:09:20 -07:00
Berkeley Martinez
e01876f3ab
disable username updating when camper is githubCool
2015-08-04 15:03:33 -07:00
Quincy Larson
73f0dcf732
make wiki open in new tab
2015-08-04 14:58:24 -07:00