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

717 Коммитов

Автор SHA1 Сообщение Дата
Michael Ballard 13c946fd50 Merge branch 'master' of https://github.com/mozilla/CSOL-site 
Conflicts:
	static/media/js/custom_logic.js
 2013-06-06 17:11:18 -04:00
Michael Ballard 338dd4221a just tabs and spaces 2013-06-06 16:28:42 -04:00
Michael Ballard b783fe0b8f footer height set 2013-06-06 16:19:59 -04:00
Chris McAvoy b59fd4e0af Merge remote-tracking branch 'origin/master' 2013-06-06 15:14:46 -05:00
Michael Ballard d211ee933e consistent footer throughout, removed from .js 2013-06-06 16:14:37 -04:00
Brian J Brennan 5ed0a58265 Move filter label options out of JS and into template. 2013-06-06 16:03:21 -04:00
Michael Ballard 5dacdad3ab Merge branch 'master' of https://github.com/mozilla/CSOL-site 2013-06-06 15:47:18 -04:00
Andrew Hayward e665176abc Fixing `db` file path 2013-06-06 20:32:16 +01:00
Chris McAvoy d5d55e42d4 Merge pull request #509 from andrewhayward/migrations 
Migrations
 2013-06-06 10:50:22 -07:00
Andrew Hayward 2aab901f2e Fixing migrations again 2013-06-06 18:45:14 +01:00
Michael Ballard 7cadde64b5 border-radius on nav to match filter 2013-06-06 13:30:24 -04:00
Andrew Hayward e8169d51a4 That doesn't look right, somehow 2013-06-06 18:27:28 +01:00
Michael Ballard 8ada1082dd footer adjustments and logo links, font size increase (todo: move footer to template) 2013-06-06 13:24:47 -04:00
Andrew Hayward 298f5223fc Merge pull request #504 from andrewhayward/migrations 
Fixing learner birthday migration
 2013-06-06 10:20:44 -07:00
Andrew Hayward ffec2f95a0 Fixing learner birthday migration 2013-06-06 18:20:02 +01:00
Chris McAvoy d977751b69 Merge pull request #501 from andrewhayward/migrations 
Making migrations actually do something useful
 2013-06-06 10:11:06 -07: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 9ad976a4a4 Merge pull request #500 from curlee/master 
fixes for explore pages
 2013-06-06 10:06:08 -07:00
Chris McAvoy c7fb3fc4dd Merge pull request #499 from andrewhayward/auth 
Tidying up auth-related templates
 2013-06-06 09:59:36 -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 ec94905607 Merge branch 'master' into passwords 2013-06-06 17:38:59 +01: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
Joe Curlee 8299240006 added shortname to program data in openbadger test 2013-06-06 11:12:52 -05:00
Andrew Hayward 03967ecc22 Making migrations actually do something useful 2013-06-06 16:45:36 +01:00
Joe Curlee 5823921205 fixed thumbnails on /explore fixes #484 2013-06-06 10:39:11 -05:00
Joe Curlee c43122147b fixed program url in normalizeProgram 2013-06-06 10:33:54 -05:00
Andrew Hayward c4a27b1273 Tidying up auth-related templates 2013-06-06 15:10:20 +01:00
Chris McAvoy 52fd6504d7 Merge pull request #487 from mgballard/master 
IE8 Fixes
 2013-06-06 06:30:52 -07:00
Chris McAvoy 83b6eaea33 resolving conflicts from @curlee 's pull request 2013-06-06 08:30:27 -05:00
Chris McAvoy 01aae17def Merge pull request #490 from paulsmith/issue-489-playlist-btn-hidden 
Fix playlist button being hidden by badges in FF
 2013-06-06 06:17:23 -07:00
Chris McAvoy cb5feac7db Merge pull request #493 from andrewhayward/passwords 
Adding email sending to password reset process
 2013-06-06 06:16:00 -07:00
Chris McAvoy c5848623f2 Merge pull request #495 from andrewhayward/tweaks 
Tweaks
 2013-06-06 06:15:24 -07:00
Andrew Hayward 269061d885 Changing support email address in footer 
Resolves #445
 2013-06-06 13:26:23 +01:00
Andrew Hayward 8d115c5771 Unhiding 'about' link in footer 
Resolves #478
 2013-06-06 13:25:01 +01:00
Andrew Hayward 90eb77b8e2 Fixing 'Earn' page title 
Resolves #467
 2013-06-06 13:20:37 +01:00
Joe Curlee 9d29f0ad35 fixed badge images on /earn and /explore. fixes #381 2013-06-05 16:35:55 -05:00
Andrew Hayward c5f9b152d7 Adding email sending to password reset process 2013-06-05 22:33:47 +01:00
Joe Curlee ab715505d0 implemented copy for claim page. fixes #474 2013-06-05 15:43:45 -05:00
Michael Ballard 95e946ec58 nav border (again) mobile home/non-home non-mobile home/non-home OK 2013-06-05 16:37:20 -04:00
Paul Smith 71fe9c6782 Fix playlist button being hidden by badges in FF 2013-06-05 16:31:35 -04:00
Michael Ballard 04992a5be9 fix border around landing page mobile 2013-06-05 16:31:22 -04:00
Michael Ballard b69db8e3fd lighter border around upper elements and ie8 background filter fix. 2013-06-05 16:25:45 -04:00
Michael Ballard 52bdf41969 nav menu nudge 2013-06-05 16:20:30 -04:00
Michael Ballard efdcc2c3a8 IE8 no longer "broken" 2013-06-05 16:17:54 -04:00
Michael Ballard e3927091ce html5shiv for ie 2013-06-05 15:31:43 -04:00
Joe Curlee 0dc56dd51f implemented signup page copy. fixes #454 2013-06-05 13:30:47 -05:00
Joe Curlee 70da3b73c0 changed My Backpack to My CSOL in nav. fixes #458 2013-06-05 13:27:21 -05:00
Chris McAvoy 9b7e4d1dd2 Merge pull request #374 from paulsmith/favorites 
[WIP] Playlist & favorites
 2013-06-05 11:17:05 -07:00
Paul Smith 0f56febff8 Fix bug w/ add-to-playlist button in badge detail 2013-06-05 14:13:04 -04:00