Berkeley Martinez
5d95a98b64
update current challenge on map click
2016-07-28 23:39:17 -07:00
Berkeley Martinez
1eb6390b85
move map as a supdirectory of challenges
2016-07-28 23:39:17 -07:00
Berkeley Martinez
33d3e94e62
Move selectors around
2016-07-28 23:39:17 -07:00
Berkeley Martinez
a0f6ecfca2
Add initial dynamic challenge rendering
2016-07-28 23:39:17 -07:00
Berkeley Martinez
59dcabb588
Move fetchChallenges up a level
2016-07-28 23:39:17 -07:00
Berkeley Martinez
b6f9cfdf71
Move to redux-epic
2016-07-28 23:39:17 -07:00
Berkeley Martinez
d511be3332
Add new rx saga
2016-07-28 23:39:17 -07:00
Berkeley Martinez
96f4f3413a
Make map links react aware
2016-07-28 23:39:17 -07:00
Berkeley Martinez
caa992ecff
Redirect /challenges to /map
2016-07-28 23:39:17 -07:00
Berkeley Martinez
c150ad2c34
Add filter clearing logic
2016-07-28 23:39:17 -07:00
Berkeley Martinez
b9dfc254f4
Add logic to filter input field
...
Add correct css to input field addon icon
2016-07-28 23:39:17 -07:00
Berkeley Martinez
82d42132df
remove active class on map button
2016-07-28 23:39:17 -07:00
Berkeley Martinez
9353c4df9f
Break up map components
...
Add static super blocks
2016-07-28 23:39:17 -07:00
Berkeley Martinez
c909cd032e
Add React Map
2016-07-28 23:39:17 -07:00
Berkeley Martinez
844afb6e2f
Add webpack code splitting module
...
Add cold-module replacement
Add webpack module hashing
2016-07-28 23:39:17 -07:00
Berkeley Martinez
6898d961bf
Normalize model json using generator loopback
2016-07-28 23:39:17 -07:00
Berkeley Martinez
4514d39eff
Add challenge map service
2016-07-28 23:39:17 -07:00
Berkeley Martinez
f29545ef6c
Move to localize non ui data
2016-07-28 23:39:17 -07:00
Berkeley Martinez
c7af14bcf7
Initial step challenge ui with state changes
2016-07-28 23:39:17 -07:00
Berkeley Martinez
09ea99e561
Add react challenge view with editor
2016-07-28 23:39:17 -07:00
Quincy Larson
3eaf37d4a9
remove wiki nav button and target blank from shop nav button
2016-07-20 01:37:38 -07:00
Mrugesh Mohapatra
85a1212da5
Error messages for invalid tokens from email links
...
This commit, adds error messages for users hiting the confirm
endpoint with invalid, or expired tokens from emailed links.
2016-07-12 11:46:11 +00:00
Mrugesh Mohapatra
546737e6be
fix password validate crash
2016-06-23 00:55:15 +05:30
Quincy Larson
bbcadd1fc5
fix a typo in notification
2016-06-08 01:13:11 -07:00
Berkeley Martinez
93df2dfa4d
Merge pull request #8832 from bugron/fix/hikes-title
...
Fix video challenge title to show challenge name instead of 'Hikes'
2016-06-03 12:07:12 -07:00
Berkeley Martinez
e29a2a9716
feature(email): add ability to verify current email
2016-06-02 15:23:49 -07:00
Berkeley Martinez
942962fa0f
Add prod urls to verify emails
2016-06-02 13:49:34 -07:00
Berkeley Martinez
564f4c1180
Update email info copy
2016-06-02 13:48:56 -07:00
Mrugesh Mohapatra
ff4dfb09da
Add email verification and notifications
...
This commit
- [x] Fixes the flash notice color (Trivial)
- [x] Adds flash message for user with no email.
- [x] Adds checks to see if user's email is verified, and displays corresponding notification.
- [x] Adds email templates.
2016-06-01 08:34:34 +00:00
Arsen Melikyan
a0b1e3c59b
Do not auto toggle to Question view when video ends
2016-05-28 20:18:19 +04:00
Arsen Melikyan
d3806bec14
Fix video challenge title
2016-05-28 09:01:18 +04:00
Quincy Larson
1872b8c775
fix forum links in navbars
2016-05-18 16:45:59 -07:00
Quincy Larson
366a4adca9
Add forum link to navbar and React nabber
2016-05-18 00:02:44 -07:00
Quincy Larson
ee2e0e290f
Merge branch 'fix/theme-flash' of https://github.com/BerkeleyTrue/FreeCodeCamp into BerkeleyTrue-fix/theme-flash
...
Conflicts:
common/models/user.js
2016-05-12 21:28:29 -07:00
Berkeley Martinez
e72ad8c513
fix(ui): Fix flash shown to user on page refresh
...
Store user theme preference on user object.
Must be logged in to use themes
2016-05-12 18:52:03 -07:00
Berkeley Martinez
04b874de45
Fix email validations
2016-05-12 16:16:36 -07:00
Berkeley Martinez
fbfb50cde3
Fix hike question transition disposing answer saga
2016-05-09 16:12:23 -07:00
Logan Tegman
c015cb5ec5
Inject csrf token into react app
2016-05-09 10:13:02 -07:00
Berkeley Martinez
a63fba8c9c
Merge pull request #8196 from QuincyLarson/fix/vimeo-to-youtube
...
Transition Videos from Vimeo to Youtube
2016-05-04 15:42:15 -07:00
Berkeley Martinez
42b8254ed2
Merge pull request #8427 from raisedadead/fix/refactor-signin-redirects
...
Update paths to minimize re-directs
2016-05-04 14:56:01 -07:00
Logan Tegman
d540e9e4ca
Switch react lecture component to youtube
2016-05-04 10:30:47 -07:00
Logan Tegman
3e258a7868
Remove thundercats and oldActions, update react-dom
2016-05-03 22:12:59 -07:00
Mrugesh Mohapatra
b02ddc135d
Update paths to minimize re-directs
2016-05-03 15:06:20 +00:00
Berkeley Martinez
7b8dc2e77e
Add friendly error message on auth create attemp
2016-05-02 23:03:44 -07:00
Berkeley Martinez
8166bfbcd8
Remove o-auth account creation
...
Accounts can only be created with Github or email
2016-05-02 21:26:47 -07:00
Berkeley Martinez
428cf8135e
user-identity
2016-05-02 21:26:47 -07:00
Berkeley Martinez
e65d55a3f7
Change update email endpoint
2016-05-02 17:22:46 -07:00
Mrugesh Mohapatra
3d55b9bb8b
Add Update Email View
...
This commit:
- Displays the user's email that we have on records
- Adds a button in the settings to update email
- Adds a form view to update the email
- Fixes CSS for the Email icons and the email form
~ Credits to @hallaathrad
- Linting fixes and updated with Berkeley's Comments
- Streamline checks and fix scope
- Add AJAX Calls
- Add flash messages
- Update the views & add XHR value
2016-05-02 18:33:37 +00:00
Quincy Larson
be27deaa4c
Merge pull request #8124 from BerkeleyTrue/feature/re-add-announcement
...
(Re)add announcement/flyer
2016-04-20 14:48:05 -07:00
Berkeley Martinez
a225648b57
Fix brownie points not showing on react pages
2016-04-15 14:00:17 -07:00
Aniruddh Agarwal
09bf747cfc
Change ESLint quote-props rule to as-needed
...
Also fixes all files flagged by the rule
2016-04-16 00:31:13 +08:00
Berkeley Martinez
02eb6cad6c
Refactor announcement feature
2016-04-14 20:06:42 -07:00
Berkeley Martinez
c9fdb581ce
Revert "Announcement feature"
2016-04-14 18:13:58 -07:00
Berkeley Martinez
17915e7ecf
Revert "Fix give-brownie-points/about API DB queries"
2016-04-14 17:07:40 -07:00
Quincy Larson
66fda23dac
Improve style on flash notification and make flyer conditional on logged in user with at least 6 points
...
Lower case model json file
2016-04-13 23:10:46 +01:00
Quincy Larson
f0c8e06574
rename the Flyer object to flyer
2016-04-13 23:10:42 +01:00
benmcmahon100
d53a2eec86
BillBoard now Flyer. Changes to API and view logic
...
Fix to replace of null error. Changed Flyer to flyer
2016-04-13 23:10:34 +01:00
benmcmahon100
a27c5ccdd2
Ground work for the bill board announcement feature
2016-04-13 22:58:57 +01:00
Berkeley Martinez
7f24986c58
Fix give-brownie-points/about API DB queries
...
This should speed up these api calls significantly
2016-04-11 15:46:22 -07:00
Berkeley Martinez
1308d312a4
Add methods to get challengeMap
...
Update boot/challenge.js to use new methods
Update boot/user.js to use new methods
2016-04-06 21:11:07 -07:00
Quincy Larson
e98fc9d9ff
Remove Google and Facebook links from user profiles and settings page for privacy reasons
2016-04-04 22:21:34 -07:00
Panayiotis Lipiridis
c17af58aee
Renamed Github to GitHub
2016-04-04 22:50:07 +02:00
Berkeley Martinez
1f8e1d2c2e
Merge pull request #7719 from bteng22/fix/mobile-text-overflow
...
Video challenges content appears out of mobile screens
2016-04-02 07:47:21 -07:00
Hallaathrad
9853a54a9a
Replace portfolio link
2016-03-26 13:20:15 -04:00
bteng22
93443ef1a5
Computer Basics (and all Video Challenges) flows out of screen on mobile devices
...
Removing react-bootstrap component Row from Hikes.jsx and Hike.jsx as it adds a row class which tightens the margins. Also removing inline overflow: hidden style that seemed to not affect anything as well as extraneous html elements.
Closes #7565
2016-03-24 00:09:34 -07:00
Mrugesh Mohapatra
ab5b1451e4
Merge pull request #7571 from alistermada/fix/links-in-video-descriptions
...
Fix links in video challenge descriptions
2016-03-17 18:03:15 +05:30
Jacob Bearden
fcf866906b
fix image protocol
2016-03-16 20:32:12 -06:00
Alister N. Mada
c13e234ff7
Fix links in video descriptions
2016-03-16 12:51:08 +07:00
Quincy Larson
d47aed4850
factor out settings page with email settings
2016-03-14 23:59:24 -07:00
Rex Schrader
8e621fd0cb
Merge pull request #7533 from ahstro/fix/hikes-question-flash
...
Don't flash next question before video in hikes
2016-03-14 21:37:39 -07:00
Berkeley Martinez
e657b96dbc
Coerce values to string before using validator methods
2016-03-13 18:09:53 -07:00
Anton Strömkvist
28a52f517d
Don't flash next question before video in hikes
2016-03-13 17:00:25 +01:00
Berkeley Martinez
29f740a8e4
Fix for non osx systems
2016-03-03 19:08:28 -08:00
Berkeley Martinez
4ef15109cd
Add createTypes function
2016-03-03 18:56:18 -08:00
Berkeley Martinez
2df87854c4
Fix unknown hike redirect to map
2016-03-03 17:53:33 -08:00
Berkeley Martinez
71ebfade15
Fix send correct datatypes on hike submit
2016-03-03 17:53:33 -08:00
Berkeley Martinez
74592e72b4
Update eslint, fix lint issues
2016-03-03 17:53:33 -08:00
Berkeley Martinez
c50510db71
Update history/react-router
2016-03-03 17:53:33 -08:00
Berkeley Martinez
a2a988764c
Fix job creation
2016-03-03 17:53:33 -08:00
Berkeley Martinez
d6f21b01e6
Add location change on successful job creation
2016-03-03 17:53:33 -08:00
Berkeley Martinez
15c9417911
Fix job saving on form submit
2016-03-03 17:53:33 -08:00
Berkeley Martinez
5dab7fddbc
Fix jobs list and refetching
2016-03-03 17:53:33 -08:00
Berkeley Martinez
a173ddf375
Fix bad boolean in professor-x
2016-03-03 17:53:33 -08:00
Berkeley Martinez
5ee802999e
Fix jobs display and priming
2016-03-03 17:53:33 -08:00
Berkeley Martinez
f6c1260336
Fix job routing
2016-03-03 17:53:33 -08:00
Berkeley Martinez
5c76978377
Fix jobs fetch
2016-03-03 17:53:33 -08:00
Berkeley Martinez
6bff10ea9c
Jobs page initially renders
2016-03-03 17:53:33 -08:00
Berkeley Martinez
056d749ddd
Wrap up flux actions
2016-03-03 17:53:33 -08:00
Berkeley Martinez
371cde1e34
Initial Job move to redux
2016-03-03 17:53:33 -08:00
Berkeley Martinez
5f97394520
Fix grabQuestion actions
2016-03-03 17:53:33 -08:00
Berkeley Martinez
f2494e5577
Answering questions using buttons works
2016-03-03 17:53:33 -08:00
Berkeley Martinez
943367c17b
Fix rendering specific hike from server
2016-03-03 17:53:33 -08:00
Berkeley Martinez
1e9c9baedd
Hikes loading next hike
2016-03-03 17:53:33 -08:00
Berkeley Martinez
f150b31c24
Render Hikes questions
2016-03-03 17:53:33 -08:00
Berkeley Martinez
ac32912cd5
Video question now loads
2016-03-03 17:53:33 -08:00
Berkeley Martinez
00187628a4
Video's and video challenge renders
2016-03-03 17:53:33 -08:00
Berkeley Martinez
8ef3fdb6a0
Initial move to redux
2016-03-03 17:53:33 -08:00
Logan Tegman
f235dcb38c
Prevent validator being called on non-strings
2016-02-25 11:14:09 -08:00
Mrugesh Mohapatra
c1fd229e96
Fix Video Challenge Completed Message
2016-02-17 13:15:51 +00:00
Logan Tegman
5b3f98dc04
coerce challengeType to string to fix video challenges
2016-02-13 17:46:01 -08:00
Quincy Larson
46d5aa5718
Update navber
2016-02-11 20:47:03 -08:00
Quincy Larson
aaaf327992
Merge pull request #6879 from FreeCodeCamp/feature/wiki-sidebar
...
Add Wiki Sidebar, Use Gatsby Generated Wiki
2016-02-11 20:01:01 -08:00
SaintPeter
ba18520845
Add language detection
2016-02-11 18:14:47 -08:00
Berkeley Martinez
a4dd9667ca
Fix typos
2016-02-10 10:09:40 -08:00
Berkeley Martinez
76cfbdf752
challenge/user router now works with challengeMap
2016-02-10 10:09:40 -08:00
Berkeley Martinez
07d54a455c
Add challengeMap migrations
2016-02-10 10:06:36 -08:00
Logan Tegman
723411dbf5
Merge pull request #6620 from FreeCodeCamp/greenkeeper-react-motion-0.4.2
...
Update react-motion to version 0.4.2 🚀
2016-02-10 09:28:52 -08:00
Logan Tegman
b715cb4abc
Update react-motion spring argument signature
2016-02-10 09:19:51 -08:00
Hallaathrad
a1963e7d68
Add shop to the react navbar
...
Closes #6802
2016-02-07 08:16:50 -05:00
Akira Laine
a7bd7e3729
worked on video challenge superblock
...
fixed rebase merge errors
Fix videos route
Fix hikes broken true/false
fixed component name
2016-02-04 17:20:34 +11:00
Logan Tegman
e2ac51f166
Fix lint errors
2016-02-01 14:16:27 -08:00
Berkeley Martinez
c7fc9dc99f
Merge pull request #6601 from SaintPeter/feature/challenge-checksum
...
Add Checksum to Challenges for Google Analytics
2016-01-31 17:36:16 -08:00
SaintPeter
f2e61ea0ac
Add Checksum to Challenges for Google Analytics
2016-01-30 09:02:22 -08:00
JelenaBarinova
29f93df1bb
Getting users timezone on client side and passing it to server side within POST (on challenge complete), showing users stats with users timezone
...
After CR
2016-01-26 15:09:47 -08:00
Berkeley Martinez
6b6232fb3e
Block certs from cheaters
2016-01-24 15:48:00 -08:00
Hallaathrad
2ca0e7edfa
Fix job's navbar offset
...
Bug caused while fixing the div in the navbar's ul in the main template.
This addresses the job's JSX template.
2016-01-24 11:25:35 -05:00
Arsen Melikyan
ecaa9c1575
Fix PayPal tab isn't opening
2016-01-24 10:40:22 +04:00
Berkeley Martinez
c752b918ac
Fix job submit infinite loop/promo ajax bugs
2016-01-23 21:30:36 -08:00
Berkeley Martinez
49987c57e8
Merge pull request #5941 from FreeCodeCamp/fix/update-babel-to-6.0
...
Update babel to 6.0
2016-01-19 13:02:25 -08:00
Arsen Melikyan
a5bde55f6e
Fixes incorrect redirection to map-aside
2016-01-17 13:28:03 +04:00
Berkeley Martinez
039f68b548
Finish up hikes
2016-01-15 04:51:11 -08:00
Berkeley Martinez
b4f574b2be
Update jobs to remove all panels and wells
2016-01-15 04:51:11 -08:00
Berkeley Martinez
47c930d7f4
Add new help rooms and logic
2016-01-15 04:51:11 -08:00
Berkeley Martinez
4e89acaa69
Fix lint error
2016-01-15 04:46:20 -08:00
Berkeley Martinez
7b53a108c3
Fix navbar link to about page
2016-01-15 04:46:20 -08:00
Quincy Larson
f410a94b54
Update
2016-01-15 04:10:16 -08:00
Berkeley Martinez
52fd15284a
Add banning to camper news
2016-01-12 22:07:19 -08:00
Berkeley Martinez
a7f04cdc11
Add data vis certification
2016-01-11 15:58:37 -08:00
Logan Tegman
4341a3eee2
Update babel to 6.0
2016-01-10 20:21:15 -08:00
Berkeley Martinez
8ba64d4950
Feature use toast instead of modal for info
2016-01-09 23:40:42 -08:00
Berkeley Martinez
d172edecf7
Remove optimistic update
...
Add multiple toast when saving challenge
and when first completed challenges
2016-01-09 23:21:19 -08:00
Berkeley Martinez
e3890785a2
Reduce threshold for mobile
2016-01-09 23:21:03 -08:00
Berkeley Martinez
c670cdfaab
Fix postJSON$ should return response
2016-01-09 23:05:53 -08:00
Berkeley Martinez
a8ee090fea
Clean up toast logic in AppActions
2016-01-09 22:49:16 -08:00
Berkeley Martinez
f65b6472dd
Clean up toast logic in App.jsx
2016-01-09 22:48:48 -08:00
Berkeley Martinez
632f596821
Fix mobile touches can be empty.
...
Use changedTouches as backup
2016-01-09 22:47:28 -08:00
Berkeley Martinez
835a478282
Fix grabQuestion on mobile
2016-01-09 22:18:17 -08:00
Berkeley Martinez
7e2867f747
Fix ajax json requests should be application/json
2016-01-09 19:59:17 -08:00
Berkeley Martinez
850c63a0a0
Fix on button answer must past in current Question
2016-01-09 18:40:07 -08:00
Berkeley Martinez
d9abe3dddc
Use release to indicate answer attempt
2016-01-09 17:00:49 -08:00
Berkeley Martinez
5c1453bbaa
Fix toast not showing up multiple times.
2016-01-08 21:43:53 -08:00
Berkeley Martinez
268bbe52e6
Left align and enlarge text in lecture
2016-01-08 10:24:30 -08:00
Berkeley Martinez
8e930fbe8a
Add toasts to react app
2016-01-07 15:04:32 -08:00
Berkeley Martinez
6c73f52970
Fix question move bug
...
Would cause question to change immediately before
answering was complete
2016-01-06 16:14:36 -08:00
Berkeley Martinez
1a858fe53c
Fix hike transition bug
2016-01-06 15:39:41 -08:00
Berkeley Martinez
622974ca2a
Fix transitioning between hikes resets questions
2016-01-06 13:19:47 -08:00
Berkeley Martinez
b2b933c153
Fix title for panel
...
This fixes hover object Object issue
2016-01-06 12:19:29 -08:00
Berkeley Martinez
1fb321332b
Change full stack to back end on job apps
2016-01-05 21:31:48 -08:00
Berkeley Martinez
5ef6a7f11e
jobsApp not jobApp
2016-01-05 17:43:01 -08:00
Berkeley Martinez
056bb6a2dd
Actually use undefined instead of implicit undefined arg
...
Which might not be undefined...
2016-01-05 17:42:10 -08:00
Berkeley Martinez
81618517c0
Fix typo in preview container map
2016-01-05 12:46:54 -08:00
Berkeley Martinez
4e5da23844
Add error handling
...
In the near future these will be handled by a toast.
2016-01-05 12:34:50 -08:00
Berkeley Martinez
53810102dd
Use isPrimed api for getUser fetch action
2016-01-05 12:26:14 -08:00
Berkeley Martinez
8e1f8d2159
Do not refetch if jobs array is not empty
2016-01-05 12:24:41 -08:00
Berkeley Martinez
6cbcc08c9f
Fix for name-spaced transformer
2016-01-05 12:05:01 -08:00
Berkeley Martinez
e832c2ebc5
Remove debug statement in appActions
...
use arrow func
2016-01-05 10:11:10 -08:00
Berkeley Martinez
b62f09e71a
Update /jobs
2016-01-04 15:51:29 -08:00
Berkeley Martinez
ea574d721e
Make document titles work
2016-01-04 14:27:22 -08:00
Berkeley Martinez
80d36cc3cd
Get router history working with flux
2016-01-04 14:27:22 -08:00
Berkeley Martinez
dcf7f59667
On hike completed, points increase
2016-01-04 14:27:22 -08:00
Berkeley Martinez
a39746d381
Fix question motion on correct answer
2016-01-04 14:27:22 -08:00
Berkeley Martinez
92246c2dd8
Fix transition bug
2016-01-04 14:27:22 -08:00
Berkeley Martinez
a3a3b1b9f2
Next hike loads up
2016-01-04 14:27:22 -08:00
Berkeley Martinez
acb05e3a71
Question now semi functional
2016-01-04 14:27:22 -08:00
Berkeley Martinez
205b0da43f
First question loads
2016-01-04 14:27:22 -08:00
Berkeley Martinez
935760a84a
[fix] Lecture loads
2016-01-04 14:27:22 -08:00
Berkeley Martinez
22cb610279
Make structure changes to hikes
2016-01-04 14:27:22 -08:00
Berkeley Martinez
65b6715f68
Add services stamp
2016-01-04 14:27:22 -08:00
Berkeley Martinez
4391bfc60b
Move hikes store to main store
2016-01-04 14:27:22 -08:00
Berkeley Martinez
8c3e14cd8e
Fix commit redirect for non signed user.
...
Now users will be directed to sign in page and on sign in
will have pledge completed
2015-12-29 10:57:35 -08:00
Quincy Larson
80bb80b23a
minor updates to copy
2015-12-28 16:28:53 -06:00
Berkeley Martinez
600ca2f8ad
Fix duplicate email sign in
2015-12-28 13:52:28 -08:00
Berkeley Martinez
0b4052fc38
Add prop to user model
2015-12-14 13:19:30 -08:00
Berkeley Martinez
5c2bdd974a
Add isComingSoon flag
2015-12-14 13:19:30 -08:00
Berkeley Martinez
f7f587194d
Add superblock ordering
2015-12-14 13:19:30 -08:00
Berkeley Martinez
108179e72e
Fix react motion api change
2015-12-14 13:19:30 -08:00
Berkeley Martinez
adc0ce28e5
Add superBlock to challenge seed
2015-12-14 13:19:30 -08:00
Quincy Larson
0f51dcfdf4
add comma to 1000
2015-12-08 14:35:25 -06:00
Quincy Larson
7e9d65675a
Merge branch 'master' into remove-angular
...
Conflicts:
bower.json
client/main.js
server/views/coursewares/showZiplineOrBasejump.jade
server/views/partials/scripts.jade
2015-12-04 18:49:38 -06:00
Berkeley Martinez
4fbcb7cfa9
Remove postedOn from list
2015-11-30 19:05:24 -08:00
Berkeley Martinez
47bcbda14a
Update job pricing
2015-11-30 14:33:39 -08:00
Berkeley Martinez
5ae5e087a4
Send down correct discount name
2015-11-23 15:51:42 -08:00
Berkeley Martinez
36067f37cb
Add company specific promocodes
2015-11-23 15:38:05 -08:00
Logan Tegman
3a9745974c
Update to react-bootstrap 0.28.1 and widen react nav
...
+ Moved away from deprecated navbar components and props
+ Removed mixin from NavItem
+ Updated stylesheet so the `.container` react-bootstrap adds doesn't impact nav positioning
2015-11-19 23:09:30 -08:00
Berkeley Martinez
dfa5acde60
Add learn button to navbar
2015-11-19 22:46:36 -08:00
Quincy Larson
9d08c1702e
update navbar, remove footer, create links page
2015-11-19 22:46:36 -08:00
Berkeley Martinez
eab4771466
Fix target blank issue
2015-11-13 12:54:46 -08:00
Berkeley Martinez
e843e3daf1
Fix lint errors
2015-11-13 11:31:55 -08:00
Quincy Larson
61ffb55a3d
Merge branch 'staging' into fix/update-labs
...
Conflicts:
common/app/routes/Jobs/components/Jobs.jsx
2015-11-12 16:38:30 -08:00
Quincy Larson
3dcc77278b
add testimonial to jobs and remove twitter button
2015-11-12 16:36:08 -08:00
Berkeley Martinez
d095fd5d90
Feature in dev mode always pull from disk
2015-11-09 17:27:56 -08:00
Berkeley Martinez
6f8ca0e191
Fix jobs list size after bootstrap update
2015-11-08 22:56:19 -08:00
Berkeley Martinez
108f54d019
Fix nav brand issue
...
bump react router
2015-11-08 22:28:05 -08:00
Berkeley Martinez
5dbfbfcf57
Add head/tail to challenge spec.
...
Lint EVERYTHING!
2015-11-06 17:32:01 -08:00
Berkeley Martinez
5a96e6266b
Lint all the things
2015-11-05 15:21:14 -08:00
Berkeley Martinez
c5843ec252
Add new message when camper is certified
2015-11-05 14:52:04 -08:00
Berkeley Martinez
743936f2eb
Change board copy
2015-11-05 13:10:35 -08:00
Berkeley Martinez
25449ae510
Fix some bugs with howToApply obscuring
2015-11-05 13:06:27 -08:00
Berkeley Martinez
7e9ba2a4cc
Obscures howToApply
2015-11-05 12:50:53 -08:00
Berkeley Martinez
0a30ad3fb4
Add more conditional logic to button
2015-11-05 12:50:53 -08:00
Berkeley Martinez
feac941b1c
Add logic to cert buttons
2015-11-05 12:50:53 -08:00
Berkeley Martinez
1251b14d9d
Add job cert buttons
2015-11-05 12:50:53 -08:00
Berkeley Martinez
173c511026
Remove old cert stuff
2015-11-05 12:50:53 -08:00
Berkeley Martinez
a8b61f566d
Merge pull request #4156 from FreeCodeCamp/testimonial-update
...
Testimonial update and landing page improvement
2015-11-03 22:15:18 -08:00
Berkeley Martinez
692f577eb3
Fix linting issue
2015-11-03 21:54:42 -08:00
Berkeley Martinez
610f9ab840
Fix job posting link should open in new tab
2015-11-02 14:54:08 -08:00
Quincy Larson
d77d78a3b2
Merge branch 'staging' into feature/jobs
...
Conflicts:
seed/jobs.json
2015-11-02 00:07:16 -08:00
terakilobyte
af30d4d56e
Implements a 'releasedOn' flag and marks challenges less than 30 days old as NEW https://www.dropbox.com/s/43un2a908ldktpl/Screenshot%202015-11-01%2017.06.53.png
2015-11-01 17:26:26 -08:00
Berkeley Martinez
6aa19ef247
Add a tag to links
2015-10-30 16:58:49 -07:00
Berkeley Martinez
9637c8739a
Fix bold font issues
2015-10-30 15:43:50 -07:00
Berkeley Martinez
ffd265d93a
Preserve white space
2015-10-30 15:27:29 -07:00
Berkeley Martinez
022dc4dd7b
Remove ascii filtering from description
2015-10-30 15:01:01 -07:00
Berkeley Martinez
50701b3dde
Remove trailing slash on submit
2015-10-30 14:43:38 -07:00
Berkeley Martinez
33a1398244
Fix leave trailing slash when entering urls
2015-10-30 14:20:20 -07:00
Berkeley Martinez
fedbd3c725
Fix paypal button url
2015-10-30 14:03:54 -07:00
Berkeley Martinez
2a04b02d03
Add http to url or logo when not present
2015-10-30 14:00:07 -07:00
Berkeley Martinez
b51b1b4078
Add How Do I apply to job and remove contact
2015-10-30 13:06:36 -07:00
Berkeley Martinez
a8f2bb1b50
Fix font
2015-10-30 12:55:13 -07:00
Berkeley Martinez
2cb305cc2c
Add real paypal buttons
2015-10-29 17:10:30 -07:00
Berkeley Martinez
83e82bd967
Fix issue with transitioning between routes
2015-10-29 17:10:30 -07:00
Berkeley Martinez
d633f74ff9
Change goToPayPal flow
2015-10-29 17:10:30 -07:00
Berkeley Martinez
2dd16796d7
Change default image
...
Make url link start with http://
2015-10-29 17:10:30 -07:00
Berkeley Martinez
d1242d8d43
Make url protocol-less
2015-10-29 17:10:30 -07:00
Berkeley Martinez
7ac7a4ccfc
Add react links to nav bar
2015-10-29 17:10:30 -07:00
Berkeley Martinez
3ee4a3fc48
Switch between highlighted buttons
2015-10-29 17:10:30 -07:00
Berkeley Martinez
8bce2c9f8b
Fix styling on PayPal button
2015-10-29 17:10:30 -07:00
Berkeley Martinez
2f86593135
Remove debugging comment
2015-10-29 17:10:29 -07:00
Berkeley Martinez
8024a5bd71
Clear discount on transition
2015-10-29 17:10:29 -07:00
Berkeley Martinez
81c40ddeeb
Add promo fetch and associated logic
2015-10-29 17:10:29 -07:00
Berkeley Martinez
b4c57e3b5f
Fix bs button size
2015-10-29 17:10:29 -07:00
Berkeley Martinez
c2bebcb77a
render highlight cost
2015-10-29 17:10:29 -07:00
Berkeley Martinez
bcec5600f7
Add Bill to paypal view
2015-10-29 17:10:29 -07:00
Berkeley Martinez
568d1ef1d2
Add promo model
2015-10-29 17:10:29 -07:00
Berkeley Martinez
cfdf95cc70
Add nonprofit discount logic
2015-10-29 17:10:28 -07:00
Berkeley Martinez
dc2df4537d
Add howToApply
2015-10-29 17:10:28 -07:00
Berkeley Martinez
24927748e0
Move highlighting around
2015-10-29 17:10:28 -07:00
Berkeley Martinez
ac8a1a3f6f
Finish copy, add flags
2015-10-29 17:10:28 -07:00
Berkeley Martinez
1319a563c7
Fix highlighted flag is under 'isHighlighted'
2015-10-29 17:10:28 -07:00
Berkeley Martinez
cc736cda4e
Add certs/isRemote flags to job form and model
2015-10-29 17:10:28 -07:00
Berkeley Martinez
c6c1d7dac4
Add redirects
2015-10-29 17:10:28 -07:00
Berkeley Martinez
8a02348ddb
Clear job from localStorage on submit
2015-10-29 17:10:27 -07:00
Berkeley Martinez
0c6a9bbd71
Add more copy on show job
2015-10-29 17:10:27 -07:00
Berkeley Martinez
0a7f31a1d1
Add twitter follower button to board
2015-10-29 17:10:27 -07:00
Berkeley Martinez
2b6a84c1f5
Fix lint errors. Add more copy
2015-10-29 17:10:27 -07:00
Quincy Larson
2b9e19cff1
continue improving job board copy
2015-10-29 17:10:27 -07:00
Berkeley Martinez
ede8da38ba
Filter unpaid, unapproved and filled jobs
...
Fix missing key in react array
2015-10-29 17:10:27 -07:00
Berkeley Martinez
c3776175a3
Add styling to job completed view
2015-10-29 17:10:27 -07:00
Berkeley Martinez
78ba6edf34
Add styling to GoToPaypal page
2015-10-29 17:10:27 -07:00
Berkeley Martinez
defd0561f1
Change name to company name in form
2015-10-29 17:10:27 -07:00
Berkeley Martinez
6512170e9b
Add styling to preview jobs
...
Add cursor pointer
2015-10-29 17:10:26 -07:00
Berkeley Martinez
1ed576bee1
Style show job page
2015-10-29 17:10:26 -07:00
Berkeley Martinez
979583e0c9
Add styling to jobs list
2015-10-29 17:10:26 -07:00
Berkeley Martinez
a65384e698
Make list an actual list instead of accordion
2015-10-29 17:10:26 -07:00
Berkeley Martinez
da26f19cde
Adds paypal button and completes the number of views
2015-10-29 17:10:26 -07:00
Berkeley Martinez
4577a007f2
Add goback and checkout buttons to preview job
2015-10-29 17:10:26 -07:00
Berkeley Martinez
1f16d6f5d9
Add required fields to job form
2015-10-29 17:10:26 -07:00
Berkeley Martinez
e4e87fd1a1
Show N/A when field is empty
2015-10-29 17:10:26 -07:00
Berkeley Martinez
d29d3407ec
Merge pull request #3835 from FreeCodeCamp/feature/solutions
...
Add solutions to upper intermediate bonfires
2015-10-22 12:53:58 -07:00
Quincy Larson
5105efa624
add solutions to challenges object and add solutions for upper intermediate bonfires
2015-10-21 15:04:58 -07:00
Quincy Larson
7f2f3885f8
change blog links to lead to medium subdomain
2015-10-19 21:55:29 -07:00
Berkeley Martinez
1e439aa4c5
hotfix brownie points
2015-10-15 00:33:45 -07:00
Berkeley Martinez
7b444b15dc
Update loopback, ThunderCats and RxJS.
...
closes #2929
2015-10-11 17:35:46 -07:00
Berkeley Martinez
c8da944caf
Add logic to load nonprofit on query
...
Add logic to model update
2015-10-06 19:51:19 -07:00
Berkeley Martinez
3f96490aff
Add pledge model
2015-10-06 19:51:19 -07:00
Quincy Larson
b8dc81214d
Merge branch 'staging' into remove-angular
...
Conflicts:
server/boot/user.js
server/views/account/show.jade
2015-10-06 16:00:59 -07:00
Berkeley Martinez
188da02ffc
Fix disable cert
...
Disable certificate when user is locked to the public
or when they haven't signed academic honesty
2015-10-05 20:00:25 -07:00
Berkeley Martinez
8c48626f03
Add certification page
2015-10-05 15:55:50 -07:00
Berkeley Martinez
ee35fe075c
Feature show Waypoints on user profile page
...
This PR also fixes some bugs in lockedDown mode
2015-10-01 23:03:52 -07:00
Berkeley Martinez
6c305dbc67
feature make completedChallenges uniq
...
now when users complete a challenge, it will instead update the
last save if it exists.
2015-10-01 22:19:26 -07:00
Quincy Larson
b197358056
make one page profile with bonfire solution urls
2015-09-30 21:04:16 -07:00
Quincy Larson
7900628d2a
Merge pull request #3525 from FreeCodeCamp/feature/jobs
...
intermediate pull
2015-09-28 17:35:13 -07:00
Quincy Larson
e74533a727
add lockdown mode toggling
2015-09-27 17:08:56 -07:00
Quincy Larson
d08c3e5a88
Merge pull request #3514 from FreeCodeCamp/tshirt
...
Tshirt voting mechanism
2015-09-27 11:06:26 -07:00
Quincy Larson
ccf5504537
add tshirt voting mechanism
2015-09-27 10:49:44 -07:00
Berkeley Martinez
90f6d986d7
show preview from new job
2015-09-26 22:23:56 -07:00
Berkeley Martinez
891341532b
refactor form to do validation right in component
2015-09-25 12:53:29 -07:00
Berkeley Martinez
c63a983fb9
filter output from localStorage
2015-09-25 00:04:38 -07:00
Berkeley Martinez
8148c1a19c
save form to localStorage
2015-09-24 20:30:18 -07:00
Quincy Larson
de976c18ba
remove email address from stories
2015-09-23 15:20:45 -07:00
Berkeley Martinez
d8a6373b1e
add submit button
2015-09-23 13:31:27 -07:00
Quincy Larson
51af4e4b0d
Merge branch 'google-cdns' into remove-angular
...
Conflicts:
server/boot/user.js
server/views/account/show.jade
server/views/account/signin.jade
server/views/coursewares/showBonfire.jade
server/views/coursewares/showZiplineOrBasejump.jade
server/views/partials/scripts.jade
2015-09-23 09:56:01 -07:00
Berkeley Martinez
01a4050059
Add higlight, company name
2015-09-22 18:25:09 -07:00
Berkeley Martinez
2ee2234050
add company URL
2015-09-22 17:26:53 -07:00
Berkeley Martinez
70b823ca63
add phone number input
...
change validation function scheme
update validator
2015-09-22 17:19:14 -07:00
Berkeley Martinez
98af05256a
switch to validator add email field
2015-09-22 16:10:12 -07:00
Berkeley Martinez
5258145ef6
add validation to all current inputs
...
validation right now is simply validating that the value is indeed a
string
2015-09-22 13:56:55 -07:00
Berkeley Martinez
10b3b8d758
add validation to one input
...
not sure this is the best approach
2015-09-21 22:41:12 -07:00
Berkeley Martinez
65572d65c8
close modal before transition to job form
2015-09-21 20:38:09 -07:00
Berkeley Martinez
41933a8360
initial job form and job form nav
2015-09-21 12:54:33 -07:00
Berkeley Martinez
d8e8f3bb67
add `create job` modal
2015-09-21 12:54:33 -07:00
Berkeley Martinez
fe144f7297
add highlighting to jobs
2015-09-21 12:54:33 -07:00
Berkeley Martinez
e579cbd778
update to react-router 1.0.0-rc1
2015-09-21 12:54:33 -07:00
Berkeley Martinez
6d8835ba56
return undefined if job is not found
...
null values count as values when using default values
so properties must be undefined when expecting default value
to work
2015-09-21 12:54:33 -07:00
Berkeley Martinez
dfed1538c7
render individual job on request and window transition
2015-09-10 16:27:10 -07:00
Berkeley Martinez
db80c098e5
add es6 shim file
...
use Object.assign
2015-09-10 16:27:09 -07:00
Berkeley Martinez
8112702e81
link job in list to show job view
2015-09-10 16:27:09 -07:00
Berkeley Martinez
f26bb16855
remove container from list component
2015-09-10 16:27:09 -07:00
Berkeley Martinez
451c3acb2e
fetch single jobs
2015-09-10 16:27:08 -07:00
Berkeley Martinez
9e947fa094
fix parent route for jobs shouldn't have a path
2015-09-10 16:27:08 -07:00
Berkeley Martinez
ac193dc4c4
split jobs routes, add show comp
2015-09-10 16:27:08 -07:00
Ammar Dodin
f3792ca2db
Updated README.md
...
There should be an apostrophe after the s on bonfires to indicate possession.
2015-09-02 00:52:06 -07:00
Berkeley Martinez
64b63d73db
intermidiate save
2015-08-28 15:56:58 -07:00
Berkeley Martinez
96742c4f30
mid stage save
2015-08-28 15:56:58 -07:00
Berkeley Martinez
83724bef1d
make thumbnails 100 x 100
2015-08-28 15:56:58 -07:00
Berkeley Martinez
bfd4980e5d
rename show to list
...
fall inline with rest conventions
2015-08-28 15:56:58 -07:00
Berkeley Martinez
df3918cc53
fix email login not case sensitive
2015-08-25 22:27:01 -07:00
Berkeley Martinez
0f3acc629c
fix profile linking
2015-08-21 16:09:07 -07:00
Quincy Larson
1dadc48aea
remove angular from user account creation flows
2015-08-19 15:55:40 -07:00
Berkeley Martinez
456bf20b05
fix should hard code domain for password reset
2015-08-18 01:40:26 -07:00
Berkeley Martinez
1d3f7331fb
email reset use port in dev
2015-08-18 01:32:38 -07:00
Berkeley Martinez
112972cfdd
fix enables email login
2015-08-18 01:32:37 -07:00
Berkeley Martinez
de7eb3d440
fix email password reset
2015-08-16 09:54:59 -07:00
Berkeley Martinez
129eebcc41
fix type should be rand not updated
2015-08-15 12:28:19 -07:00
Berkeley Martinez
13b38aefb5
add random attribute to user props
...
Allows easier random sampling
2015-08-15 12:19:36 -07:00
Berkeley Martinez
dfb85e4ba7
fix prevent crash from user migrated profiles
2015-08-14 18:24:13 -07:00
Berkeley Martinez
70d2810306
remove accordian
2015-08-13 15:41:30 -07:00
Berkeley Martinez
4b0a9bef0a
fix social auth scheme
...
closes #1734
2015-08-12 20:10:12 -07:00
Berkeley Martinez
eb07cbfea6
fix override user identity login to reformat provider
2015-08-12 20:10:12 -07:00
Berkeley Martinez
fc29c1fd9b
linking accounts now works.
...
bug, need to change how loopback generates provider string.
2015-08-12 20:10:11 -07:00
Berkeley Martinez
a4e220e2bc
Move auth functions to central location
2015-08-12 20:10:11 -07:00
Berkeley Martinez
0838486483
properly define id fields for basic models
...
closes #1724
2015-08-11 14:49:57 -07:00
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