terakilobyte
b626c811d0
Add initial I need help button and slack webhook integration
2015-05-23 02:26:29 -04:00
Quincy Larson
7279559c41
Merge branch 'staging' into nonprofit-improvements
...
Conflicts:
controllers/resources.js
seed_data/bonfires.json
views/partials/navbar.jade
2015-05-22 19:36:15 -07:00
Quincy Larson
b9adbd5976
add jobs page
2015-05-22 19:30:56 -07:00
Quincy Larson
2e46777f8e
add simply hired page
2015-05-22 12:57:43 -07:00
Berkeley Martinez
c63a77066d
Merge pull request #460 from phoenixstormcrow/phoenixstormcrow-459
...
removed "white-space: pre-line" rule from pre.wrappable elements to p…
2015-05-21 08:19:04 -07:00
Berkeley Martinez
4ad757ebd5
Merge pull request #466 from terakilobyte/challenge-restructure
...
Challenge restructure
2015-05-21 00:12:52 -07:00
terakilobyte
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
terakilobyte
16ca72f716
Update views for new variable names. Get profile view working. Update challenge map.
2015-05-20 21:50:31 -04:00
LumenTeun
7b9faabd32
Github => GitHub
2015-05-20 16:29:05 +02:00
terakilobyte
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
phoenixstormcrow
804866013f
removed "white-space: pre-line" rule from pre.wrappable elements to prettify bonfire solution formatting.
2015-05-19 18:00:25 -07:00
Quincy Larson
ae70d0abd9
Merge branch 'courseware' into challenge-restructure
2015-05-18 23:33:03 -07:00
Quincy Larson
45d4954a43
fix script tag importing issue in coursewares
2015-05-18 22:25:48 -07:00
terakilobyte
e6851b22d8
Minor updates
2015-05-18 21:20:32 -04:00
Quincy Larson
68962d4d82
further improvements to coursewares and bonfires
2015-05-10 22:33:04 -07:00
Quincy Larson
d63b8f01be
improve bonfires and js coursewares
2015-05-10 21:59:55 -07:00
Quincy Larson
f3646b0aae
give points for upvoting, add facebook profile attribute, improve social profile icons
2015-05-09 16:23:45 -07:00
Quincy Larson
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
terakilobyte
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
Quincy Larson
961096cf49
finish moving away from connectAssets
2015-05-03 16:45:34 -07:00
Quincy Larson
a0b7b0b653
heatmap looks better
2015-05-03 14:45:46 -07:00
Quincy Larson
c7c11cf7f6
get closer to all bower static assets
2015-05-03 01:37:22 -07:00
Quincy Larson
451e3c75f2
improvements to portfolios and heatmaps
2015-05-03 00:34:46 -07:00
Quincy Larson
d65f66e03f
fix mobile camper news headlines
2015-05-02 17:06:31 -07:00
Quincy Larson
0f0adac85c
stylize search results
2015-05-01 23:05:37 -07:00
Quincy Larson
222f9b9a64
fix some of the news functionality
2015-04-30 17:18:08 -07:00
Quincy Larson
2cb02176a4
more camper news improvements
2015-04-30 15:56:14 -07:00
Quincy Larson
7b61e9daa2
More view beautification for mobile.
2015-04-30 15:19:38 -07:00
Quincy Larson
cc13b325d6
fix some issues with @terakilobyte and beautify the camper news index view
2015-04-30 14:55:00 -07:00
Quincy Larson
589059aa05
start styling news for mobile
2015-04-28 22:29:59 -07:00
Quincy Larson
45490f75c4
make checkboxes larger and remove text clicking for completion
2015-04-27 00:10:14 -07:00
Quincy Larson
b8bffae47b
@terakilobyte cleaned up event handlers
2015-04-25 18:59:15 -07:00
Quincy Larson
20c2b7a0ac
Merge branch 'maximization-352' of https://github.com/Maximization/freecodecamp into Maximization-maximization-352
2015-04-25 18:17:46 -07:00
terakilobyte
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
Maxim Orlov
1539708613
Fix Camper News email notification logic
2015-04-25 16:05:36 +02:00
Quincy Larson
e5e47136ea
make all navbar layouts wide style, redirect logo to challenge map, improve navbar collapse
2015-04-24 01:31:59 -07:00
Quincy Larson
bf723b522b
start making ux changes
2015-04-23 23:46:58 -07:00
terakilobyte
8781bc3e63
Accept comment edit pr
2015-04-19 22:22:11 -04:00
terakilobyte
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
Quincy Larson
2c53a17521
fix an issue with checklists
2015-04-18 21:09:24 -07:00
Michael Q Larson
b671ab9817
move checkboxes to the left of the showVideo view
2015-04-18 15:00:31 -07:00
Michael Q Larson
aacfb86e1f
improve challenge map look
2015-04-18 14:17:10 -07:00
Michael Q Larson
6106dfa31a
presist checklist states in localStorage
2015-04-18 01:29:10 -07:00
Michael Q Larson
e39dfee5ef
getting closer with the persisted checklists
2015-04-17 23:51:57 -07:00
Michael Q Larson
11ece0fda1
fix courseware.json typo and make it easier to click checkboxes
2015-04-17 22:37:13 -07:00
terakilobyte
b49d2fd343
Resolve merge conflicts using Webstorm's merge integration tool.
2015-04-17 00:11:13 -04:00
Michael Q Larson
e0aa084c7a
finish getting field-guide working and improve zipline show view
2015-04-14 20:12:47 -07:00
terakilobyte
9c67d4988f
Add new currying challenge to bonfires and allow inspectlet through protective helmet
2015-04-14 23:04:54 -04:00
Michael Q Larson
11548bfcf9
add checkbox cross off effect to challenges and reword pairwise bonfire
2015-04-13 02:41:42 -04:00
Michael Q Larson
7da6f69cd8
start process of moving wiki over to field guide
2015-04-08 17:18:51 -07:00
Michael Q Larson
6242f322d7
still working on passing original author email all the way down the comment chain
2015-04-08 00:30:51 -07:00
Michael Q Larson
1c7d0b11b6
pass the original story URL to all comments for notification email
2015-04-07 23:39:52 -07:00
Michael Q Larson
bd7c5310b1
improve the footer
2015-04-07 00:11:31 -07:00
Michael Q Larson
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
Michael Q Larson
ef57ec58c2
improve wikis with hotkey and update the flash to allow links
2015-04-05 17:35:08 -07:00
Michael Q Larson
60fee94574
create infrastructure for advancing through wiki
2015-04-05 16:44:07 -07:00
Michael Q Larson
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
Michael Q Larson
c9b4a90f57
more improvements to look of challengeMap
2015-04-03 20:50:27 -07:00
Michael Q Larson
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
Michael Q Larson
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
Michael Q Larson
1248cde97f
continue work on nonprofit show views
2015-04-01 22:31:08 -07:00
Michael Q Larson
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
Michael Q Larson
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
Michael Q Larson
f20743428a
Merge branch 'jameskopacz-patch-259' of https://github.com/jameskopacz/freecodecamp into ux-improvements
2015-03-29 14:19:12 -07:00
Nathan Leniz
aa2f0e8af8
Change completion event to remove duplicate entries if the user states they paired with themselves
2015-03-29 21:15:18 +09:00
Nathan Leniz
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
Michael Q Larson
4d3337df32
Merge branch 'ziplines' into ux-improvements
...
Conflicts:
views/coursewares/showJS.jade
2015-03-28 00:24:41 -07:00
jameskopacz
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
Michael Q Larson
f7f7fb39b9
start refactoring basejumps and ziplines to just be normal challenges, make all timestamps miliseconds
2015-03-27 14:36:17 -07:00
Michael Q Larson
e78609171d
continue work on the param-based funnel
2015-03-26 23:33:52 -07:00
Michael Q Larson
09b812688e
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp into ux-improvements
...
Conflicts:
app.js
2015-03-25 14:20:34 -07:00
Michael Q Larson
7d4c30c502
start adding progress bar to nonprofit onboarding
2015-03-25 14:18:27 -07:00
Michael Q Larson
d4935d44de
add the routes, controller actions and views for the nonprofit wizard
2015-03-24 21:46:42 -07:00
Michael Q Larson
bcec96e427
half way done with the initial views and controllers
2015-03-24 19:08:26 -07:00
Berkeley Martinez
f246ef618c
Close web worker after completion
...
closes #257
2015-03-22 16:57:10 -07:00
Michael Q Larson
6e0da758e0
finish wiring in buttons and hotkeys
2015-03-22 01:38:04 -07:00
Michael Q Larson
9633a2dbe0
get hotkey working in showVideo
2015-03-22 01:28:40 -07:00
Nathan Leniz
ac511982a4
User facing challenge mentions now point to coursewares, remove completed view from account/show
2015-03-21 18:42:19 +09:00
Nathan Leniz
6ad7c22313
Working on codemirror display issue in html coursewares
2015-03-21 16:34:06 +09:00
Nathan Leniz
a2e2e6bfa2
Improve profile view on devices, store name in completedCoursewares for display in account/show
2015-03-21 15:44:18 +09:00
Nathan Leniz
be91849d20
coursewares properly push timestamps to user object
2015-03-21 14:28:00 +09:00
Nathan Leniz
cd89ad1574
Change complete-challenge to completed-challenge
2015-03-21 13:50:31 +09:00
Nathan Leniz
5e095e8832
Merge remote-tracking branch 'upstream/master' into ux-improvements
2015-03-21 13:42:08 +09:00
Nathan Leniz
d48da59aa7
resolve merge conflicts
2015-03-21 12:03:16 +09:00
Michael Q Larson
56d7301d25
refactor announcement modal and add nodeschool-challenges
2015-03-19 22:34:36 -07:00
Michael Q Larson
af19ea4308
improve upvoting UX and start adding angular validation to submit-story view
2015-03-18 00:40:18 -07:00
Michael Q Larson
a52ab83757
half way done with the new upvoting ux
2015-03-17 17:57:50 -07:00
Quincy Larson
f144e84310
Merge pull request #214 from MrRenter/upvoteFix
...
Upvote fix
2015-03-17 15:48:15 -07:00
MrRenter
2d5b34802b
so spaces and tabs are totally differnt...whitespace fixes
2015-03-17 03:20:07 -04:00
MrRenter
9a5c7a0ce6
dammit part2
2015-03-17 03:09:34 -04:00
MrRenter
6a2209b9b4
god dammit already
2015-03-17 03:07:07 -04:00
MrRenter
c9970c1725
Hide upvote arrow on news page if already upvoted. Make it disappear on upvote
2015-03-17 03:00:37 -04:00
Renter
b7dd72f3a3
fixed coursewares
2015-03-17 03:00:37 -04:00
Nathan Leniz
bf7d38e080
resolve conflict
2015-03-15 17:08:34 +09:00
Nathan Leniz
c609294e1f
force merge conflict for stream viewers
2015-03-15 17:06:05 +09:00
Michael Q Larson
191e38472e
make selected indenting and outdenting work on courseware HTML, JS and Bonfires
2015-03-14 15:07:05 -07:00
Nathan Leniz
ac4b4c64de
Merge remote-tracking branch 'upstream/master' into next-courseware-flow
2015-03-12 00:04:12 +09:00
Nathan Leniz
4b1be9c67a
Fix flow of next courseware in showJS view
2015-03-12 00:03:56 +09:00
Michael Q Larson
f068df3ddf
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
2015-03-09 22:50:11 -07:00
Quincy Larson
367262403c
Merge pull request #177 from jameskopacz/patch-1
...
Pointer on upvote button and reply button mouseover
2015-03-09 22:46:00 -07:00
Michael Q Larson
47507471ff
update the stories view to have ghost discuss button and update chat instructions
2015-03-09 22:10:09 -07:00
Michael Q Larson
d224fda65f
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
2015-03-09 17:05:24 -07:00
Michael Q Larson
0d43c8942e
add discuss button to views and fix onhover issues
2015-03-09 17:05:18 -07:00
Quincy Larson
c0702b9d04
Merge pull request #180 from terakilobyte/master
...
MOre news updates
2015-03-09 16:39:04 -07:00
jameskopacz
6f18936ee9
Pointer on upvote button and reply button mouseover
2015-03-09 16:18:12 -05:00
jameskopacz
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
Nathan Leniz
25b14354ad
Use params correctly and improve display of meta description. Refactor to media object.
2015-03-09 18:38:05 +09:00
Nathan Leniz
528e0094d1
Add image display to show view for news
2015-03-09 13:55:13 +09:00
Michael Q Larson
2f54153b16
get a running start on refactoring comment ui elements
2015-03-08 18:56:06 -07:00
Michael Q Larson
8d2552fe57
give users without images a default image and retroactively give that to all their stories and comments and also make some UI changes to stories.
2015-03-08 15:39:36 -07:00
Nathan Leniz
7a56d4fcb2
Remove debug/console.log statements
2015-03-09 06:58:08 +09:00
Michael Q Larson
dd1b1b3635
fix issue #150 Show user rendering glitch
2015-03-08 13:44:09 -07:00
Michael Q Larson
3bd979ad08
Merge branch 'news' of https://github.com/FreeCodeCamp/freecodecamp
2015-03-08 12:16:35 -07:00
Nathan Leniz
212e59e061
Minor view tweaking
2015-03-08 20:22:55 +09:00
Nathan Leniz
6283ec1174
resolve show.jade merge conflict
2015-03-08 18:50:28 +09:00
Nathan Leniz
de91be44da
comment submit time bug fixed
2015-03-08 18:48:20 +09:00
Nathan Leniz
f367a0310e
Finalizing display issues for news release
2015-03-08 16:50:51 +09:00
Michael Q Larson
7b7f808385
minor fix to the showHTML view. No longer has awkward horizontal scroll, and should prevent this UX nonstarter throughout app now
2015-03-07 22:20:29 -08:00
Nathan Leniz
bac22c1d96
Space hot stories view, remove all listing and refactor to divs
2015-03-08 12:48:02 +09:00
Nathan Leniz
1edc1aa3cf
Begin refactoring story lists to order list, remove separate rank div
2015-03-08 12:32:35 +09:00
Michael Q Larson
c8a9f6f810
add benign class that makes search and submit fields on news right size on mobile
2015-03-07 19:03:26 -08:00
Nathan Leniz
790a2d987b
Fighting CSS
2015-03-08 11:53:03 +09:00
Michael Q Larson
7bb18d41a8
Revert "Add cloud front and remove together.js"
...
This reverts commit e029a00440
.
2015-03-07 14:53:28 -08:00
Michael Q Larson
e029a00440
Add cloud front and remove together.js
2015-03-07 12:48:25 -08:00
Nathan Leniz
585544e1fd
Minor view improvements and removing extra dom closing tags from views
2015-03-07 21:33:04 +09:00
Nathan Leniz
485bbcc3a9
Bring reply link up closer to comment details
2015-03-07 20:57:28 +09:00
Nathan Leniz
b776be58e5
Finish full functionality for intial release of camper news
2015-03-07 20:51:20 +09:00
Nathan Leniz
a3769f6507
Story submission now with a description, refactor show to display description above comment box
2015-03-07 18:26:49 +09:00
Michael Q Larson
19afeda949
make google fonts also an async call
2015-03-07 01:08:08 -08:00
Michael Q Larson
43c729d288
attempt to make css loading asynchronous
2015-03-07 00:36:17 -08:00
Michael Q Larson
687eb6c477
add font-awesome
2015-03-07 00:09:04 -08:00
Michael Q Larson
e049951b88
remove CDN call for bootstrap and font awesome and get them loading locally
2015-03-06 23:56:22 -08:00
Nathan Leniz
39d66ea0da
Merge branch 'master' into news
2015-03-07 15:23:56 +09:00
Nathan Leniz
b46fb576c3
window refreshes on comment submission
2015-03-07 02:24:28 +09:00
Nathan Leniz
6910ed0aea
Nesting of comments in view, disabling comment form display button on button click
2015-03-07 01:57:09 +09:00
Michael Q Larson
c8c396981a
update sitemap
2015-03-06 00:13:58 -08:00
Michael Q Larson
9df29350ed
update the search UI
2015-03-05 17:30:05 -08:00
Nathan Leniz
6fc72de232
add basic text search for post headlines
2015-03-06 09:20:30 +09:00
Nathan Leniz
046a209637
Comment submission now works on main story, need to refresh page after submission to display new comment
2015-03-06 06:08:40 +09:00
Nathan Leniz
40a42e29c2
Fixed url redirect after submission, upvoting now works
2015-03-05 19:40:44 +09:00
Nathan Leniz
41442a540f
Need to work on story redirect after submission, fix url link in stories/show
2015-03-05 19:21:26 +09:00
Michael Q Larson
6a9bfc5ebf
remove together.js and add a non-functioning submit form to the index view of news
2015-03-04 23:44:30 -08:00
Nathan Leniz
3fac5cb70e
Improve comment view, re-enable upvoting for articles
2015-03-05 09:13:22 +09:00
Nathan Leniz
ba97c984e7
Improve view for individual news story
2015-03-05 07:49:55 +09:00
Michael Q Larson
d8b8373b70
do some refactoring of the camper news views
2015-03-03 19:55:04 -08:00
Michael Q Larson
260c25a482
some minor UI improvements on news
2015-03-03 14:35:35 -08:00
Nathan Leniz
6ac780e836
Rewire upvote to use post and req.body instead of req.params, add logic on click handler to reject upvotes if the user has already upvoted, coment display now works
2015-03-04 07:15:00 +09:00
Nathan Leniz
4b84b49d07
Added start of individual post view and post lists view, wired upvoting functionality for individual posts
2015-03-03 22:03:33 +09:00
Nathan Leniz
50b29eb2ba
Refactor error message from bonfire
2015-03-01 09:54:03 +09:00
Michael Q Larson
d962e3afe5
fix a line spacing issue
2015-02-27 14:00:47 -08:00