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

936 Коммитов

Автор SHA1 Сообщение Дата
Chris McAvoy 77573929f6 adding terms and privacy fixes #429 2013-06-07 19:07:01 -05:00
Chris McAvoy cf625fe00e Merge remote-tracking branch 'origin/erin' 2013-06-07 18:51:24 -05:00
Brian J Brennan 34098db4b8 Fix issue with underage signup. 2013-06-07 19:33:17 -04:00
Andrew Hayward 0bc9d9db28 Missing global flag 
Resolves #546
 2013-06-08 00:23:19 +01:00
erinknight 513e16cb4d Updated FAQ 
18 back to 13
 2013-06-07 19:23:18 -03: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 20632d05ff Merge pull request #544 from curlee/master 
updates for mybadges copy
 2013-06-07 13:27:27 -07: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
Joe Curlee 7eabc4bf05 merged from upstream 2013-06-07 14:40:42 -05:00
Joe Curlee c4ac159f24 added no_data text for my badges. fixes #399 2013-06-07 14:37:48 -05:00
Chris McAvoy 59bd884de6 Merge pull request #542 from mozilla/chris-fixes 
added copy and video to empty backpack page
 2013-06-07 12:36:14 -07:00
Chris McAvoy cb71188d9d added copy and video to empty backpack page 2013-06-07 14:32:18 -05:00
erinknight cf83c090d9 Updated copy on MyBadges 
Copy for MyBadges
 2013-06-07 16:16:41 -03:00
Chris McAvoy ebeec3ccf1 Merge pull request #541 from curlee/master 
Updates for play list copy
 2013-06-07 12:06:54 -07:00
Joe Curlee 22302a6f68 updated playlist copy. fixes #492 2013-06-07 14:03:37 -05: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
Brian J Brennan bedf707444 Add new data to learner model. 2013-06-07 15:02:58 -04: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
Chris McAvoy 0414f5524b Merge pull request #538 from mozilla/erin 
Updates to FAQ
 2013-06-07 11:55:59 -07:00
Chris McAvoy 00706963a8 Merge pull request #537 from mozilla/chris-fixes 
[WIP] fixes
 2013-06-07 11:55:41 -07:00
Chris McAvoy aa6323cf69 Merge pull request #539 from curlee/master 
more copy tickets
 2013-06-07 11:55:18 -07:00
erinknight 2b210723da Updated copy on signup-guardian.html 
Updated opening copy from placeholder text
 2013-06-07 15:47:26 -03:00
erinknight 125386af1c Updates to FAQ 
13 to 18
Explore instead of Learn
Other Sunny and Mari changes
 2013-06-07 15:39:02 -03:00
Chris McAvoy eb6dec8a42 fixes #523 2013-06-07 13:27:48 -05:00
Joe Curlee 51be7fbac1 updated claim page copy. fixes #205 2013-06-07 13:26:57 -05:00
Joe Curlee 52c18c9de4 added more text to about page. fixes #536 2013-06-07 13:20:46 -05:00
Andrew Hayward c0202eba97 Adjusting claim code template 2013-06-07 18:24:56 +01: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
Chris McAvoy 5bc0c22629 Merge pull request #530 from christensenep/278-badge-application-email 
Send email to guardian when <13 learner applies for badge.
 2013-06-07 10:06:38 -07:00
Chris McAvoy fe98c11a71 Merge pull request #531 from mozilla/527-change-criteria 
remove required flag fixes #527
 2013-06-07 10:05:38 -07:00
Michael Ballard 65f0f77448 Merge branch 'master' of https://github.com/mozilla/CSOL-site 2013-06-07 12:55:33 -04:00
Chris McAvoy 2f5eae9e8e remove required flag fixes #527 2013-06-07 11:53:01 -05:00
Erik Christensen b83b116dce Send email to guardian when <13 learner applies for badge. 2013-06-07 09:44:25 -07:00
Chris McAvoy 4594d3e86d Merge pull request #526 from andrewhayward/guardians 
Overhauling guardian bits and pieces
 2013-06-07 09:38:29 -07:00
Andrew Hayward f19d9bad30 Tidying evidence titles 2013-06-07 16:07:32 +01:00
Andrew Hayward 200e0627d7 Overhauling guardian dashboard 2013-06-07 15:47:15 +01:00
Andrew Hayward 22f0f71a1c Removing 'accepted' applications if badges present 2013-06-07 15:35:25 +01:00
Andrew Hayward f837d9ed28 Making it easier to get application's badge 2013-06-07 15:28:25 +01:00
Andrew Hayward 4855fa95d9 Adding minor flexibility to `getUserBadge` 2013-06-07 15:25:20 +01:00
Andrew Hayward b1b3660739 Tidying up dashboard application page 2013-06-07 15:24:58 +01:00
Andrew Hayward 0a9b4e56d5 Putting some content in the dashboard badge page 2013-06-07 14:53:05 +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 15b8f33ab8 Merge remote-tracking branch 'origin/master' 2013-06-06 17:09:46 -05:00
Chris McAvoy 0ee52ecde6 small offline approved copychange 2013-06-06 17:09:15 -05:00
Brian J Brennan 12c9c1673c Figured out how to make the tests pass. 2013-06-06 17:58:49 -04:00