 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 |
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
|
5c2565f236
|
表更改
|
2018-11-22 15:30:25 +08:00 |
|
guange
|
ecbdfcf1ed
|
表更改
|
2018-11-22 15:29:17 +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
|
3ce8abeb9e
|
body log
|
2018-09-30 18:46:44 +08:00 |
|
huang
|
c1e97b8631
|
some log
|
2018-09-30 18:25:50 +08:00 |
|
huang
|
a739561989
|
定位gitlab日志
|
2018-09-30 17:47:16 +08:00 |
|
huang
|
26cc87ba84
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2018-09-30 17:32:08 +08:00 |
|
huang
|
e50207e4e8
|
版本库不能创建问题
|
2018-09-30 17:31:52 +08:00 |
|
cxt
|
451682f8fd
|
样式调整
|
2018-09-14 16:43:15 +08:00 |