1. 19 Dec, 2014 1 commit
  2. 17 Dec, 2014 2 commits
  3. 16 Dec, 2014 1 commit
  4. 12 Dec, 2014 1 commit
  5. 09 Dec, 2014 1 commit
  6. 08 Dec, 2014 2 commits
  7. 06 Dec, 2014 1 commit
  8. 05 Dec, 2014 1 commit
  9. 04 Dec, 2014 4 commits
  10. 03 Dec, 2014 2 commits
  11. 02 Dec, 2014 1 commit
  12. 01 Dec, 2014 1 commit
  13. 30 Nov, 2014 1 commit
  14. 29 Nov, 2014 2 commits
  15. 27 Nov, 2014 3 commits
    • carlosperate's avatar
    • carlosperate's avatar
      Merge branch 'blockly-original' into temporary branch of master · 23dfe76e
      carlosperate authored
      Synchronised up to: https://github.com/google/blockly/commit/208e49c9e6edb5b2eea84a32f43c3bf22cd75b60
      
      Conflicts:
      	.gitignore
      	README.md
      	appengine/README.txt
      	appengine/app.yaml
      	appengine/redirect.html
      	apps/arduino/index.html
      	apps/arduino/readonly.html
      	apps/code/code.js
      	apps/code/generated/en.js
      	apps/common.js
      	apps/common.soy
      	apps/graph/blocks.js
      	apps/graph/graph.js
      	apps/index/generated/ace.js
      	apps/index/generated/ar.js
      	apps/index/generated/az.js
      	apps/index/generated/be-tarask.js
      	apps/index/generated/br.js
      	apps/index/generated/ca.js
      	apps/index/generated/cs.js
      	apps/index/generated/da.js
      	apps/index/generated/de.js
      	apps/index/generated/el.js
      	apps/index/generated/en.js
      	apps/index/generated/es.js
      	apps/index/generated/eu.js
      	apps/index/generated/fa.js
      	apps/index/generated/fr.js
      	apps/index/generated/gl.js
      	apps/index/generated/he.js
      	apps/index/generated/hi.js
      	apps/index/generated/hrx.js
      	apps/index/generated/hu.js
      	apps/index/generated/ia.js
      	apps/index/generated/is.js
      	apps/index/generated/it.js
      	apps/index/generated/ja.js
      	apps/index/generated/ko.js
      	apps/index/generated/lv.js
      	apps/index/generated/mg.js
      	apps/index/generated/mk.js
      	apps/index/generated/ms.js
      	apps/index/generated/nb.js
      	apps/index/generated/nl.js
      	apps/index/generated/pl.js
      	apps/index/generated/pms.js
      	apps/index/generated/pt-br.js
      	apps/index/generated/pt.js
      	apps/index/generated/ro.js
      	apps/index/generated/ru.js
      	apps/index/generated/sco.js
      	apps/index/generated/sk.js
      	apps/index/generated/sr.js
      	apps/index/generated/sv.js
      	apps/index/generated/sw.js
      	apps/index/generated/th.js
      	apps/index/generated/tr.js
      	apps/index/generated/uk.js
      	apps/index/generated/vi.js
      	apps/index/generated/zh-hans.js
      	apps/index/generated/zh-hant.js
      	apps/index/index.js
      	apps/index/template.soy
      	apps/json/ace.json
      	apps/json/ar.json
      	apps/json/az.json
      	apps/json/be-tarask.json
      	apps/json/br.json
      	apps/json/ca.json
      	apps/json/cs.json
      	apps/json/da.json
      	apps/json/de.json
      	apps/json/diq.json
      	apps/json/el.json
      	apps/json/en.json
      	apps/json/es.json
      	apps/json/eu.json
      	apps/json/fa.json
      	apps/json/fi.json
      	apps/json/fr.json
      	apps/json/gl.json
      	apps/json/gn.json
      	apps/json/hak.json
      	apps/json/he.json
      	apps/json/hi.json
      	apps/json/hrx.json
      	apps/json/hu.json
      	apps/json/ia.json
      	apps/json/is.json
      	apps/json/it.json
      	apps/json/ja.json
      	apps/json/keys.json
      	apps/json/ko.json
      	apps/json/lb.json
      	apps/json/lrc.json
      	apps/json/lt.json
      	apps/json/lv.json
      	apps/json/mg.json
      	apps/json/mk.json
      	apps/json/mr.json
      	apps/json/ms.json
      	apps/json/nb.json
      	apps/json/ne.json
      	apps/json/nl.json
      	apps/json/oc.json
      	apps/json/pl.json
      	apps/json/pms.json
      	apps/json/ps.json
      	apps/json/pt-br.json
      	apps/json/pt.json
      	apps/json/qqq.json
      	apps/json/ro.json
      	apps/json/ru.json
      	apps/json/sc.json
      	apps/json/sco.json
      	apps/json/si.json
      	apps/json/sk.json
      	apps/json/sr.json
      	apps/json/sv.json
      	apps/json/sw.json
      	apps/json/th.json
      	apps/json/tr.json
      	apps/json/uk.json
      	apps/json/vi.json
      	apps/json/zh-hans.json
      	apps/json/zh-hant.json
      	apps/maze/blocks.js
      	apps/maze/generated/az.js
      	apps/maze/generated/tlh.js
      	apps/maze/maze.js
      	apps/maze/template.soy
      	apps/plane/generated/ace.js
      	apps/plane/generated/az.js
      	apps/plane/generated/lrc.js
      	apps/plane/generated/mg.js
      	apps/plane/generated/ne.js
      	apps/plane/generated/sc.js
      	apps/plane/generated/tlh.js
      	apps/plane/plane.js
      	apps/turtle/blocks.js
      	apps/turtle/generated/az.js
      	apps/turtle/turtle.js
      	blockly_compressed.js
      	blockly_uncompressed.js
      	core/blockly.js
      	core/css.js
      	core/inject.js
      	demos/index.html
      	msg/js/be-tarask.js
      	msg/js/br.js
      	msg/js/en.js
      	msg/js/es.js
      	msg/js/he.js
      	msg/js/hi.js
      	msg/js/hu.js
      	msg/js/ia.js
      	msg/js/is.js
      	msg/js/ja.js
      	msg/js/lb.js
      	msg/js/lrc.js
      	msg/js/oc.js
      	msg/js/pl.js
      	msg/js/ro.js
      	msg/js/sc.js
      	msg/js/tl.js
      	msg/js/tlh.js
      	msg/js/zh-hans.js
      	msg/json/en.json
      	msg/json/he.json
      	msg/json/pl.json
      	msg/json/qqq.json
      	msg/json/ro.json
      	msg/json/tl.json
      	msg/messages.js
      	tests/jsunit/index.html
      23dfe76e
    • carlosperate's avatar
  16. 26 Nov, 2014 1 commit
  17. 25 Nov, 2014 2 commits
  18. 24 Nov, 2014 1 commit
  19. 22 Nov, 2014 1 commit
    • Neil Fraser's avatar
      Merge pull request #11 from JordiOrlando/master · cefb9385
      Neil Fraser authored
      Update delete icon to Material Design
      
      Google has always been suspicious of the old trashcan artwork.  It came from MIT's Open Blocks, which despite claiming to be open source is known to have some copyrighted resources (click sound is stolen from MS Windows 95).  A thorough search could not locate any known origin for the trashcan, so we used it, warily.
      cefb9385
  20. 21 Nov, 2014 3 commits
  21. 20 Nov, 2014 1 commit
  22. 19 Nov, 2014 3 commits
  23. 14 Nov, 2014 4 commits