guange
|
5839959f0a
|
修改openid调用位置
|
2016-04-02 07:32:40 +08:00 |
cxt
|
9da89ef5e2
|
课程通知的回复
|
2016-04-02 00:37:24 +08:00 |
cxt
|
d47f887fd1
|
issue回复的修改
|
2016-04-01 23:48:29 +08:00 |
cxt
|
bc5e455f0f
|
解决冲突
|
2016-04-01 23:25:19 +08:00 |
cxt
|
790b452a9b
|
issue回复
|
2016-04-01 23:22:39 +08:00 |
txz
|
d45604c4a0
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-01 23:21:25 +08:00 |
txz
|
3b70970651
|
问题跟踪详情页面修改
|
2016-04-01 23:21:18 +08:00 |
cxt
|
cc2fe6108a
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-01 22:38:57 +08:00 |
cxt
|
5e697e5367
|
作业的回复
|
2016-04-01 22:38:45 +08:00 |
txz
|
0d24de7198
|
详情页面回复
|
2016-04-01 22:35:44 +08:00 |
cxt
|
7dccb0d963
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-01 21:32:56 +08:00 |
cxt
|
88c39512b9
|
journal的修改
|
2016-04-01 21:32:33 +08:00 |
txz
|
58e5fe85c3
|
issue 详情页面
|
2016-04-01 21:28:25 +08:00 |
txz
|
4902361b3f
|
冲突解决
|
2016-04-01 20:56:50 +08:00 |
txz
|
596bf641ac
|
最新动态各详情页面
|
2016-04-01 20:53:21 +08:00 |
cxt
|
b3b0488bf5
|
动态点击更多
|
2016-04-01 20:46:38 +08:00 |
Yiang Gan
|
4088fb9cb4
|
课程作业详情页面
|
2016-04-01 14:58:41 +08:00 |
Yiang Gan
|
392c5708f2
|
作业详情页面
|
2016-03-31 20:43:06 +08:00 |
Yiang Gan
|
f23c0e7602
|
最新动态修改
|
2016-03-30 18:02:33 +08:00 |
Tim
|
77e11fe0fe
|
微信最新动态修改
|
2016-03-30 17:47:44 +08:00 |
Yiang Gan
|
6dc374cf9a
|
最新动态
|
2016-03-30 17:41:18 +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
|
60931dde6a
|
添加获取openid的功能
|
2016-03-26 15:52:14 +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 |
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 |
huang
|
51bd745b8d
|
课程讨论区限制改成20000
|
2016-03-18 13:39:28 +08:00 |
ouyangxuhua
|
093c777b23
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/views/users/_user_message_course.html.erb
|
2016-03-17 16:18:30 +08:00 |
huang
|
7e0aa44b68
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/users/_user_message_userfeedaback.html.erb
|
2016-03-17 16:06:36 +08:00 |
huang
|
28cb1755d8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/files/_org_subfield_list.html.erb
db/schema.rb
|
2016-03-17 16:06:05 +08:00 |
cxt
|
6b8ae56ce4
|
Merge branch 'alan_develop' into develop
|
2016-03-17 16:04:06 +08:00 |
cxt
|
d72aa3a93c
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/homework_common_controller.rb
app/views/student_work/show.js.erb
public/javascripts/application.js
public/stylesheets/base.css
public/stylesheets/public_new.css
|
2016-03-17 15:27:52 +08:00 |
cxt
|
a8780be9b4
|
提交作品、提交作业、发布课程帖子、组织文章实现每隔10秒自动保存帖子
|
2016-03-17 15:03:34 +08:00 |
alan
|
9265186307
|
修改user动态中issue行高,使之与project中的一样
|
2016-03-17 14:36:05 +08:00 |
huang
|
7ff946e488
|
课程资源库提供历史版本下载
|
2016-03-17 12:37:05 +08:00 |
ouyangxuhua
|
098844a910
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/helpers/application_helper.rb
app/views/organizations/_org_course_homework.html.erb
app/views/organizations/_org_course_news.html.erb
app/views/organizations/_org_project_issue.html.erb
app/views/organizations/_project_message.html.erb
app/views/organizations/_show_org_document.html.erb
app/views/users/_user_message_course.html.erb
|
2016-03-15 13:40:33 +08:00 |
huang
|
bf4116906f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/controllers/users_controller.rb
public/stylesheets/public.css
|
2016-03-15 11:09:11 +08:00 |
cxt
|
5476016b79
|
调整题库高度与资源库一致
|
2016-03-15 09:47:58 +08:00 |
huang
|
2b21213b7f
|
公共资源库,排序
|
2016-03-15 09:26:26 +08:00 |
huang
|
a7990a4c3c
|
Merge branch 'yuanke' into develop
|
2016-03-14 18:25:26 +08:00 |