 huang
|
3e17edecd1
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-02 19:05:46 +08:00 |
|
huang
|
2cd41cde7f
|
1706项目500问题
|
2016-09-02 19:05:21 +08:00 |
 cxt
|
b8d04c1352
|
课程列表的主讲老师改为创建老师
|
2016-09-02 16:40:07 +08:00 |
|
cxt
|
0d2a3cbe36
|
测试版消息列表报500
|
2016-09-02 16:00:54 +08:00 |
|
cxt
|
e949566d3d
|
合并
|
2016-09-02 15:26:00 +08:00 |
|
cxt
|
aaefd8b4aa
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_news_replies.html.erb
|
2016-09-02 15:24:55 +08:00 |
|
cxt
|
613f974440
|
项目的管理员和课程的老师都有权限删除帖子和新闻/通知的回复
|
2016-09-02 15:22:09 +08:00 |
|
cxt
|
ded6753ce1
|
访问他人的主页只显示他本人的动态
|
2016-09-02 14:23:02 +08:00 |
|
huang
|
5527b4e3a9
|
项目隐藏之 公共资源库底端发送隐藏课程信息
|
2016-09-01 12:25:35 +08:00 |
|
huang
|
4903064a5b
|
项目隐藏之 公共资源右键发送隐藏课程功能
|
2016-09-01 12:18:39 +08:00 |
|
huang
|
c51f725a78
|
项目隐藏之 项目动态中讨论区 新闻发送隐藏课程信息
|
2016-09-01 11:24:16 +08:00 |
|
huang
|
1444511fd9
|
项目隐藏之 项目讨论区详情页面 发送隐藏课程信息
|
2016-09-01 11:18:07 +08:00 |
|
huang
|
b2aba0f0bc
|
项目隐藏之 新闻发送隐藏课程信息
|
2016-09-01 11:12:56 +08:00 |
|
huang
|
3856ed8033
|
项目隐藏之资源发送项目组织
|
2016-09-01 11:00:34 +08:00 |
|
huang
|
52a8a64a69
|
项目隐藏 项目讨论区发送中去掉课程
|
2016-09-01 10:48:13 +08:00 |
|
cxt
|
5676f0b82f
|
项目类消息为空导致消息列表报500
|
2016-08-31 17:14:32 +08:00 |
|
huang
|
ac85eadc30
|
资源库点击切换样式
|
2016-08-31 15:42:17 +08:00 |
 Tim
|
ecf7522c4b
|
Merge branch 'cs_optimize_txz' into rep_quality
|
2016-08-31 15:32:23 +08:00 |
|
Tim
|
718e59c144
|
消息下拉框样式
|
2016-08-31 15:31:09 +08:00 |
|
huang
|
02fbdb57bd
|
隐藏项目中用户消息信息
|
2016-08-31 14:44:31 +08:00 |
|
cxt
|
cc7b97192e
|
分组作业关联项目下的文字链接到项目
|
2016-08-31 11:27:37 +08:00 |
|
huang
|
936198a8bd
|
隐藏非项目信息
|
2016-08-31 10:30:23 +08:00 |
|
cxt
|
623dadaea1
|
回复的删除按钮当鼠标放上去才显示
|
2016-08-30 14:12:50 +08:00 |
|
huang
|
803bd9819a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
public/stylesheets/css/public.css
|
2016-08-26 17:55:51 +08:00 |
|
cxt
|
6eb518c465
|
Merge branch 'cxt_course' into develop
Conflicts:
app/helpers/application_helper.rb
app/views/at/show.json.erb
app/views/layouts/new_base_user.html.erb
|
2016-08-26 16:23:07 +08:00 |
|
cxt
|
cb5e5f18ce
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-08-25 15:59:15 +08:00 |
|
cxt
|
b33136c59b
|
班级问答区改成讨论区
|
2016-08-25 15:59:09 +08:00 |
|
Tim
|
df1039cd09
|
项目收藏按钮位置调整
|
2016-08-25 15:55:36 +08:00 |
|
cxt
|
60beb2abab
|
首页左侧班级和项目列表的收藏功能
|
2016-08-25 11:30:47 +08:00 |
|
huang
|
3778871f58
|
issue在项目动态、列表、用户动态中删除回复添加提示
|
2016-08-25 10:39:16 +08:00 |
|
cxt
|
56b74b755b
|
取消收藏
|
2016-08-24 17:30:30 +08:00 |
|
cxt
|
7d89f69981
|
班级和项目收藏夹
|
2016-08-24 15:58:23 +08:00 |
 daiao
|
a3ec35c008
|
个人主页报500
|
2016-08-24 15:56:03 +08:00 |
|
daiao
|
90803fbb2a
|
Merge branch 'dev_shcool' into develop
|
2016-08-24 14:53:31 +08:00 |
|
daiao
|
078900088a
|
修复：新建组织关联trustie-forge项目，点击组织动态的论坛动态报500
|
2016-08-24 14:41:26 +08:00 |
|
cxt
|
6af43070c7
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-08-24 13:56:53 +08:00 |
|
Tim
|
bb2b51aa8d
|
收藏按钮增加title
|
2016-08-24 10:30:20 +08:00 |
|
Tim
|
57ecffc130
|
班级新增收藏功能
|
2016-08-24 10:28:09 +08:00 |
|
daiao
|
7e34062435
|
Merge branch 'dev_shcool' into develop
|
2016-08-23 09:43:38 +08:00 |
|
huang
|
1f4f03d8ed
|
修改项目列表中的资源链接
|
2016-08-13 17:31:09 +08:00 |
|
huang
|
d7faed7f6d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-13 15:39:06 +08:00 |
|
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 |