jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
19,439 Commits 98 Branches 0 Tags 0 B
Commit Graph

15708 Commits

Author SHA1 Message Date
nigel007 e5ff3707cb change routes of contributions and logger of contributions_controller 2019-06-13 22:16:46 +08:00
nigel007 4d17e6c425 add show of contribution 2019-06-13 21:44:34 +08:00
nigel007 b3ed98bc37 add some logger.info 2019-06-12 22:24:39 +08:00
nigel007 62bf884225 remove 2019-06-12 22:17:07 +08:00
nigel007 af04a44512 change unless port 2019-06-12 22:04:55 +08:00
nigel007 cd04ace5e7 remove attr_accessor 2019-06-12 21:58:43 +08:00
nigel007 7ceba9efcf add loggers 2019-06-12 21:43:23 +08:00
nigel007 917f9a0f2c add log of user_id 2019-06-12 21:33:50 +08:00
nigel007 546fb22643 change logger to Rails.logger 2019-06-11 09:49:30 +08:00
nigel007 4cfd888414 change port and network_id to bc.sth 2019-06-11 09:03:48 +08:00
nigel007 68a975d30a add judge of nil value for ports and networkids 2019-06-11 09:00:01 +08:00
nigel007 f4cff59064 add logger.info to get_networkids_ports 2019-06-11 08:51:07 +08:00
nigel007 1a9d73b6b3 change repo_name to reponame 2019-06-07 18:51:30 +08:00
nigel007 883729ed9a add reponame 2019-06-07 18:44:46 +08:00
nigel007 28951b11bf remove find_by_project_id and change the obtain method of blockchain attributes 2019-06-07 17:19:54 +08:00
nigel007 d3c3280470 change to accessor 2019-06-07 17:05:56 +08:00
nigel007 3f81a7fa8e add attr_accessible to blockchain model 2019-06-07 16:54:28 +08:00
nigel007 55009f2365 change the acquire of project's owner name 2019-06-07 16:38:19 +08:00
nigel007 192ee15a59 add outputs 2019-06-07 16:17:01 +08:00
nigel007 9d0d3854ae change return for join service 2019-06-07 15:46:12 +08:00
nigel007 34daf5d94a finish join service 2019-06-07 13:55:14 +08:00
nigel007 8d2372cabc change sth 2019-06-07 13:15:40 +08:00
nigel007 e88f938979 change output 2019-06-07 13:09:49 +08:00
nigel007 d57561f116 modify function join 2019-06-07 13:03:01 +08:00
nigel007 cc0fc188c2 add join service for blockchain 2019-06-07 12:45:12 +08:00
nigel007 9a6456afdc add status to get_already_things function 2019-05-30 21:43:43 +08:00
nigel007 ea2465092c change return to true and false and remove logger.infos 2019-05-26 22:56:31 +08:00
nigel007 226b9632b5 add branch 2019-05-26 22:49:59 +08:00
nigel007 ed9e2b1d37 output gpid 2019-05-26 21:41:58 +08:00
nigel007 8bc19d36db change true to commit 2019-05-26 20:36:10 +08:00
nigel007 e4e6c9cc61 change the iterator of shaList 2019-05-26 16:26:45 +08:00
nigel007 f2d403cc43 change function name to getCommitInfo and return list of true or false 2019-05-26 16:12:39 +08:00
nigel007 49eb0cf73a change param type 2019-05-26 16:00:00 +08:00
nigel007 5bbec0b311 change the api of getPushInfo 2019-05-26 15:50:50 +08:00
nigel007 f59d3f5114 change project.id to project.gpid 2019-05-26 14:49:24 +08:00
nigel007 8fe2589baa add status for retur 2019-05-26 13:45:52 +08:00
nigel007 a01fa6ab00 change diff_result.diff to diff_result[0].diff 2019-05-26 11:27:12 +08:00
nigel007 ecba5eaae4 add two loggers 2019-05-26 11:15:29 +08:00
nigel007 7ea70e5524 add Rails.logger of owner not found 2019-05-26 11:07:48 +08:00
nigel007 9ac5b33689 read the diff of commit_diff 2019-05-26 10:50:11 +08:00
nigel007 18ccb3347d add gitlab commits.rb lib and getPushInfo function 2019-05-26 10:08:13 +08:00
nigel007 81842d4ba5 change services and blockchain.rb 2019-05-24 11:30:18 +08:00
nigel007 46bafc9d35 create repo while creating 2019-04-14 20:24:05 +08:00
nigel007 c8689b3dd0 add createNewRepoBlockchain function 2019-04-14 20:23:39 +08:00
nigel007 d2ef049f08 verify current_user through username and password 2019-04-14 16:25:24 +08:00
nigel007 60415e1182 add blockchain api 2019-04-14 16:24:47 +08:00
nigel007 4dfef1b571 change createNewProject function and add createNewProjectBlockchain function 2019-04-14 16:24:25 +08:00
nigel007 c484f17812 add verify_user function 2019-04-14 16:24:01 +08:00
nigel007 49cac39403 change blockchain service 2019-04-14 16:22:30 +08:00
nigel007 7d18d66b01 delete some lines by huangjingquan 2019-04-13 13:04:34 +08:00
nigel007 bef1734156 modify attributes by huangjingquan 2019-04-13 13:03:26 +08:00
nigel007 9d228b01b9 change def create by huangjingquan 2019-04-13 13:03:01 +08:00
nigel007 8ed186dfe7 register blockchain api in api.rb file 2019-04-12 09:51:20 +08:00
nigel007 68a41879c5 create model Blockchain and add migrations and add api/blockchains 2019-04-12 09:11:46 +08:00
nigel007 9e642b8627 remove some test after copying from hjq 2019-04-11 19:42:40 +08:00
caishi c041275cdc Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2019-03-25 09:11:48 +08:00
caishi fa62e4aacb introduce页面修改 2019-03-25 09:11:31 +08:00
cxt c066193d13 调整 2019-03-24 14:46:22 +08:00
cxt 0831e3eae9 申诉调整 2019-03-24 14:37:22 +08:00
caishi dcabcebfa6 背景图 2019-03-23 17:25:34 +08:00
cxt cd125e76b9 去掉首页的“问题和建议” 2019-03-23 17:02:48 +08:00
caishi c7473779aa 介绍页头部样式 2019-03-23 16:29:57 +08:00
cxt 5b078e1a04 介绍页 2019-03-23 16:18:06 +08:00
caishi 550dcc1948 introduce页面 2019-03-23 15:48:29 +08:00
guange a576abdfa3 oauth加allow 2019-03-03 15:50:51 +08:00
guange 5a8baa9326 oauth说明修改 2019-02-28 18:39:15 +08:00
huang ef4eb540c8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/api/mobile/apis/courses.rb
 2019-02-28 17:11:38 +08:00
