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

690 Коммитов

Автор SHA1 Сообщение Дата
Chris McAvoy 17968469f9 Merge pull request #435 from andrewhayward/birthdays 
Storing learner birthday
 2013-06-06 09:55:09 -07: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
Paul Smith c535fb6856 Add docs to badge thumbnail include 2013-06-05 14:07:43 -04:00
Paul Smith 4723790fdf Remove favorite button 2013-06-05 14:05:46 -04: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
Chris McAvoy e91d525da4 Merge pull request #455 from andrewhayward/encore-une-fois 
Adding application state 'sashes'
 2013-06-05 10:29:06 -07:00
Paul Smith 43b3df32e8 Factor out add-to-playlist button to own template 2013-06-05 13:04:56 -04:00
Joe Curlee ff4f4ecb9e converted tabs to spaces 2013-06-05 11:54:28 -05:00
Joe Curlee b4bd22db1c converted tabs to spaces 2013-06-05 11:50:16 -05:00
Andrew Hayward 01017679b1 Adding state 'sashes' to `/myapplications` 2013-06-05 17:48:37 +01:00
Paul Smith aab6cccbcf Add docs to playlist.middleware 2013-06-05 12:42:48 -04:00
Andrew Hayward 5f92f3f946 Merge branch 'master' into encore-une-fois 
Conflicts:
	static/media/css/core.css
 2013-06-05 17:41:04 +01:00
Andrew Hayward 9b36ed3d25 Adjusting markup for new state labels 2013-06-05 17:38:38 +01:00
Andrew Hayward 563b5961ab Fixing stupid mistakes 2013-06-05 17:37:22 +01:00
Andrew Hayward b672bfbe8e Styling for application states 2013-06-05 17:35:33 +01:00
Paul Smith a45f802acf Sort playlist by rank order 
NB: There is currently no GUI for re-ordering badges in a playlist.
 2013-06-05 12:29:07 -04:00
Chris McAvoy aa158c21dd Merge pull request #438 from andrewhayward/uploads 
Evidence uploads
 2013-06-05 09:24:23 -07:00
Chris McAvoy eb8eb701d7 Merge pull request #448 from andrewhayward/tweaks 
Tweaks
 2013-06-05 09:23:25 -07:00
Paul Smith 44dea6ddfa Always make badge shortname the pk if available 
The various openbadger APIs don't always return shortname in the badge object
itself (sometimes, the shortname is a key to a badge object), but if we have
the shortname, it should be the badge's id.
 2013-06-05 12:16:24 -04:00
Chris McAvoy 9aeafa4b31 Merge pull request #449 from mgballard/master 
CSS Bug Fixes
 2013-06-05 08:58:44 -07:00
Chris McAvoy c20a750cd7 Merge pull request #452 from curlee/master 
About page copy implementation
 2013-06-05 08:57:15 -07:00
Joe Curlee 281c17d330 implemented about page lead. fixes #245 2013-06-05 10:35:56 -05:00
Paul Smith b8fb1f9093 Add illustration of criteria badges 2013-06-05 11:04:52 -04:00
Paul Smith 04005e0453 Use correct articles 2013-06-05 10:56:02 -04:00
Paul Smith 7e4743c0b7 Display STEAM letter badge for rec categories 
In the /myplaylist recommendations section, recommended badges are grouped by
STEAM category, and this change replaces the category name in the header with
the respective letter badge.
 2013-06-05 10:49:46 -04:00
Michael Ballard c7a474a54c move everything other than mobile out of media queries 2013-06-05 10:09:27 -04:00
Michael Ballard 63a9a00e1f fix stretch background on landing page 2013-06-05 09:50:20 -04:00
Paul Smith ee57862d3a Group recommendations by STEAM category 2013-06-05 09:45:26 -04:00