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

690 Коммитов

Автор SHA1 Сообщение Дата
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
Paul Smith 7305fe3566 Initial /myplaylist view 2013-06-04 11:54:10 -04:00
Mike Larsson 9a5a9e550b Changing support email address 2013-06-04 11:53:14 -04:00
Paul Smith 4c1e4229db Favorites middleware creates list of fav'd badges 
This changes the favorites middleware to, in addition to adding a "favd" flag
property on each user's badge, add a list of the user's favorited badges to
the `req' object.
 2013-06-04 11:52:46 -04:00
Paul Smith c7a5560290 Minor refactor 2013-06-04 11:29:45 -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
Paul Smith f22c9940e9 Move favorited status/button to badge thumbnail 2013-06-04 10:24:24 -04:00
Paul Smith 0eb491291c Fix bug in favorites middleware with async 
This also renames the flag on the badge from "favorited" to "favd"
 2013-06-04 09:24:32 -04:00
Andrew Hayward 9a0c260ade Refactoring 2013-06-04 13:54:03 +01:00
Paul Smith e75385b4a9 Merge in from master 2013-06-04 08:37:44 -04: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
Michael Ballard 40b47a0bd3 menu font adjustment 2013-06-04 00:21:43 -04:00
Michael Ballard 0eb0f7e07d mobile bug fixes plus sliding menu 2013-06-04 00:16:43 -04:00
Ian Dees b82af27e78 Add a /myapplications/:id endpoint. 2013-06-04 02:58:16 +00:00
Atul Varma e7d5bc57ae Health check subsystems can provide richer data about their status. 
Specifically, if they set a 'notes' property on their metadata object,
it will be displayed in the console version of their results, for
easier debugging.
 2013-06-03 22:18:28 -04:00
Andrew Hayward afcb9b6145 Badge awarding 2013-06-04 03:04:12 +01:00
Ian Dees 360232bab7 Merge remote-tracking branch 'upstream/master' into myapplications 
Conflicts:
	controllers/backpack.js
 2013-06-04 01:57:02 +00:00
Atul Varma 474ad3ca7c Fake S3/email can only be used when NODE_ENV=development. 
Also show a warning message if NODE_ENV is unset, and cleaned up README.md
a bit.
 2013-06-03 21:32:23 -04:00
Andrew Hayward be803b5cdd Minor badge template updates 2013-06-04 01:52:59 +01:00
Atul Varma 26b71fd3ff Merge remote-tracking branch 'erik/mandrill-health-monitor' 2013-06-03 20:44:57 -04:00
Atul Varma 69ac993655 Changed database healthcheck to use mysql module instead of sequelize. 
sequelize is really confusing and the healthcheck seems to be failing
on staging with "undefined is not a function". Hopefully just using
mysql and executing SHOW TABLES as a connection test will fix this.
 2013-06-03 20:41:10 -04:00
Andrew Hayward ab9cb3b7f8 Merge branch 'master' into guardians 
Conflicts:
	openbadger.js
 2013-06-04 01:33:32 +01:00
Andrew Hayward 38030f0935 Allow/deny applications 2013-06-04 01:31:40 +01:00
Andrew Hayward 5d2fd41201 Template updates 2013-06-04 01:03:44 +01:00
Erik Christensen c3ad019bf0 Fixed request.post being overwritten globally, added mandrill health check 2013-06-03 16:42:13 -07:00
Atul Varma 0086d01eee No crashing the server if startup healthcheck fails. 2013-06-03 19:07:41 -04:00
Atul Varma 2345c13415 updated package.json version to latest tag, 0.9.13. 2013-06-03 19:07:38 -04:00
Atul Varma ec4b9ce536 No more killing the server at startup if healthcheck fails. 
However, we do print a big red message telling anyone watching that
things are seriously messed up.
 2013-06-03 18:56:00 -04:00
Michael Ballard 8ffc028bfa mobile header fix 2013-06-03 18:28:18 -04:00
Michael Ballard 21e063ac8e mobile header fix 2013-06-03 18:28:10 -04:00
Chris McAvoy d25d41eb8c Merge remote-tracking branch 'ballard/master' 2013-06-03 16:48:13 -05:00
Michael Ballard aef1da2726 padding fix, grid overrides :'( - must have a convo about whether fixed/fluid, bootstrap/less, etc. 2013-06-03 17:42:38 -04:00
Michael Ballard be84537d57 Merge branch 'master' of https://github.com/mgballard/CSOL-site 
Conflicts:
	static/media/less/core.less
 2013-06-03 17:19:00 -04:00