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

542 Коммитов

Автор SHA1 Сообщение Дата
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
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
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
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
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
Michael Ballard b2901df59b mobile version 2013-06-03 17:11:59 -04:00
Atul Varma 4318552e68 Merge pull request #385 from toolness/healthcheck 
Added /health_check endpoint, with health check at startup too.
 2013-06-03 13:52:32 -07:00
Atul Varma 4bf40a8222 Added /health_check endpoint, with health check at startup too. 
The health check ensures that s3, aestimia, openbadger, and MySQL
connections are all functional.

Currently the cookie secret is used as the password at /health_check but
we can change this later in app.js.
 2013-06-03 16:30:31 -04:00
Chris McAvoy 7632ee763f Merge pull request #380 from curlee/master 
badge recommendations
 2013-06-03 12:57:12 -07:00
Atul Varma ed45d73261 oops ... forgot about calling .end() on result of s3.get() for s3-fake. 2013-06-03 15:53:06 -04:00
Atul Varma df491ba015 added deleteFile() method to fake-s3. 2013-06-03 15:17:30 -04:00
Joe Curlee aa858c3a4b active class is now added to earn nav 2013-06-03 13:19:39 -05:00
Chris McAvoy 860e533fe5 Merge remote-tracking branch 'ballard/master' 2013-06-03 12:41:08 -05:00
Michael Ballard 2065c8908f open menu bug fix 2013-06-03 13:00:58 -04:00
Joe Curlee df234fb9a4 recommendations on opsingle badge page will not show if there are no recommendations 2013-06-03 11:49:07 -05:00
Joe Curlee 2d17e29287 removed console.log in openbadger.js 2013-06-03 11:44:55 -05:00
Joe Curlee 1ad88a55a2 removed commented out error callback 2013-06-03 11:44:29 -05:00
Joe Curlee 43638fa1db implemented related badges on badge detail page. added getBadgeRecommendations to openbadger api 2013-06-03 11:43:52 -05:00
Chris McAvoy 44b00abbfa Merge remote-tracking branch 'origin/master' into random-fixes 2013-06-03 10:44:53 -05:00
Chris McAvoy 5e9c0b7d72 Merge pull request #365 from paulsmith/mybadges 
[WIP] implement /mybadges part deux
 2013-06-03 08:43:53 -07:00
Chris McAvoy 0ec7e0ff1b Merge pull request #358 from andrewhayward/pagination 
Pagination
 2013-06-03 08:41:03 -07:00
Chris McAvoy e5e51a9ec2 Merge pull request #364 from andrewhayward/filtering 
Filtering badges and programs
 2013-06-03 08:39:39 -07:00
Chris McAvoy 1cd7516689 Merge pull request #366 from mgballard/master 
Landing page adjustments for new menu items
 2013-06-03 08:39:23 -07:00
Chris McAvoy 8e6a0f3494 Merge pull request #367 from andrewhayward/aestimia 
Fixing upload form accessibility
 2013-06-03 08:39:07 -07:00
Andrew Hayward b4f425d11f Rebuilding page number generation 2013-06-03 11:18:27 +01:00
Andrew Hayward 0024705249 Fixing 'running over' issue 2013-06-03 11:17:48 +01:00
Andrew Hayward 9a1d293512 Merge branch 'master' into pagination 2013-06-03 08:55:06 +01:00