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

255 Коммитов

Автор SHA1 Сообщение Дата
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
Joe Curlee 83910850df simplified logic to use default 2013-06-06 13:49:22 -05:00
Chris McAvoy 9ad976a4a4 Merge pull request #500 from curlee/master 
fixes for explore pages
 2013-06-06 10:06:08 -07:00
Joe Curlee 5823921205 fixed thumbnails on /explore fixes #484 2013-06-06 10:39:11 -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
Andrew Hayward 269061d885 Changing support email address in footer 
Resolves #445
 2013-06-06 13:26:23 +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
Joe Curlee ab715505d0 implemented copy for claim page. fixes #474 2013-06-05 15:43:45 -05:00
Paul Smith 71fe9c6782 Fix playlist button being hidden by badges in FF 2013-06-05 16:31:35 -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
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
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
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
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
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 ee57862d3a Group recommendations by STEAM category 2013-06-05 09:45:26 -04:00
Andrew Hayward f0b7e8e457 Removing 'about' from main nav 
Resolves #412
 2013-06-05 14:29:58 +01:00
Andrew Hayward a9279eae49 Fixing filter inputs 
Resolves #409
 2013-06-05 13:05:06 +01:00
Andrew Hayward e17a406ca6 Updating 'explore' page title 
Resolves #419 and #420
 2013-06-05 12:56:40 +01:00
Andrew Hayward 08188e00c2 Template/style tweaks 2013-06-05 12:08:30 +01:00
Paul Smith e7d220f2ae Merge in badge template de-duping 2013-06-05 00:28:14 -04:00
Paul Smith ff8751fc24 Deduplicate badge thumbnail markup 
This is an attempt to have a single badge thumbnail include that works in all
view contexts. There are currently some hacks and ideally there would be more
logic pushed back up into the controllers.
 2013-06-05 00:24:12 -04:00
Andrew Hayward 847b0c78e8 Template updates 2013-06-05 04:38:07 +01:00
Paul Smith 25d48d3692 Merge in from master 2013-06-04 22:26:40 -04:00
Paul Smith 8720ca969a Initial markup of recommended badges in playlist 2013-06-04 22:17:51 -04:00
Chris McAvoy e65e53b04f Merge pull request #369 from andrewhayward/guardians 
Guardian dashboard
 2013-06-04 15:31:54 -07:00
Chris McAvoy cf4c58237a Merge pull request #405 from stenington/about 
Add copy and embedded youtube video to about page
 2013-06-04 15:31:37 -07:00
Chris McAvoy baa8e8c124 Merge pull request #428 from curlee/master 
fixes for assigned tickets
 2013-06-04 15:29:55 -07:00
Joe Curlee 59d2cea1ce using name and link of real organization on program detail page. using fallback images for missing program detail page program image. fixes #355 and fixes #381 2013-06-04 16:01:22 -05:00
Andrew Hayward e353308741 Merge branch 'master' into guardians 
Conflicts:
	controllers/backpack.js
 2013-06-04 21:54:00 +01:00