4f45867b6e
move to freecodecamp.slack.com
2015-06-01 16:17:06 -07:00
e322b3b7d6
Merge branch 'master' into modals
...
Conflicts:
seed_data/field-guides.json
views/coursewares/showHTML.jade
2015-05-28 17:25:34 -07:00
193f9d16db
Set a refresh on codemirror instance rather than setting the cursor position. Closes #640
2015-05-28 19:51:42 -04:00
8501de396f
finish fixing modals
2015-05-28 16:18:04 -07:00
673a617151
create pair, help, bug modals
2015-05-28 14:29:45 -07:00
131b9ad1b7
bump version numbers to force fresh browser fetch and suppress "editor is not defined". closes #
2015-05-28 14:13:31 -04:00
718ae04f2f
Add ability to test editor contents. Ensures classes are implemented, closes # 684
2015-05-28 08:26:25 -04:00
57fad7d923
proper fix for uncomment html challenge, improved codemirror performance
2015-05-27 15:29:31 -04:00
6a2d365b9a
Update framework version, set cursor to line 15 on load to force full display. Closes #653
2015-05-27 14:40:06 -04:00
cad39e1b5e
Fixes duplication bug in Firefox
2015-05-27 13:39:37 -04:00
fa43dd1051
Unbind click handler on next-courseware-button to prevent repeated presses from advancing more than one challenge
2015-05-26 12:32:50 -04:00
e7c855d72f
Fully disable all help buttons for now, remove post to slack functionality for aventerous campers who enable the buttons through their console
2015-05-26 11:10:10 -04:00
ff6e11433c
Update bonfire framework to know how to use chai.should()
2015-05-26 10:41:50 -04:00
186d320d01
version updates to force browser fetch so buttons works
2015-05-26 09:14:10 -04:00
6ce5ccf449
Rename framework file to force new browser fetching. Update view to remove unused vars
2015-05-26 02:31:10 -04:00
1c4b40c8e6
Update to bonfires. Successfully completing triggers a save. "Paired with" form field moved to bonfire view. Controller hardened for checking pair as button is no longer disabled for unfound username
2015-05-25 17:27:27 -04:00
bf0cf4cc7d
add the bug, pair and help buttons to challenge views
2015-05-24 00:53:01 -07:00
1949005632
remove modal from field guide and create index view
2015-05-23 18:39:30 -07:00
a3ab32f339
improve get help and add find a pair
2015-05-23 00:53:41 -07:00
b626c811d0
Add initial I need help button and slack webhook integration
2015-05-23 02:26:29 -04:00
4ad757ebd5
Merge pull request #466 from terakilobyte/challenge-restructure
...
Challenge restructure
2015-05-21 00:12:52 -07:00
5e918bdd7c
Remove bonfire and courseware controller, relying on all challenge related logic in challenge.js. Remove bonfire folder. Move necessary JS to coursewares folder and rename.
2015-05-20 22:31:20 -04:00
16ca72f716
Update views for new variable names. Get profile view working. Update challenge map.
2015-05-20 21:50:31 -04:00
7b9faabd32
Github => GitHub
2015-05-20 16:29:05 +02:00
a174a1c630
Work on challenge flow from block to block, start refactoring the name courseware to challenges in main.js
2015-05-19 22:31:01 -04:00
ae70d0abd9
Merge branch 'courseware' into challenge-restructure
2015-05-18 23:33:03 -07:00
45d4954a43
fix script tag importing issue in coursewares
2015-05-18 22:25:48 -07:00
e6851b22d8
Minor updates
2015-05-18 21:20:32 -04:00
68962d4d82
further improvements to coursewares and bonfires
2015-05-10 22:33:04 -07:00
d63b8f01be
improve bonfires and js coursewares
2015-05-10 21:59:55 -07:00
70503528d2
give user a point for submitting to news, remove broken javascript path, remove unnecessary empty js lib
2015-05-09 15:53:01 -07:00
72339f9183
Set correct mime type in jailed. Set correct types on script imports in bonfire/show. Open helmet up to potentially unsafe levels by allowing "* unsafe-inline" in scriptSrc.
2015-05-06 14:06:10 -04:00
961096cf49
finish moving away from connectAssets
2015-05-03 16:45:34 -07:00
c7c11cf7f6
get closer to all bower static assets
2015-05-03 01:37:22 -07:00
222f9b9a64
fix some of the news functionality
2015-04-30 17:18:08 -07:00
7b61e9daa2
More view beautification for mobile.
2015-04-30 15:19:38 -07:00
45490f75c4
make checkboxes larger and remove text clicking for completion
2015-04-27 00:10:14 -07:00
b8bffae47b
@terakilobyte cleaned up event handlers
2015-04-25 18:59:15 -07:00
20c2b7a0ac
Merge branch 'maximization-352' of https://github.com/Maximization/freecodecamp into Maximization-maximization-352
2015-04-25 18:17:46 -07:00
a9feb269f6
Remove some debug/console.log statements.
...
Fix allFieldGuideIds method in resources.js to return an array of _ids, not an array of objects.
Field guide controller now correctly completes field guides. Closes #367 .
2015-04-25 12:28:14 -04:00
1539708613
Fix Camper News email notification logic
2015-04-25 16:05:36 +02:00
bf723b522b
start making ux changes
2015-04-23 23:46:58 -07:00
8781bc3e63
Accept comment edit pr
2015-04-19 22:22:11 -04:00
08bf658897
Harden camper news and don't expose user object. Upvoting still needs to be looked at.
2015-04-19 03:36:54 -04:00
2c53a17521
fix an issue with checklists
2015-04-18 21:09:24 -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
6106dfa31a
presist checklist states in localStorage
2015-04-18 01:29:10 -07:00
e39dfee5ef
getting closer with the persisted checklists
2015-04-17 23:51:57 -07:00
11ece0fda1
fix courseware.json typo and make it easier to click checkboxes
2015-04-17 22:37:13 -07:00
b49d2fd343
Resolve merge conflicts using Webstorm's merge integration tool.
2015-04-17 00:11:13 -04: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
11548bfcf9
add checkbox cross off effect to challenges and reword pairwise bonfire
2015-04-13 02:41:42 -04:00
7da6f69cd8
start process of moving wiki over to field guide
2015-04-08 17:18:51 -07:00
6242f322d7
still working on passing original author email all the way down the comment chain
2015-04-08 00:30:51 -07:00
1c7d0b11b6
pass the original story URL to all comments for notification email
2015-04-07 23:39:52 -07:00
840930d967
get bonfire solutions showing up in the view; eliminate a lot of old views in favor of new challenge map
2015-04-05 18:37:58 -07:00
60fee94574
create infrastructure for advancing through wiki
2015-04-05 16:44:07 -07: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
97e59d4568
add verified flag to challenges so we can tell which ziplines and basejumps have been verified
2015-04-02 14:07:00 -07:00
36c43cc73a
add jQuery to check for broken images and replace them with standard image. Remove gravatar logic.
2015-04-02 13:42:15 -07:00
aa01a896a5
Add show all challenges button to all challenge views and refactor bonfire to use same modal and button ids
2015-03-29 17:09:12 -07:00
43810ccb0c
Merge branch 'ux-improvements' of https://github.com/terakilobyte/freecodecamp into terakilobyte-ux-improvements
...
Conflicts:
controllers/bonfire.js
controllers/resources.js
public/js/main.js
views/bonfire/show.jade
2015-03-29 14:44:49 -07:00
f20743428a
Merge branch 'jameskopacz-patch-259' of https://github.com/jameskopacz/freecodecamp into ux-improvements
2015-03-29 14:19:12 -07:00
aa2f0e8af8
Change completion event to remove duplicate entries if the user states they paired with themselves
2015-03-29 21:15:18 +09:00
1fc3cffdbf
Add .editorconfig to enforce certain automatic behavior on all editors,
...
Add logic for ziplines and basejumps completion.
2015-03-29 20:49:56 +09:00
4d3337df32
Merge branch 'ziplines' into ux-improvements
...
Conflicts:
views/coursewares/showJS.jade
2015-03-28 00:24:41 -07:00
d3dee00df5
Stories reply and upvote redirect to signin when user isn't signed in.
...
Redirects user back to story after signing in.
2015-03-28 00:16:48 -05:00
f7f7fb39b9
start refactoring basejumps and ziplines to just be normal challenges, make all timestamps miliseconds
2015-03-27 14:36:17 -07:00
09b812688e
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp into ux-improvements
...
Conflicts:
app.js
2015-03-25 14:20:34 -07:00
d4935d44de
add the routes, controller actions and views for the nonprofit wizard
2015-03-24 21:46:42 -07:00
f246ef618c
Close web worker after completion
...
closes #257
2015-03-22 16:57:10 -07:00
6e0da758e0
finish wiring in buttons and hotkeys
2015-03-22 01:38:04 -07:00
9633a2dbe0
get hotkey working in showVideo
2015-03-22 01:28:40 -07:00
ac511982a4
User facing challenge mentions now point to coursewares, remove completed view from account/show
2015-03-21 18:42:19 +09:00
6ad7c22313
Working on codemirror display issue in html coursewares
2015-03-21 16:34:06 +09:00
a2e2e6bfa2
Improve profile view on devices, store name in completedCoursewares for display in account/show
2015-03-21 15:44:18 +09:00
be91849d20
coursewares properly push timestamps to user object
2015-03-21 14:28:00 +09:00
cd89ad1574
Change complete-challenge to completed-challenge
2015-03-21 13:50:31 +09:00
5e095e8832
Merge remote-tracking branch 'upstream/master' into ux-improvements
2015-03-21 13:42:08 +09:00
d48da59aa7
resolve merge conflicts
2015-03-21 12:03:16 +09:00
56d7301d25
refactor announcement modal and add nodeschool-challenges
2015-03-19 22:34:36 -07:00
af19ea4308
improve upvoting UX and start adding angular validation to submit-story view
2015-03-18 00:40:18 -07:00
a52ab83757
half way done with the new upvoting ux
2015-03-17 17:57:50 -07:00
f144e84310
Merge pull request #214 from MrRenter/upvoteFix
...
Upvote fix
2015-03-17 15:48:15 -07:00
2d5b34802b
so spaces and tabs are totally differnt...whitespace fixes
2015-03-17 03:20:07 -04:00
9a5c7a0ce6
dammit part2
2015-03-17 03:09:34 -04:00
6a2209b9b4
god dammit already
2015-03-17 03:07:07 -04:00
c9970c1725
Hide upvote arrow on news page if already upvoted. Make it disappear on upvote
2015-03-17 03:00:37 -04:00
b7dd72f3a3
fixed coursewares
2015-03-17 03:00:37 -04:00
bf7d38e080
resolve conflict
2015-03-15 17:08:34 +09:00
c609294e1f
force merge conflict for stream viewers
2015-03-15 17:06:05 +09:00
191e38472e
make selected indenting and outdenting work on courseware HTML, JS and Bonfires
2015-03-14 15:07:05 -07:00
ac4b4c64de
Merge remote-tracking branch 'upstream/master' into next-courseware-flow
2015-03-12 00:04:12 +09:00
4b1be9c67a
Fix flow of next courseware in showJS view
2015-03-12 00:03:56 +09:00
c0702b9d04
Merge pull request #180 from terakilobyte/master
...
MOre news updates
2015-03-09 16:39:04 -07:00
3a0bda0f92
"challengeName is not defined" fix
...
Was getting this error in Firefox and Chrome: Uncaught ReferenceError: challengeName is not defined
2015-03-09 04:49:03 -05:00
25b14354ad
Use params correctly and improve display of meta description. Refactor to media object.
2015-03-09 18:38:05 +09:00
528e0094d1
Add image display to show view for news
2015-03-09 13:55:13 +09:00
Quincy Larson
terakilobyte
Berkeley Martinez
LumenTeun
Maxim Orlov
jameskopacz
MrRenter
Renter
jameskopacz