cxt e8cdb0caed 选用题库时去掉对学生身份的验证 2019-02-19 09:13:24 +08:00
cxt 0c7fb625b7 上传附件 2019-01-09 15:05:46 +08:00
cxt c8eb0c9fa6 调整 2018-12-20 11:46:06 +08:00
cxt 537560654f 放大主页文章的内容限制 2018-12-20 11:31:23 +08:00
guange f8f083d1eb oauth取用户资料返回绝对地址头像 2018-12-03 16:26:33 +08:00
guange e1d0dc4661 token去除session验证 2018-12-03 09:06:31 +08:00
guange 9a4dafbce5 优化密码设置流程 2018-11-23 19:35:28 +08:00
daiao cbd3efe796 Merge branch 'dev_toschina' of https://git.trustie.net/jacknudt/trustieforge into dev_toschina 2018-11-23 01:50:47 -08:00
daiao ea55f9873e oschina课堂数据 2018-11-23 01:50:41 -08:00
guange 282bb483d2 Merge branch 'dev_toschina' of https://git.trustie.net/jacknudt/trustieforge into dev_toschina 2018-11-23 16:42:34 +08:00
guange a9b8d82da6 优化密码设置流程 2018-11-23 16:41:52 +08:00
daiao 5caa9bc61a Merge branch 'dev_toschina' of https://git.trustie.net/jacknudt/trustieforge into dev_toschina 2018-11-22 23:57:45 -08:00
daiao 4dd5e76a05 toschina课程动态接口 2018-11-22 23:57:41 -08:00
guange f007f5f249 信息完整则跳到个人首页 2018-11-23 11:54:00 +08:00
huang c4b5f2cd47 课堂接口 2018-11-23 10:30:09 +08:00
guange 8b3e4949b9 url配置 2018-11-22 17:37:35 +08:00
guange 76c701678c 文字修改 2018-11-22 17:24:42 +08:00
caishi 0166854dc3 授权页 2018-11-22 17:18:37 +08:00
guange ed253cdbec back_url base64 2018-11-22 16:25:46 +08:00
guange d568f42451 backurl base64 2018-11-22 16:04:31 +08:00
guange d78224fe67 增加文档 2018-11-22 15:56:30 +08:00
guange 32a26f8eb7 Merge branch 'dev_toschina' of https://git.trustie.net/jacknudt/trustieforge into dev_toschina 2018-11-22 15:53:40 +08:00
guange 532866eb17 增加文档 2018-11-22 15:53:32 +08:00
caishi 1067d596d9 Merge branch 'dev_toschina' of https://git.trustie.net/jacknudt/trustieforge into dev_toschina 
Conflicts:
	db/schema.rb
 2018-11-22 15:46:15 +08:00
caishi ac1d3e8bf6 oschina登录--授权页 2018-11-22 15:45:22 +08:00
guange 77d2f3ac17 oauth生成token 2018-11-22 14:55:06 +08:00
caishi ac0cd92c68 Merge branch 'dev_toschina' of https://git.trustie.net/jacknudt/trustieforge into dev_toschina 2018-11-22 11:17:32 +08:00
caishi 99e9971272 登录页增加oschina登录 2018-11-22 11:16:35 +08:00
guange 859ed0015f . 2018-11-22 11:15:49 +08:00
guange 075fd9670f 添加oauth接口 2018-11-22 10:50:48 +08:00
guange 317e940fb0 oschina登录同步 2018-11-21 14:41:44 +08:00
huang 0951a24009 用户注册问题 2018-09-30 18:54:57 +08:00
huang 26cc87ba84 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2018-09-30 17:32:08 +08:00