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

542 Коммитов

Автор SHA1 Сообщение Дата
Mike Larsson bf2460d7a2 Require a missing module 2013-05-31 11:41:38 -04:00
Erik Christensen 304a3dde3a Merge branch 'master' of http://github.com/mozilla/CSOL-site.git 2013-05-31 08:26:36 -07:00
Andrew Hayward 8ebd4c561a Merge branch 'master' into aestimia 
Conflicts:
	controllers/auth.js
	models/learner.js
 2013-05-31 16:19:17 +01:00
Chris McAvoy ec49f08e3c Merge remote-tracking branch 'origin/master' 2013-05-31 10:17:44 -05:00
Chris McAvoy e71c027c52 Merge remote-tracking branch 'curlee/master' 2013-05-31 10:16:29 -05:00
Chris McAvoy 7704b0210c Merge pull request #321 from andrewhayward/passwords 
Password reset
 2013-05-31 08:15:13 -07:00
Andrew Hayward 84c7ead4ea Merge branch 'master' into passwords 
Conflicts:
	static/media/css/core.css
 2013-05-31 16:13:54 +01:00
Chris McAvoy d5761e401f Merge remote-tracking branch 'origin/master' 2013-05-31 10:13:10 -05:00
Chris McAvoy b426752b9d turning off nunjucks autoescape 2013-05-31 10:12:50 -05:00
Mike Larsson daaf7281d7 Merge pull request #318 from stenington/under-13-claims 
Building out claim code process for <13
 2013-05-31 08:05:58 -07:00
Mike Larsson bb29e2964c Adding claim model to handle badge claim requests and approval process 2013-05-31 11:04:55 -04:00
Mike Larsson 61a090a86d Adding basic claim code confirmation screen 2013-05-31 11:04:55 -04:00
Chris McAvoy b93f85c6fb Merge pull request #324 from andrewhayward/sign-up 
Adding first and last names to learner sign-up process
 2013-05-31 07:59:59 -07:00
Atul Varma 0777e011fb Now fake S3 storage is used if CSOL_AWS_FAKE_S3_DIR is specified. 
I also added some code that checks to see if the required CSOL_AWS_*
env vars are defined; if they're not, it throws a helpful error and
mentions that CSOL_AWS_FAKE_S3_DIR can be used as an alternative.

Unfortunately I haven't been able to test out this integration yet,
because I'm having trouble figuring out how to upload evidence locally on
the website...
 2013-05-31 10:57:32 -04:00
Chris McAvoy a0347b6cb1 Merge pull request #329 from andrewhayward/filtering 
Filtering
 2013-05-31 07:56:46 -07:00
Andrew Hayward 0bee9e7259 Merge branch 'master' into aestimia 2013-05-31 15:52:20 +01:00
Chris McAvoy fc0ec995de Merge pull request #322 from mgballard/master 
footer, active menu item, grid (ear/learn) fix + challenges page
 2013-05-31 07:43:37 -07:00
Andrew Hayward a466a8fadf Merge branch 'master' into aestimia 2013-05-31 15:31:03 +01:00
Atul Varma 10f0a62cd9 removed spurious console.log() statements. 2013-05-31 10:28:03 -04:00
Andrew Hayward e290aa8218 Merge branch 'master' into sign-up 
Conflicts:
	static/media/css/core.css
	static/media/less/core.less
 2013-05-31 15:27:40 +01:00
Andrew Hayward a0cda30a98 Aestimia submission callback handling 2013-05-31 15:25:04 +01:00
Andrew Hayward d97896d9b6 Fixing email address 2013-05-31 15:16:23 +01:00
Andrew Hayward 48927d05ee Callback fallback (!) 2013-05-31 15:15:43 +01:00
Andrew Hayward dde9a17ff8 Fixing CSRF middleware for whitelisting 2013-05-31 15:15:31 +01:00
Andrew Hayward 45f8486e3e Updating README 2013-05-31 15:15:06 +01:00
Atul Varma e0fdd878a6 added s3-fake.js and smoke test. 2013-05-31 10:03:53 -04:00
Andrew Hayward 345ab8f0dd Submission template/style updates 2013-05-31 13:02:01 +01:00
Andrew Hayward 353dd69a8d Filtering badges 2013-05-31 11:47:03 +01:00
Andrew Hayward 805d099533 Adding filtering functionality to APIs 2013-05-31 11:46:50 +01:00
Andrew Hayward 62feb8f7c8 Freeing the 'filter' button 2013-05-31 11:45:29 +01:00
Andrew Hayward ed9e459455 Aestimia/API updates 2013-05-31 09:36:23 +01:00
Andrew Hayward b69faac55f Handling aestimia response 2013-05-31 09:35:48 +01:00
Michael Ballard c1bba5617c fade background then modal for more pleasant ux 2013-05-31 02:05:05 -04:00
Michael Ballard ef895fcdde fix disappearing LOG IN button and ensure landing LOG IN stays white 2013-05-31 01:29:48 -04:00
Michael Ballard 797e2783d9 fade background when video displays 2013-05-31 01:23:56 -04:00
Michael Ballard 675588d47e footer list item border fixes 2013-05-31 01:04:33 -04:00
Michael Ballard 447626cbf5 autoplay video 2013-05-31 00:32:21 -04:00
Erik Christensen 2af95dd950 Added a send-reminders script to send out reminder emails. 2013-05-30 20:21:05 -07:00
Michael Ballard c7d3192a76 conflict markers 2013-05-30 18:49:00 -04:00
Michael Ballard fd5464032f oops, forgot to remove conflict markers 2013-05-30 18:46:33 -04:00
Michael Ballard 2db47aa9bb Merge branch 'master' of https://github.com/mozilla/CSOL-site 
Conflicts:
	static/media/css/core.css
	static/media/less/core.less
 2013-05-30 18:30:29 -04:00
Michael Ballard a5da3a2518 return false on embed modal close 2013-05-30 18:10:14 -04:00
Michael Ballard 21e2e89185 Additional badge graphic on challenges page 2013-05-30 18:08:05 -04:00
Michael Ballard d0695a1582 embed video 2013-05-30 17:54:33 -04:00
Erik Christensen cc951338bd Changed childname to earnername 2013-05-30 14:05:29 -07:00
Chris McAvoy 6d558fac85 Merge pull request #326 from andrewhayward/auth 
Fleshing out the session user
 2013-05-30 13:37:19 -07:00
Michael Ballard 6d000d1f61 footer (lower) padding adjustment 2013-05-30 12:05:52 -04:00
Erik Christensen e8b62cf5b2 Adding support for *|CHILDNAME|* in email templates 2013-05-30 09:03:43 -07:00
Michael Ballard ab12b6ff5c learn/earn filter padding fix 2013-05-30 12:02:12 -04:00
Andrew Hayward 12e66016f8 Fleshing out the session user 2013-05-30 17:00:23 +01:00