cxt
|
bb71d1c322
|
调试模式
|
2016-04-07 16:59:46 +08:00 |
txz
|
411a8be8b8
|
点击展开
|
2016-04-07 16:58:06 +08:00 |
txz
|
139a7931ee
|
点赞功能修改
|
2016-04-07 16:39:04 +08:00 |
cxt
|
60c8320f82
|
praise api的修改
|
2016-04-07 15:42:08 +08:00 |
txz
|
938bf48d08
|
点赞功能修改
|
2016-04-07 15:26:23 +08:00 |
cxt
|
2fe32fda61
|
点赞的js
|
2016-04-07 15:17:42 +08:00 |
txz
|
eb996280a6
|
点赞功能
|
2016-04-07 15:07:37 +08:00 |
cxt
|
f1783c06a2
|
详情页面传参openid
|
2016-04-07 14:24:15 +08:00 |
txz
|
3008c0c44d
|
activities.html冲突解决
|
2016-04-07 14:16:51 +08:00 |
txz
|
0b1b08bd3d
|
点赞
|
2016-04-07 14:15:19 +08:00 |
guange
|
80f47476cb
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
# Conflicts:
# public/javascripts/wechat/app.js
|
2016-04-07 13:58:23 +08:00 |
guange
|
99f39696d0
|
点击展开功能完成
|
2016-04-07 13:57:38 +08:00 |
txz
|
6d8ffabb39
|
代码优化
|
2016-04-07 11:40:20 +08:00 |
guange
|
8ac8e1c9e5
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-07 11:23:15 +08:00 |
guange
|
79dcd48d8c
|
重构
|
2016-04-07 11:22:22 +08:00 |
txz
|
8e1473a484
|
点赞代码优化等
|
2016-04-07 09:26:24 +08:00 |
txz
|
ec47fb1949
|
项目缺陷详情页面修改
|
2016-04-06 19:29:00 +08:00 |
txz
|
a1ef398b9d
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-06 16:24:41 +08:00 |
txz
|
422621759e
|
项目讨论区详情修改
|
2016-04-06 16:24:35 +08:00 |
cxt
|
20bb8c1e09
|
留言详情页面
|
2016-04-06 16:23:21 +08:00 |
txz
|
6115e374bf
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-06 15:34:59 +08:00 |
txz
|
a1a9dbd8a3
|
项目讨论区详情页面
|
2016-04-06 15:34:54 +08:00 |
guange
|
42bd2dcfc5
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
# Conflicts:
# public/javascripts/wechat/app.js
|
2016-04-06 15:23:48 +08:00 |
guange
|
3ee79a6889
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
# Conflicts:
# public/javascripts/wechat/app.js
|
2016-04-06 15:23:20 +08:00 |
guange
|
70c2c9cc9f
|
把activities列表存起来,防止返回时页面变空
|
2016-04-06 15:19:18 +08:00 |
txz
|
c9687a8764
|
课程通知详情页面
|
2016-04-06 14:44:35 +08:00 |
txz
|
feb0014bf8
|
作业详情页面
|
2016-04-06 11:29:50 +08:00 |
txz
|
18cda892d9
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-06 09:43:31 +08:00 |
cxt
|
be30ac889b
|
冲突
|
2016-04-06 09:43:04 +08:00 |
txz
|
0d04f996c5
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-06 09:40:53 +08:00 |
cxt
|
035b47d2b7
|
issue页面的调整
|
2016-04-06 09:38:46 +08:00 |
guange
|
606599047d
|
详情页出错
|
2016-04-05 17:35:27 +08:00 |
guange
|
23ec67b2eb
|
详情页出错
|
2016-04-05 17:23:36 +08:00 |
guange
|
afd779f292
|
使用cookies存储openid
|
2016-04-05 17:19:00 +08:00 |
guange
|
80d5424ff3
|
详情页出错
|
2016-04-05 16:36:18 +08:00 |
guange
|
619b07b5c2
|
服务器上调试openid成功
|
2016-04-05 16:32:42 +08:00 |
txz
|
50c6b565e7
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-05 16:32:38 +08:00 |
txz
|
11651fc866
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-05 15:58:11 +08:00 |
guange
|
bb5a527f9e
|
配置新菜单
|
2016-04-05 15:57:19 +08:00 |
txz
|
b2a892bd22
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-05 15:12:50 +08:00 |
guange
|
417484f3ad
|
加入调试标志
|
2016-04-05 15:12:05 +08:00 |
txz
|
48e26fce62
|
冲突解决
|
2016-04-05 10:43:51 +08:00 |
txz
|
8c7de04dbf
|
项目问答详情页面
|
2016-04-05 10:30:25 +08:00 |
guange
|
36f3e3a46c
|
改为angularjs实现
|
2016-04-04 22:24:13 +08:00 |
guange
|
58c1b27600
|
加入openid传参
|
2016-04-02 08:13:52 +08:00 |
guange
|
e1f1c6fbc0
|
openid参数
|
2016-04-02 08:05:49 +08:00 |
guange
|
1926f0ba53
|
修改openid路由
|
2016-04-02 07:49:36 +08:00 |
guange
|
9c93b3f9a6
|
修改openid调用位置
|
2016-04-02 07:43:55 +08:00 |
guange
|
7d4de36521
|
修改openid调用位置
|
2016-04-02 07:39:46 +08:00 |
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 |
Tim
|
77e11fe0fe
|
微信最新动态修改
|
2016-03-30 17:47:44 +08:00 |
Yiang Gan
|
4de598873f
|
动态和作业的api
|
2016-03-30 10:32:45 +08:00 |
ouyangxuhua
|
9e599da365
|
组织动态,点击展开更多没有反应问题解决
|
2016-03-29 15:47:05 +08:00 |
ouyangxuhua
|
a69997f6c7
|
Merge branch 'develop' into ouyangxuhua
|
2016-03-29 10:21:29 +08:00 |
yuanke
|
213cf48c09
|
编程的输出和结果每行尾部的空格才用别的符号代替,中间的空格不管
|
2016-03-29 09:02:54 +08:00 |
ouyangxuhua
|
1a1d5b4c49
|
解决:发送功能在中文输入的情况下,会出现输入框内容增多的问题
|
2016-03-28 19:20:09 +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 |
yuanke
|
5116d75eb7
|
编程作业空格用□表示
|
2016-03-26 14:48:57 +08:00 |
Tim
|
4f7d698076
|
wechat init
|
2016-03-26 14:45:57 +08:00 |
yuanke
|
e62ee2eade
|
修改评测问题
|
2016-03-26 13:44:13 +08:00 |
yuanke
|
63ae921c40
|
return 放错位置了
|
2016-03-25 17:07:06 +08:00 |
yuanke
|
674b63d106
|
Merge branch 'develop' into yuanke
Conflicts:
app/views/student_work/_programing_work_show.html.erb
|
2016-03-25 15:59:49 +08:00 |
yuanke
|
3c1be19702
|
修改编程提示语句
|
2016-03-25 15:41:14 +08:00 |
yuanke
|
1f9d2ceffb
|
修改下编程的提示
|
2016-03-25 15:38:14 +08:00 |
yuanke
|
0fd164d2bb
|
修改编程的几个提示语句
|
2016-03-25 15:24:31 +08:00 |
yuanke
|
3af257eb77
|
评测服务器有问题时得提示
|
2016-03-25 15:18:33 +08:00 |
yuanke
|
dea947e9ce
|
Merge branch 'develop' into yuanke
Conflicts:
db/schema.rb
public/javascripts/application.js
public/javascripts/homework.js
public/stylesheets/new_user.css
|
2016-03-25 14:58:17 +08:00 |
yuanke
|
c6361406b5
|
代码评测超时优化
|
2016-03-25 14:43:51 +08:00 |
ouyangxuhua
|
5cc31fb511
|
组织资源栏目排序,带过滤条件,如tag类型、搜索条件等
|
2016-03-25 12:30:33 +08:00 |
ouyangxuhua
|
2d4f5284df
|
删除的课程、项目不能被关联到组织;组织名称长度限制;组织栏目添加帖子加上栏目名称;编辑组织时,如果组织名称没变,就不需要提示;学生回复老师的作业留言,打开后,显示该学生作业;新增、编辑组织文章,需要验证标题
|
2016-03-24 17:03:51 +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 |
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
|
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
|
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 |
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 |
yuanke
|
27a2aad3d6
|
修改KE贴吧回复添加视频图片不能显示的BUG
|
2016-03-14 18:19:23 +08:00 |
yuanke
|
465a236049
|
修改KE贴吧等地图片显示不出来的问题
|
2016-03-14 17:16:11 +08:00 |
luoquan
|
270a290df9
|
修改视频不能播放问题。
|
2016-03-14 15:18:56 +08:00 |
luoquan
|
1900a824e8
|
0
|
2016-03-11 14:39:17 +08:00 |
ouyangxuhua
|
766569afa6
|
1.组织下的课程作业,设置评分等按钮点击没反应的问题修复;更新项目/课程的活动,相应地更新组织的活动的更新时间
|
2016-03-10 16:43:50 +08:00 |
yuanke
|
5dcd3b6826
|
解决KE工具栏一行与两行显示不一致的情况
|
2016-03-09 15:32:08 +08:00 |
cxt
|
91d000c8f3
|
编程作业:编程测试集的弹框中,多行却只显示一行
|
2016-03-07 17:01:10 +08:00 |
guange
|
509d4a3df7
|
绑定提交改为ajax
|
2016-03-01 16:56:37 +08:00 |
guange
|
445bae6de9
|
patch mysql5.7的create table
|
2016-03-01 16:13:13 +08:00 |
cxt
|
072300331b
|
编程测试集的输入输出添加序号
|
2016-02-29 17:05:11 +08:00 |
ouyangxuhua
|
956ce8045d
|
Merge branch 'ouyangxuhua' into develop
|
2016-02-26 16:18:17 +08:00 |
ouyangxuhua
|
8784c7cec6
|
超链接不能正常显示的问题
|
2016-02-26 16:13:14 +08:00 |
cxt
|
347efa275d
|
Merge branch 'develop' into cxt_course
|
2016-02-24 09:50:53 +08:00 |
ouyangxuhua
|
a4ca676ccb
|
Merge branch 'szzh' into ouyangxuhua
Conflicts:
app/views/org_document_comments/edit.html.erb
app/views/users/search_user_course.js.erb
app/views/users/search_user_org.js.erb
app/views/users/search_user_project.js.erb
|
2016-02-20 16:49:19 +08:00 |
ouyangxuhua
|
5df44ba44f
|
1.ke回复框能自动增加高度;2.组织页面右上角链接修改
|
2016-02-20 15:18:24 +08:00 |
ouyangxuhua
|
63b644dbb9
|
解决”组织帖子附件超过20个后,编辑时不能增加附件“的问题
|
2016-02-20 11:06:21 +08:00 |
guange
|
ac121ce585
|
组织文章无法编辑问题
|
2016-02-18 15:26:07 +08:00 |
cxt
|
e6d4d7d0cb
|
描述框的自动增高
|
2016-02-02 17:16:50 +08:00 |
cxt
|
d42f144f23
|
作业、组织帖子描述框的自动增高
|
2016-02-02 15:50:28 +08:00 |
cxt
|
265359cd74
|
发布作业时作业类型的切换
|
2016-01-29 18:17:27 +08:00 |
ouyangxuhua
|
280f679b0c
|
1.调整项目中的问题快捷编辑的宽度;2.https://www.trustie.net/manual/feedback链接到帮助中心;3.编辑框显示更多选项
|
2016-01-28 16:49:25 +08:00 |
ouyangxuhua
|
c857fb734b
|
快捷回复中,设置回复框的高度和宽度
|
2016-01-28 10:16:45 +08:00 |
ouyangxuhua
|
89a919163c
|
一旦组织私有,就disabled掉允许游客下载选项
|
2016-01-26 15:25:25 +08:00 |
cxt
|
f632a3d4fb
|
编程弹框固定位置
|
2016-01-22 22:17:52 +08:00 |
cxt
|
8f1bffd28b
|
留言不能为空
|
2016-01-22 21:53:32 +08:00 |
cxt
|
bb67a8f77d
|
若测试集够长,点击增加测试集,此时应该自动定位到测试集输入框
|
2016-01-22 17:34:35 +08:00 |
cxt
|
338c224846
|
课程配置页面的结束学期可修改
|
2016-01-22 15:17:11 +08:00 |
ouyangxuhua
|
b8ae62db84
|
Merge branch 'szzh' into dev_hjq
|
2016-01-21 15:32:18 +08:00 |
ouyangxuhua
|
c303f7ff3f
|
将分享的js方法统一,分享文件、通知等均可复用
|
2016-01-21 14:33:31 +08:00 |
cxt
|
247924af26
|
动态内容显示不全
|
2016-01-21 11:24:26 +08:00 |
cxt
|
1ff244ad98
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-01-20 18:38:00 +08:00 |
cxt
|
3b180aca90
|
用户个人留言页面的改版
|
2016-01-20 18:37:47 +08:00 |
Tim
|
c7edf0d73b
|
弹框样式修改
|
2016-01-20 17:55:20 +08:00 |
ouyangxuhua
|
340d404ecd
|
组织栏目的通知增加查、改、删功能
|
2016-01-20 17:23:02 +08:00 |
Tim
|
ffba281de5
|
弹框蓝色边框与关闭键替换
|
2016-01-20 16:03:28 +08:00 |
huang
|
c936304314
|
课程默认收起
|
2016-01-15 15:37:17 +08:00 |
Tim
|
8feea07825
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
2016-01-14 15:59:50 +08:00 |
ouyangxuhua
|
7bcf995eaf
|
Merge branch 'develop' into dev_hjq
Conflicts:
db/schema.rb
public/stylesheets/share.css
|
2016-01-13 09:58:14 +08:00 |
ouyangxuhua
|
d5fc0277a2
|
3.2组织资源的样式更新
|
2016-01-12 16:43:40 +08:00 |
guange
|
e96496ddcd
|
avatar.js和attachments.js冲突,导致头像不能上传
|
2016-01-08 23:01:16 +08:00 |
huang
|
5b9be0bb11
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
public/stylesheets/public.css
|
2016-01-08 18:11:54 +08:00 |
ouyangxuhua
|
626e3da1e6
|
Merge branch 'szzh' into dev_hjq
Conflicts:
public/stylesheets/new_user.css
public/stylesheets/public.css
|
2016-01-08 18:09:21 +08:00 |
ouyangxuhua
|
b2bad60b38
|
1.修改用户留言页面的宽度;2.编辑博客首页转到博客首页
|
2016-01-08 16:16:57 +08:00 |
cxt
|
7d663ce66f
|
动态内容统一高度
|
2016-01-08 14:53:12 +08:00 |
huang
|
0a1aa9e569
|
Merge branch 'develop' into hjq_new_course
Conflicts:
db/schema.rb
public/stylesheets/public.css
|
2016-01-06 09:27:00 +08:00 |
huang
|
680e861620
|
项目资源搜索功能
|
2016-01-05 11:00:26 +08:00 |
guange
|
d2c7d12cd9
|
merge
|
2016-01-04 15:53:56 +08:00 |
guange
|
8ea9430318
|
at链接问题修改
|
2016-01-04 15:51:24 +08:00 |
lizanle
|
d26b51c982
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/organizations_controller.rb
db/schema.rb
|
2015-12-31 15:44:57 +08:00 |
cxt
|
ec631691e3
|
新建课程和课程配置页面增加结束学期
|
2015-12-31 11:12:09 +08:00 |
lizanle
|
be146a9421
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/organizations_controller.rb
db/schema.rb
public/stylesheets/courses.css
public/stylesheets/public.css
|
2015-12-31 11:11:38 +08:00 |
ouyangxuhua
|
82b8cb77fd
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-30 17:28:04 +08:00 |
cxt
|
76b95fbf93
|
课程和项目的课程简介默认可显示20行
|
2015-12-30 16:27:56 +08:00 |
ouyangxuhua
|
dcfe89c544
|
帖子发送到组织资源栏目,同时增加增删查改功能
|
2015-12-30 15:46:01 +08:00 |
lizanle
|
abb19422ff
|
发送资源到组织功能。同时个人资源库也要添加这个功能
|
2015-12-29 17:13:01 +08:00 |
huang
|
41cd038758
|
讨论区帖子添加锁定
|
2015-12-29 15:05:07 +08:00 |
huang
|
5060ec26bb
|
项目讨论区
|
2015-12-29 11:04:20 +08:00 |
guange
|
fd746c25f3
|
文件下载改为base64传输
|
2015-12-22 16:11:09 +08:00 |
guange
|
22d8fc9abd
|
作业附件乱码优化
|
2015-12-22 15:45:17 +08:00 |
cxt
|
e86f9f9aeb
|
去掉通知页面的字符限制
|
2015-12-21 13:20:09 +08:00 |
huang
|
ea51b24a4e
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-18 17:06:00 +08:00 |
guange
|
d0e139650f
|
issue回复的at出错
|
2015-12-18 16:50:44 +08:00 |
huang
|
a080306f75
|
解决课程动态中,点击按钮,提交多次的问题
|
2015-12-18 16:05:39 +08:00 |
guange
|
eb97f7dfb2
|
merge
|
2015-12-18 09:20:51 +08:00 |
cxt
|
0ed58d4898
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-17 19:07:17 +08:00 |
cxt
|
3b25616f0c
|
编辑作品时可编辑分组成员
|
2015-12-17 19:06:10 +08:00 |
lizanle
|
5f8c04e3a0
|
Merge branch 'szzh' into dev_zanle
|
2015-12-17 18:17:38 +08:00 |
lizanle
|
8ce2dbc4b8
|
issue回复
|
2015-12-17 18:12:38 +08:00 |
lizanle
|
1dbccd81d6
|
issue回复的删除功能
|
2015-12-17 17:15:03 +08:00 |
lizanle
|
4bc68081ee
|
editor修改
|
2015-12-17 15:15:00 +08:00 |
lizanle
|
8d58b045f1
|
文件链接却弹出图片框 bug
|
2015-12-17 09:55:02 +08:00 |
lizanle
|
b13ae8f599
|
issue
|
2015-12-16 15:55:40 +08:00 |
lizanle
|
68aceaa7df
|
issue下载
|
2015-12-15 18:43:58 +08:00 |
guange
|
4f57e48b92
|
merge
|
2015-12-14 18:20:32 +08:00 |
guange
|
f61f639af2
|
转换为remote js
|
2015-12-14 17:13:57 +08:00 |
cxt
|
af0e592d8a
|
匿评日期的设置
|
2015-12-14 17:03:20 +08:00 |
cxt
|
d7b690e53a
|
匿评设置时匿评关闭日期可以等于匿评开启日期
|
2015-12-14 16:54:28 +08:00 |
cxt
|
dfd0c95f2a
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-11 18:11:48 +08:00 |
lizanle
|
d1423ebc7e
|
ke高度小修改。
|
2015-12-11 15:41:41 +08:00 |
cxt
|
bb2f49439e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
2015-12-11 15:00:35 +08:00 |
cxt
|
f880ccd749
|
分组作业
|
2015-12-11 14:57:09 +08:00 |
huang
|
1ba0dae3c4
|
修复课程留言重复提交问题
|
2015-12-11 09:42:19 +08:00 |
huang
|
c7b2c9e3af
|
课程删除功能
admin中课程列表取消删除按钮
|
2015-12-10 18:59:54 +08:00 |
cxt
|
b61a0a98e5
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/student_work/new.html.erb
app/views/users/_user_homework_form.html.erb
db/schema.rb
public/stylesheets/courses.css
|
2015-12-07 09:47:18 +08:00 |
huang
|
c72cf55564
|
Merge branch 'develop' into szzh
|
2015-12-04 16:43:48 +08:00 |
cxt
|
8fe53468e1
|
作品追加附件
|
2015-12-04 16:21:11 +08:00 |
lizanle
|
e3c594a7ca
|
Merge branch 'develop' into dev_zanle
|
2015-12-04 10:59:14 +08:00 |
cxt
|
77e96af78f
|
还原分组作业
|
2015-12-03 10:41:27 +08:00 |
cxt
|
f90ff781ab
|
学生提交作品页面的合作成员弹窗
|
2015-12-03 09:17:36 +08:00 |
cxt
|
ae218fa86c
|
发布作业时添加分组作业
|
2015-12-02 11:14:46 +08:00 |
lizanle
|
8f4c915c57
|
博客的非空验证bug
|
2015-12-01 17:33:18 +08:00 |
huang
|
85515befc4
|
实现工具栏数字大于0显示,小于0隐藏
|
2015-11-24 17:29:57 +08:00 |
lizanle
|
dffabce806
|
Merge branch 'dev_zanle' into szzh
Conflicts:
db/schema.rb
|
2015-11-19 15:03:56 +08:00 |
ouyangxuhua
|
af981f841e
|
添加组织时,翻页提醒功能改善
|
2015-11-18 16:52:03 +08:00 |
ouyangxuhua
|
219774afab
|
将课程动态加入组织动态中
|
2015-11-18 16:05:08 +08:00 |
ouyangxuhua
|
b231b44e81
|
1.项目和课程中,添加翻页提醒;
2.项目和课程中,删除组织关联时,给出弹窗,确认是否删除。
|
2015-11-18 11:12:40 +08:00 |
ouyangxuhua
|
fc7e41ebf9
|
1.在项目和课程在关联和删除关联组织后,翻页能链接到正确的位置
|
2015-11-18 10:57:17 +08:00 |