Commit Graph

298 Commits

Author SHA1 Message Date
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