1. 09 Dec, 2016 2 commits
  2. 08 Dec, 2016 1 commit
  3. 05 Dec, 2016 1 commit
  4. 23 Nov, 2016 1 commit
  5. 18 Nov, 2016 1 commit
  6. 17 Nov, 2016 1 commit
  7. 18 Oct, 2016 1 commit
  8. 05 Oct, 2016 1 commit
  9. 13 Sep, 2016 1 commit
  10. 08 Sep, 2016 1 commit
  11. 07 Sep, 2016 1 commit
  12. 29 Aug, 2016 2 commits
  13. 28 Aug, 2016 10 commits
  14. 24 Aug, 2016 1 commit
  15. 23 Aug, 2016 2 commits
  16. 16 Aug, 2016 1 commit
  17. 10 Aug, 2016 4 commits
    • Jennie Yoder's avatar
      preparing for release. Rebuilt. · a48d5127
      Jennie Yoder authored
      a48d5127
    • Jennie Yoder's avatar
      Merge branch 'development' · d8fa2b71
      Jennie Yoder authored
      Conflicts:
      	blockly/blockly_compressed.js
      	blockly/blocks_compressed.js
      	blockly/core/workspace_svg.js
      	blockly/msg/js/ar.js
      	blockly/msg/js/az.js
      	blockly/msg/js/bcc.js
      	blockly/msg/js/be-tarask.js
      	blockly/msg/js/bg.js
      	blockly/msg/js/br.js
      	blockly/msg/js/ca.js
      	blockly/msg/js/cs.js
      	blockly/msg/js/da.js
      	blockly/msg/js/el.js
      	blockly/msg/js/es.js
      	blockly/msg/js/fa.js
      	blockly/msg/js/fi.js
      	blockly/msg/js/he.js
      	blockly/msg/js/hi.js
      	blockly/msg/js/hrx.js
      	blockly/msg/js/hu.js
      	blockly/msg/js/ia.js
      	blockly/msg/js/id.js
      	blockly/msg/js/is.js
      	blockly/msg/js/it.js
      	blockly/msg/js/ja.js
      	blockly/msg/js/ko.js
      	blockly/msg/js/lb.js
      	blockly/msg/js/lrc.js
      	blockly/msg/js/lt.js
      	blockly/msg/js/mk.js
      	blockly/msg/js/ms.js
      	blockly/msg/js/nb.js
      	blockly/msg/js/nl.js
      	blockly/msg/js/oc.js
      	blockly/msg/js/pl.js
      	blockly/msg/js/pms.js
      	blockly/msg/js/pt-br.js
      	blockly/msg/js/pt.js
      	blockly/msg/js/ro.js
      	blockly/msg/js/ru.js
      	blockly/msg/js/sc.js
      	blockly/msg/js/sk.js
      	blockly/msg/js/sq.js
      	blockly/msg/js/sr.js
      	blockly/msg/js/sv.js
      	blockly/msg/js/th.js
      	blockly/msg/js/tl.js
      	blockly/msg/js/tlh.js
      	blockly/msg/js/tr.js
      	blockly/msg/js/uk.js
      	blockly/msg/js/vi.js
      	blockly/msg/js/zh-hans.js
      	blockly/msg/js/zh-hant.js
      	blockscad/blockscad.js
      
      first stage of merge.  Not working.  ???
      d8fa2b71
    • Jennie Yoder's avatar
      Merge remote-tracking branch 'origin/cameraButton' into development · 2057cd6a
      Jennie Yoder authored
      Conflicts:
      	blockscad/blockscad.js
      	blockscad/bsPage.js
      	blockscad/style.css
      
      merge in Tristan's camera button/screencap code.
      2057cd6a
    • Jennie Yoder's avatar
  18. 08 Aug, 2016 1 commit
  19. 07 Aug, 2016 1 commit
  20. 01 Aug, 2016 1 commit
  21. 28 Jul, 2016 1 commit
  22. 27 Jul, 2016 1 commit
    • Jennie Yoder's avatar
      this is mostly working. Locking cylinders work again, · b27f161b
      Jennie Yoder authored
      module/function/variable typing seem to mostly work, shadow blocks are
      added, imported stls are put in a reasonable place on the workspace,
      connections work, all seems to be well.  This needs more testing, but it
      is getting close.
      b27f161b
  23. 25 Jul, 2016 1 commit
  24. 20 Jul, 2016 2 commits