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

271 Коммитов

Автор SHA1 Сообщение Дата
Joe Curlee 95865a5199 users can now click rejected applications in order to reopen them 2013-08-14 11:57:15 -05:00
Joe Curlee df622a4f7e Merge branch 'master' of https://github.com/mozilla/CSOL-site 2013-08-13 11:44:19 -05:00
Joe Curlee 39d27136df added pagination to /mybadges page. fixes #789 2013-08-13 11:28:35 -05:00
Erik Christensen 656a862c05 Use first email in list as JWT prn in the case of bulk issues. 2013-08-12 14:50:15 -07:00
Erik Christensen 0c9b65df56 Oops, removing test code. 2013-08-12 14:45:01 -07:00
Erik Christensen fbbdc69ec5 reverting "no approval needed" for underage learners 2013-08-12 14:27:55 -07:00
Erik Christensen 3b37418ce6 Allow multiple claimCode/email pairs in a call to /notify/claim 2013-08-12 08:09:17 -07:00
Joe Curlee 821be3fa46 changed incentives to csol showcase page. added callout to homepage 2013-08-09 15:39:11 -05:00
Joe Curlee 4ee71c64ae added incentives page 2013-07-30 13:30:12 -05:00
Erik Christensen 528694dfca Formatting cleanup 2013-07-18 13:33:55 -07:00
Erik Christensen 02a0fb9d10 fixing blank badges in playlist 2013-07-18 13:31:36 -07:00
Joe Curlee bfa591c965 added filters to asm page. fixes #740 2013-07-16 11:27:48 -05:00
Joe Curlee 36a7c9cbd1 split asm content into two columns 2013-07-16 09:10:25 -05:00
Joe Curlee 9ce37cfa2f fixed typo (paylist). also now using correct playlist array 2013-07-15 11:51:39 -05:00
Joe Curlee fc58d26c03 badges now show correct "playlisted" info on /earn and badge detail pages if they are playlisted. fixes #718 2013-07-13 07:44:05 -05:00
Erik Christensen 257d7a3196 Fixed two crashes related to sharing badges with invalid share tokens. 2013-07-10 20:27:39 -07:00
Joe Curlee 709a655946 Merge branch 'master' of https://github.com/mozilla/CSOL-site into afterschoolmatters 
Conflicts:
	static/media/css/core.css
	static/media/less/core.less
 2013-07-10 10:20:20 -05:00
Erik Christensen 4e3fe50fe2 Fixing a crash when removing a non-existant badge from a playlist. 2013-07-09 09:33:39 -07:00
Chris McAvoy 9fc183a9ce Merge pull request #721 from christensenep/258-retroactive-steam-awards 
Adding webhook to be notified of a retroactively awarded STEAM badge
 2013-07-03 11:22:45 -07:00
Erik Christensen 502bff040c /notify/award will now return 200 if isTesting is set (for now, this just tests that the endpoint exists). 2013-07-02 11:11:59 -07:00
Chris McAvoy cb370d74b2 Merge pull request #714 from stenington/703-myapplications 
Fixing /myapplications
 2013-07-02 08:36:18 -07:00
Joe Curlee 41709a93d6 added data to asm page and styled it. 2013-06-28 16:06:36 -05:00
Joe Curlee ee32f61c7f adding After School Matters page 2013-06-28 08:12:01 -05:00
Erik Christensen b49f0460a0 Adding webhook to be notified of an awarded STEAM badge 2013-06-27 10:41:40 -07:00
Andrew Hayward c3971b6dc8 Fixing word count calculation 
Applications without descriptions raise a fatal error
 2013-06-27 17:10:00 +01:00
Mike Larsson f0cccda8a3 Removes /myapplication/:id in favor of already existing /earn/:id/apply 
pages, although arguably the routes should be /myapplication/:id instead.

Adds a denied template to show when a badge is denied approval by
parent/guardian.
 2013-06-26 17:12:12 -04:00
