 guange
|
85cfd542e6
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-03-30 12:03:26 +08:00 |
|
guange
|
d50d8818c4
|
del tag
|
2016-03-30 12:03:03 +08:00 |
 Yiang Gan
|
4de598873f
|
动态和作业的api
|
2016-03-30 10:32:45 +08:00 |
 Tim
|
406bb7930c
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
Conflicts:
public/javascripts/wechat/wechat-dev.js
|
2016-03-28 14:47:11 +08:00 |
|
Tim
|
a9fd79ec63
|
微信动态筛选
|
2016-03-28 14:45:11 +08:00 |
|
guange
|
d5124e128e
|
添加调试功能
|
2016-03-26 15:56:36 +08:00 |
|
guange
|
c27fbc7022
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-03-26 15:52:48 +08:00 |
|
guange
|
60931dde6a
|
添加获取openid的功能
|
2016-03-26 15:52:14 +08:00 |
|
Tim
|
43de1a21b1
|
issues api 列表
|
2016-03-26 14:54:36 +08:00 |
|
Tim
|
4f7d698076
|
wechat init
|
2016-03-26 14:45:57 +08:00 |
|
guange
|
aaa2a0dea7
|
手机头修改
|
2016-03-21 18:26:35 +08:00 |
|
guange
|
7804a1e9ec
|
url更改
|
2016-03-21 18:23:34 +08:00 |
|
guange
|
908b3dfdbd
|
利用reactjs前后端分离
|
2016-03-21 18:18:11 +08:00 |
|
guange
|
fbe1b2dac2
|
Merge branch 'guange_dev' into weixin_guange
# Conflicts:
# Gemfile
# db/schema.rb
|
2016-03-21 18:17:39 +08:00 |
|
guange
|
6ae4cd0767
|
merge
|
2016-03-21 16:02:30 +08:00 |
|
guange
|
59923dfb03
|
merge
|
2016-03-18 16:38:21 +08:00 |
 cxt
|
74e77bf347
|
题库的来源排序不可用
题库的分布时间排序
|
2016-03-18 16:23:24 +08:00 |
|
cxt
|
fdcd44e240
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-18 16:07:43 +08:00 |
|
cxt
|
d967a31ec9
|
课程报500
|
2016-03-18 16:07:34 +08:00 |
 alan
|
7d4e0c5d8a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-18 16:00:00 +08:00 |
|
alan
|
20cdec0cab
|
Merge branch 'alan_develop' into develop
|
2016-03-18 15:59:21 +08:00 |
|
alan
|
66d2558f87
|
修复《issue具体页面样式》
|
2016-03-18 15:58:23 +08:00 |
|
guange
|
b356c6cd1f
|
答案提交加入超时处理
|
2016-03-18 15:40:02 +08:00 |
|
cxt
|
d2bff21de5
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-18 15:39:27 +08:00 |
|
cxt
|
54a00ca867
|
题库作业信息框的样式调整
|
2016-03-18 15:39:20 +08:00 |
 ouyangxuhua
|
a1fbe8b886
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-18 15:33:17 +08:00 |
 huang
|
0413eb1c02
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-18 15:23:53 +08:00 |
|
alan
|
2b07671d95
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-18 15:21:01 +08:00 |
|
huang
|
8b09be83e0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-18 15:18:31 +08:00 |
|
huang
|
66fcdb5f7e
|
Merge branch 'hjq_new_course' into develop
|
2016-03-18 15:18:20 +08:00 |
|
huang
|
fc6210eada
|
资源导入，搜索条件中导入400问题
|
2016-03-18 15:17:49 +08:00 |
|
cxt
|
9917e802cb
|
课程推荐的资源统计
|
2016-03-18 15:15:25 +08:00 |
|
cxt
|
e167a28d49
|
课程推荐的作业统计
|
2016-03-18 14:59:34 +08:00 |
|
ouyangxuhua
|
c64910d343
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-18 14:53:52 +08:00 |
|
cxt
|
a482b76207
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-18 14:53:52 +08:00 |
|
cxt
|
dc4a7ee2e6
|
Merge branch 'cxt_course' into develop
|
2016-03-18 14:53:43 +08:00 |
|
cxt
|
e34f2e45db
|
管理员界面的课程列表和项目列表分页
|
2016-03-18 14:53:06 +08:00 |
|
ouyangxuhua
|
5c22b23f3a
|
Merge branch 'develop' into ouyangxuhua
|
2016-03-18 14:52:51 +08:00 |
|
cxt
|
b1f3395bd1
|
修改作品描述框和名称框的提示文字
|
2016-03-18 14:45:42 +08:00 |
|
ouyangxuhua
|
b5964fba0b
|
组织超链接问题
|
2016-03-18 14:44:39 +08:00 |
|
huang
|
bff20ee072
|
英雄榜数据显示问题
|
2016-03-18 14:16:23 +08:00 |
|
huang
|
51bd745b8d
|
课程讨论区限制改成20000
|
2016-03-18 13:39:28 +08:00 |
|
cxt
|
24318e3d6b
|
题库的刷新
|
2016-03-18 12:47:25 +08:00 |
|
huang
|
8a8c9bf7c3
|
注释修改
|
2016-03-18 12:41:07 +08:00 |
|
huang
|
2fe1100da6
|
去掉课程使者帖子中时间
|
2016-03-18 12:34:41 +08:00 |
|
huang
|
888c024e9e
|
资源库ajax局部刷新
|
2016-03-18 12:23:59 +08:00 |
|
huang
|
4876e6669a
|
课程附件局部刷新
|
2016-03-18 11:04:43 +08:00 |
|
cxt
|
119b12349b
|
作品名称的缺省值为 作业名称+的作品提交(可修改) 若学生不修改则保存为 作业名称+的作品提交
|
2016-03-18 10:56:35 +08:00 |
|
ouyangxuhua
|
1eafad6468
|
鼠标经过用户头像显示用户信息后，持续显示用户信息半秒钟，以便用户及时操作用户信息
|
2016-03-18 10:05:31 +08:00 |
|
huang
|
4766abab7f
|
下载行为添加ID判断
|
2016-03-18 09:59:39 +08:00 |