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

59 Коммитов

Автор SHA1 Сообщение Дата
Andrew Hayward 00a36f1196 Testing for badge existence during 'claim' process 2013-06-19 17:12:32 +01:00
Chris McAvoy 95fd56d8b8 Merge pull request #612 from mgballard/master 
Cleanup! And mobile visual adjustments.
 2013-06-17 10:40:09 -07:00
100010001 f67a11f6c9 added real similar badge data to myapplications page. on myapplications and mybadges detail pages, "similar badges" section will only show if there is similar badge data 2013-06-17 07:53:20 -05:00
100010001 de48678662 added similar badges to /mybadges page. fixes #595 2013-06-17 07:45:23 -05:00
Michael Ballard 592e7f955c References to and fies from /images/ moved to /img/ 2013-06-16 23:55:31 -04:00
Chris McAvoy 83e01071fa Merge pull request #602 from stenington/592-backpack-push 
Push to backpack
 2013-06-14 14:28:06 -07:00
Mike Larsson 8887404c77 Fix minor issues: 
share toggle endpoint is post instead of get now
  removed unused model relationship
  basic (like... really basic) LESS styles
 2013-06-14 16:02:00 -04:00
Mike Larsson 328b873935 Add where clause to shareToken.find()s 2013-06-14 16:00:19 -04:00
Mike Larsson 8485adb25b Basic badge sharing and privacy control 2013-06-14 16:00:19 -04:00
Mike Larsson 1524f383b3 Add share button to /mybadges page that shows share modal. 
Because badge thumbnails were turned into an include, internal
blocks can't be overridden where we were doing it before,
so there's some extra redirection to get around that.
 2013-06-13 14:53:20 -04:00
Andrew Hayward 68a578ea16 Plugging claims into guardian dashboard 2013-06-07 20:45:01 +01:00
Andrew Hayward 5897c238cb Ensuring that guardians don't see backpack pages 2013-06-07 14:42:07 +01:00
Paul Smith b81d8fa317 Add ability to remove badge from playlist 2013-06-05 13:51:24 -04:00
Paul Smith ee57862d3a Group recommendations by STEAM category 2013-06-05 09:45:26 -04:00
Paul Smith 655fab04bc Use consistent capitalization 2013-06-05 00:34:17 -04:00
Paul Smith 25d48d3692 Merge in from master 2013-06-04 22:26:40 -04:00
Paul Smith 8720ca969a Initial markup of recommended badges in playlist 2013-06-04 22:17:51 -04:00
Paul Smith e390cac55f Switch playlist to use new getAllBadges call 2013-06-04 17:06:09 -04:00
Paul Smith bf913576ce Remove console.log statements 2013-06-04 17:05:53 -04:00
Andrew Hayward e353308741 Merge branch 'master' into guardians 
Conflicts:
	controllers/backpack.js
 2013-06-04 21:54:00 +01:00
Paul Smith 7d7cb4e9d5 Ability to add badges to playlist & display them 
The basic functionality works, but the key missing piece is that the
*getBadges* API call to openbadger, as exposed in the openbadger.js module,
doesn't return all badges, which we need to filter down on.

The next step is to add another middleware function that returns **all** of
the badges from openbadger.
 2013-06-04 16:02:59 -04:00
Ian Dees 5d11dcd0f1 Filter out the accepted applications. 2013-06-04 19:03:35 +00:00
Paul Smith ec132b6067 Refactor playlist view 2013-06-04 14:31:38 -04:00
Paul Smith 7305fe3566 Initial /myplaylist view 2013-06-04 11:54:10 -04:00
Paul Smith c7a5560290 Minor refactor 2013-06-04 11:29:45 -04:00
Paul Smith e75385b4a9 Merge in from master 2013-06-04 08:37:44 -04:00
Ian Dees 616ae82b54 Give /myapplications/:id a page and include a style for the application state. 2013-06-04 04:22:20 +00:00
Ian Dees b82af27e78 Add a /myapplications/:id endpoint. 2013-06-04 02:58:16 +00: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 4b74f5f0db Merge branch 'master' into guardians 2013-06-03 16:54:23 +01:00
Paul Smith 1c109f0bc6 1st pass at favorites middleware for badge lists 2013-06-03 11:07:59 -04:00
Paul Smith 7e9aa52eb9 Refactor favoriting a badge to class method 2013-06-03 10:12:06 -04:00
Paul Smith 895417e2d5 Minor 2013-06-03 09:12:48 -04:00
Andrew Hayward 21bf0194c2 Merge branch 'master' into guardians 2013-06-03 12:22:59 +01:00
Ian Dees b4bf0e7a69 Merge the application and badge together so we can show more data. 2013-06-03 03:33:03 +00:00
Paul Smith 871e316858 Start work on favorites 
Implemented:

 - DB model
 - Add badge to favorites view
 2013-06-02 23:29:33 -04: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
Ian Dees 0aa6352489 Customize the item for the applications list. 
Thanks to https://github.com/stenington/CSOL-site/compare/my-applications
 2013-06-02 23:28:19 +00: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
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
Ian Dees b0715d5e87 Point to a different template for applications. 2013-06-02 19:25:02 +00:00
Ian Dees d1ecbe6edc Initial impl of myapplications. 2013-06-02 19:14:03 +00:00
Joe Curlee df4d0e3a03 changed organisation to organization. fixes #345 2013-06-01 17:32:45 -05: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
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 a5a92918c2 Adding basic claim code confirmation screen 2013-05-31 11:50:27 -04:00