chrisgarrity
|
ea6de54104
|
[WIP]: embed GUI in a preview page
|
2018-02-21 14:39:21 -05:00 |
|
chrisgarrity
|
1d42674651
|
Conference March 1 update
- Add buttons that link to conference registration
- Updated FAQ copy
|
2018-02-21 11:19:13 -05:00 |
|
Andrew Sliwinski
|
2c30faef09
|
Merge pull request #1809 from ktrvs/ktrvs-press-link-update
Fixes #1808 | Updates scratch press link to point to Scratch Foundation Media Kit.
|
2018-02-19 08:50:05 -05:00 |
|
jwzimmer
|
6db990ff06
|
Update footer link for wiki
|
2018-02-18 09:59:35 -05:00 |
|
Kerr Travers
|
2d98faf160
|
Update footer.jsx
|
2018-02-14 16:32:24 +00:00 |
|
LiFaytheGoblin
|
71196886ad
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2018-02-14 11:33:36 +01:00 |
|
Ray Schamp
|
a409894816
|
Merge pull request #1807 from LLK/release/2.2.27-jan
[Master] January 2018 Release
|
2018-02-13 10:50:03 -05:00 |
|
Ray Schamp
|
788d24b0f0
|
Merge pull request #1806 from LLK/release/2.2.27-jan
[Develop] January 2018 Release
|
2018-02-13 10:49:55 -05:00 |
|
Ray Schamp
|
f7364d6782
|
Merge pull request #1805 from rschamp/add-fullstack
Add Full Stack Engineer job post
|
2018-02-12 13:36:46 -05:00 |
|
Ray Schamp
|
2617dc95d1
|
Add Full Stack Engineer job post
Also reorder existing posts to be alphabetical
|
2018-02-12 13:33:20 -05:00 |
|
Ray Schamp
|
6eacece227
|
Merge pull request #1403 from carlflor/issue/gh1400-load-more-button-behavior
Fix gh-1400: Button Behavior for Search Result State
|
2018-02-12 13:28:34 -05:00 |
|
Ray Schamp
|
c6f7681197
|
Fix merge issues
|
2018-02-12 09:26:39 -05:00 |
|
Andrew Sun͈̮
|
a66a0f02e5
|
lint?
|
2018-02-08 12:01:07 -05:00 |
|
Andrew Sun͈̮
|
f392678174
|
Don't run UglifyJS unless it's a production build
|
2018-02-08 11:08:15 -05:00 |
|
Ray Schamp
|
5513b6a7e9
|
Merge branch 'develop' of github.com:LLK/scratch-www into issue/gh1400-load-more-button-behavior
# Conflicts:
# src/views/search/search.jsx
|
2018-02-08 10:42:04 -05:00 |
|
Ray Schamp
|
8f4bc64154
|
Merge pull request #1689 from as-com/eval-devtool
Don't use eval devtool in production
|
2018-02-08 10:19:27 -05:00 |
|
chrisgarrity
|
5010e47edf
|
Merge pull request #1802 from LLK/hotfix/conf2018-feb-master
[MASTER] Hotfix Conference 2018 (Feb 6) - close session proposals
|
2018-02-06 07:10:44 -05:00 |
|
chrisgarrity
|
aff3c33817
|
Merge pull request #1796 from chrisgarrity/hotfix/conf2018-feb5
[DEVELOP] Hotfix Conference page to close session proposals
|
2018-02-05 08:41:27 -05:00 |
|
chrisgarrity
|
3fc0d2ab23
|
Another hotel update
|
2018-02-02 13:26:05 -05:00 |
|
chrisgarrity
|
0a59a7f40c
|
Update hotel links
|
2018-02-02 13:26:05 -05:00 |
|
chrisgarrity
|
0b665a97a1
|
Update Conference page to close session proposals
Fixes #1782, needs to be hotfixed on Feb 5
|
2018-02-02 13:26:05 -05:00 |
|
chrisgarrity
|
a5f2121fea
|
Another hotel update
|
2018-02-02 10:25:12 -05:00 |
|
chrisgarrity
|
901ec9d2f1
|
Update hotel links
|
2018-02-02 09:23:46 -05:00 |
|
St19_Galla
|
15982b5699
|
Fix gh-1780: Corrects Link on About Page (#1781)
* Update about.jsx
* shorten
|
2018-02-01 17:26:34 -05:00 |
|
Linda
|
358ac9a5b9
|
fixes #1764/reduce string duplication in teaacher registration (#1791)
|
2018-02-01 17:25:55 -05:00 |
|
Arav Narula
|
2799d12069
|
Update credits.jsx (#1770)
* Update credits.jsx
* Fix up ES6 changes.
|
2018-02-01 17:24:28 -05:00 |
|
Ray Schamp
|
25a1280cca
|
Merge pull request #1759 from towerofnix/fix-firefox-focusring
Hide Firefox focus ring on <select> elements (language selector)
|
2018-02-01 09:29:09 -05:00 |
|
chrisgarrity
|
2989857dbe
|
Update Conference page to close session proposals
Fixes #1782, needs to be hotfixed on Feb 5
|
2018-01-31 17:14:42 -05:00 |
|
Ray Schamp
|
00fd21bac7
|
Merge pull request #1795 from LLK/hotfix/shim-formsy
[Develop] ES6: Fixes for IE
|
2018-01-31 16:31:37 -05:00 |
|
Ray Schamp
|
840542bebe
|
Merge branch 'develop' into hotfix/shim-formsy
|
2018-01-31 16:22:16 -05:00 |
|
Ray Schamp
|
3dd61cd1d4
|
Merge pull request #1794 from LLK/hotfix/shim-formsy
[Master] ES6: Fixes for IE
|
2018-01-31 16:20:19 -05:00 |
|
Ray Schamp
|
cbc5bbd565
|
Fix search tabs
|
2018-01-31 13:00:27 -05:00 |
|
Ray Schamp
|
0a6092bde8
|
Add Symbol polyfill
|
2018-01-31 10:01:14 -05:00 |
|
Linda
|
7c1d9421ec
|
Merge pull request #1 from LLK/develop
uh update this for once
|
2018-01-31 15:08:33 +01:00 |
|
Ray Schamp
|
295a1045cd
|
Add polyfills for formsy-react-components
This module now requires polyfills for Set and Array.from: https://github.com/twisty/formsy-react-components#browser-support
|
2018-01-30 20:22:19 -05:00 |
|
Ray Schamp
|
51533bbf39
|
Merge pull request #1789 from LLK/hotfix/es6-upgrade
[Master] Upgrade to ES6, Take II
|
2018-01-30 16:29:51 -05:00 |
|
Ray Schamp
|
c8287913f6
|
Merge pull request #1790 from LLK/hotfix/es6-upgrade-develop
[Develop] Upgrade to ES6, Take II
|
2018-01-30 15:50:14 -05:00 |
|
Ray Schamp
|
a47623306b
|
Fix "Load More" on search
Concatenating a number with null results in NaN, and when NaN was used as an API query argument, resulted in a 503.
|
2018-01-30 11:53:24 -05:00 |
|
Ray Schamp
|
dba366815d
|
Restore JSON linting
|
2018-01-30 11:53:24 -05:00 |
|
Ray Schamp
|
590f505a61
|
Revert "Merge pull request #1788 from LLK/revert-1775-hotfix/es6-upgrade"
This reverts commit 1b1b396e92, reversing
changes made to a144bab0e6.
|
2018-01-30 11:53:12 -05:00 |
|
Ray Schamp
|
83db222e28
|
Fix "Load More" on search
Concatenating a number with null results in NaN, and when NaN was used as an API query argument, resulted in a 503.
|
2018-01-30 10:50:05 -05:00 |
|
Ray Schamp
|
0054424b9d
|
Restore JSON linting
|
2018-01-30 10:36:08 -05:00 |
|
Ray Schamp
|
53d3bb94dc
|
Revert "Merge pull request #1787 from LLK/revert-1786-hotfix/es6-upgrade"
This reverts commit 5ce1a9f411, reversing
changes made to 5be4c45f08.
|
2018-01-30 10:33:15 -05:00 |
|
Ray Schamp
|
1b1b396e92
|
Merge pull request #1788 from LLK/revert-1775-hotfix/es6-upgrade
Revert "[Develop] Upgrade to ES6"
|
2018-01-30 09:55:05 -05:00 |
|
Ray Schamp
|
46511e1253
|
Revert "[Develop] Upgrade to ES6"
|
2018-01-30 09:54:45 -05:00 |
|
Ray Schamp
|
5ce1a9f411
|
Merge pull request #1787 from LLK/revert-1786-hotfix/es6-upgrade
Revert "[Master] Upgrade to ES6"
|
2018-01-30 09:54:04 -05:00 |
|
Ray Schamp
|
c7c92c49f7
|
Revert "[Master] Upgrade to ES6"
|
2018-01-30 09:53:25 -05:00 |
|
Ray Schamp
|
5be4c45f08
|
Merge pull request #1786 from LLK/hotfix/es6-upgrade
[Master] Upgrade to ES6
|
2018-01-30 08:40:29 -05:00 |
|
Ray Schamp
|
a144bab0e6
|
Merge pull request #1775 from LLK/hotfix/es6-upgrade
[Develop] Upgrade to ES6
|
2018-01-29 15:53:59 -05:00 |
|
chrisgarrity
|
a7532c49db
|
Fix projects curated row
Changed the localization string to use a placeholder to allow translators to re-order if needed.
Also added preview-faq to the transifex config.
|
2018-01-29 14:22:23 -05:00 |
|