1. 03 Dec, 2017 1 commit
  2. 02 Dec, 2017 2 commits
  3. 01 Dec, 2017 13 commits
  4. 30 Nov, 2017 15 commits
  5. 29 Nov, 2017 4 commits
  6. 28 Nov, 2017 2 commits
  7. 22 Nov, 2017 2 commits
  8. 21 Nov, 2017 1 commit
    • Matthew Taylor's avatar
      Merge branch 'hotfix/dec-1' of https://github.com/LLK/scratch-www into develop · 87146c31
      Matthew Taylor authored
      * 'hotfix/dec-1' of https://github.com/LLK/scratch-www:
        update transifex config to reflect new conference page
        fix lint
        update translations to just use `FormattedMessage`
        Change back routeAlias for conference pages
        Add Learning Resource designer (#1676)
        Fixes #1633 - Scratch Conference 2018 Website Phase 1 (#1673)
        Fix #1649: Edit Scratch Conf Website - Correct Info for Costa Rica Conf (#1650) (#1663)
      
      # Conflicts:
      #	src/routes.json
      #	src/views/conference/2018/index/index.jsx
      #	src/views/conference/2018/index/l10n.json
      87146c31