Erik Christensen 912c3770e7 Fixing a couple cases where emails were normalized via normalizeUsername, stripping their @ symbols. 2013-06-25 16:21:38 -07:00
Chris McAvoy 3d23870e10 Merge pull request #700 from stenington/677-name-consistency 
Consistent user name display
 2013-06-25 12:42:06 -07:00
Chris McAvoy 1185b1c3ef Merge pull request #688 from stenington/clean-up-share-token-logic 
Clean up share token logic
 2013-06-25 12:41:29 -07:00
Mike Larsson 4f281f5837 Use getDisplayName consistently as user's name on site 2013-06-25 15:30:01 -04:00
Mike Larsson c045036db7 Style tweaks and adjustments per code review 2013-06-25 10:26:18 -04:00
Erik Christensen 51fa9cde1c Reset password emails will now be sent to guardians of <13 learners even if the guardian has not yet signed up. Also fixed confirmation emails using the incorrect template. 2013-06-24 12:01:46 -07:00
Mike Larsson 09c89d2dc5 Introducing isUnderage/notUnderage middleware to split out /mybadges and /mybadges/:id routes so underage never get shareTokens 2013-06-24 14:31:56 -04:00
Mike Larsson 48e61aba33 Forgotten return on next(). Always forgotten returns on nexts()s. 2013-06-24 14:30:55 -04:00
Joe Curlee bb627e480e Merge branch 'master' of git://github.com/mozilla/CSOL-site 2013-06-21 16:00:35 -05:00
Joe Curlee 8bab84208b Implemented Copy for Badge-Apply Confirmation Message with other badge suggestions. fixes #200 and fixes #199 2013-06-21 16:00:26 -05:00
Chris McAvoy a12cf5f457 Merge pull request #644 from christensenep/197-steam-badge-email 
Implement STEAM badge award emails
 2013-06-21 11:19:53 -07:00
Chris McAvoy 4596be034f Merge pull request #664 from andrewhayward/auth 
Moving notification to global scope
 2013-06-20 12:26:46 -07:00
Chris McAvoy 383f79db76 Merge pull request #645 from stenington/590-591-twitter-facebook 
Twitter/Facebook sharing for /mybadges badges
 2013-06-20 12:26:01 -07:00
Mike Larsson 23ed5844fc Changing tweet text 2013-06-20 12:59:47 -04:00
Andrew Hayward 446105654b Moving notification to global scope 
Underage learners without guardians now get a message on every page
 2013-06-20 15:33:30 +01:00
Andrew Hayward bb0d076056 Adding 'search' to `/earn` and `/explore` filters 
Resolves #616
 2013-06-20 12:43:14 +01:00
Mike Larsson feacce4438 Add ajax public/private toggle to badge share modal 2013-06-19 22:24:33 -04:00
Mike Larsson d01bcdb8b7 Change from single share modal to one share modal per badge 2013-06-19 20:31:04 -04:00
Chris McAvoy aa983d1db4 Merge pull request #648 from andrewhayward/auth 
Overhauling user sign-up flow
 2013-06-19 12:29:49 -07:00
Chris McAvoy f6fe465512 Merge pull request #653 from andrewhayward/claims 
Testing for badge existence during 'claim' process
 2013-06-19 11:58:42 -07:00
Andrew Hayward e57157fc09 Adding notification for in-progress applications 
Fixes #647
 2013-06-19 18:32:54 +01:00
Andrew Hayward 00a36f1196 Testing for badge existence during 'claim' process 2013-06-19 17:12:32 +01:00
Andrew Hayward b5f26e81ff Overhauling user sign-up flow 
Allowing users to restart sign-up, and go back in the process should they need to.
Fixes second item in #621
 2013-06-19 14:20:09 +01:00
Mike Larsson 973d0076cc Attach shareTokens to badge objects for backpack.html page, and use correct share url for social sharing 2013-06-18 21:54:30 -04:00