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

606 Коммитов

Автор SHA1 Сообщение Дата
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
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
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
Joe Curlee 281c17d330 implemented about page lead. fixes #245 2013-06-05 10:35:56 -05: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 7a3fbf818b Merge pull request #427 from mgballard/master 
Today's bug fixes
 2013-06-04 15:31:20 -07:00
Chris McAvoy baa8e8c124 Merge pull request #428 from curlee/master 
fixes for assigned tickets
 2013-06-04 15:29:55 -07:00
Michael Ballard 6d82b88987 Replace MacArthur footer image 2013-06-04 17:25:51 -04:00
Michael Ballard d4eaa34f44 blue background and margin atop filter 2013-06-04 17:09:57 -04: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
Michael Ballard 0d9484b5a6 icon filter fix (activity and type) 2013-06-04 16:44:42 -04:00
Joe Curlee ebaeaccd9d applied copy as per #424 2013-06-04 15:29:52 -05:00
Mike Larsson 5f3a560379 Get rid of gaps in about page org listing for modern browsers 2013-06-04 15:53:09 -04:00
Mike Larsson a040fd1156 Move list-style css up to ul 2013-06-04 15:53:08 -04:00
Mike Larsson 6cc4013a36 Add copy and embedded youtube video to about page 2013-06-04 15:53:08 -04:00
Brian J Brennan 23d5b6cfa5 Navigation should be lettercase. 2013-06-04 15:27:39 -04:00
Chris McAvoy 49c2dab808 Merge pull request #418 from curlee/master 
fixes for assigned tickets
 2013-06-04 12:25:31 -07:00
Chris McAvoy 9ddd00afaf Merge pull request #377 from stenington/faq 
FAQ page
 2013-06-04 12:22:45 -07:00
Chris McAvoy 10d1afd78f Merge pull request #396 from andrewhayward/aestimia 
Badge awarding
 2013-06-04 12:22:21 -07:00
Brian J Brennan b4164d98f1 Merge pull request #407 from mgballard/master 
Miscellaneous bugs per @iamjessklein
 2013-06-04 12:21:43 -07:00
Chris McAvoy 346cdde9f6 Merge remote-tracking branch 'origin/master' 2013-06-04 14:18:50 -05:00
Brian J Brennan 3beab786f2 Specify right version of nunjucks. 2013-06-04 15:17:44 -04:00
Ian Dees 5d11dcd0f1 Filter out the accepted applications. 2013-06-04 19:03:35 +00:00
Joe Curlee f6eca5fc52 changed badges header to reflect earnable badges being displayed on explore detail page. fixes #189 2013-06-04 12:56:40 -05:00
Michael Ballard 21ff952cfa periods added to ends of sentences and org becomes organizational 2013-06-04 13:05:53 -04:00
Michael Ballard 7f6cd7acf8 Capitalize "J"oin the conversation... on landing page 2013-06-04 12:59:45 -04:00
Michael Ballard 64bfc1027c bolder calls to action on landing page 2013-06-04 12:58:32 -04:00
Michael Ballard 6dec956e43 ...in a new window (obviously). 2013-06-04 12:54:31 -04:00
Michael Ballard 146038719f facebook link on landing page 2013-06-04 12:52:48 -04:00
Mike Larsson 396c562a6b Achieve 1, 2a, 2b numbering with CSS counters 2013-06-04 12:50:41 -04:00
Joe Curlee d0dd39659d limited badge recommendations on badge detail page to 4. fixes #383 2013-06-04 11:45:46 -05:00
Mike Larsson 241bdc50ff CONSISTENT ALL THE </p>S 2013-06-04 12:06:08 -04:00
Mike Larsson a566c2574d Add embedded youtube video to faq page 2013-06-04 12:01:24 -04:00
Mike Larsson 9a5a9e550b Changing support email address 2013-06-04 11:53:14 -04:00
Mike Larsson fa236bd1b8 Adding just a few styles to improve the FAQ page 2013-06-04 11:18:25 -04:00
Mike Larsson 79421f6dc6 Basic FAQ content 2013-06-04 11:17:23 -04:00
Andrew Hayward 9a0c260ade Refactoring 2013-06-04 13:54:03 +01:00
Chris McAvoy b0f45d4754 Merge pull request #390 from mgballard/master 
Bug fixes, collapsible mobile menu, filter icons
 2013-06-04 05:07:28 -07:00
Chris McAvoy 56cc338684 Merge pull request #394 from andrewhayward/badges 
Minor badge template updates
 2013-06-04 05:07:06 -07:00
Andrew Hayward be070bddc3 Merge branch 'master' into guardians 
Conflicts:
	openbadger.js
 2013-06-04 12:43:15 +01:00
Michael Ballard 033c2f5035 recompressed footer logos, added icons to filters 2013-06-04 02:10:57 -04:00
Michael Ballard cc839795dd Open Sans all around 2013-06-04 00:50:28 -04:00
Michael Ballard bc6596db27 Remove extraneous CSS and remove active menu item border 2013-06-04 00:45:26 -04:00
Michael Ballard 939ecf6a17 show mobile menu only after rearranging 2013-06-04 00:39:08 -04:00
Ian Dees 616ae82b54 Give /myapplications/:id a page and include a style for the application state. 2013-06-04 04:22:20 +00:00