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

116 Коммитов

Автор SHA1 Сообщение Дата
Chris McAvoy 5e9c0b7d72 Merge pull request #365 from paulsmith/mybadges 
[WIP] implement /mybadges part deux
 2013-06-03 08:43:53 -07:00
Chris McAvoy e5e51a9ec2 Merge pull request #364 from andrewhayward/filtering 
Filtering badges and programs
 2013-06-03 08:39:39 -07:00
Paul Smith f18eaca319 Add rough display of similar badges in detail view 2013-06-02 17:08:54 -04:00
Paul Smith 0c92894529 Add issued by and issued to on badge detail view 2013-06-02 16:24:21 -04:00
Andrew Hayward 4a25343684 Updating filtering template 2013-06-02 21:00:15 +01:00
Paul Smith 6aae2d8303 Add placeholder for badge description 
Awaiting the 'description' field in the openbadger API call, see
https://github.com/mozilla/openbadger/issues/175
 2013-06-02 15:42:51 -04:00
Joe Curlee 199e5c99b8 renamed /learn to /explore. fixes #344 2013-06-01 17:44:36 -05:00
Joe Curlee df4d0e3a03 changed organisation to organization. fixes #345 2013-06-01 17:32:45 -05:00
Joe Curlee 192d050223 Replaced VPAT with FAQ on homepage and changed page title, header and filename. closes #348 2013-06-01 17:08:06 -05:00
Chris McAvoy 7df03b7b02 merging andrews aestimia branch 2013-05-31 15:39:39 -05:00
Chris McAvoy 413a21d428 resolving conflict 2013-05-31 13:42:28 -05:00
Andrew Hayward d7034726e2 Merge branch 'master' into aestimia 
Conflicts:
	README.md
 2013-05-31 17:27:58 +01:00
Mike Larsson cfbbeba59e Add basic, ugly mybadges details page 2013-05-31 12:21:00 -04:00
Andrew Hayward 42ec6ccc96 Adding `reopen` action 2013-05-31 17:15:40 +01:00
Mike Larsson 9d7b65d500 Change /backpack/badges to /mybadges 
Remove /backpack
Require login for /mybadges
Add openbadger method to fetch user badges
Add session to query object passed to api methods
Basic /mybadges display (doesn't really work until openbadger changes are made)
 2013-05-31 11:52:41 -04:00
Mike Larsson a5a92918c2 Adding basic claim code confirmation screen 2013-05-31 11:50:27 -04:00
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
Andrew Hayward 84c7ead4ea Merge branch 'master' into passwords 
Conflicts:
	static/media/css/core.css
 2013-05-31 16:13:54 +01: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
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
Erik Christensen cc951338bd Changed childname to earnername 2013-05-30 14:05:29 -07:00
Erik Christensen e8b62cf5b2 Adding support for *|CHILDNAME|* in email templates 2013-05-30 09:03:43 -07:00
Andrew Hayward 12e66016f8 Fleshing out the session user 2013-05-30 17:00:23 +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 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 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 9224305b8f Allowing everyone access to evidence via `GET` 2013-05-30 13:12:30 +01:00
Andrew Hayward ea38e52529 Template/logic updates for first/last name 2013-05-30 10:47:24 +01: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
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 2994cae543 Password reset functionality 2013-05-30 01:06:06 +01:00
Chris McAvoy d071d48084 Merge remote-tracking branch 'stenington/mandrill-email' 2013-05-29 11:57:45 -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
Andrew Hayward edab98a0b4 Ensuring all learners have email addresses 2013-05-29 16:17:58 +01:00
Mike Larsson 0b4160fdd5 Adding 409 Conflict error class, differentiating the claim code error reporting a bit 2013-05-29 09:29:25 -04:00
Andrew Hayward efe2b23702 Yep, still an idiot 2013-05-29 12:24:36 +01:00
Mike Larsson 1adb982b48 Add redirect back to claims page after login 2013-05-28 21:57:01 -04:00
Mike Larsson fc6237648f Add openbadger.claim() method, and implement basic badge claim flow 2013-05-28 20:56:49 -04:00
Andrew Hayward ad931a8a21 Application controllers 2013-05-28 20:46:24 +01:00
Joe Curlee db1df10440 added underage to user data. required for <13 specific Copy. 2013-05-24 14:30:23 -05:00
Mike Larsson c3ce74e089 Insert confirmation url into <13 signup emails 2013-05-23 18:44:34 -04:00
Mike Larsson 870a230081 Fixes various bugs in mandrill.js 
Adds more detailed logging to mandrill.js
Send confirmation emails on learner account signup.
 2013-05-23 15:44:57 -04:00