Quincy Larson
bc1393edac
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into calculator
2015-08-24 19:19:58 -07:00
Quincy Larson
a94c919374
update cost calculator
2015-08-24 19:19:47 -07:00
Ben McMahon
86d7c2f35a
Merge pull request #2646 from QuincyLarson/linking
2015-08-25 02:00:04 +01:00
Quincy Larson
fd440916a8
add descriptive message to failed account linking attempt
2015-08-24 17:52:12 -07:00
Berkeley Martinez
15c49ec520
remove unused challenge utils
2015-08-24 16:19:06 -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
Berkeley Martinez
4ff9d2ffe1
Merge pull request #2578 from issyl0/fix_github_capitalization
...
Consistently capitalize GitHub in the account settings text
2015-08-24 11:04:24 -07:00
Berkeley Martinez
d5118f489f
Merge pull request #2619 from bugron/bugron-lisenting_typo
...
Fixes a typo in source code
2015-08-24 10:57:03 -07:00
Arsen Melikyan
49e3e20555
Fixes a typo in source code
2015-08-24 11:57:14 +04: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
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
f5a652e046
fix remove console log
2015-08-21 16:09:50 -07: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
Berkeley Martinez
d14eb0dbaa
fix 401 account/delete if not auth
2015-08-20 09:40:29 -07:00
Berkeley Martinez
16dcc6a39e
remove old password reset route
2015-08-20 08:55:26 -07:00
Berkeley Martinez
eaca9ef495
refactor challenges
...
now only queries challenges on start up
use default scheduler for array manipulation
2015-08-20 08:55:25 -07:00
Berkeley Martinez
6d1d8a3e28
fix current streak
...
always start from today
2015-08-20 08:55:25 -07:00
Berkeley Martinez
da61161765
fix longest streak
2015-08-20 08:55:25 -07:00
benmcmahon100
d52a2d8da0
Attempt to sorta fix the scroll locker resetting
2015-08-20 16:48:46 +01:00
Berkeley Martinez
f3410a3a95
remove debug statement
2015-08-19 13:48:04 -07:00
Berkeley Martinez
03b837cf51
fix break current stream
2015-08-19 13:46:26 -07:00
benmcmahon100
f4eecc9127
Merge pull request #1993 from kurzninja/patch-4
...
Potentially missing ;
2015-08-19 21:30:09 +01:00
Berkeley Martinez
576315abdc
fix current streak,
...
longest streak still broken
2015-08-19 13:05:53 -07:00
Berkeley Martinez
6a11b30bc2
serve static assets before sessions
2015-08-19 11:28:44 -07:00
Quincy Larson
04c9d376f7
remove server maintenance warnings
2015-08-18 23:48:31 -07:00
Berkeley Martinez
679d1383a5
up timeout
2015-08-18 23:14:27 -07:00
Berkeley Martinez
bc84a25ff9
add message on emergency maintenance
2015-08-18 23:07:06 -07:00
Berkeley Martinez
01a45e0635
fix cannot find challengeId of undefined
2015-08-18 20:02:39 -07:00
Berkeley Martinez
0128829d11
fix cannot read property id of user durring upvote
...
post to upvote without auth returns 401
2015-08-18 19:48:42 -07:00
Berkeley Martinez
8c803281f6
fix cannot read property match of undefined
2015-08-18 19:23:43 -07:00
Berkeley Martinez
0367a19ffc
add bower_components to pathsOfNOReturnTo
2015-08-18 16:00:27 -07:00
Berkeley Martinez
f59d029336
fix check if url sent with story
2015-08-18 15:56:23 -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
Berkeley Martinez
d9d44ae509
fix redirect link failures to /account
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
patlanders
973c9e67c2
Change "opps!" to "Oops!" in error-handlers.js
2015-08-17 13:20:15 -04: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
Berkeley Martinez
a228e61353
hot fix test for function first
2015-08-16 15:27:06 -07:00
Quincy Larson
a0c9906e69
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-08-16 14:20:19 -07:00
Berkeley Martinez
f475a4e1ad
fix map, should not mutate challenges
2015-08-16 14:20:00 -07: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
98df14bf86
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-08-16 08:03:48 -07:00
Quincy Larson
b05d9338f4
update csp
2015-08-16 08:03:34 -07:00
Berkeley Martinez
b828a1e825
fix google should be oauth2
2015-08-16 06:51:47 -07:00
Quincy Larson
d14514f661
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-08-16 06:07:49 -07:00
Quincy Larson
58d86ce2dc
hide linking buttons
2015-08-16 06:07:38 -07:00
Berkeley Martinez
7d22c2a073
fix should check completed challenge old _id
2015-08-16 05:52:25 -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
23003e8724
add new congratulatory quotes
2015-08-16 04:05:49 -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
42303dc6aa
fix progressBar not showing
...
reduce function needs initial seed
closes #1753
2015-08-14 18:24:14 -07:00
Quincy Larson
ed0d38a474
make more progress QAing challenges
2015-08-13 17:20:52 -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
benmcmahon100
5905e19e1b
Merge remote-tracking branch 'origin/OOPF' into OOPF
2015-08-13 12:57:14 +01:00
Quincy Larson
40b43370eb
update twitch page title thanks to @1hella for spotting this
2015-08-13 01:20:45 -07:00
Quincy Larson
c50b9c5afa
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-08-13 00:57:42 -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
Berkeley Martinez
0262d1b676
fix github link
...
link callback uri should have some path as auth callback uri
2015-08-12 21:44:55 -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
Berkeley Martinez
7eaccffd15
remove hikes from map
...
closes #1682
2015-08-12 20:39:40 -07:00
Berkeley Martinez
cd9dcc6953
hide react routes
2015-08-12 20:32:27 -07:00
Quincy Larson
315b78fb69
update copy on onboarding
2015-08-12 20:27:46 -07:00
Berkeley Martinez
4b0a9bef0a
fix social auth scheme
...
closes #1734
2015-08-12 20:10:12 -07:00
Berkeley Martinez
eb07cbfea6
fix override user identity login to reformat provider
2015-08-12 20:10:12 -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
Berkeley Martinez
a4e220e2bc
Move auth functions to central location
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
Berkeley Martinez
ca01115674
fix next challenge unknown bug
...
closes #1725
2015-08-12 11:47:03 -07:00
Berkeley Martinez
0fcf3bcf42
fix challenge completion should give brownie points
...
closes #1665
2015-08-11 14:17:08 -07:00
Berkeley Martinez
6fd19738ce
refactor and lint home router
2015-08-11 13:22:16 -07:00
Berkeley Martinez
2256f3ef6e
fix add github link to passport
2015-08-10 23:38:10 -07:00