1
0
Fork 0
mirror of synced 2025-09-24 04:40:05 +00:00
Commit graph

324 commits

Author SHA1 Message Date
sdeml
00147b3917 Merge branch 'develop' into add-sharound
* develop: (53 commits)
  move book snippets to files in test folder, link to them from md
  handle case where path is a directory
  update cargo.lock
  update tests to use relative paths
  resolve cargo.lock conflict
  WASM crate import depends on the presence of the `wasm` feature
  Insert missing fi at the end of if statement
  change test to check flattening of 1-sized array is identical to flattening of single value
  implement variable access to ifelse array
  add support for ifelse array access, clean up semantic treatment
  recommend setting /Users/obit/sides/zokrates/zokrates_stdlib/stdlib if it is not already
  add /Users/obit/sides/zokrates/zokrates_stdlib/stdlib to Dockerfiles, add stdlib with dummy file
  remove commented out old serialization
  branch  based on first path component
  base decision on first character of path
  fallback to /Users/obit/.zokrates when importing source files
  Run the tests with WASM enabled
  Fix build after rebase
  Fix warning
  Move wasm plugin generation to a different repo
  ...

# Conflicts:
#	zokrates_book/src/sha256example.md
2019-01-23 17:43:14 +01:00
schaeff
0fe0cbef2c move book snippets to files in test folder, link to them from md 2019-01-21 19:00:21 +01:00
Asif Mallik
86495b9436
Insert missing fi at the end of if statement 2019-01-19 01:27:33 -05:00
sdeml
02dfa019ff new test fails 2019-01-17 17:29:46 +01:00
sdeml
e9bdc6dcde update mdbook docs 2019-01-15 16:04:22 +01:00
sdeml
c0db24bb79 cleaning and adding docs 2019-01-15 11:47:51 +01:00
schaeff
6158a7a2bf typo 2019-01-03 10:28:26 +01:00
schaeff
659d01659f add inequality caveat to doc 2019-01-03 10:25:47 +01:00
schaeff
9160aa4164 fix conflicts 2018-12-07 18:01:17 +01:00
schaeff
57fc5453dd Merge branch 'master' of github.com:JacobEberhardt/ZoKrates into gm17 2018-12-07 17:54:08 +01:00
sdeml
2bbff8c1f5 add if to control flow 2018-11-26 18:32:18 +01:00
Kendrick Tan
e2acdbff37
fixed hashexample.code example 2018-11-25 00:14:21 +00:00
schaeff
d6785d50d6 update book 2018-11-23 15:57:32 +01:00
sdeml
d5506a7ed0 link readme to docs 2018-11-20 09:42:14 +01:00
schaeff
f63ffa5e5e Merge branch 'add-book' of github.com:stefandeml/ZoKrates into add-book 2018-10-26 21:15:10 +02:00
schaeff
9ff0030f15 remove grammar, clean structure 2018-10-26 21:13:44 +02:00
sdeml
3351b25fb9 corrected number of public inputs 2018-10-26 16:12:11 +01:00
sdeml
dd6ff30eda fixed link and typo 2018-10-26 15:59:19 +01:00
schaeff
7ad49a45a5 restructure, amend tutorial 2018-10-26 16:31:46 +02:00
schaeff
8de54f5979 edit Introduction and getting started, change zokrates to ZoKrates 2018-10-26 14:43:18 +02:00
sdeml
eb7ce0982b —gadgets flag is not necessary any more 2018-10-25 15:30:58 +01:00
sdeml
01058e5783 add programming concepts and changed example 2018-10-25 15:22:21 +01:00
sdeml
a0e93c6683 changes on the structure and beginning of SHA256 example 2018-10-25 15:22:21 +01:00
schaeff
b182e88e7b set up mdbook 2018-10-05 10:08:27 +02:00