993819cf3b
mirror the zipline view and the showVideo view
2015-04-19 18:07:19 -07:00
f396dad029
Fix upvote button on initial story submission.
2015-04-19 20:28:56 -04:00
2736dfe638
Merge remote-tracking branch 'origin/master'
2015-04-19 03:37:25 -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
d078c6768a
make the all field guides view conform to the challengeMap aesthetic
2015-04-18 17:19:06 -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
b2f18a790a
Changed from post to put for since updating not creatings
2015-04-18 11:53:46 -04:00
e39dfee5ef
getting closer with the persisted checklists
2015-04-17 23:51:57 -07:00
790a4f941d
Removed alert and added server side check for 10minutes
2015-04-18 02:46:16 -04:00
349dbbc2af
Added functuality to the edit button. Added router to /commets/:id/edit as well as commentEdit method in story js.
2015-04-18 02:40:48 -04:00
47bb301a91
Made it so edit will only be displayed for the user. Since its on client side (following practices used) a final check should be used when actually saving edit to db
2015-04-17 22:36:09 -04:00
c711b41fa0
Added code to display edit button next to discuss button when viewing a story. Button will vanish if comment was posted > 10 minutes
2015-04-17 22:33:07 -04:00
13d5b64427
fix a bug in the account view
2015-04-17 19:28:07 -07:00
b1e92ddcd8
comment out non-twitter auth options and add pintrest clone to basejumps
2015-04-17 19:04:46 -07:00
5bdcc15e05
Enable search
2015-04-17 20:32:46 -04:00
820fbb99c7
finalize the way zipline and basejump challenges will look, fix twitch view
2015-04-17 15:01:08 -07:00
061d86b074
simplify the camper news UX
2015-04-17 13:09:35 -07:00
d10011acc3
Pull some useful changes from aborted branch
2015-04-16 23:54:26 -07:00
d2fae63310
fix a few minor issues post merge
2015-04-16 23:16:55 -07:00
dbc99eafb6
Update chat link and copy.
2015-04-17 01:41:01 -04:00
b49d2fd343
Resolve merge conflicts using Webstorm's merge integration tool.
2015-04-17 00:11:13 -04:00
ddb88643e0
Nathan's updates to the userMigration script'
2015-04-14 21:19:05 -07:00
e033f224bc
fix challenge map to redirect to nonprofits
2015-04-14 20:20:38 -07: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
d7a698f629
fix the field guide
2015-04-14 19:39:25 -07:00
be00c7e402
Revert "remove inspectlet thinking this may be the malware twitter is finding"
...
This reverts commit 4b9be16b24
2015-04-14 16:03:27 -07:00
4b9be16b24
remove inspectlet thinking this may be the malware twitter is finding
2015-04-14 13:44:17 -07:00
11548bfcf9
add checkbox cross off effect to challenges and reword pairwise bonfire
2015-04-13 02:41:42 -04:00
332d4f1875
refactor story.js mailer and remove some cruft
2015-04-09 17:50:10 -07:00
6f752b2437
minor tweaks to landing page
2015-04-09 13:06:36 -07:00
62cabd56ff
update camper news and chat challenges to have new videos and updated copy
2015-04-09 12:58:30 -07:00
9fb048183c
finish up adding the slack functionality with a redirect on the chat navbar button
2015-04-08 22:52:14 -07:00
9145e959de
able to use the api upon button click
2015-04-08 22:42:40 -07:00
7da6f69cd8
start process of moving wiki over to field guide
2015-04-08 17:18:51 -07:00
73b536de95
update sitemap
2015-04-08 15:05:24 -07:00
29b4e3b970
get seed data seeding and improve application submitted button
2015-04-08 14:57:08 -07:00
c02fafa6a9
add status, turn hours into integer, create a directory view of all nonprofits
2015-04-08 14:36:05 -07:00
61e07041a7
camper news reply emails go out to original story poster and poster of replied-to comment, works with old stories as well
2015-04-08 13:16:16 -07:00
889de9c875
build other solutions page of links for nonprofits
2015-04-08 00:42:33 -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
751d25219e
improve the wiki seed file and add strikethrough to read wikis
2015-04-07 22:33:49 -07:00
df4c698177
improve the challenge map
2015-04-07 12:45:31 -07:00
2c6a781890
add inspectlet javascript
2015-04-07 00:32:01 -07:00
bd7c5310b1
improve the footer
2015-04-07 00:11:31 -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
ef57ec58c2
improve wikis with hotkey and update the flash to allow links
2015-04-05 17:35:08 -07:00
32f9a61d5d
add hotkey to wiki pages
2015-04-05 17:17:31 -07:00
60fee94574
create infrastructure for advancing through wiki
2015-04-05 16:44:07 -07:00
c8b72499ab
dynamically redirect chat link in navbar
2015-04-05 00:16:23 -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
29568d45b8
fix a typo related to challenge tweets
2015-04-03 23:54:31 -07:00
c9b4a90f57
more improvements to look of challengeMap
2015-04-03 20:50:27 -07:00
fbeff58477
build a functional challenge map and change navbar links
2015-04-03 20:05:53 -07:00
3cff4e9879
add logic to add campers to nonprofit projects of interest to them
2015-04-02 17:23:45 -07:00
4aea12abca
make slight modifications to the d3 calendar heatmap on the portfolio page
2015-04-02 15:53:38 -07:00
44c5da8f72
improve the streak counter which previously wasn't defaulting to one day
2015-04-02 14:23:56 -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
1248cde97f
continue work on nonprofit show views
2015-04-01 22:31:08 -07:00
fa74a1b454
got show all nonprofits button working and improved nonprofit show view
2015-03-31 17:38:33 -07:00
8c97528171
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
2015-03-31 13:32:51 -07:00
a24ad9b993
update the welcome mailer and change fontsize on bonfire helpful links
2015-03-31 10:00:30 -07:00
ca404e66e8
close to getting all nonprofits to render
2015-03-30 20:08:29 -07:00
acea52dc1b
make further improvements to wiki and start new show view for nonprofits
2015-03-30 18:02:50 -07:00
18a9818200
Merge branch 'master' into nonprofit-show
...
Conflicts:
controllers/challenges.js
controllers/courseware.js
2015-03-30 16:17:04 -07:00
106a10edca
add a modal that allows one to scroll through all wiki pages
2015-03-30 15:55:00 -07:00
23a3e235a7
Update routes for all static pages and leave redirects for existing routes to get to new wiki routes
2015-03-30 15:15:07 -07:00
660214f87e
able to seed and view wiki content
2015-03-30 13:48:54 -07:00
b6da312547
Merge pull request #278 from FreeCodeCamp/accessability
...
Fix some bugs, improver perf of show all bonfires/challenges and add buttons to challenge views
2015-03-30 13:12:56 -07:00
83a9223dcc
respond to @BerkeleyTrue feedback
2015-03-30 13:09:24 -07:00
97c978dc7c
Make Basejumps show up properly and get their github routes persisting in the database.
2015-03-29 18:13:04 -07:00
5bb084120e
create a styleguide from @brndbr's sample style guide
2015-03-29 17:28:25 -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
f0ae47dcf2
Fix show all bonfire bug where it wouldn't show while unauthenticated; add sr-only class to completed bonfires
2015-03-29 16:47:49 -07:00
9fe8bf2fbf
remove references to codepen from codebase
2015-03-29 15:14:13 -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
70f812dc78
Merge branch 'master' into ux-improvements
...
Conflicts:
controllers/bonfire.js
controllers/resources.js
views/bonfire/show.jade
2015-03-29 13:05:39 -07:00
b00c5be45c
View improvement for users that are not logged in or happen to hit control enter
2015-03-29 21:41:59 +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
f6df15d5e0
merge master in ux-improvements
2015-03-29 19:19:19 +09:00
47d0d8e0da
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
2015-03-28 23:43:08 -07:00
1b247f97fc
Merge pull request #262 from aldraco/bonfirelinks
...
Bonfire MDN links - Issue #255
2015-03-28 20:34:34 -07:00
ef27fda537
remove references to meeting from announcements and notification modal
2015-03-28 10:14:49 -07:00
6a19dc9bda
Zipline/Basejump view with controller logic to serve. Will have to change based upon json
2015-03-29 00:09:50 +09:00
9e1a4a1348
Streak display in account/show.jade, refactor courseware.json for error handling and linting
2015-03-28 23:42:07 +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
94b6cae3ec
apply Nathan's insights into multistep form'
2015-03-27 12:36:21 -07:00
c69d919d46
Merge branch 'master' into ux-improvements
2015-03-27 10:28:31 -07:00
683498e62a
remove calls to trello and blogger, camp counselor photos, and update the notice about Saturday's meeting
2015-03-27 00:20:50 -07:00
e78609171d
continue work on the param-based funnel
2015-03-26 23:33:52 -07:00
d64b5c5718
add progress bar to nonprofit project proposal wizard
2015-03-25 15:25:19 -07:00
7d4c30c502
start adding progress bar to nonprofit onboarding
2015-03-25 14:18:27 -07:00
6e4067ee00
most views are now in place
2015-03-24 22:12:16 -07:00
d4935d44de
add the routes, controller actions and views for the nonprofit wizard
2015-03-24 21:46:42 -07:00
bcec96e427
half way done with the initial views and controllers
2015-03-24 19:08:26 -07:00
b3174eeadf
If no links are present, the template does not show the helpful links header.
2015-03-24 01:24:06 -04:00
4dae91ff41
formatting done.
2015-03-23 23:57:44 -04:00
dbc57dd0cb
links iterated through on the page. TODO formatting and adding more data.
2015-03-23 23:55:24 -04:00
0bf68fea5f
Links from database are being passed to the view. TODO create links
2015-03-23 23:20:19 -04:00
1facf532f3
start building the nonprofit project flow
2015-03-23 10:42:59 -07:00
f9523beb29
update copy on show all bonfires button
2015-03-22 18:22:07 -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
d0a40dc202
fix intermittent variable declaration error in camper news view
2015-03-22 01:16:02 -07:00
91edf73965
start building zipline views and controller
2015-03-21 17:23:13 -07:00
2dbd59b7f1
Merge branch 'ux-improvements' of https://github.com/FreeCodeCamp/freecodecamp into ux-improvements
...
Conflicts:
controllers/resources.js
views/account/show.jade
views/coursewares/showHTML.jade
views/coursewares/showJS.jade
views/partials/bonfires.jade
2015-03-21 16:36:35 -07:00
88e261ccf6
Merge branch 'master' into ux-improvements
...
Conflicts:
controllers/resources.js
controllers/user.js
seed_data/challenges.json
views/account/show.jade
views/coursewares/showHTML.jade
views/coursewares/showJS.jade
views/partials/bonfires.jade
2015-03-21 16:25:39 -07:00
fa0462da4c
point courseware reference in navbar to challenges
2015-03-21 18:58:14 +09:00
cf44287d7a
resolve merge conflict in navbar
2015-03-21 18:53:15 +09: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
b35f5ca59c
Working on unifying coursewares view and logic
2015-03-21 13:42:02 +09:00
6aaebbf34e
Clean up show all bonfires modal
2015-03-21 12:12:48 +09:00
d48da59aa7
resolve merge conflicts
2015-03-21 12:03:16 +09:00
2f240655a2
update announcements and move announcement modal back into learn-to-code view
2015-03-19 23:24:44 -07:00
29a0701e71
update link to nodeschool challenges video
2015-03-19 23:09:50 -07:00
56d7301d25
refactor announcement modal and add nodeschool-challenges
2015-03-19 22:34:36 -07:00
76d0467758
update nonprofit project guide copy
2015-03-18 16:01:21 -07:00
af19ea4308
improve upvoting UX and start adding angular validation to submit-story view
2015-03-18 00:40:18 -07:00
5ff3aabdd5
stories js var double output fix
...
challengeName and user are in stories/index.jade and stories/show.jade.
show.jade is only called from index.jade. This fix removes double output of those vars.
2015-03-17 21:18:55 -05:00
a52ab83757
half way done with the new upvoting ux
2015-03-17 17:57:50 -07:00
f1dcb4c373
start fixing the password in scope potential corner case security issue
2015-03-17 17:22:58 -07:00
f144e84310
Merge pull request #214 from MrRenter/upvoteFix
...
Upvote fix
2015-03-17 15:48:15 -07:00
c9dd6366ec
Compare against userIds
2015-03-18 05:01:14 +09:00
8b491ed27e
Fix display of comments if user is not logged in, disable reply button if no user, reject attempted comments if no user and no author
2015-03-17 17:44:52 +09:00
c9970c1725
Hide upvote arrow on news page if already upvoted. Make it disappear on upvote
2015-03-17 03:00:37 -04:00
6503cfc27d
Comment overflow in News fix
2015-03-16 02:21:47 -05:00
f99718daa0
update meta og:image
2015-03-14 01:51:28 -07:00
8e8711d947
add @rybar's new placeholder camper image and fix the broken logic that was supposed to update it for existing users
2015-03-11 23:58:16 -07:00
58e4e3c21a
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
2015-03-11 23:01:39 -07:00
e8ea6b39c9
fix link issue on show view
2015-03-11 22:29:03 -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
bb91982577
make link on show page open in new tab
2015-03-10 12:24:38 -07:00
09f7be37ee
make reply button consistent with discuss button throughout camper news
2015-03-10 10:22:20 -07:00
526d874d1b
add logic to truncate long headlines fetched from websites
2015-03-10 10:05:29 -07:00
ca52ab2b9b
make links open a new tab
2015-03-10 09:43:13 -07:00
5c0764c022
switch to tiny bullets in stories
2015-03-09 23:18:09 -07:00
f93fe396db
hide all codemirror textareas until codemirror can replace them on load
2015-03-09 23:03:17 -07:00
f9133957e3
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
2015-03-09 22:52:52 -07:00
68cc8cf7a7
Merge pull request #178 from jameskopacz/jameskopacz-patch-3
...
Hide codeEditor textarea to prevent flash
2015-03-09 22:52:03 -07:00
47507471ff
update the stories view to have ghost discuss button and update chat instructions
2015-03-09 22:10:09 -07:00
d224fda65f
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
2015-03-09 17:05:24 -07:00
0d43c8942e
add discuss button to views and fix onhover issues
2015-03-09 17:05:18 -07:00
c0702b9d04
Merge pull request #180 from terakilobyte/master
...
MOre news updates
2015-03-09 16:39:04 -07:00
d6a6834971
Validate min length of 5 for username, 8 for password
2015-03-10 08:17:10 +09:00
b21217f80c
Hide codeEditor to prevent flash
...
Fixes #176 .
Hide #codeEditor textarea so it won't flash when code mirror hides it.
2015-03-09 17:38:21 -05:00
489aa68854
Merge pull request #167 from jameskopacz/jameskopacz-patch-1
...
"Update my public portfolio" button fix
2015-03-09 14:47:08 -07:00
792d72c6b4
alias /news to /stories
2015-03-09 08:54:45 -07:00
09e42df355
update sitemap
2015-03-09 07:18:31 -07:00
ac89c44064
Merge branch 'master' of https://github.com/freecodecamp/freecodecamp
2015-03-09 18:45:21 +09:00
1da79c2b86
Display meta description
2015-03-09 18:40:14 +09:00
af820582b5
Server side checking of user input before allowing signup.
2015-03-09 18:39:31 +09:00
8326d0f973
"Update my public portfolio" button fix
...
"Update my public portfolio" button was appearing on all account pages.
2015-03-09 04:39:00 -05:00
b7e73c90eb
Server side checking of user input before allowing signup.
2015-03-09 18:39:00 +09:00
77cf279f54
Enforce 8 character length password with angular
2015-03-09 18:10:15 +09:00
24ab61e271
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
2015-03-09 00:27:23 -07:00
d7edde2a19
fix the casing of the views and a minor Jade warn statement
2015-03-09 00:27:17 -07:00
528e0094d1
Add image display to show view for news
2015-03-09 13:55:13 +09:00
eb991c4f15
Add image fetching for articles that support the og:image meta tag
2015-03-09 13:08:39 +09:00
ca440c53f8
Enter button now triggers comment submission
2015-03-09 11:55:33 +09:00
77496864d4
Unify comment view between comments and show, hide all comment input elements when user clicks on new reply button
2015-03-09 11:31:32 +09:00
2f54153b16
get a running start on refactoring comment ui elements
2015-03-08 18:56:06 -07:00
9475c2a899
start changing the reply areas on camper news from text areas to text fields
2015-03-08 17:51:27 -07:00
48ce07058d
disable searching since it's not yet working in production
2015-03-08 16:27:25 -07:00
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
7a56d4fcb2
Remove debug/console.log statements
2015-03-09 06:58:08 +09:00
b2e8858e68
remove asynchronous loading of jquery
2015-03-08 14:45:06 -07:00
35ce34104c
fix bug 144 profile glitch
2015-03-08 13:56:11 -07:00
3bd979ad08
Merge branch 'news' of https://github.com/FreeCodeCamp/freecodecamp
2015-03-08 12:16:35 -07:00
212e59e061
Minor view tweaking
2015-03-08 20:22:55 +09:00
6283ec1174
resolve show.jade merge conflict
2015-03-08 18:50:28 +09:00
de91be44da
comment submit time bug fixed
2015-03-08 18:48:20 +09:00
aacb0070b3
add the nonprofit projects guide view and change all our nonbreaking spaces to smaller, more natural looking spaces
2015-03-08 01:36:09 -08:00
f367a0310e
Finalizing display issues for news release
2015-03-08 16:50:51 +09:00
bac22c1d96
Space hot stories view, remove all listing and refactor to divs
2015-03-08 12:48:02 +09:00
1edc1aa3cf
Begin refactoring story lists to order list, remove separate rank div
2015-03-08 12:32:35 +09:00
c8a9f6f810
add benign class that makes search and submit fields on news right size on mobile
2015-03-07 19:03:26 -08:00
790a2d987b
Fighting CSS
2015-03-08 11:53:03 +09:00
0a741f0e54
further ux improvements to branch
2015-03-07 17:38:47 -08:00
87ac659038
tighten up the interface for mobile
2015-03-07 16:48:57 -08:00
585544e1fd
Minor view improvements and removing extra dom closing tags from views
2015-03-07 21:33:04 +09:00
485bbcc3a9
Bring reply link up closer to comment details
2015-03-07 20:57:28 +09:00
b776be58e5
Finish full functionality for intial release of camper news
2015-03-07 20:51:20 +09:00
b0e853d600
fix angular but at the cost of losing page speed
2015-03-07 02:30:39 -08:00
8d86a6a060
add compression to svg assets
2015-03-07 02:25:35 -08:00
61435283d0
fix issue with chat page showing 304 in firefox
2015-03-07 01:37:41 -08:00
a3769f6507
Story submission now with a description, refactor show to display description above comment box
2015-03-07 18:26:49 +09:00
19afeda949
make google fonts also an async call
2015-03-07 01:08:08 -08:00
297c7f3287
test moving the css to body
2015-03-07 01:02:46 -08:00
Quincy Larson
terakilobyte
MrRenter
Berkeley Martinez
jameskopacz
A. Drake
jameskopacz