nanda版本 #318

Merged

xxq250 merged 51 commits from qyzh1996/forgeplus:sponsor into dev_nanda

2023-01-12 17:40:18 +08:00

xxq250 commented

2023-01-12 17:40:06 +08:00

Owner

No description provided.

xxq250 added 51 commits 2023-01-12 17:40:06 +08:00

e07dddde98 before merge

38193dff54 Merge remote-tracking branch 'origin_trustie/dev_trustie' into dev_trustie

8e2cf4ecc0 add column to users

cb089b1bb8 create table sponsorship

0a460d1d37 create sponsor_tier

46b906d2ac create stoppedsponsorship

33951af37d create table wallet

98176f839d create coinchange

94ad4ce56c create waitlist

769bf2b90e create passedlist

c546eda537 update table waitlist and passed_waitlist

9915c10bcf update model user

50bef66261 update model sponsor_tier

d480deee64 update model stopped_sponsorship

0f69255422 update model wallet

0ebcf3d7f7 update model coin_change

80d6cbf823 update model waitlist

1c45b48063 update model passed_waitlist

0e33b12989 before update

5433920724 Merge branch 'dev_trustie' of https://git.trustie.net/qyzh1996/forgeplus into dev_trustie

faf2302b8e sponsor tiers增删改查

1ac5498091 完成用户log

cd595646d8 新增：修改赞助关系

01f15da5ed fix bugs

c963a80e8c merge origin_trustie/master to dev

ffbe4942b7 delete some interface

5addece8d5 fix bugs

6de617d898 fix bugs, add test cases

bf68c1c544 add daily reward

dafdbadb6b fix bugs

244c1b865a merge integrated_blockchain

b524111ae6 fix structure.sql

eaf78c4d8f rewrite wallet module

8b11fb604a 新增：发表issue奖励

661c8dda85 修复赞助支付bug

7776ab29ed coinchange chart

c9b15a02d6 添加统计图标接口

34212a3468 merge gitlink/develop

859566e4be 整理测试代码

0cd58a4e7a 整理测试代码

5a61965704 add test case

aa81e7030d add test case

2a02b6f530 每日统计

6571db8a3c sponsor config

88b96565d1 Initial commit

c9b1e30583 profile_completed = true

ce5b6a67bf fix 无法创建PR

13263a44e4 merge

fc3f50a2bf add column to statistics

0f776c5cdb update user.last_login_on before every requests

9065029d08 Merge branch 'master' into sponsor

# Conflicts:
#	.gitignore
#	Gemfile
#	Gemfile.lock
#	app/controllers/accounts_controller.rb
#	app/controllers/application_controller.rb
#	app/controllers/compare_controller.rb
#	app/controllers/journals_controller.rb
#	app/controllers/members_controller.rb
#	app/controllers/pull_requests_controller.rb
#	app/controllers/settings_controller.rb
#	app/controllers/users_controller.rb
#	app/controllers/version_releases_controller.rb
#	app/models/gitea/webhook_task.rb
#	app/models/message_template/pull_request_atme.rb
#	app/models/project.rb
#	app/models/project_category.rb
#	app/models/user_extension.rb
#	app/views/users/get_user_info.json.jbuilder
#	app/views/users/show.json.jbuilder
#	config/routes.rb

xxq250 merged commit 3612c8aa60 into dev_nanda

2023-01-12 17:40:18 +08:00

Sign in to join this conversation.

No reviewers

No Label

No Milestone

No Assignees

1 Participants

Notifications

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: Gitlink/forgeplus#318

No description provided.