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
|
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 |
|