Commit Graph

246 Commits (c354ddf1ac340be0a5651f5a1917f2323238a60f)

Author SHA1 Message Date
Berkeley Martinez 2256f3ef6e fix add github link to passport 2015-08-10 23:38:10 -07:00
Berkeley Martinez 5f21db457d fix challenge ordering
Now challenges are ordered on map first by top order value of json file
second by index of array
2015-08-10 23:29:32 -07:00
Quincy Larson 7bfe61731b give a user a brownie point when they start 2015-08-10 20:55:01 -07:00
Berkeley Martinez 967f92e6f4 fix challenge naming scheme 2015-08-09 22:46:44 -07:00
Berkeley Martinez 2476f35309 add challenge order to individual challenge 2015-08-09 07:40:16 -07:00
Berkeley Martinez 26e69c8621 add type to challenges 2015-08-07 23:37:32 -07:00
Berkeley Martinez 83397b7e1b add picture on github signin/up 2015-08-07 18:10:32 -07:00
Berkeley Martinez ce9e2ebcae fix test email for string 2015-08-05 22:56:23 -07:00
Berkeley Martinez 0ce81bbabb fix email sign should not require username 2015-08-05 19:29:17 -07:00
Berkeley Martinez e6d05e3421 fix specify index using mongodb property 2015-08-05 19:08:25 -07:00
Berkeley Martinez 8c7a9dd818 fix trim and lowercase user username and email 2015-08-05 18:51:15 -07:00
Berkeley Martinez e9958281c9 pull user bio from github 2015-08-05 17:49:54 -07:00
Berkeley Martinez 3cfd69c704 add loopbackMigrationGrandfathered flag 2015-08-05 13:01:48 -07:00
Quincy Larson 61aed73fa8 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-04 15:15:33 -07:00
Quincy Larson 5f2ec0aeae Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp i:wq
nto staging
2015-08-04 15:10:15 -07:00
Berkeley Martinez d752e5b487 on login double check that github username
if different, assign user to new name
2015-08-04 15:09:42 -07:00
Quincy Larson c573caf2e2 remove website links from user model and account view 2015-08-04 14:57:34 -07:00
Berkeley Martinez 9196d1c48e add github check on login with github. 2015-08-04 14:52:29 -07:00
Berkeley Martinez 2dc9934da2 add user.isGithubCool check
if user signs up with github, they become GithubCool.
2015-08-04 13:41:10 -07:00
Berkeley Martinez 70c5bcea20 fix error message string 2015-08-04 10:52:41 -07:00
Berkeley Martinez c2720d784c add debug flag to giveBrowniePoints endpoint 2015-08-01 20:08:32 -07:00
Quincy Larson feab8b508e remove field guide cruft and update all field guide links to wiki 2015-07-31 21:55:49 -07:00
Berkeley Martinez 13f2f349dc remove bonfire/comments models
remove comments from user router
2015-07-31 20:22:08 -07:00
Berkeley Martinez e7f522a611 fix giveBrowniePoints error messages 2015-07-31 13:45:45 -07:00
Berkeley Martinez 0e21d6eb30 set browniePoints timeout to 30 seconds for dev 2015-07-31 12:45:34 -07:00
Berkeley Martinez f1b964a26d send back user bio on giveBroniePoints 2015-07-31 12:16:27 -07:00
Berkeley Martinez fa47ed9afb remove extra debugs 2015-07-29 15:10:03 -07:00
Berkeley Martinez 5533779d45 add give brownie points!!!! 2015-07-29 15:00:24 -07:00
Berkeley Martinez 9731e8ccc6 fix return callbacks 2015-07-29 11:41:41 -07:00
Berkeley Martinez 9e22122832 adds user/about 2015-07-29 11:32:16 -07:00
Berkeley Martinez c82b2e3ae6 set and render page title
note this requires changes to thundercats to work
see: thundercatsjs/thundercats-react/issues/3
2015-07-29 10:18:06 -07:00
Berkeley Martinez 884825cb1d add profile-picture to profile picture 2015-07-28 11:18:11 -07:00
Berkeley Martinez b9d544d13e hide job position on small screens 2015-07-26 18:42:26 -07:00
Berkeley Martinez 9bc14d24a4 Display contact information for job and size thumbnail 2015-07-26 07:57:14 -07:00
Berkeley Martinez f547ce32f7 update jobs model and jobs seed 2015-07-25 21:59:52 -07:00
Berkeley Martinez 4792485ac4 show jobs route up 2015-07-25 21:32:18 -07:00
Berkeley Martinez 41274fad2d jobs store fetching 2015-07-25 15:42:03 -07:00
Berkeley Martinez a45863ce87 jobs page rendering 2015-07-25 15:15:59 -07:00
Berkeley Martinez 0d628f57bb move jobs flux, use createClass for react 2015-07-25 13:58:26 -07:00
Berkeley Martinez 9a236d1ec7 render user picture and mobile nav 2015-07-24 22:27:52 -07:00
Berkeley Martinez 81b1c81b51 use desctructing and assignment to rename instance 2015-07-24 22:27:52 -07:00
Berkeley Martinez a1a4ac883d add user stores/actions
construct fetchr on every request
2015-07-24 22:27:52 -07:00
Berkeley Martinez f1e39ac744 fix nav bar drop down menu 2015-07-23 22:59:22 -07:00
Berkeley Martinez f3508db401 fix lint error 2015-07-23 16:03:52 -07:00
Berkeley Martinez e88b5a81c4 on question complete, ping /completed-challenges 2015-07-23 16:03:52 -07:00
Berkeley Martinez 6de5ad682e Get rid of uncompletedChallenges on user object 2015-07-23 16:03:52 -07:00
Berkeley Martinez eb0dc42089 rename ajax$ to remove special characters 2015-07-23 16:03:51 -07:00
Berkeley Martinez 0ef87cc040 adds postJSON method 2015-07-23 16:03:51 -07:00
Berkeley Martinez e22cd5da23 correct answer hits server 2015-07-23 16:03:51 -07:00
Berkeley Martinez 9485bdd20a add question header 2015-07-23 16:03:51 -07:00
Berkeley Martinez b38f9baa3c turn down dampness and spring constant 2015-07-23 16:03:51 -07:00
Berkeley Martinez 02f5e49909 touch move works 2015-07-23 16:03:51 -07:00
Berkeley Martinez bc3787fdfc Add transition between questions 2015-07-23 16:03:51 -07:00
Berkeley Martinez 89bd18a387 reset info on router transition 2015-07-23 16:03:51 -07:00
Berkeley Martinez c3ce578a26 moving question to right answers true
moving question to left answer false
2015-07-23 16:03:50 -07:00
Berkeley Martinez 524b59828c release question on mouseLeave 2015-07-23 16:03:50 -07:00
Berkeley Martinez 52b0391d15 fix should be mixins plural 2015-07-23 16:03:50 -07:00
Berkeley Martinez 35193f22cc click drag question 2015-07-23 16:03:50 -07:00
Berkeley Martinez 9a73d20d5a shake on wrong answer 2015-07-23 16:03:50 -07:00
Berkeley Martinez 2ceef5f0f6 remove last binding methods 2015-07-23 16:03:50 -07:00
Berkeley Martinez 50fce52261 remove bind methods 2015-07-23 16:03:50 -07:00
Berkeley Martinez fe3b983347 remove react-stampit 2015-07-23 16:03:49 -07:00
Berkeley Martinez f735572b6e Go back to map when no more hikes are found 2015-07-23 16:03:49 -07:00
Berkeley Martinez be6d2a2dfc refetch on param changes 2015-07-23 16:03:49 -07:00
Berkeley Martinez b0e3cfd028 fix copy array because .reverse mutates! 2015-07-23 16:03:49 -07:00
Berkeley Martinez cafd18a5ec return currentHike on load 2015-07-23 16:03:49 -07:00
Berkeley Martinez b945fc94a4 Move flux contianer to top level hike comp
Removes all the lower level hikes
Finishing questions takes you to next hike
BUG: sometimes it takes you an incorrect next challenge
2015-07-23 16:03:49 -07:00
Berkeley Martinez 5da04b14d3 fix should be transform not transformer 2015-07-23 16:03:49 -07:00
Berkeley Martinez dd72b57d56 fetch/set current hike shouldn't pass state around 2015-07-23 16:03:48 -07:00
Berkeley Martinez 2d5013d9ae fetch/set current hike shouldn't need to pass around state 2015-07-23 16:03:48 -07:00
Berkeley Martinez 639f85c580 Add modal on correct answer 2015-07-23 16:03:48 -07:00
Berkeley Martinez f5963192d1 move transcript rending into method 2015-07-23 16:03:48 -07:00
Berkeley Martinez 892fd64cf5 On successful answer take camper to next question 2015-07-23 16:03:48 -07:00
Berkeley Martinez 2fda45897f Add skip to question button to lecture 2015-07-23 16:03:48 -07:00
Berkeley Martinez 73c0e8a73f questions renders corrent test on number param 2015-07-23 16:03:48 -07:00
Berkeley Martinez 04a5a081b3 fix mixing forward slash on transistionTo 2015-07-23 16:03:48 -07:00
Berkeley Martinez caaa21d367 Video end goes to questions 2015-07-23 16:03:48 -07:00
Berkeley Martinez 4232eb6bfe Render question 2015-07-23 16:03:47 -07:00
Berkeley Martinez 5ba0dc1fec hikes/:dashedName renders questions 2015-07-23 16:03:47 -07:00
Berkeley Martinez 3dbe91e92d render transcript below video 2015-07-23 16:03:47 -07:00
Berkeley Martinez 5e02896269 update loading hike directly loads lecture 2015-07-23 16:03:47 -07:00
Berkeley Martinez 88ab374ba6 update going from hikes map to lecture loads video
bug: does not load directly from url
2015-07-23 16:03:47 -07:00
Berkeley Martinez d0b1d83249 prefetch data and prime stores on client render 2015-07-23 16:03:47 -07:00
Berkeley Martinez cc418e780b use title field 2015-07-23 16:03:47 -07:00
Berkeley Martinez 3df60136e8 add title field to challenges 2015-07-23 16:03:46 -07:00
Berkeley Martinez de1d931b82 add hikes/map pulls hikes out of db and renders 2015-07-23 16:03:46 -07:00
Berkeley Martinez 8b0b5dd6ce split field guides into separate categories 2015-07-23 15:50:47 -07:00
Berkeley Martinez ef91cf3bb2 add titles and grids 2015-07-23 15:49:03 -07:00
Berkeley Martinez bc62d18eb4 add map of hikes 2015-07-23 15:49:03 -07:00
Berkeley Martinez debcfaa86c fix videoId should be a string 2015-07-23 15:49:02 -07:00
Berkeley Martinez cd1df0d1b8 add key to footer map 2015-07-23 15:49:02 -07:00
Berkeley Martinez 43d817d060 fix use assign module instead of Object.assign
Object.assign not available in most browser yet...
2015-07-23 15:49:02 -07:00
Berkeley Martinez 080fb4d37c add video player 2015-07-23 15:49:01 -07:00
Berkeley Martinez ef7e0c67ee fix not found calls next 2015-07-23 15:49:01 -07:00
Berkeley Martinez 4c8a8a4875 change mobile to hikes 2015-07-23 15:49:01 -07:00
Berkeley Martinez b2a7351aef fix add missing nav links
refactor into json
2015-07-23 15:49:01 -07:00
Berkeley Martinez 9825f55754 fix use special navItem for signin button 2015-07-23 15:49:01 -07:00
Berkeley Martinez 6ad1a0af23 remove $nbsp in favor of whitespace 2015-07-23 15:49:01 -07:00
Berkeley Martinez f159d68fc5 fix undefined functions
it renders!
2015-07-23 15:49:01 -07:00
Berkeley Martinez bb37583c90 fix should be getChildRoutes
fix fromNodeCallback returns array of values from callback
fix remove require.ensure - needs to be tested
2015-07-23 15:49:01 -07:00
Berkeley Martinez e3acbe01a9 initial entry points up 2015-07-23 15:49:01 -07:00
Berkeley Martinez a5e7009a57 initial react app(WIP) 2015-07-23 15:49:00 -07:00
Quincy Larson 378f6da221 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
	public/js/main_0.0.3.js
	seed/challenges/get-set-for-free-code-camp.json
	seed/field-guides.json
