nanda版本 #318

Merged
xxq250 merged 51 commits from qyzh1996/forgeplus:sponsor into dev_nanda 2023-01-12 17:40:18 +08:00

51 Commits

Author SHA1 Message Date
xxq250 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
2023-01-12 17:33:18 +08:00
qyzh 0f776c5cdb update user.last_login_on before every requests 2021-12-24 15:25:14 +08:00
qyzh fc3f50a2bf add column to statistics 2021-12-24 15:14:26 +08:00
qyzh 13263a44e4 merge 2021-12-22 17:39:22 +08:00
qyzh ce5b6a67bf fix 无法创建PR 2021-12-22 17:10:58 +08:00
qyzh c9b1e30583 profile_completed = true 2021-12-15 19:06:34 +08:00
testaccount 88b96565d1 Initial commit 2021-12-07 16:32:16 +08:00
qyzh 6571db8a3c sponsor config 2021-12-07 16:20:42 +08:00
qyzh 2a02b6f530 每日统计 2021-12-07 09:45:33 +08:00
qyzh aa81e7030d add test case 2021-11-30 10:19:52 +08:00
qyzh 5a61965704 add test case 2021-11-30 10:19:04 +08:00
qyzh 0cd58a4e7a 整理测试代码 2021-10-29 09:10:36 +08:00
qyzh 859566e4be 整理测试代码 2021-10-29 09:09:47 +08:00
qyzh 34212a3468 merge gitlink/develop 2021-09-28 16:31:33 +08:00
qyzh c9b15a02d6 添加统计图标接口 2021-06-09 11:06:33 +08:00
qyzh 7776ab29ed coinchange chart 2021-05-13 11:15:54 +08:00
qyzh 661c8dda85 修复赞助支付bug 2021-05-10 16:15:02 +08:00
qyzh 8b11fb604a 新增:发表issue奖励 2021-04-20 09:58:43 +08:00
qyzh eaf78c4d8f rewrite wallet module 2021-04-14 15:10:39 +08:00
qyzh b524111ae6 fix structure.sql 2021-04-08 18:41:31 +08:00
qyzh 244c1b865a merge integrated_blockchain 2021-04-08 16:19:27 +08:00
qyzh dafdbadb6b fix bugs 2021-04-08 16:05:40 +08:00
qyzh bf68c1c544 add daily reward 2021-03-08 20:45:15 +08:00
qyzh 6de617d898 fix bugs, add test cases 2020-12-14 22:04:25 +08:00
qyzh 5addece8d5 fix bugs 2020-12-14 17:59:01 +08:00
qyzh ffbe4942b7 delete some interface 2020-12-11 17:01:52 +08:00
qyzh c963a80e8c merge origin_trustie/master to dev 2020-12-03 17:24:52 +08:00
qyzh 01f15da5ed fix bugs 2020-12-01 14:48:19 +08:00
qyzh cd595646d8 新增:修改赞助关系 2020-11-09 20:42:58 +08:00
qyzh 1ac5498091 完成用户log 2020-10-20 19:58:08 +08:00
qyzh faf2302b8e sponsor tiers增删改查 2020-09-19 09:59:05 +08:00
qyzh 5433920724 Merge branch 'dev_trustie' of https://git.trustie.net/qyzh1996/forgeplus into dev_trustie 2020-09-13 14:48:45 +08:00
qyzh 0e33b12989 before update 2020-09-13 14:48:23 +08:00
wyx 1c45b48063 update model passed_waitlist 2020-07-25 12:19:16 +08:00
wyx 80d6cbf823 update model waitlist 2020-07-25 12:18:49 +08:00
wyx 0ebcf3d7f7 update model coin_change 2020-07-25 12:17:46 +08:00
wyx 0f69255422 update model wallet 2020-07-25 12:12:34 +08:00
wyx d480deee64 update model stopped_sponsorship 2020-07-25 11:23:57 +08:00
wyx 50bef66261 update model sponsor_tier 2020-07-25 11:22:53 +08:00
wyx 9915c10bcf update model user 2020-07-25 11:21:44 +08:00
wyx c546eda537 update table waitlist and passed_waitlist 2020-07-25 10:57:45 +08:00
wyx 769bf2b90e create passedlist 2020-07-24 17:51:14 +08:00
wyx 94ad4ce56c create waitlist 2020-07-24 17:50:25 +08:00
wyx 98176f839d create coinchange 2020-07-24 17:49:07 +08:00
wyx 33951af37d create table wallet 2020-07-24 17:45:29 +08:00
wyx 46b906d2ac create stoppedsponsorship 2020-07-24 17:40:58 +08:00
wyx 0a460d1d37 create sponsor_tier 2020-07-24 17:38:31 +08:00
wyx cb089b1bb8 create table sponsorship 2020-07-24 17:21:16 +08:00
wyx 8e2cf4ecc0 add column to users 2020-07-24 16:58:25 +08:00
qyzh 38193dff54 Merge remote-tracking branch 'origin_trustie/dev_trustie' into dev_trustie 2020-07-15 10:55:16 +08:00
qyzh e07dddde98 before merge 2020-07-15 10:55:13 +08:00