Commit graph

544 commits

Author SHA1 Message Date
Andrew Sliwinski
80dcc08416 Merge pull request #371 from thisandagain/feature/node
Swap environments for CD
2016-03-03 11:54:14 -05:00
Andrew Sliwinski
f23ada9264 Swap environments for CD. Resolves GH-351 2016-03-03 09:57:41 -05:00
Andrew Sliwinski
14e28739bc Merge pull request #370 from thisandagain/feature/node
Prepare for migration to Node 4.2 LTS
2016-03-02 11:38:49 -05:00
Andrew Sliwinski
834327a96a Patch GCC for travis image for Node 4.X. Re GH-351 2016-03-02 11:17:19 -05:00
Andrew Sliwinski
9cbe1c8498 Update devDependencies and remove redundant / unused modules. Re GH-351 2016-03-02 10:14:05 -05:00
Andrew Sliwinski
5ae65979dd Update dependencies. Re GH-351 2016-03-02 10:03:22 -05:00
Andrew Sliwinski
7faf2aa8c2 Update travis to use Node 4.2.X LTS. Re GH-351 2016-03-02 10:01:08 -05:00
Matthew Taylor
0ac9f5edc5 Merge pull request #359 from TheGrits/patch-2
Fix gh-357: Splash - Initial value of project count is arbitrary
2016-02-23 11:43:26 -05:00
Matthew Taylor
9dc4195bbf add key again 2016-02-23 08:48:19 -05:00
Matthew Taylor
ab6bdfbd6a Add new keys 2016-02-23 08:39:44 -05:00
Matthew Taylor
e294b68b77 Revert "Attempt to fix travis deployment"
This reverts commit 7488715b9a.
2016-02-22 09:07:25 -05:00
Matthew Taylor
4a1362b434 Merge pull request #364 from mewtaylor/issue/gh-358-travis-badge
Fix GH-358: Add new travis badge to readme
2016-02-19 08:20:48 -05:00
Matthew Taylor
7488715b9a Attempt to fix travis deployment
It seems to not like underscores anymore.
2016-02-18 15:54:03 -05:00
Matthew Taylor
c596765b51 Merge pull request #361 from TheGrits/patch-1
Fix travis build fail
2016-02-18 15:29:02 -05:00
Matthew Taylor
1d2fa70e4e Add new travis badge to readme
Fixes #358
2016-02-18 15:16:49 -05:00
The_Grits
8d05ed84b4 singlequotes
Apparently double quotes don't work
2016-02-18 14:34:02 -05:00
The_Grits
9f2325bd83 "over 13 million"
Changed as per @mewtaylor's suggestion
2016-02-18 14:29:58 -05:00
The_Grits
7992c43b87 Update credits.jsx
Travis was complaining that link 188 had over 120 characters, this should fix it.
2016-02-12 07:37:25 -05:00
Matthew Taylor
212a2d2c41 Merge pull request #352 from technoboy10/gh333-creditspage
Fix gh-333: Add/Remove Moderators on Credits Page
2016-02-10 22:51:54 -05:00
Matthew Taylor
b961891e66 Merge pull request #355 from TheGrits/patch-1
Fix gh-354: 'Supported Organizations' in credits overflows
2016-02-10 22:51:05 -05:00
Matthew Taylor
8884bcae7a Merge pull request #360 from technoboy10/gh300-scrollbar-fix
Fix gh-300: Horizontal Scroll Bar Shows on Front Page
2016-02-10 22:23:16 -05:00
Technoboy10
a4c24b2c6c oops 2016-02-09 08:19:29 -07:00
Technoboy10
2666975508 removed padding 2016-02-09 08:14:59 -07:00
The_Grits
91f3de0682 link formatting in paragraphs 2016-02-08 14:50:56 -05:00
Technoboy10
f99472afe1 fixed horizontal scrollbar 2016-02-08 10:08:32 -07:00
The_Grits
53cf85a4c2 Update project count
Updated the number with a more recent number, I wasn't sure if using a string like "Loading..." would damage anything.
2016-02-08 10:04:38 -05:00
The_Grits
3939dde44e Update credits.scss 2016-02-08 08:10:41 -05:00
The_Grits
2a6f30cdb7 word-wrap for p elements
Should fix #354, I'll test on a local machine.
2016-02-05 07:59:09 -05:00
Technoboy10
e1b9cf5716 Removed Megan Haddadi, added Linda and Lily 2016-02-03 08:36:05 -07:00
Andrew Sliwinski
faa00982fd Merge pull request #349 from thisandagain/feature/oss
Update license and add trademark notice
2016-01-31 17:55:47 -05:00
Andrew Sliwinski
c76533bf38 Update license and add trademark notice 2016-01-31 13:07:21 -05:00
Ray Schamp
cc48811e8f Merge pull request #348 from rschamp/feature/documentation-revision
Revise focus of CONTRIBUTING, README
2016-01-29 15:50:02 -05:00
Ray Schamp
755e24f7ad Merge pull request #343 from LLK/release/2.2.5
Release/2.2.5 (develop)
2016-01-29 15:48:10 -05:00
Ray Schamp
0603b3b9df Merge pull request #346 from rschamp/bugfix/GH-3329
Fix GH-345: Make carousel not so tall
2016-01-29 15:26:10 -05:00
Ray Schamp
fd584b1d67 Heed some SCSS warnings 2016-01-29 15:22:06 -05:00
Ray Schamp
f90198d7c3 Fix tall carousel
I am mystified by how this changed. But this fixes #345.
2016-01-29 15:22:02 -05:00
Ray Schamp
72e08d5b9a Revise focus of CONTRIBUTING, README
Introduce the repo in README, and point people to guidelines more quickly in CONTRIBUTING, since that is linked to from the pages for new issues and new pull requests
2016-01-28 13:07:58 -05:00
Matthew Taylor
43b39feb5e Merge pull request #340 from mewtaylor/issue/gh-337-accessibility
Fix issue GH-337: accessibility
2016-01-28 06:35:55 -05:00
Ray Schamp
15c11acaf3 Merge pull request #334 from rschamp/feature/deploy-hotfix-release-branches
Deploy hotfix and release branches to staging
2016-01-25 09:34:38 -05:00
Matthew Taylor
c46e42e83c fix test 2016-01-25 09:07:55 -05:00
Matthew Taylor
581f071c0e Add missing alt tags 2016-01-25 08:30:10 -05:00
Ray Schamp
478fb499a7 Deploy hotfix and release branches to staging 2016-01-22 11:55:49 -05:00
Matthew Taylor
75ea8a7304 Merge pull request #329 from mewtaylor/bugfix/localize-nonlocalized-views
Add general localizations to nonlocalized pages
2016-01-22 10:25:09 -05:00
Matthew Taylor
1ad1380eff simplify to one loop
thanks @rschamp!
2016-01-22 10:16:18 -05:00
Matthew Taylor
73875552a0 Merge pull request #330 from mewtaylor/issue/gh-322-typeerror
Fix GH-322: surround redirect check in try/catch
2016-01-20 15:56:43 -05:00
Matthew Taylor
41c23f76c0 Get rid of superfluous checks
thanks @rschamp!
2016-01-20 14:01:51 -05:00
Matthew Taylor
e85563c96e surround redirect check in try/catch
based on the suggestion by @rschamp!
2016-01-20 08:36:05 -05:00
Matthew Taylor
2e79a5aa6b Merge pull request #323 from mewtaylor/bugfix/readme-update
Added some more documentation
2016-01-19 16:11:49 -05:00
Matthew Taylor
5858bb94bb Added a bit more info on what csrf does
Thanks @rschamp for the suggestion!
2016-01-19 16:04:08 -05:00
Matthew Taylor
a0d92dacfc Add general localizations to nonlocalized pages
For nav/footer purposes.
2016-01-19 15:52:42 -05:00