 Yiang Gan
|
af2bd66847
|
回复api
|
2016-04-01 18:23:12 +08:00 |
|
Yiang Gan
|
825b57ba5c
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-03-31 20:49:03 +08:00 |
 cxt
|
e4db141604
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-03-31 20:48:25 +08:00 |
|
Yiang Gan
|
03abdbb68b
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-03-31 20:46:54 +08:00 |
|
Yiang Gan
|
536394663a
|
微信消息模板
|
2016-03-31 20:46:36 +08:00 |
|
Yiang Gan
|
392c5708f2
|
作业详情页面
|
2016-03-31 20:43:06 +08:00 |
|
Yiang Gan
|
1c5b22abf4
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-03-30 18:02:38 +08:00 |
|
Yiang Gan
|
f23c0e7602
|
最新动态修改
|
2016-03-30 18:02:33 +08:00 |
|
Yiang Gan
|
6965ad0f60
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-03-30 18:00:49 +08:00 |
|
Yiang Gan
|
6c831b6811
|
解决冲突
|
2016-03-30 18:00:39 +08:00 |
 guange
|
b30fad723d
|
菜单更新
|
2016-03-30 17:56:45 +08:00 |
|
Yiang Gan
|
313d415a15
|
详情api
|
2016-03-30 17:49:05 +08:00 |
 Tim
|
77e11fe0fe
|
微信最新动态修改
|
2016-03-30 17:47:44 +08:00 |
|
Yiang Gan
|
6dc374cf9a
|
最新动态
|
2016-03-30 17:41:18 +08:00 |
|
guange
|
6f9fcbe1a7
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-03-30 17:36:12 +08:00 |
|
Yiang Gan
|
9cebcfdd2d
|
动态api调整
|
2016-03-30 15:51:27 +08:00 |
|
guange
|
5b9cbe8784
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-03-30 15:32:55 +08:00 |
|
cxt
|
c8142b3ee5
|
作业api
|
2016-03-30 14:02:35 +08:00 |
|
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 |