Matthew Taylor
e9f7748fdf
Merge pull request #1243 from TheGrits/patch-4
...
Fix gh-1242: Update Credits Page
2017-03-16 11:57:11 -04:00
Matthew Taylor
0bb60700ba
Merge pull request #1244 from mewtaylor/issue/opt-in
...
[Develop] Hotfix: re-add checkbox to opt-in to email list for teacher
2017-03-15 10:15:16 -04:00
Matthew Taylor
63c6bf59f2
Merge pull request #1149 from mewtaylor/issue/r2-4092
...
For R2-4092: Add checkbox to opt-in to teacher emails
2017-03-15 10:08:35 -04:00
The_Grits
c45663e966
Add Juanita Buitrago to Previous Members
2017-03-13 17:09:08 -04:00
The_Grits
f1880e47d5
Remove Juanita Buitrago
2017-03-13 17:08:39 -04:00
The_Grits
7e9a6ef410
Add, remove, and resort! (2)
2017-03-13 16:17:12 -04:00
The_Grits
b5cebffe11
Add, remove, resort!
2017-03-13 16:06:37 -04:00
Matthew Taylor
1b4c14b333
Exit on error in translation building
...
thanks @chrisgarrity !
2017-03-13 11:51:31 -04:00
Matthew Taylor
5ca880d16a
still iterate over languages for views without l10n
...
Fixes #1199 by continuing the iteration over languages even if a view doesn’t have an l10n file. The issue was that only the `en` language object was getting added when the view didn’t have an l10n file, because of the `hasOwnProperty` check. This adjusts it to iterate over languages anyways, and only ouput the `No translations for…` message if it’s for a language of a view that does have an l10n file.
2017-03-13 10:00:30 -04:00
The_Grits
715b05fbdf
whoops
...
12th not 15th
2017-03-08 18:20:28 -05:00
The_Grits
1794b30079
Update dates
...
Costa Rica dates were updated, plus fixed a gotcha with the China dates
2017-03-08 18:18:22 -05:00
Matthew Taylor
5634e993e9
Merge pull request #1237 from TheGrits/patch-3
...
Fix gh-1232: Footer Links space-between
2017-03-07 10:14:16 -05:00
chrisgarrity
91af38b8f0
Fixed Sardinian ( #1236 )
...
Added sc to custom-locales with parent Italian (it).
2017-03-07 09:41:11 -05:00
The_Grits
86b5e462c6
Between, not Around
2017-03-06 16:34:21 -05:00
Matthew Taylor
f76707381a
Merge pull request #1235 from TheGrits/patch-3
...
Fix gh-1234: Update China Conference
2017-03-06 11:10:03 -05:00
Matthew Taylor
56bf384459
Merge pull request #1233 from mewtaylor/issue/max-chars
...
Match `routeAlias` with that of `/jobs` route
2017-03-06 10:23:44 -05:00
Matthew Taylor
8d2a43530e
Merge pull request #1205 from TheGrits/patch-2
...
Fix gh-1183: Remove slashes
2017-03-06 10:11:43 -05:00
The_Grits
46a3cea40c
Fix gh-1234: Update China Conference
2017-03-02 22:14:26 -05:00
Matthew Taylor
2954d0916b
match routeAlias with that of /jobs route
...
this `routeAlias` is being added as it’s own path pattern since it’s not matching the other one, causing us to hit our 512 char limit.
2017-02-28 09:55:16 -05:00
Matthew Taylor
a170aec6d2
Merge pull request #1220 from TheGrits/patch-4
...
Fix gh-1218: Community Moderator Page
2017-02-28 09:38:44 -05:00
The_Grits
82af7786a0
Put back some slashes
2017-02-28 09:38:43 -05:00
The_Grits
c26e42f715
Change parenthesis
2017-02-28 09:34:20 -05:00
The_Grits
8772ab5605
Fix jobs-moderator route
2017-02-28 09:33:18 -05:00
Matthew Taylor
184947d3d9
Merge pull request #1215 from TheGrits/patch-3
...
Fix gh-1214: Lowercase F in Family
2017-02-24 13:40:53 -05:00
Ray Schamp
4e67f95577
Merge pull request #1229 from LLK/release/2.2.18
...
[Develop] Release 2.2.18
2017-02-24 12:05:06 -05:00
Matthew Taylor
becae19f6f
Merge pull request #1221 from LLK/release/2.2.18
...
[Master] Release 2.2.18
2017-02-24 11:51:51 -05:00
Matthew Taylor
35490386d6
Merge pull request #1226 from mewtaylor/issue/gh-translations
...
Use `scratchr2_translations` for language files
2017-02-24 08:53:02 -05:00
Matthew Taylor
4621b25ed8
remove transifex module
...
no longer use this, since we removed our dependency on pulling translations from transifex during builds
2017-02-24 08:41:17 -05:00
Matthew Taylor
37fae8fe86
Merge pull request #1225 from chrisgarrity/add-new-activity-guides
...
Add Guide PDFs for new activities
2017-02-24 07:59:58 -05:00
Matthew Taylor
0912fca5f2
Use scratchr2_translations for language files
...
Adjusts the translation system to go back to using a github repo to store snapshots of transltions, but continues to use new `.json` formatted files
2017-02-24 07:58:50 -05:00
chrisgarrity
d94349b8d2
Add Guide PDFs for new activities
2017-02-23 16:21:19 -05:00
Ray Schamp
828ace9a1f
Merge pull request #1223 from TheGrits/patch-5
...
Fix gh-1222: One 24 Hours More
2017-02-23 15:24:11 -05:00
The_Grits
55f94eb19c
24 hours => one day
...
zap!
2017-02-23 15:14:03 -05:00
The_Grits
b01c8a44e0
/jobs route
...
R is for route and that's good enough for me
2017-02-23 12:47:42 -05:00
The_Grits
1ac7cd4b79
Bump Path
2017-02-23 12:29:23 -05:00
The_Grits
5eed0fe430
Remove sharing links
2017-02-23 12:14:40 -05:00
The_Grits
90aaf6140f
Remove Back-End Engineer
2017-02-23 11:54:38 -05:00
The_Grits
9a11c04cd2
Add Community Moderator Page
2017-02-23 11:53:29 -05:00
The_Grits
39ceaa2f33
Add Community Moderator
2017-02-23 11:12:18 -05:00
Matthew Taylor
8516c3a361
Merge pull request #1219 from mewtaylor/issue/gh-1196-follow-up
...
GH-1196 Follow Up: Update `otherDisabled` check
2017-02-23 11:02:35 -05:00
Matthew Taylor
eb56b27a88
Update otherDisabled check
...
Fall out from #1217 . We should likely change the way this is set up, it seems not ideal. But not sure the best way atm.
2017-02-23 10:57:27 -05:00
Matthew Taylor
abcb92243b
Merge pull request #1217 from mewtaylor/issue/gh-1196
...
Fix GH-1196: Don’t localize an empty string
2017-02-23 09:58:59 -05:00
Matthew Taylor
f59774bd0d
Don’t localize an empty string
2017-02-23 09:52:33 -05:00
Matthew Taylor
df88daea36
Merge pull request #1216 from mewtaylor/issue/conference-tweaks
...
Some additional tweaks for conference 2017
2017-02-23 09:50:34 -05:00
Matthew Taylor
7a2e7cc949
Some additional tweaks for conference 2017
...
1. Updates svgs for formatting
2. Makes the font size of the title smaller
Fixes #1211 , 5-6 in #1206
2017-02-23 09:39:57 -05:00
The_Grits
4f2768e7f2
Lowercase F in Family
...
Fixes #1214
2017-02-22 21:28:15 -05:00
Matthew Taylor
efa00b95db
Merge pull request #1212 from mewtaylor/issue/svg-ie11
...
Fix GH-1208: add height to svg
2017-02-22 16:46:38 -05:00
Matthew Taylor
e13fa6dc4b
add height to svg
...
needed by ie11 to render correctly. fixes #1208
2017-02-22 16:37:57 -05:00
The_Grits
f7d9086296
credits typo
...
Should fix #1201
2017-02-22 11:14:32 -05:00
The_Grits
e0a81c50c3
Lowercase P
...
Should fix #1202
2017-02-22 11:14:26 -05:00
