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

215 Коммитов

Автор SHA1 Сообщение Дата
Ian Dees d1ecbe6edc Initial impl of myapplications. 2013-06-02 19:14:03 +00: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
Andrew Hayward 0d2d65b5c0 Basic dashboard views 2013-06-01 20:29:13 +01:00
Andrew Hayward 328be700cc Basic dashboard setup 2013-06-01 00:18:42 +01:00
Andrew Hayward fb63fcc29d Restricting backpack pages to learners 2013-06-01 00:17:52 +01:00
Andrew Hayward 7fff33fa29 Upstream merge 2013-05-31 22:38:14 +01: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
Andrew Hayward 4753244ba2 Merge branch 'master' into applications 2013-05-22 10:38:30 -04:00
Andrew Hayward df551138b6 Very basic application template stuff 2013-05-22 10:37:54 -04:00
Andrew Hayward 4bdc6fe35c Allowing people with complex usernames to log in 
Generally it helps to compare with what's actually in the database
 2013-05-20 16:11:47 -04:00
Andrew Hayward dde2a8ce38 Adding flash modal for first-time <13 visitors 2013-05-20 14:50:34 -04:00
Chris McAvoy 8a5067c7a3 Merge remote-tracking branch 'origin/master' 2013-05-17 15:03:23 -05:00
Chris McAvoy 2d563aa830 merging andrew's branch 2013-05-17 15:02:48 -05:00
Chris McAvoy 62d9d45690 changed levelup to challenges, dumped copy without styling into the page, added up, modified readme to include openbadger config 2013-05-17 14:49:25 -05:00
Andrew Hayward f0bcc6c657 Merging 2013-05-17 16:42:35 +01:00
Mike Larsson ba23cd2751 Adds issuers endpoint to Open Badger API client, and passes 
the data along to the About page. About page renders org list
in three columns.
 2013-05-17 11:14:05 -04:00
Andrew Hayward 2f708fd84f Doing (error) messages somewhat more centrally 2013-05-17 14:15:09 +01:00
Andrew Hayward f9e0d56aa3 Using new error handling 2013-05-16 14:19:30 +01:00
Andrew Hayward b8ff27be93 Validating normalised username 2013-05-16 09:15:30 +01:00
Andrew Hayward a760085eda Removing parent/guardian sign-up process 
Token sign-up still remains, but somewhat refactored
 2013-05-16 08:35:47 +01:00
Andrew Hayward 986e81b10e Generating usernames and passwords 2013-05-16 08:35:33 +01:00
Mike Larsson b327dbfbf1 This changes openbadger.js and api.js such that openbadger now 
uses api, and the app only has to use openbadger. api(openbadger.x)
calls now look like openbadger.middleware('x'), and otherwise
the same methods are exposed on the openbadger object.

Note that this means api.js has a new usage as well. If you create
a new api, e.g.
  var api = new Api('ORIGIN');
you will have an object with all the get/post/head/etc. helpers
that could also be used if you want to fetch data from an API
without the layer of abstraction that providing additional functions
gives. This usage isn't well tested.
 2013-05-15 15:25:41 -04:00
Mike Larsson bf5ce3393e Incorporating /v2/program and /v2/programs endpoints, and 
refining badge endpoints. The program endpoints currently
do not return enough data from the OpenBadger side to fully
build out their pages. I'm also not sure about the controllers
organizational strategy, and whether I'm breaking it. Changing
site main navigation and major endpoints to "Earn, Learn, Level Up".
 2013-05-14 16:18:25 -04:00
Mike Larsson 9e44593a4e Remove api method lookup by name 2013-05-13 14:53:01 -04:00
Andrew Hayward 6fb5744271 Handling API errors in the API 2013-05-10 15:09:16 +01:00
Andrew Hayward 6752704157 More sensible naming of badges 2013-05-09 18:28:41 +01:00
Andrew Hayward 3637cb45c0 Reducing redundant redundancy 2013-05-09 18:27:55 +01:00
Andrew Hayward e9aa537530 Passing through error code 2013-05-09 14:31:17 +01:00
Andrew Hayward 3a7c3cc8d8 Changing my mind about data availability 2013-05-08 15:55:23 +01:00
Andrew Hayward fa1b8d7baa Making use of new API 2013-05-08 15:14:31 +01:00
Brian J Brennan afdbd2a2d6 Merge pull request #115 from andrewhayward/auth 
Sign-up process
 2013-04-23 12:35:45 -07:00
Andrew Hayward 6a697a5dfc Discarding `find` in favour of single `create` 
Relying on `create` failing based on duplicate keys where appropriate
 2013-04-22 18:11:25 +01:00
