cxt
|
35260f2f6d
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-08-13 15:36:48 +08:00 |
cxt
|
2759d562ac
|
首页项目列表
|
2016-08-13 15:35:03 +08:00 |
daiao
|
4a9967674a
|
1. 强制编辑基本资料,在删除单位时给出消息通知
2. 单位名称申请提示一直显示
3. 申请单位的消息通知显示申请人头像,并连接到申请人主页
|
2016-08-13 14:29:33 +08:00 |
huang
|
37df983009
|
项目列表
|
2016-08-13 11:13:11 +08:00 |
huang
|
1b19d227f9
|
项目列表样式及连接
|
2016-08-13 10:17:38 +08:00 |
cxt
|
03c093fb13
|
班级作业列表中“赞”和“取消点赞”不可用
|
2016-08-11 16:34:00 +08:00 |
Tim
|
f4445619d2
|
题库预览弹框样式调整
|
2016-08-11 11:02:40 +08:00 |
cxt
|
9b8470b813
|
编辑分组作业后点确定,原来设置的基于项目实施会被取消
|
2016-08-11 10:23:44 +08:00 |
cxt
|
7edb30754b
|
student_works添加字段commit_time,记录学生作品实际的提交时间
|
2016-08-10 16:50:27 +08:00 |
cxt
|
0cc9fafddb
|
“关注、粉丝”页面中分页显示要紧跟上面的内容
|
2016-08-09 17:21:11 +08:00 |
cxt
|
0ed508a887
|
题库预览弹窗的调整
|
2016-08-09 17:09:36 +08:00 |
cxt
|
2951259d23
|
左侧项目列表的展开
|
2016-08-09 10:40:00 +08:00 |
cxt
|
153e02c4fa
|
消息列表报500
|
2016-08-09 10:39:32 +08:00 |
cxt
|
90e480f7e9
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-05 18:52:39 +08:00 |
cxt
|
5b8883960b
|
Merge branch 'cxt_course' into develop
|
2016-08-05 18:52:09 +08:00 |
cxt
|
d3db6719eb
|
“我的作业”中编辑作业不跳转到“题库”,而是返回到“我的作业”
|
2016-08-05 18:41:32 +08:00 |
Tim
|
cd30f94d72
|
题库发送预览弹框位置及可拖拽js更新
|
2016-08-05 18:01:11 +08:00 |
cxt
|
e7e873e0df
|
Merge branch 'dev_shcool' into develop
Conflicts:
app/helpers/users_helper.rb
|
2016-08-05 16:32:10 +08:00 |
cxt
|
3178700131
|
Merge branch 'cxt_course' into develop
|
2016-08-05 16:14:56 +08:00 |
cxt
|
0d86a28c54
|
我的作业
|
2016-08-05 16:12:53 +08:00 |
cxt
|
6c7b53f7d4
|
首页左侧栏
|
2016-08-04 11:05:34 +08:00 |
daiao
|
7f62de59e1
|
优化周二代码审查的代码
|
2016-08-03 17:36:04 +08:00 |
cxt
|
f262447ff1
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/users/user_homeworks.html.erb
|
2016-08-03 15:01:43 +08:00 |
cxt
|
cecf917764
|
从题库选用作业时增加提示:“您选中的题是“我收到的作业”,不能选用”
|
2016-08-03 15:00:16 +08:00 |
Tim
|
a5fe620452
|
题库翻页居中对齐
|
2016-08-03 14:57:02 +08:00 |
cxt
|
bae775ec34
|
题库的搜索调整
|
2016-08-03 14:06:47 +08:00 |
cxt
|
acc3ba121f
|
测试集的显示、新版分页
|
2016-08-03 13:46:59 +08:00 |
cxt
|
718b13e6c1
|
新版题库
|
2016-08-03 11:12:55 +08:00 |
daiao
|
5f969c6593
|
单位审核相关Bug修复
|
2016-08-03 10:36:03 +08:00 |
huang
|
94b36e227c
|
申请加入项目消息刷新,同时更新其它管理员的消息状态
|
2016-08-02 13:03:33 +08:00 |
daiao
|
fc1fc0bd7d
|
单位审核bug修复
|
2016-08-01 15:44:18 +08:00 |
daiao
|
5272f20de8
|
单位审核bug的修复
|
2016-08-01 13:56:37 +08:00 |
cxt
|
87e3707b52
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-29 23:54:17 +08:00 |
cxt
|
0ac906a5cf
|
消息列表报500
|
2016-07-29 23:54:10 +08:00 |
daiao
|
6ea829131b
|
单位列表发送消息样式调整
|
2016-07-29 23:48:12 +08:00 |
daiao
|
15227907ea
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-29 23:23:11 +08:00 |
daiao
|
db690bedab
|
单位名称列表缺陷修复
|
2016-07-29 23:22:32 +08:00 |
huang
|
21eed9ebb3
|
去掉同意拒绝“:”
|
2016-07-29 23:03:18 +08:00 |
cxt
|
23bb010315
|
课程列表的资源数显示不对
|
2016-07-29 22:49:39 +08:00 |
daiao
|
911a769670
|
Merge branch 'develop' into dev_shcool
Conflicts:
app/models/applied_message.rb
|
2016-07-29 22:05:56 +08:00 |
cxt
|
98a2ebd682
|
Merge branch 'cxt_course' into develop
|
2016-07-29 21:54:33 +08:00 |
cxt
|
4a800b67d8
|
消息列表报500
|
2016-07-29 21:53:00 +08:00 |
daiao
|
d6178ec7dd
|
管理员界面单位申请
|
2016-07-29 21:45:52 +08:00 |
cxt
|
04b9c35a05
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-29 21:41:26 +08:00 |
cxt
|
807db1ac40
|
课程角色申请链接的样式
|
2016-07-29 21:41:19 +08:00 |
huang
|
847cae6d41
|
Merge branch 'develop' into rep_quality
Conflicts:
app/models/applied_message.rb
db/schema.rb
|
2016-07-29 21:39:00 +08:00 |
huang
|
f857ceab32
|
消息中项目添加title
|
2016-07-29 21:07:15 +08:00 |
huang
|
8d625eff5e
|
修改方式就用户图像显示
|
2016-07-29 21:04:01 +08:00 |
daiao
|
3251890c91
|
Merge branch 'rep_quality' into dev_shcool
Conflicts:
app/models/applied_message.rb
db/schema.rb
|
2016-07-29 20:52:18 +08:00 |
huang
|
643b06484b
|
消息表添加字段
|
2016-07-29 20:50:55 +08:00 |
daiao
|
430a93e4b2
|
单位名称列表功能代码
|
2016-07-29 20:48:36 +08:00 |
cxt
|
e3d538c3fa
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/_course_base_info.html.erb
db/schema.rb
|
2016-07-29 19:39:42 +08:00 |
huang
|
60417b2db7
|
项目邀请消息样式问题
|
2016-07-29 19:30:53 +08:00 |
cxt
|
335b82c046
|
加入班级的弹框
|
2016-07-29 19:19:58 +08:00 |
huang
|
c07677ef99
|
项目邀请框架 拒绝消息
|
2016-07-29 14:49:37 +08:00 |
cxt
|
a1a2b3dd33
|
Merge branch 'rep_quality' into cxt_course
Conflicts:
db/schema.rb
|
2016-07-29 14:36:18 +08:00 |
daiao
|
50ec127c5b
|
单位名称列表功能
|
2016-07-28 20:01:22 +08:00 |
huang
|
a8fa4a55e3
|
项目申请消息发送
|
2016-07-28 16:22:33 +08:00 |
cxt
|
a1149c1104
|
班级列表的公开私有
|
2016-07-27 14:07:16 +08:00 |
huang
|
43cb2a0d18
|
单位申请消息显示
|
2016-07-27 11:33:54 +08:00 |
cxt
|
4422bb1bc0
|
课程列表中的私有班级不可访问
|
2016-07-27 10:11:00 +08:00 |
cxt
|
76eca76728
|
作业发布时资源库的提示修改
|
2016-07-27 09:39:42 +08:00 |
cxt
|
a0f2f518cf
|
回复他人的博客首页不应跳到自己的博客首页
|
2016-07-26 17:45:59 +08:00 |
cxt
|
feb45a07bf
|
课程列表分为我创建的课程和我加入的课程
|
2016-07-26 16:45:36 +08:00 |
cxt
|
0564ddb6ea
|
课程大纲的回复
|
2016-07-25 13:56:26 +08:00 |
cxt
|
11c9fba7e7
|
提示信息修改
|
2016-07-22 18:58:41 +08:00 |
cxt
|
71b5fe1273
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/issues_controller.rb
app/views/issues/_issue_replies.html.erb
app/views/issues/_issue_reply_ke_form.html.erb
db/schema.rb
|
2016-07-21 14:31:43 +08:00 |
cxt
|
0146ac1f11
|
访问他人主页时,对于动态过滤按钮,“我的动态”应改为“他的动态”;但浏览自己的主页时,应该显示为“我的动态”。
|
2016-07-21 10:50:53 +08:00 |
cxt
|
f3c95906d8
|
项目缺陷的二级回复
|
2016-07-21 10:30:48 +08:00 |
cxt
|
7853b8aa54
|
班级通知、项目新闻、帖子栏目通知的动态和详情页的二级回复, 二级回复代码的整合
|
2016-07-20 17:00:18 +08:00 |
Tim
|
1fc2bbd56a
|
作业资源库弹框,资源名称与上传者栏增加宽度限制
|
2016-07-19 09:17:20 +08:00 |
cxt
|
fdf925a0b8
|
个人主页留言动态:如图回复当前用户自己的留言却不能删除,“展开回复”后又可删除了,刷新网页后又删除不了
|
2016-07-18 16:40:04 +08:00 |
cxt
|
8e3488132b
|
导入作业:公共题库中显示的却是我的题库,我的题库中显示的却是公共题库
|
2016-07-18 14:43:47 +08:00 |
Tim
|
e966972750
|
Merge branch 'develop' into cs_optimize_txz
Conflicts:
app/views/versions/index.html.erb
|
2016-07-18 14:32:17 +08:00 |
cxt
|
9e5e7a75b0
|
编程作业关闭匿评后,老师点击模拟答题,却弹出匿评提示
|
2016-07-18 14:09:41 +08:00 |
cxt
|
a9ee1d10cd
|
新增班级成员的消息通知,跳转至该班级的成员配置页面
|
2016-07-18 11:19:56 +08:00 |
cxt
|
c9e0143fe8
|
作业动态的时间
|
2016-07-15 19:36:46 +08:00 |
cxt
|
48e5a0be7e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
2016-07-15 17:38:56 +08:00 |
cxt
|
fcc8a08138
|
课程列表的样式问题
|
2016-07-15 17:38:10 +08:00 |
huang
|
4c5052dce2
|
作业按更新时间排序
|
2016-07-15 17:28:57 +08:00 |
cxt
|
5b070b6acc
|
消息列表的html标签
|
2016-07-15 16:52:18 +08:00 |
cxt
|
1c967ce569
|
Merge branch 'rep_quality' into develop
Conflicts:
app/views/users/_user_message_system.html.erb
app/views/users/_user_message_userfeedaback.html.erb
|
2016-07-15 15:53:32 +08:00 |
cxt
|
11e0101f56
|
导航栏题库中 我的题库放在前面
|
2016-07-15 15:06:33 +08:00 |
cxt
|
fd68479d72
|
课程/项目/组织资源库发送资源、问答区帖子发送、通知发送、新闻发送、动态中发送到课程改为班级
|
2016-07-15 11:02:53 +08:00 |
cxt
|
b77779ca55
|
文章的二级回复和组织帖子的二级回复
|
2016-07-14 17:23:48 +08:00 |
huang
|
7da67350fd
|
issue列表进入详情页面,弹出新页面
|
2016-07-14 15:31:25 +08:00 |
huang
|
e98d7a213f
|
系统消息点击跳转列表定位
|
2016-07-14 15:23:16 +08:00 |
huang
|
f7c9bc0a19
|
消息跳转定位
|
2016-07-14 15:04:58 +08:00 |
cxt
|
e19efc1c8a
|
博客的二级回复
|
2016-07-14 14:44:47 +08:00 |
huang
|
3485d48163
|
Merge branch 'develop' into rep_quality
Conflicts:
app/controllers/quality_analysis_controller.rb
|
2016-07-14 14:08:03 +08:00 |
huang
|
8c6fca87c9
|
项目动态中,新闻添加快捷操作,所有操作默认显示
|
2016-07-14 13:57:06 +08:00 |
Tim
|
fdf147326c
|
Merge branch 'develop' into cs_optimize_txz
|
2016-07-14 11:01:12 +08:00 |
cxt
|
ded8f48d34
|
博客的二级回复
|
2016-07-13 15:20:39 +08:00 |
cxt
|
c46fcc48b1
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/users/_join_course_course_message.html.erb
|
2016-07-12 16:26:13 +08:00 |
cxt
|
f0e456729e
|
过滤掉消息中的html
|
2016-07-12 16:21:30 +08:00 |
cxt
|
89819f5ccd
|
消息列表
|
2016-07-11 17:33:11 +08:00 |
huang
|
22745edb9b
|
Merge branch 'rep_quality' into develop
|
2016-07-11 17:02:25 +08:00 |
huang
|
8b5a2ac1cb
|
message 500
|
2016-07-11 16:59:37 +08:00 |
cxt
|
b4e6561e50
|
Merge branch 'cxt_course' into develop
|
2016-07-11 15:16:27 +08:00 |
cxt
|
5d9bde3c95
|
课程发送资源到课程
|
2016-07-11 15:10:55 +08:00 |
Tim
|
a0db221ffc
|
Merge branch 'develop' into cs_optimize_txz
|
2016-07-11 13:57:04 +08:00 |
huang
|
0a001b4f76
|
message 500 for boliang
|
2016-07-11 11:29:15 +08:00 |
cxt
|
3362ebe321
|
线下作业
|
2016-07-08 18:22:59 +08:00 |
cxt
|
cc4b24cdb9
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-07-08 13:18:46 +08:00 |
cxt
|
13bae8f8a5
|
线下作业
|
2016-07-08 13:17:14 +08:00 |
huang
|
ef8b127225
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
public/javascripts/application.js
|
2016-07-08 11:33:51 +08:00 |
yuanke
|
06f7594680
|
Merge branch 'yuanke' into develop
|
2016-07-08 09:15:55 +08:00 |
cxt
|
37dd447fcb
|
Merge branch 'daiao_dev' into cxt_course
Conflicts:
app/views/admin/courses.html.erb
public/stylesheets/new_user.css
|
2016-07-07 15:14:11 +08:00 |
yuanke
|
a732efa6c6
|
1.组织动态中去掉设为首页的文章动态 2.个人主页动态中去掉设为首页的博客动态并将 最上面的博客显示回复内容及可回复
|
2016-07-07 10:42:51 +08:00 |
Tim
|
0b764d0dfc
|
RSide样式处理
|
2016-07-06 15:52:18 +08:00 |
Tim
|
75475b6058
|
个人主页,课程,项目样式更新
|
2016-07-06 15:43:48 +08:00 |
Tim
|
1658f78a7b
|
Merge branch 'develop' into cs_optimize_txz
Conflicts:
app/views/layouts/new_base.html.erb
app/views/layouts/new_base_user.html.erb
app/views/users/_user_resource_info.html.erb
|
2016-07-05 15:38:56 +08:00 |
cxt
|
3ccdf7f9ae
|
课程问答区,项目讨论区的帖子消息通知应直接打开对应的帖子详情界面
|
2016-07-05 15:00:41 +08:00 |
cxt
|
2956b08f40
|
分组作业:去掉组员“追加附件”的入口
|
2016-07-05 10:32:46 +08:00 |
cxt
|
0dd7ef4460
|
帖子列表的回复数与实际不符
|
2016-07-04 14:45:50 +08:00 |
cxt
|
599cedaa18
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/courses.css
public/stylesheets/public.css
|
2016-07-04 14:15:56 +08:00 |
cxt
|
cc649ae64b
|
课程讨论区、项目讨论区、帖子详情页面的二级回复
|
2016-07-04 14:14:51 +08:00 |
yuanke
|
447e624f36
|
课程大纲bug修复
|
2016-07-01 21:38:37 +08:00 |
cxt
|
b1a77a036b
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-01 17:52:35 +08:00 |
cxt
|
8b87c141cc
|
bug修复
|
2016-07-01 17:47:35 +08:00 |
cxt
|
0f8cc584a9
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-07-01 17:27:40 +08:00 |
yuanke
|
1edc63721f
|
修改课程列表班级时间显示问题
|
2016-07-01 17:03:05 +08:00 |
Tim
|
afbf62fd64
|
当课程数为0时,课程列表点击无效
|
2016-07-01 17:02:52 +08:00 |
cxt
|
0ff8f0a774
|
课程大纲的删除和课程大纲描述的删除
|
2016-07-01 16:25:52 +08:00 |
cxt
|
afe16cc99c
|
课程大纲列表的js调整
|
2016-07-01 14:13:40 +08:00 |
Tim
|
def0d79271
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/users/_user_syllabus_list.html.erb
|
2016-07-01 13:56:07 +08:00 |
Tim
|
7633761bbe
|
课程大纲列表展开收起js
|
2016-07-01 13:54:00 +08:00 |
cxt
|
3b7679b254
|
课程大纲列表
|
2016-07-01 11:29:03 +08:00 |
cxt
|
a50e15b2ab
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/users/_user_syllabus_list.html.erb
db/schema.rb
|
2016-07-01 11:15:03 +08:00 |
cxt
|
2c1e0f534c
|
课程大纲
|
2016-07-01 11:11:53 +08:00 |
Tim
|
10f52f110f
|
课程大纲列表点击展开收起,配置按钮链接跳转实现
|
2016-06-30 16:12:25 +08:00 |
cxt
|
ac4218bfb0
|
课程大纲列表
|
2016-06-30 15:36:46 +08:00 |
cxt
|
ebb697a49f
|
班级列表、课程大纲的编辑、回复、课程列表
|
2016-06-30 10:44:11 +08:00 |
cxt
|
e066445036
|
课程大纲的显示和编辑
|
2016-06-29 10:45:56 +08:00 |
cxt
|
4f342142e6
|
组织文章的展开更多
|
2016-06-24 17:58:50 +08:00 |
cxt
|
b2f939fa92
|
代码调整
|
2016-06-24 17:01:35 +08:00 |
cxt
|
0611ddcc43
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/users/_reply_to.html.erb
|
2016-06-24 16:54:19 +08:00 |
cxt
|
76e7c50bf4
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_reply_to.html.erb
|
2016-06-24 16:52:00 +08:00 |
cxt
|
eab000306c
|
动态回复的展开更多、收起,组织文章回复不可用
|
2016-06-24 16:38:36 +08:00 |
Tim
|
a3738c4cb2
|
新建组织,题库和资源库弹框样式检查
|
2016-06-24 15:42:42 +08:00 |
yuanke
|
c6be37020f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_reply_to.html.erb
|
2016-06-24 15:11:52 +08:00 |
Tim
|
a28d775cb2
|
资源库,题库样式检查
|
2016-06-24 14:01:49 +08:00 |
Tim
|
8a6bbf50a9
|
css文件替换
|
2016-06-24 09:30:46 +08:00 |
cxt
|
126bf9c195
|
个人留言、课程留言的二级回复
|
2016-06-23 14:47:22 +08:00 |
cxt
|
3f8beaf97c
|
动态回复banner的代码重构
|
2016-06-21 16:53:31 +08:00 |
yuanke
|
f3014c3993
|
Merge branch 'yuanke' into develop
|
2016-06-17 17:25:53 +08:00 |
yuanke
|
948ec58248
|
作业二级回复未登录显示样式问题
|
2016-06-17 17:18:36 +08:00 |
cxt
|
7b1efe193d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-17 14:45:16 +08:00 |
cxt
|
eb3694dbe6
|
消息报500
|
2016-06-17 14:45:07 +08:00 |
yuanke
|
d6d9a366f2
|
Merge branch 'develop' into yuanke
Conflicts:
public/stylesheets/new_user.css
|
2016-06-17 14:36:12 +08:00 |
yuanke
|
c51c73f225
|
所有回复添加未登录提示
|
2016-06-17 14:31:14 +08:00 |
cxt
|
a105f4eaf0
|
课程动态中:课程讨论区、课程通知
项目动态中:项目issue、项目新闻、项目讨论区
个人动态:如上动态
未登录时不显示齿轮
|
2016-06-17 14:09:43 +08:00 |
huang
|
88b838a89a
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-06-17 11:33:48 +08:00 |
cxt
|
795917688c
|
留言内容无法展开、收起
|
2016-06-17 09:34:48 +08:00 |
cxt
|
30db43eb13
|
作业开启匿评之后,如果是普通作业,会提示学生提交的作业不会进入匿评,也不能对其他人进行匿评,如果是编程作业,在打开作业时则无此提示,应该统一,均进行提示
|
2016-06-16 15:58:34 +08:00 |
cxt
|
e3ee99b486
|
消息通知中过滤掉已删除的课程消息、
at消息不显示
|
2016-06-16 15:46:16 +08:00 |
yuanke
|
a17fb86a17
|
组织回复点登录直接跳入登录页面
|
2016-06-15 17:07:29 +08:00 |
cxt
|
43192b8648
|
分组作业的弹框增加人数的验证、点击关闭弹框时还原弹框中的值
|
2016-06-15 17:04:53 +08:00 |
yuanke
|
a2d1b6d646
|
组织回复点登录直接跳入登录界面
|
2016-06-15 17:01:53 +08:00 |
yuanke
|
7b6e8fbc53
|
修改组织点击登录后可回复报500的BUG
|
2016-06-15 14:33:25 +08:00 |
yuanke
|
44c9265fee
|
个人主页个性签名增加自动识别url
|
2016-06-13 15:29:15 +08:00 |
cxt
|
02e2831980
|
管理员界面的留言列表优化
|
2016-06-12 17:17:37 +08:00 |
huang
|
dcb3d8659b
|
Merge branch 'cxt_course' into develop
|
2016-06-12 15:02:33 +08:00 |
cxt
|
9d36c74d7f
|
作业回复的删除
|
2016-06-12 14:59:00 +08:00 |
cxt
|
a1e49d9a81
|
Merge branch 'cxt_course' into develop
|
2016-06-08 15:24:00 +08:00 |
cxt
|
c0d167d2e2
|
项目缺陷动态的回复不显示
|
2016-06-08 15:23:19 +08:00 |
huang
|
3e3c300273
|
Merge branch 'cxt_course' into develop
|
2016-06-08 11:37:58 +08:00 |
cxt
|
196c92f9c4
|
动态回复最多只加赞三条,点击展开更多时才加载余下的回复
|
2016-06-07 16:02:00 +08:00 |
huang
|
21197c95b3
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-06 15:11:59 +08:00 |
huang
|
df8df117a8
|
解决匿名用户登录问题(控制器和view)
|
2016-06-06 15:02:11 +08:00 |
Tim
|
a44cb47a26
|
组织未登录回复框提示
|
2016-06-06 14:41:18 +08:00 |
huang
|
c6d36bd738
|
未登录留言判断
|
2016-06-06 14:21:58 +08:00 |
cxt
|
ffe447e5bc
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-03 16:28:23 +08:00 |
cxt
|
d27a050ffa
|
消息弹窗的显示
|
2016-06-03 16:28:11 +08:00 |
huang
|
b128ba5257
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/views/layouts/base_org2.html.erb
|
2016-06-03 14:58:37 +08:00 |
cxt
|
5097abbe1e
|
Merge branch 'develop' into cxt_course
|
2016-06-01 14:22:43 +08:00 |
huang
|
91ae3d8b39
|
Merge branch 'develop' into hjq_beidou
Conflicts:
db/schema.rb
|
2016-05-31 18:38:05 +08:00 |
cxt
|
0cafebb3a2
|
新闻列表的点赞
|
2016-05-27 17:14:37 +08:00 |
huang
|
f7cb9bdffd
|
Merge branch 'cxt_course' into develop
|
2016-05-27 17:13:01 +08:00 |
cxt
|
1535c4cd07
|
编辑分组作业时的基于项目实施总是默认选中
|
2016-05-27 15:54:55 +08:00 |
yuanke
|
d08809bfbd
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/project.css
|
2016-05-27 15:34:55 +08:00 |
huang
|
ff14809237
|
Merge branch 'cxt_course' into develop
|
2016-05-27 15:30:35 +08:00 |
cxt
|
7599bf75a3
|
分组作业不关联项目时的作品列表样式调整
|
2016-05-27 15:04:56 +08:00 |
yuanke
|
cfc3751f6f
|
Merge branch 'yuanke' into develop
|
2016-05-27 14:01:02 +08:00 |
huang
|
c7bf29b0c9
|
组织切换问题
|
2016-05-27 12:46:11 +08:00 |
huang
|
fb46062640
|
项目、课程、组织资源列表发送无法弹框问题
|
2016-05-27 10:20:15 +08:00 |
huang
|
ab4aa0f06f
|
公共资源多个资源发送功能
|
2016-05-27 09:32:24 +08:00 |
huang
|
0a7d1f1efc
|
公共资源库添加资源多个发送功能,修复项目、课程多个发送的bug
|
2016-05-25 17:54:53 +08:00 |
cxt
|
c8467a50a0
|
自己可以给自己点赞
|
2016-05-25 16:19:41 +08:00 |
huang
|
457cf72263
|
断行样式
发送JS
|
2016-05-25 14:08:05 +08:00 |
huang
|
0a8d21ea55
|
公共资源底端发送JS
|
2016-05-25 14:05:09 +08:00 |
huang
|
415b624e0b
|
样式问题
|
2016-05-25 11:07:36 +08:00 |
huang
|
b6de2dbd2d
|
发布作业导入资源
|
2016-05-25 09:44:30 +08:00 |
huang
|
4280d79eab
|
Merge branch 'develop' into hjq_beidou
|
2016-05-25 09:11:55 +08:00 |
huang
|
197f054c18
|
注释掉申请私有资源功能
|
2016-05-25 09:10:41 +08:00 |
huang
|
d1e11d4260
|
代码审查后代码简化
|
2016-05-25 08:58:58 +08:00 |
huang
|
b38bd0c1e5
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-24 20:13:42 +08:00 |
cxt
|
ed2f413949
|
代码还原
|
2016-05-24 20:04:06 +08:00 |
huang
|
a7a2be6a4b
|
作业导入资源问题
|
2016-05-24 16:01:02 +08:00 |
huang
|
bc0e24d39e
|
资源引用代码注释
|
2016-05-24 10:28:17 +08:00 |