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

41 Коммитов

Автор SHA1 Сообщение Дата
Andrew Hayward e353308741 Merge branch 'master' into guardians 
Conflicts:
	controllers/backpack.js
 2013-06-04 21:54:00 +01:00
Chris McAvoy 49c2dab808 Merge pull request #418 from curlee/master 
fixes for assigned tickets
 2013-06-04 12:25:31 -07:00
Chris McAvoy 10d1afd78f Merge pull request #396 from andrewhayward/aestimia 
Badge awarding
 2013-06-04 12:22:21 -07:00
Chris McAvoy 346cdde9f6 Merge remote-tracking branch 'origin/master' 2013-06-04 14:18:50 -05:00
Joe Curlee d0dd39659d limited badge recommendations on badge detail page to 4. fixes #383 2013-06-04 11:45:46 -05:00
Andrew Hayward be070bddc3 Merge branch 'master' into guardians 
Conflicts:
	openbadger.js
 2013-06-04 12:43:15 +01:00
Atul Varma e7d5bc57ae Health check subsystems can provide richer data about their status. 
Specifically, if they set a 'notes' property on their metadata object,
it will be displayed in the console version of their results, for
easier debugging.
 2013-06-03 22:18:28 -04:00
Andrew Hayward afcb9b6145 Badge awarding 2013-06-04 03:04:12 +01:00
Ian Dees 360232bab7 Merge remote-tracking branch 'upstream/master' into myapplications 
Conflicts:
	controllers/backpack.js
 2013-06-04 01:57:02 +00:00
Andrew Hayward ab9cb3b7f8 Merge branch 'master' into guardians 
Conflicts:
	openbadger.js
 2013-06-04 01:33:32 +01:00
Atul Varma 4bf40a8222 Added /health_check endpoint, with health check at startup too. 
The health check ensures that s3, aestimia, openbadger, and MySQL
connections are all functional.

Currently the cookie secret is used as the password at /health_check but
we can change this later in app.js.
 2013-06-03 16:30:31 -04:00
Chris McAvoy 7632ee763f Merge pull request #380 from curlee/master 
badge recommendations
 2013-06-03 12:57:12 -07:00
Joe Curlee 2d17e29287 removed console.log in openbadger.js 2013-06-03 11:44:55 -05:00
Joe Curlee 1ad88a55a2 removed commented out error callback 2013-06-03 11:44:29 -05:00
Joe Curlee 43638fa1db implemented related badges on badge detail page. added getBadgeRecommendations to openbadger api 2013-06-03 11:43:52 -05:00
Andrew Hayward 4b74f5f0db Merge branch 'master' into guardians 2013-06-03 16:54:23 +01:00
Andrew Hayward a1a653dbe3 OpenBadger API flexibility 2013-06-03 16:46:05 +01:00
Ian Dees f26c496c71 Include the badge id when normalizing the badge representation. 2013-06-03 02:28:56 +00:00
Andrew Hayward 478ba31336 Merge branch 'master' into guardians 
Conflicts:
	controllers/backpack.js
	middleware.js
	openbadger.js
	views/layout.html
 2013-06-03 01:05:11 +01:00
Andrew Hayward 40ba66409d Removing pointless logging 2013-06-02 21:34:49 +01:00
Andrew Hayward 4a25343684 Updating filtering template 2013-06-02 21:00:15 +01:00
Andrew Hayward dbaad38eaa Fixing `openbadger` filtering 2013-06-02 18:42:33 +01:00
Andrew Hayward 4e99005ad6 Merge branch 'master' into filtering 2013-06-02 15:51:40 +01:00
Joe Curlee 199e5c99b8 renamed /learn to /explore. fixes #344 2013-06-01 17:44:36 -05:00
Andrew Hayward 46d5dbe1a8 Bailing early if no filters set 2013-06-01 21:16:08 +01:00
Andrew Hayward 7fff33fa29 Upstream merge 2013-05-31 22:38:14 +01:00
Mike Larsson cfbbeba59e Add basic, ugly mybadges details page 2013-05-31 12:21:00 -04: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 61a090a86d Adding basic claim code confirmation screen 2013-05-31 11:04:55 -04:00
Andrew Hayward 353dd69a8d Filtering badges 2013-05-31 11:47:03 +01:00
Mike Larsson fc6237648f Add openbadger.claim() method, and implement basic badge claim flow 2013-05-28 20:56:49 -04:00
Mike Larsson 19d857ac22 Remove /v2/ as that should now be part of config url 2013-05-17 11:14:53 -04: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
Mike Larsson 689d01bf8e Dropping the /v2/ from Open Badger api paths and implicitly expecting it in the configured url. 2013-05-17 10:57:48 -04:00
Mike Larsson 2615f39d01 Allow api origins to have paths. 
Add basic logging wrapper for winston to start using.
Connect express.logger to logger module.
Use example.org instead of origin.org juuuuuust to be safe.
 2013-05-17 10:57:48 -04:00
Andrew Hayward f9e0d56aa3 Using new error handling 2013-05-16 14:19:30 +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 5d549f0d3a Pull openbadger url from env, and fix a few tests 2013-05-13 22:59:46 -04:00
Mike Larsson b3f0cc577b Bring openbadger into closer conformance with v2 badge endpoints 2013-05-13 15:46:49 -04:00
Mike Larsson 806412880d Trying to separate api util methods from actual OpenBadger API calls 
so utils can be reused for other APIs too, like Aestimia. This also
helps a little bit with testing to avoid testing e.g. pagination
fully on every paginated endpoint (although having a small sanity check
is still advisable).
 2013-05-13 14:27:20 -04:00