2015-06-26 01:08:40 -07:00
Quincy Larson 6700729658 update emails and refine sponsor view 2015-06-25 23:35:48 -07:00
Berkeley Martinez 3e24f21828 fix comment model defaults 2015-06-24 08:24:13 -07:00
Berkeley Martinez 62d2c40a87 Add read access to all models 2015-06-24 08:23:49 -07:00
Berkeley Martinez 5bde1839f3 add read authority to all for stories and comments 2015-06-24 07:25:56 -07:00
Berkeley Martinez b383da47bb fix uncompletedBonfires should default to empty array 2015-06-22 19:18:15 -07:00
Berkeley Martinez a8540bee35 add initial react app 2015-06-17 21:04:28 -07:00
terakilobyte e08f895769 Handle invalid login 2015-06-16 00:29:32 -04:00
terakilobyte 070c248132 Handle invalid login 2015-06-16 00:27:32 -04:00
Berkeley Martinez c4d229e62d remove email verification step.
users are marked for future uses
2015-06-15 15:43:12 -07:00
Quincy Larson b411426874 add dashedName attribute to challenge 2015-06-14 00:56:47 -07:00
Berkeley Martinez f6fbe6e9c7 make username unique and make username required 2015-06-12 16:40:49 -07:00
terakilobyte 5b2b7e23ae Take id property of username, remove wasteful save on profile lookup. 2015-06-12 19:16:10 -04:00
terakilobyte d07e5351ea Comment out blacklist 2015-06-12 18:55:47 -04:00
Berkeley Martinez e29a340afb add blacklisted usernames to loopback user validations 2015-06-12 13:54:38 -07:00
Berkeley Martinez 63937c3a56 fix make usernames required 2015-06-12 13:14:07 -07:00
Berkeley Martinez 070a80cb79 set saltfactor for Passwords 2015-06-12 11:38:00 -07:00
Berkeley Martinez b9b5a649ee fix grab user photo from profile 2015-06-11 21:12:47 -07:00
terakilobyte a5092d379d Merge conflicts and clean up lint errors. 2015-06-11 21:08:40 -04:00
terakilobyte 223ea2a393 Merge conflicts and clean up lint errors. 2015-06-11 21:08:16 -04:00
terakilobyte 3017991de5 Finished local user login flow 2015-06-11 21:03:01 -04:00
Berkeley Martinez c2f408fb56 add blacklist to usernames 2015-06-11 17:04:48 -07:00
Berkeley Martinez 5be6ce7193 add delete user idenity and credentials after profile deletion 2015-06-11 16:57:06 -07:00
terakilobyte 34c3fef7d4 Move api hooks to user.js 2015-06-11 19:11:07 -04:00
terakilobyte f7bb14803e Update field guides to display properly. Correct models on user object. 2015-06-11 16:19:44 -04:00
terakilobyte 0aa83f1bb9 Remove mongoose style lookup from fieldguide.js. Update user model. 2015-06-11 15:33:38 -04:00
Berkeley Martinez 0d32cf701f fix find instance or currentInstance 2015-06-11 12:17:53 -07:00
Berkeley Martinez fe5cbec117 add pull in user image on signup when available 2015-06-11 11:38:08 -07:00
Berkeley Martinez af902799b1 add acl controls to models 2015-06-10 23:59:42 -07:00
Berkeley Martinez 9f5ace03dc fix acls access for user exists remote method 2015-06-10 17:11:32 -07:00
Berkeley Martinez bdb7d40548 fix usernames should be saved lowercased 2015-06-10 15:22:57 -07:00
Berkeley Martinez a8494b29da add user signup through loopback 2015-06-09 16:45:14 -07:00
terakilobyte 4f9061bffb Sort out story model. 2015-06-05 14:53:12 -04:00
Berkeley Martinez 0ac664c9ae Use mongodb sparse indexing for user emails 2015-06-04 14:21:01 -07:00
Quincy Larson 3654bb7e6f change _id to id everywhere that seems relevant to loopback 2015-06-04 13:20:42 -07:00
Berkeley Martinez a695daa03f add default empty array to user.completedChallenges 2015-06-04 13:09:22 -07:00
Berkeley Martinez db37482c59 Flatten user object 2015-06-04 12:47:31 -07:00
Berkeley Martinez 4a696462d2 Add reactify branch react components 2015-06-04 10:53:01 -07:00
Berkeley Martinez 66eff31294 Adding passport config stuff 2015-06-04 10:52:12 -07:00
Berkeley Martinez 75f9b06e90 fix incorrect model name 2015-06-03 16:48:17 -07:00
Quincy Larson 57893cf714 two more minor fixes 2015-06-02 16:58:12 -07:00
Quincy Larson a6dc24521d update models to be loopback compliantgs 2015-06-02 16:57:57 -07:00
Berkeley Martinez 88a512d96c refactor bonfire to loopback json 2015-06-02 16:08:50 -07:00
Berkeley Martinez 279f953628 Move models to common/models
closes #795
2015-06-02 15:05:26 -07:00