Commit Graph

19489 Commits

Author SHA1 Message Date
nigel007 c484f17812 add verify_user function 2019-04-14 16:24:01 +08:00
nigel007 a1d70dae18 change the version of migrations 2019-04-14 16:23:21 +08:00
nigel007 2698bc58fc change type of genesis_content 2019-04-14 16:22:48 +08:00
nigel007 49cac39403 change blockchain service 2019-04-14 16:22:30 +08:00
nigel007 3094a4c19a add user_id to blockchains table 2019-04-13 15:13:00 +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 dcbf50c85e 图片过大 2019-03-23 17:41:33 +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 3e529f0b8b Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	app/controllers/article_homepages_controller.rb
	app/models/article_homepage.rb
	app/views/article_homepages/_article_form.html.erb
	app/views/article_homepages/_article_show.html.erb
2019-02-15 17:08:08 +08:00
cxt 657a633005 版权信息 2019-02-15 17:05:47 +08:00
cxt e52ad49b64 fujian 2019-01-09 15:28:31 +08:00
cxt 0c7fb625b7 上传附件 2019-01-09 15:05:46 +08:00
cxt 0608c7ceb9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2019-01-09 14:02:09 +08:00
cxt 9e0d46c296 css 2019-01-09 12:44:39 +08:00
cxt d68daaa496 css 2019-01-09 12:43:08 +08:00
cxt 653e07d71b Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2019-01-09 12:39:14 +08:00
cxt 539883f255 css 2019-01-09 12:38:17 +08:00
cxt e18ee270a0 样式调整 2019-01-09 12:23:26 +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