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
|
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
|
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
|
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
|
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 |
Michael Q Larson
|
d8b8373b70
|
do some refactoring of the camper news views
|
2015-03-03 19:55:04 -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 |
Nathan Leniz
|
2cc469e293
|
Refactor undefined check for mainjs, add a challengeName to email signup page
|
2015-02-27 05:02:52 +09:00 |
Nathan Leniz
|
dc4aa40a32
|
Add bitly url shortening example to showHTML view
|
2015-02-23 07:47:43 +09:00 |
Nathan Leniz
|
3e65298e35
|
All coursewares list now displays properly, coursewares properly direct to the follow on, courseware controller now properly finds the next courseware
|
2015-02-22 18:23:50 +09:00 |
Nathan Leniz
|
90caed3369
|
More UX improvements
|
2015-02-22 16:46:55 +09:00 |
Michael Q Larson
|
e0c82156a7
|
refactor layout.jade to have universal head, and customize together.js
|
2015-02-21 14:49:24 -08:00 |
Michael Q Larson
|
e5cfa147fa
|
attempt to use togetherjs
|
2015-02-21 14:22:46 -08:00 |
Nathan Leniz
|
b32f6133db
|
Update bonfire plugin version number to force fresh import on browsers
|
2015-02-22 06:23:44 +09:00 |
Nathan Leniz
|
c852aef1be
|
Ramda upgrade
|
2015-02-21 11:38:03 +09:00 |
Nathan Leniz
|
8a70678a0b
|
Merge branch 'master' into ramda-fire
|
2015-02-16 00:51:11 -05:00 |
Nathan Leniz
|
cf288c7daf
|
Switch to angular jqlite for class manipulation on pairedwith form in bonfire/show
|
2015-02-15 11:51:56 -05:00 |
Nathan Leniz
|
92136dcd1f
|
Fixing dependency injection for account view as well as defining a challengeName to suppress errors
|
2015-02-14 22:52:44 -05:00 |
Nathan Leniz
|
3d7c7cf6b3
|
Remove debug statements from the server
|
2015-02-14 22:42:10 -05:00 |
Nathan Leniz
|
284b8e03ff
|
Properly observe angular dependency injection in main
|
2015-02-14 22:35:16 -05:00 |
Nathan Leniz
|
68ad6f9831
|
Added in debug statements to diagnose problem in production
|
2015-02-14 21:55:24 -05:00 |
Nathan Leniz
|
d66f6bebf5
|
Merge branch 'master' of https://github.com/freecodecamp/freecodecamp
|
2015-02-14 21:49:04 -05:00 |
Nathan Leniz
|
4f6a6bd8f0
|
Clean up username validation in bonfires and remove red border from input field if user deletes all input
|
2015-02-14 21:48:48 -05:00 |
Nathan Leniz
|
e3c9e42fce
|
showJS view now shows errors in a pretty format (kinda)
|
2015-02-14 18:43:45 -05:00 |
Nathan Leniz
|
9ac19023d9
|
Show tests on html view
|
2015-02-14 18:31:32 -05:00 |
Nathan Leniz
|
693b8fbb33
|
Forward progress, need to resolve script loading timing
|
2015-02-14 17:28:07 -05:00 |
Michael Q Larson
|
fb971ab080
|
start adding test output to coursewares
|
2015-02-14 14:09:26 -08:00 |
Nathan Leniz
|
b5c0ad9942
|
Building out new challenge framework to allow controller to determine view type for challenge
|
2015-02-13 20:55:49 -05:00 |
Nathan Leniz
|
a0427b3e18
|
Fix for bonfire to allow people to prototype objects properly but lose default insertion point injection (i.e. they will get an error if they forget to call their function
|
2015-02-13 12:14:12 -05:00 |
Jason Rueckert
|
54b5870fc9
|
Merge pull request #91 from phlacin/automaticDating-livepair
Added Moment.js library and time logic to next Live session
|
2015-02-12 20:44:27 -08:00 |
phlacin
|
2d447f0bb0
|
added automatic time logic to live-pair-programming page
|
2015-02-12 20:31:11 -08:00 |
Michael Q Larson
|
f8f0c3454a
|
subtle completed challenge button for courseware and add completionMessage to coursewares
|
2015-02-12 16:48:35 -08:00 |
phlacin
|
6455d80a6e
|
Added Moment.js library and added logic to the time for the next Live session.
|
2015-02-11 23:08:10 -08:00 |
Michael Q Larson
|
a1507a969b
|
Add should and assert to coursewares and write code to test multiple instances of an element for a condition
|
2015-02-10 22:22:40 -08:00 |
Nathan Leniz
|
e7b0cd53ed
|
Adding ramda to bonfire
|
2015-02-09 14:20:27 -05:00 |
Nathan Leniz
|
4fa6c9c65d
|
iFrame cleanup for courseware to get rid of domain error, rename both framework files to force browser fetches to most recent code
|
2015-02-08 01:12:40 -05:00 |
Michael Q Larson
|
180699adb2
|
Wiring up analytics for courseware, unifying analytics between coursewares and bonfires, general housekeeping tasks for live push
|
2015-02-07 21:11:26 -08:00 |
Michael Q Larson
|
07c5757538
|
Code cleanup
|
2015-02-07 20:43:39 -08:00 |
Michael Q Larson
|
4f9474bc3a
|
Add hotkey to go to next challenge/bonfire from completion modal, keep editor in focus on exiting completion modal, allow for courseware to theoretically work in production and development.
|
2015-02-06 16:55:48 -08:00 |
Michael Q Larson
|
319b537e5b
|
add a hotkey for advancing to the next challenge
|
2015-02-06 15:18:02 -08:00 |
Michael Q Larson
|
a1c5d665e6
|
Merge branch 'courseware' of https://github.com/FreeCodeCamp/freecodecamp into courseware
|
2015-02-06 13:54:55 -08:00 |