Andrew Hayward 3bb978183c Making duplicate email errors more obvious 2013-04-22 18:10:31 +01:00
Andrew Hayward 87b4b26f1b Oops again 2013-04-22 18:04:29 +01:00
Andrew Hayward 99b8286616 Oops. 2013-04-22 17:57:49 +01:00
Andrew Hayward 4c45bc0892 `username` will never be in `signup` at this point 2013-04-22 17:30:22 +01:00
Andrew Hayward 5bea387971 Removing magic numbers from crypt hashing 2013-04-22 16:27:46 +01:00
Andrew Hayward 5f37c15363 Merge pull request #147 from andrewhayward/learn 
That really shouldn't be there.
 2013-04-22 05:40:15 -07:00
Andrew Hayward 40b848b2a9 That really shouldn't be there. 2013-04-22 13:38:48 +01:00
Andrew Hayward 7c8e3d0428 Basic 'challenge' layout 2013-04-22 13:36:50 +01:00
Andrew Hayward 276c5ed9b2 Merge pull request #145 from andrewhayward/learn 
Nothing to see here.
 2013-04-22 05:14:30 -07:00
Andrew Hayward 2c6eb61454 Removing challenges, adding activities 2013-04-22 13:13:31 +01:00
Andrew Hayward 8273e5152c Merge pull request #100 from andrewhayward/learn 
Simplified this pull request greatly, so pushing it through to get more wireframes up.
 2013-04-22 04:10:39 -07:00
Andrew Hayward cbda6e6c1d Simplifying `learn` controller 
Removing all references to models, etc.
 2013-04-22 12:07:08 +01:00
Andrew Hayward 2ac12ed6a7 Minor fix 2013-04-19 13:54:42 +01:00
Andrew Hayward 57d999527b Centralising user clearance 2013-04-19 13:54:26 +01:00
Andrew Hayward 1c330925c0 Nothing was using that anyway 2013-04-19 13:53:36 +01:00
Andrew Hayward bdcc794617 Making `extractUserData` a bit more flexible 2013-04-19 13:53:23 +01:00
Andrew Hayward a22c54cf2c Conforming a little more to the node style guide 
http://nodeguide.com/style.html
 2013-04-19 11:38:00 +01:00
Andrew Hayward ce41e98b12 Various bits of tidying and refactoring 2013-04-19 11:11:18 +01:00
Andrew Hayward 69c4ba39e9 Complying with expressjs 3.0 
http://expressjs.com/api.html#res.redirect
 2013-04-19 10:18:17 +01:00
Andrew Hayward 79e26523f2 Removing debugging logging 2013-04-19 09:08:05 +01:00
Andrew Hayward 8c1d1e6f97 Removing magic number for max age 2013-04-19 09:02:40 +01:00
Andrew Hayward 1127c4ab0a Dropping `switch` for ternary format 2013-04-18 17:43:04 +01:00
Andrew Hayward c5e8c91653 Switching function declaration styles 2013-04-18 17:37:40 +01:00
Andrew Hayward 4286e8b486 Removing pointless code 2013-04-18 17:21:38 +01:00
Andrew Hayward c7b8bf18bf Moving to somewhere a bit more sensible 2013-04-18 15:36:50 +01:00
Andrew Hayward 18a4735479 Going a bit more node-esque 2013-04-18 15:35:54 +01:00
Andrew Hayward 5080673f66 Sign-up process 2013-04-18 15:33:41 +01:00
Andrew Hayward 009d217c4b Adjustments to token signup process 2013-04-18 11:53:03 +01:00
Andrew Hayward 661208e66e Overhauling models 
Relationships were getting recursive, due to models being split across multiple files
 2013-04-18 11:48:12 +01:00
Andrew Hayward dab83d1beb Guardian sign-up and general log-in processes 2013-04-17 17:50:31 +01:00
Andrew Hayward 800bd61315 Stubbing out signup submission endpoint 2013-04-16 15:55:12 +01:00
Andrew Hayward d08d25a412 Parent sign-up changes 2013-04-16 12:11:52 +01:00
Andrew Hayward 89ea1be36f Parents and guardians don't have backpacks 
(They don't have dashboards yet either!)
 2013-04-12 13:43:38 +01:00
Andrew Hayward ec26883e5c Somewhat modified sign-up flow 
See https://github.com/mozilla/CSOL-site/issues/59
 2013-04-12 13:27:30 +01:00
Andrew Hayward 1fe3b5dbd9 A rough start on the 'learn' subsection 2013-04-11 12:53:36 +01:00
Andrew Hayward b0698907fe A load more changes 2013-03-28 16:42:32 +00:00
Andrew Hayward 52582aef1a Don't need that logging there 2013-03-28 13:17:21 +00:00
Andrew Hayward 3a1a2bcb15 Ch-ch-ch-ch-changes 2013-03-28 13:14:16 +00:00
Andrew Hayward 0c216ffd0c Controller updates 2013-03-27 18:00:30 +00:00
Brian J Brennan 5ef836c7c0 Add nunjucks, package.json 2013-03-25 10:56:30 -04:00
Brian J Brennan daa4bb8bac Skeleton 2013-03-24 16:52:09 -04:00