Matthew Taylor
3d8f5eff82
Add tx config for camp page
2017-07-20 08:06:01 -04:00
Matthew Taylor
7d9b6fc5d8
Merge pull request #1415 from St19Galla/patch-2
...
Fix gh-1410: Correct "Tips" Page Link
2017-07-20 07:40:59 -04:00
Matthew Taylor
36583f0d04
Merge pull request #1416 from mewtaylor/issue/custom-rows-api
...
Move custom homepage row to new api endpoints
2017-07-19 17:19:27 -04:00
St19_Galla
9f47d504ec
Update l10n.json ( #1421 )
2017-07-19 15:42:16 -04:00
jwzimmer
b289c42120
Fix Gh-1385 - Issue/smoke test signing in ( #1411 )
...
* add tests for signing in and my stuff
* flesh out tests, reorganize a bit
* add more tests
* tests for my stuff & signing in
* fix some of the errors causing build to fail
* pass in credentials from commandline rather than uncommitted file
* switch root back to staging
* address pr review comments, rename username & password vars
* update testing readme
2017-07-19 12:58:50 -04:00
jwzimmer
06acfbb61c
Issue/gh 1371 update tests post tips navbar change ( #1412 )
...
* Update compatibility requirements to clarify support for ChromeOS
* update tests after changes to footer links and navbar
2017-07-19 12:58:14 -04:00
St19_Galla
43b8f0b38f
Down Deep - Scratch Camp 2017 Page ( #1409 )
...
* Add files via upload
* Create downdeep.jsx
* Delete downdeep.jsx
* Delete downdeep.scss
* Delete l10n.json
* Delete downdeep.jsx
* Create dd.jsx
* Rename dd.jsx to filler.jsx
* Add files via upload
* Delete dd.jsx
* Delete filler.jsx
* Create filler.jsx
* Add files via upload
* Delete filler.jsx
* Update routes.json
* whoops
* travis
* Update downdeep.jsx
* Update downdeep.scss
* Update downdeep.scss
* Update _colors.scss
* what i get for rushing
* Update downdeep.jsx
* Update l10n.json
* thisandagain's changes
* Carl's Changes
* carl's changes
* carl's changes
* Update downdeep.jsx
* Rename downdeep.jsx to camp.jsx
* Rename downdeep.scss to camp.scss
* Rename src/views/downdeep/camp.jsx to src/views/camp/camp.jsx
* Rename src/views/downdeep/camp.scss to src/views/camp/camp.scss
* Rename src/views/downdeep/l10n.json to src/views/camp/l10n.json
* Update camp.jsx
* Add files via upload
* Update camp.jsx
* Update camp.scss
* Update l10n.json
* Create filler
* Add files via upload
* Delete bubbles.svg
* Delete dolphin.svg
* Delete fish-divider.svg
* Delete fish-divider2.svg
* Delete map.svg
* Delete ocean-bottom.svg
* Delete ocean-top.svg
* Delete treasure.svg
* Update camp.scss
* Update camp.scss
* Update camp.scss
* Update camp.jsx
* whoops
* Update camp.scss
* Update l10n.json
* Update camp.scss
* Update camp.jsx
* Update _colors.scss
* Update camp.scss
* Update camp.scss
* Update camp.scss
* Update camp.scss
* Update _colors.scss
* Update camp.scss
* Update camp.scss
2017-07-19 11:48:29 -04:00
Matthew Taylor
36dc8283b8
move projects loved by following to new api endpoint
2017-07-19 11:25:39 -04:00
chrisgarrity
9bf5a8e6c2
Merge pull request #1418 from chrisgarrity/issue/gh1362-obsolete-strings
...
remove obsolete strings
2017-07-18 09:18:42 -04:00
Matthew Taylor
753a3e1eed
Split splash into container/presentation component
...
This does a bit of upkeep based on recs from @rschamp that:
1. Splits splash into container/presentation components
2. Updates the default project count to 20 million
3. makes the api calls that get info from the api take in arguments rather than use the session
4. Updates `MapStateToProps` to be more specific in what it uses beyond just `session` and `permissions`
Thanks @rschamp!
2017-07-17 12:19:49 -04:00
chrisgarrity
4cc353ab43
remove obsolete strings
...
‘Help’ and ‘Discuss’ are not needed now that they’ve been replaced with the Tips page.
Fixes #1362
2017-07-17 10:14:32 -04:00
Ray Schamp
3f90e98593
Merge pull request #1413 from rschamp/hotfix/rip-smartystreets
...
[Master] Remove SmartyStreets API
2017-07-13 16:32:51 -04:00
Matthew Taylor
8c94a04e77
Move custom homepage row to new api endpoints
...
This goes along with https://github.com/LLK/scratch-api/pull/292 . This can be updated if we choose to migrate the `lovedByFollowing` endpoint off of proxy as well.
2017-07-13 15:35:18 -04:00
St19_Galla
093d8f4eb3
Update tips.jsx
2017-07-13 12:48:18 -04:00
Ray Schamp
02b36ab9f3
Merge pull request #1414 from rschamp/hotfix/rip-smartystreets
...
[Develop] Remove SmartyStreets API
2017-07-13 10:52:58 -04:00
Ray Schamp
84a37a671f
Remove SmartyStreets API
...
We are so lax with this that it's not actually helping us, and we don't have a plan with them anymore.
2017-07-13 10:44:50 -04:00
Matthew Taylor
03785b78f6
Merge pull request #1406 from TheGrits/patch-3
...
Fix gh-1382: Centre Align Note
2017-07-13 10:38:04 -04:00
Matthew Taylor
71e702b002
Merge pull request #1407 from TheGrits/patch-4
...
Fix gh-1399: Misplaced Periods Fix
2017-07-13 09:48:16 -04:00
The_Grits
6533b5b50a
Misplaced Periods Fix
2017-07-10 19:49:13 -04:00
The_Grits
c5f6619947
Fix gh-1382: Centre Align Note
2017-07-07 20:17:03 -04:00
Andrew Sliwinski
d705272341
Merge pull request #1402 from TheGrits/patch-3
...
Fix gh-1397: Update Supporting Organizations
2017-07-07 19:45:28 -04:00
Andrew Sliwinski
78940b1e2f
Merge pull request #1405 from TheGrits/patch-4
...
Fix gh-1404: Add Junior Designer Position
2017-07-07 19:43:47 -04:00
The_Grits
a9ba27ef97
Fix gh-1404: Add Junior Designer
2017-07-07 19:34:55 -04:00
The_Grits
a3714e5348
Add transifex remove pootle
2017-07-06 23:06:23 -04:00
chrisgarrity
61d65a00a5
Merge pull request #1398 from chrisgarrity/issue/gh1396-missing-tag
...
Add missing closing tag for PDF Guide
2017-07-06 14:41:27 -04:00
chrisgarrity
24bfc18487
Add missing closing tag for PDF Guide
2017-07-05 13:42:20 -04:00
Matthew Taylor
716d332907
Merge pull request #1394 from LLK/release/2.2.22
...
[Develop] Release 2.2.22
2017-07-05 10:23:04 -04:00
Matthew Taylor
c8afebfa6d
Merge pull request #1395 from LLK/release/2.2.22
...
[Master] Release 2.2.22
2017-07-05 10:12:51 -04:00
chrisgarrity
91b1784e33
Merge pull request #1392 from chrisgarrity/remove-alias-caret
...
Remove unnecessary ‘^’ from routeAliases
2017-06-29 16:38:19 -04:00
chrisgarrity
ced9339fb6
Remove unnecessary ‘^’ from routeAliases
2017-06-29 15:30:26 -04:00
chrisgarrity
89a8c3fc55
Merge pull request #1391 from chrisgarrity/issue/redirect-routes
...
update /help and /info routes
2017-06-29 14:54:47 -04:00
chrisgarrity
ece3d4a1f9
update /help and /info routes
2017-06-29 14:42:17 -04:00
Matthew Taylor
7a44be5e5b
Merge pull request #1389 from TheGrits/patch-3
...
Fix gh-1388: Help -> Tips on FAQ Page
2017-06-29 09:58:17 -04:00
chrisgarrity
f1cfeeca81
Merge pull request #1390 from chrisgarrity/issue/gh1387
...
Add /info redirect
2017-06-29 07:33:07 -04:00
chrisgarrity
ed056701c4
Add /info redirect
2017-06-28 17:25:36 -04:00
The_Grits
5570632ed3
Help -> Tips
2017-06-28 16:54:42 -04:00
chrisgarrity
0672ba0e05
Merge pull request #1383 from chrisgarrity/issue/windows7-icon
...
Fix blocks icon for windows
2017-06-28 10:18:00 -04:00
chrisgarrity
f7345c443d
Fix blocks icon for windows
...
Note for future reference - set the size for SVGs with height not width if using rem.
IE on Windows 7 doesn’t resize correctly if the width is set with rem. Height works with rem, and exact pixel width works, but that should be avoided.
2017-06-28 09:32:08 -04:00
chrisgarrity
a712a8d28a
Fix typo in tutorial URL ( #1377 )
...
Getting started tutorial link started with `//` instead of just `/`., and typo in downloading
2017-06-27 16:33:57 -04:00
chrisgarrity
022d2dd506
FIx layout problems ( #1380 )
...
* removed white-space: no wrap to let buttons flow in Cards section
* Fix download link (download should be part of the link)
* Set the size of the icons to fix alignment
2017-06-27 16:27:07 -04:00
Andrew Sliwinski
d2353075b1
Merge pull request #1368 from LLK/hotfix/chromeos
...
Update compatibility requirements to clarify support for ChromeOS
2017-06-26 11:19:38 -04:00
Matthew Taylor
970db19b44
Merge pull request #1370 from mewtaylor/issue/r2-4571
...
Add `/store` to footer
2017-06-26 10:48:24 -04:00
Matthew Taylor
b22aaa8465
Add /store to footer
2017-06-26 10:35:29 -04:00
Andrew Sliwinski
16691792b7
Merge pull request #1369 from LLK/bugfix/chromeos
...
Update compatibility requirements to clarify support for ChromeOS
2017-06-26 09:48:33 -04:00
Andrew Sliwinski
a16a189a7f
Update compatibility requirements to clarify support for ChromeOS
2017-06-26 09:42:56 -04:00
Andrew Sliwinski
c7fcec4f54
Update compatibility requirements to clarify support for ChromeOS
2017-06-26 09:29:52 -04:00
Matthew Taylor
df2b7fd7df
Merge pull request #1367 from mewtaylor/issue/gh-1364
...
Fix GH-1364: Change `help` to `tips` in footer
2017-06-23 16:39:19 -04:00
chrisgarrity
6469ac3362
Simplify /help redirect pattern ( #1366 )
...
Restrict /help redirect to just `/help` or `/help/`. Anything else following help should get handled by scratchr2.
2017-06-23 12:02:15 -04:00
Matthew Taylor
c1e5c7cb03
Change help to tips in footer
...
Fixes #1364
2017-06-23 11:55:43 -04:00
chrisgarrity
39b1400705
Handle /help redirect ( #1363 )
2017-06-23 10:28:34 -04:00
