mozilla
/
CSOL-site
зеркало из https://github.com/mozilla/CSOL-site.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность
542 коммитов 6 Ветки 101 Тег 14 MiB
Граф коммитов

542 Коммитов

Автор SHA1 Сообщение Дата
Andrew Hayward 118fdaa118 Merge branch 'applications' into aestimia 2013-05-30 16:57:11 +01:00
Andrew Hayward 0b88cabd1e Merge branch 'master' into passwords 
Conflicts:
	static/media/css/core.css
	static/media/css/core.min.css
 2013-05-30 16:43:30 +01:00
Andrew Hayward cc3271a7f2 Switching order of user and evidence collection 2013-05-30 16:39:56 +01:00
Andrew Hayward abc67b7554 Aestimia API update 2013-05-30 16:39:40 +01:00
Andrew Hayward fcdfd507d4 Allow for default request options 2013-05-30 16:38:08 +01:00
Andrew Hayward 8876066916 Updating README 2013-05-30 16:37:49 +01:00
Chris McAvoy 0bfc127541 Merge pull request #266 from andrewhayward/applications 2013-05-30 08:35:29 -07:00
Michael Ballard bdab4400d4 Learn grid height set and overflow ellipsis 2013-05-30 10:13:32 -04:00
Joe Curlee f2f0d8c048 Implemented Copy for My Badges (learner) - Share modal. fixes #214 2013-05-30 08:27:05 -05:00
Joe Curlee f2a6e654ef added copy for delete modal. fixes #219 2013-05-30 08:25:35 -05:00
Andrew Hayward 1c051ad8d3 Merge branch 'applications' into aestimia 2013-05-30 14:24:15 +01:00
Andrew Hayward 4835a42374 Fixing application learner id error 
// Oops
 2013-05-30 14:24:01 +01:00
Andrew Hayward b258364975 Extending learner model functionality 2013-05-30 14:23:14 +01:00
Andrew Hayward e30ec86128 Filling out session user 2013-05-30 14:23:00 +01:00
Andrew Hayward 41cf483ecd Making user flow a bit better 2013-05-30 13:41:08 +01:00
Andrew Hayward ca5edafc84 Merge branch 'applications' into aestimia 2013-05-30 13:17:30 +01:00
Andrew Hayward 9224305b8f Allowing everyone access to evidence via `GET` 2013-05-30 13:12:30 +01:00
Andrew Hayward 826d01c093 Merge branch 'applications' into aestimia 2013-05-30 12:17:38 +01:00
Andrew Hayward ca57c6cb79 Minor style tweak that seems to have disappeared 2013-05-30 10:47:40 +01:00
Andrew Hayward ea38e52529 Template/logic updates for first/last name 2013-05-30 10:47:24 +01:00
Andrew Hayward beff460fc9 Adding migration script to package 2013-05-30 10:46:32 +01:00
Andrew Hayward d95f1b1b78 Updating `learner` model with first/last names 2013-05-30 10:46:07 +01:00
Andrew Hayward b3f88dc0f4 Simple DB migration wrapper 2013-05-30 10:45:43 +01:00
Michael Ballard e7fb3eff1c Challenges title to match other pages 2013-05-30 01:12:17 -04:00
Michael Ballard 9b99665037 Preliminary Challenges page (need copy + first image) and active menu item fix 2013-05-30 01:07:07 -04:00
Andrew Hayward 93faac386e Merge branch 'master' into applications 
Conflicts:
	README.md
	lib/errors.js
	static/media/css/core.css
	static/media/less/core.less
	views/badges/single.html
 2013-05-30 02:13:04 +01:00
Michael Ballard 22352adf27 favorite hidden in css - this needs to be done in templates 2013-05-29 20:36:51 -04:00
Michael Ballard 886d7558dc footer adjustments and grid (earn page) fix 2013-05-29 20:32:17 -04:00
Andrew Hayward 07b9e2b37c Merge branch 'master' into passwords 
Conflicts:
	static/media/css/core.css
	static/media/less/core.less
 2013-05-30 01:21:40 +01:00
Andrew Hayward eecc1a038d Somehow we managed to lose the password styling 2013-05-30 01:10:07 +01:00
Andrew Hayward 2994cae543 Password reset functionality 2013-05-30 01:06:06 +01:00
Joe Curlee 2336e913fe Merge branch 'master' of git://github.com/mozilla/CSOL-site 2013-05-29 18:12:13 -05:00
Chris McAvoy 665e3eef1b Merge pull request #312 from mgballard/master 
Learn -> Explore, Footer logo rearrange, Landing Page
 2013-05-29 15:18:27 -07:00
Michael Ballard c7ba48db22 remove banner250.png 2013-05-29 18:04:24 -04:00
Michael Ballard 6d67063578 remove mac.gif 2013-05-29 18:03:41 -04:00
Michael Ballard abc97ab2f1 remove spacedimg.png 2013-05-29 18:01:57 -04:00
Michael Ballard c661807d1c remove rahm-head.png 2013-05-29 18:01:28 -04:00
Michael Ballard d142f3324c remove banner200.png 2013-05-29 18:00:58 -04:00
Michael Ballard c9e2201b4e remove hive.png 2013-05-29 18:00:23 -04:00
Michael Ballard fa894eea35 landing image downsized 2013-05-29 17:57:40 -04:00
Michael Ballard a3049f388c landing page ready for review 2013-05-29 17:51:42 -04:00
Joe Curlee 3458d19727 replaced program placeholder image with imageurl from api 2013-05-29 16:27:14 -05:00
Joe Curlee 6bb6db44fe fixed indentation 2013-05-29 16:16:17 -05:00
Joe Curlee 1a4bf80721 added real description from program model 2013-05-29 16:00:19 -05:00
Joe Curlee d86cdf943d Merge branch 'master' of git://github.com/mozilla/CSOL-site 2013-05-29 14:44:28 -05:00
Chris McAvoy d071d48084 Merge remote-tracking branch 'stenington/mandrill-email' 2013-05-29 11:57:45 -05:00
Chris McAvoy 5ee8ec4ff6 adding doc on JWT secret 2013-05-29 11:54:25 -05:00
Chris McAvoy d2bf5dd2c2 Merge remote-tracking branch 'stenington/claims' 2013-05-29 11:45:10 -05:00
Chris McAvoy 6c09833b84 Merge remote-tracking branch 'origin/master' 2013-05-29 11:42:14 -05:00
Mike Larsson a717b32dc0 Merge pull request #313 from andrewhayward/auth 
Ensuring all learners have email addresses
 2013-05-29 09:19:05 -07:00