Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: EOSIO/eosio.forum
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: eoscanada/eosio.forum
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
Loading
Showing with 3,462 additions and 89 deletions.
  1. +17 −0 .gitignore
  2. +13 −0 CHANGELOG.md
  3. +13 −0 CMakeLists.txt
  4. +21 −0 LICENSE.md
  5. +641 −0 README-cn.md
  6. +678 −1 README.md
  7. +28 −0 build.sh
  8. +9 −0 clean.sh
  9. +17 −0 compile.sh
  10. +66 −0 deploy/kylin/000-create-forum-account-and-deploy.json
  11. +47 −0 deploy/kylin/001-create-account.json
  12. +36 −0 deploy/kylin/002-deploy-forum.json
  13. +14 −0 deploy/kylin/auth-eosio.forum.yaml
  14. +36 −0 deploy/mainnet/001-create-account.json
  15. +36 −0 deploy/mainnet/002-deploy-forum.json
  16. +25 −0 deploy/mainnet/approforum1.json
  17. +14 −0 deploy/mainnet/auth-eosio.forum.yaml
  18. +36 −0 deploy/preprod/deploy-preprod.json
  19. +0 −50 forum.abi
  20. +0 −38 forum.cpp
  21. +153 −0 include/forum.hpp
  22. +60 −0 resources/forum.clauses.md
  23. +94 −0 resources/forum.contracts.md
  24. +47 −0 run.sh
  25. +251 −0 src/forum.cpp
  26. +23 −0 stop.sh
  27. +52 −0 tests.sh
  28. +5 −0 tests/.gitignore
  29. +23 −0 tests/all.sh
  30. +3 −0 tests/boot.sh
  31. +221 −0 tests/boot_sequence.yaml
  32. +26 −0 tests/clnproposal_validates_correctly.sh
  33. +166 −0 tests/clnproposal_working.sh
  34. +24 −0 tests/config.ini
  35. +69 −0 tests/data.sh
  36. +7 −0 tests/eosc-vault.json
  37. +36 −0 tests/expire_validates_correctly.sh
  38. +16 −0 tests/expire_working.sh
  39. +1 −0 tests/genesis.json
  40. +1 −0 tests/genesis.key
  41. +1 −0 tests/genesis.pub
  42. +130 −0 tests/library.sh
  43. +50 −0 tests/post_validates_correctly.sh
  44. +64 −0 tests/propose_validates_correctly.sh
  45. +13 −0 tests/propose_working.sh
  46. +15 −0 tests/unpost_validates_correctly.sh
  47. +28 −0 tests/unvote_validates_correctly.sh
  48. +45 −0 tests/unvote_working.sh
  49. +72 −0 tests/vote_validates_correctly.sh
  50. +19 −0 tests/vote_working.sh
17 changes: 17 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Build
build*/
output.log
scripts/voter_key

# CMake
CMakeCache.txt
CMakeFiles/
cmake_install.cmake
compile_commands.json
Makefile

# Env
.envrc

# VSCode
.vscode
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
## In Progress

## 1.1.0 (January 7, 2019)

- Updated Ricardian clauses of `expire`'s action.
- Updated Ricardian clauses of `vote`'s action.
- Updated Ricardian clauses of contract around vote tally.
- Fixed `proposal_name` that can be empty, now enforcing 3 characters or more.

## 1.0.0 (December 8, 2018)

- Updated contract to CDT 1.4.1
- Implementation of final proposal/voting system
13 changes: 13 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
set(CMAKE_SYSTEM_NAME Generic)
set(CMAKE_C_COMPILER_WORKS 1)
set(CMAKE_CXX_COMPILER_WORKS 1)

find_package(eosio.cdt)

cmake_minimum_required(VERSION 3.5)
project(eosio.forum VERSION 1.1.1.0)

add_contract(forum forum src/forum.cpp)

target_compile_options(forum.wasm PUBLIC -R${CMAKE_CURRENT_SOURCE_DIR}/resources)
target_include_directories(forum.wasm PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
21 changes: 21 additions & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
Copyright (c) 2018, Respective Authors all rights reserved.

The MIT License

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
Loading