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

936 Коммитов

Автор SHA1 Сообщение Дата
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
Chris McAvoy ecc83aba5f Merge pull request #507 from mgballard/master 
footer adjustments, logo links, and font size increase
 2013-06-06 14:48:25 -07:00
Chris McAvoy ad0ebcacf3 Merge pull request #517 from curlee/master 
more 1.0 ticket closings... and beyond
 2013-06-06 14:47:42 -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
Michael Ballard 3f356f27ea mobile footer adjustments 2013-06-06 17:20:59 -04:00
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
Joe Curlee acc716972c white-space pre-wrap added to badge and program descriptions. fixes #363 2013-06-06 16:03:15 -05:00
Joe Curlee f1957ab339 added requirements to badge detail page. fixes #518 2013-06-06 15:51:44 -05:00
Joe Curlee b72cca207f added rubric to badge apply page prior to first form. fixes #508 2013-06-06 15:48:24 -05: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
Joe Curlee 1bf9adcc94 paragraph at bottom of page now has "lead" class. fixes #297 2013-06-06 14:47:58 -05:00
Michael Ballard 5dacdad3ab Merge branch 'master' of https://github.com/mozilla/CSOL-site 2013-06-06 15:47:18 -04:00
Joe Curlee f72e780143 changed My Playlist to Playlist in My CSOL dropdown. fixes #300 2013-06-06 14:44:49 -05:00
Joe Curlee 4d18bd3a48 modified sample claim code to match style of actual claim codes. fixes #496 2013-06-06 14:41:28 -05:00
Joe Curlee 525df09abd added organizations link to footer. fixes #479 2013-06-06 14:38:24 -05:00
Joe Curlee 78de508433 added mentors link to footer. fixes #480 2013-06-06 14:37:06 -05:00
Andrew Hayward e665176abc Fixing `db` file path 2013-06-06 20:32:16 +01:00
Joe Curlee 83910850df simplified logic to use default 2013-06-06 13:49:22 -05: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
Andrew Hayward a2e3dd0164 Dashboard fixes 2013-06-06 18:16:23 +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
Erik Christensen a727ad6d48 Removing duplicate error logging. 2013-06-06 07:57:04 -07: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