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

215 Коммитов

Автор SHA1 Сообщение Дата
Andrew Hayward 95184fe9f5 Merge branch 'master' into auth 
Conflicts:
	views/auth/signup-next-child.html
	views/auth/signup-next.html
	views/auth/signup.html
 2013-06-18 22:00:06 +01:00
Andrew Hayward ee81a8d36f Making sign-up forms a bit more informative 2013-06-18 21:55:48 +01:00
Andrew Hayward ebd37ca927 Fixing some validation 2013-06-18 21:53:46 +01:00
Andrew Hayward 1668cb681b Adding email validation 2013-06-18 21:48:49 +01:00
Chris McAvoy 891b07ffe3 Merge pull request #622 from christensenep/fix-email-urls 
Fix broken links to csol-site in emails
 2013-06-17 14:04:22 -07:00
Erik Christensen 8b5bff5bb6 Proper parsing of CSOL_HOST. 2013-06-17 13:44:21 -07:00
Chris McAvoy 944242ebc4 removing openbadger hooks as it's definied elsewhere now. merge conflict 2013-06-17 14:00:09 -05:00
Chris McAvoy db60a9d742 Merge pull request #603 from christensenep/128-badge-issue-email-fixes 
Improve logging and error responses in badge issuing webhooks
 2013-06-17 11:23:14 -07: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
Andrew Hayward 75c6e6fd84 Fixing typos and bad labelling 
One of these days I'll learn how to write software :(
 2013-06-17 13:20:30 +01: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
Andrew Hayward cc6b196059 Fixing `testHandler` weirdness 2013-06-14 19:16:43 +01:00
Erik Christensen d42beede14 Renaming helper function to respondWithForbidden. 2013-06-13 13:52:31 -07: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
Erik Christensen 28a5eb84a6 Fixing error codes, improving logging. 2013-06-13 11:20:54 -07:00
Atul Varma 3f867476a8 Make openbadger health check test webhook. 
Fixes #525.
 2013-06-13 11:10:51 -04:00
Mike Larsson 0df2947cf0 This removes autogeneration of passwords for both < and >13 
by setting passwordGenerated to false, and copying the >13
password form element stuff into the <13 signup page. If
we're really not going to auto-generate, a follow-up commit
can clean it all out.
 2013-06-12 11:27:12 -04:00
Michael Ballard 4ff9f84074 All references to "nickname" changed to "username" 2013-06-12 00:11:46 -04:00
Chris McAvoy bd79ad3d06 changing age back to 13 2013-06-07 19:11:59 -05:00
Chris McAvoy ef85bbb314 Merge pull request #540 from mozilla/338-optional-learner-data 
Add new data to learner model.
 2013-06-07 14:10:06 -07:00
Brian J Brennan ceb8611341 Form options for required optional data. 2013-06-07 17:05:37 -04:00
Chris McAvoy b7d43e31fa Merge pull request #545 from andrewhayward/claims 
Getting badge claims into guardian dashboard
 2013-06-07 13:27:15 -07:00
Andrew Hayward 68a578ea16 Plugging claims into guardian dashboard 2013-06-07 20:45:01 +01:00
Chris McAvoy 0a250d8d81 Merge pull request #535 from andrewhayward/redefining-children 
[WIP] Adjusting age cutoff for Chicago compliance
 2013-06-07 12:03:23 -07:00
Chris McAvoy 8e8b56ab16 Merge pull request #534 from andrewhayward/applications 
Adding description as evidence to application
 2013-06-07 11:56:21 -07:00
Andrew Hayward 83008b5533 Adjusting age cutoff for Chicago compliance 
(And fixing variable/method names to make more sense)
 2013-06-07 18:16:45 +01:00
Andrew Hayward 9506e102b5 Adding description as evidence to application 2013-06-07 18:12:13 +01:00
Andrew Hayward 200e0627d7 Overhauling guardian dashboard 2013-06-07 15:47:15 +01:00
Andrew Hayward 5897c238cb Ensuring that guardians don't see backpack pages 2013-06-07 14:42:07 +01:00
Andrew Hayward e9bab02170 Merge branch 'master' into guardians 2013-06-07 11:33:13 +01:00
Chris McAvoy e849180bd6 Merge pull request #519 from mozilla/505-fix-explore-filters 
Implement filtering.
 2013-06-06 15:15:14 -07:00
Chris McAvoy 82162de19f Merge pull request #391 from christensenep/128-badge-issue-email 
Send badge issue notification emails
 2013-06-06 14:48:37 -07:00
Brian J Brennan ec19365981 Implement filtering. 
This takes advantage of the fact that OpenBadger will have filtering
at the API level once mozilla/openbadger#209 lands.
 2013-06-06 17:39:16 -04:00
Andrew Hayward a2e3dd0164 Dashboard fixes 2013-06-06 18:16:23 +01:00
Chris McAvoy e7ff9fd22c Merge pull request #502 from andrewhayward/passwords 
Resolving password resetting confusions
 2013-06-06 10:10:21 -07:00
Chris McAvoy 17968469f9 Merge pull request #435 from andrewhayward/birthdays 
Storing learner birthday
 2013-06-06 09:55:09 -07:00
Andrew Hayward d00aaa1029 Allowing guardians to use their own email address 2013-06-06 17:38:46 +01:00
Andrew Hayward 6fa261a7bd Template allows for custom underage passwords 
Deleting server-side logic that denies this
 2013-06-06 17:30:01 +01:00
Erik Christensen a727ad6d48 Removing duplicate error logging. 2013-06-06 07:57:04 -07:00
Erik Christensen b898fc8ef2 Improvements to email template selection. 2013-06-05 20:55:48 -07:00
Erik Christensen a9d9606caf Function to handle notification from openbadger that a badge claim has been issued. 
Very rough functional version.
 2013-06-05 19:25:40 -07:00
Andrew Hayward c5f9b152d7 Adding email sending to password reset process 2013-06-05 22:33:47 +01:00
Paul Smith f033ee0359 Merge in from master 2013-06-05 14:00:16 -04:00
Paul Smith b81d8fa317 Add ability to remove badge from playlist 2013-06-05 13:51:24 -04:00