gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,547 Commits 9 Branches 0 Tags
aa01a896a50846ca9eecedea92f4400ffc3f7314
Commit Graph

219 Commits

Author SHA1 Message Date
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
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
d4935d44de add the routes, controller actions and views for the nonprofit wizard 2015-03-24 21:46:42 -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
Quincy Larson
c0702b9d04 Merge pull request #180 from terakilobyte/master 
MOre news updates
 2015-03-09 16:39:04 -07: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
Nathan Leniz
7a56d4fcb2 Remove debug/console.log statements 2015-03-09 06:58:08 +09:00
Nathan Leniz
790a2d987b Fighting CSS 2015-03-08 11:53:03 +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
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
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