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