Commits · master · code / genecoop

05 Apr, 2022 2 commits
- Reverting to previously used Zenroom version · 0743335d
  Stefano authored Apr 05, 2022
  
  0743335d
- Some minor error fixing and update Zenroom version · 03c4abb9
  Stefano authored Apr 05, 2022
  
  03c4abb9
17 Jun, 2021 3 commits
- Merge branch 'demo' of https://github.com/LedgerProject/GeneCoop into demo · 827ae009
  Stefano authored Jun 17, 2021
  
  827ae009
- change contracts to version compatible with zenroom on Ubuntu · d8594b2d
  Stefano authored Jun 14, 2021
  
  d8594b2d
- Update footer · a759c036
  Stefano authored Jun 17, 2021
  
  a759c036
16 Jun, 2021 6 commits
- Merge branch 'demo' of https://github.com/LedgerProject/GeneCoop into demo · c3859f86
  Stefano authored Jun 16, 2021
  
  c3859f86
- change contracts to version compatible with zenroom on Ubuntu · 78567c86
  Stefano authored Jun 14, 2021
  
  78567c86
- new plugins and text changed in landing page · c3d3b50d
  Stefano authored Jun 16, 2021
  
  c3d3b50d
- Update README.md · 9abd3f59
  Stefano authored Jun 16, 2021
  
  9abd3f59
- Update README.md · 79134ce0
  Stefano authored Jun 16, 2021
  
  79134ce0
- Update README.md · e91bd8ac
  Stefano authored Jun 16, 2021
  
  e91bd8ac
15 Jun, 2021 11 commits
- Update to latest zenroom parsing · 022ec63c
  Stefano authored Jun 15, 2021
  
  022ec63c
- Merge branch 'demo' of https://github.com/LedgerProject/GeneCoop into demo · 2fcade6a
  Stefano authored Jun 15, 2021
  
  2fcade6a
- change contracts to version compatible with zenroom on Ubuntu · c17a0cd7
  Stefano authored Jun 14, 2021
  
  c17a0cd7
- checkin dependencies · 1f71f9f0
  Stefano authored Jun 15, 2021
  
  1f71f9f0
- Merge branch 'demo' of https://github.com/LedgerProject/GeneCoop into demo · 169fe661
  Stefano authored Jun 15, 2021
  
  169fe661
- change contracts to version compatible with zenroom on Ubuntu · 374b82e0
  Stefano authored Jun 14, 2021
  
  374b82e0
- fix truncate in login · c7f4a76d
  taco@waag.org authored Jun 15, 2021
  
  c7f4a76d
- Add better handling of the request status · 405d6775
  Stefano authored Jun 15, 2021
  
  405d6775
- Add data-label back · a3ba2bc3
  Stefano authored Jun 15, 2021
  
  a3ba2bc3
- Merge remote-tracking branch 'origin/styling' · 1b890d33
  Stefano authored Jun 15, 2021
```
# Conflicts:
#	Demonstrator/ResearchInterface/donor_app/migrations/0001_initial.py
#	Demonstrator/ResearchInterface/id_app/migrations/0001_initial.py
#	Demonstrator/ResearchInterface/researcher_app/migrations/0001_initial.py
```
  1b890d33
- Some restyling of the datasafe app · 83dc73be
  Stefano authored Jun 15, 2021
  
  83dc73be
14 Jun, 2021 18 commits
- design files · f027bf2c
  alain authored Jun 14, 2021
  
  f027bf2c
- landing page styling · 8eb4cd7b
  alain authored Jun 14, 2021
  
  8eb4cd7b
- Merge branch 'demo' of https://github.com/LedgerProject/GeneCoop into demo · 07b1e736
  Stefano authored Jun 14, 2021
  
  07b1e736
- change contracts to version compatible with zenroom on Ubuntu · 92e40cb4
  Stefano authored Jun 14, 2021
  
  92e40cb4
- Adding some formatting to data page · 34949a87
  Stefano authored Jun 14, 2021
  
  34949a87
- Merge branch 'demo' of https://github.com/LedgerProject/GeneCoop into demo · a31d6eaa
  Stefano authored Jun 14, 2021
  
  a31d6eaa
- change contracts to version compatible with zenroom on Ubuntu · f97e9dbe
  Stefano authored Jun 14, 2021
  
  f97e9dbe
- change of namespace · d668d2eb
  Stefano authored Jun 14, 2021
  
  d668d2eb
- landing page · ea332017
  taco@waag.org authored Jun 14, 2021
  
  ea332017
- Merge branch 'styling' of https://gitlab.waag.org/code/genecoop into styling · 4f0b7c20
  taco@waag.org authored Jun 14, 2021
  
  4f0b7c20
- user id placeholder · a46fbf91
  taco@waag.org authored Jun 14, 2021
  
  a46fbf91
- some addon styling · 80462cb3
  alain authored Jun 14, 2021
  
  80462cb3
- add text for when we don't have any logs yet · 796cb34c
  alain authored Jun 14, 2021
  
  796cb34c
- Merge branch 'styling' of https://gitlab.waag.org/code/genecoop into styling · 65f71799
  alain authored Jun 14, 2021
  
  65f71799
- somewhat final app styling · 53a2f20b
  alain authored Jun 14, 2021
  
  53a2f20b
- filter log category, and include experiment name in log · 45cdfc6a
  taco@waag.org authored Jun 14, 2021
  
  45cdfc6a
- change contracts to version compatible with zenroom on Ubuntu · 3bc1accd
  Stefano authored Jun 14, 2021
  
  3bc1accd
- Crash in verify signature · 52ff9a2d
  Stefano authored Jun 14, 2021
  
  52ff9a2d