 huang
|
7fd73348a6
|
消息404问题
|
2016-09-09 17:41:09 +08:00 |
|
huang
|
121537bfcb
|
消息404问题
|
2016-09-09 17:22:38 +08:00 |
 daiao
|
70fc7761da
|
Merge branch 'dev_shcool' into develop
|
2016-09-09 16:03:13 +08:00 |
|
daiao
|
2307c0c3c0
|
项目列表，添加“公开"字样
|
2016-09-09 16:00:51 +08:00 |
 cxt
|
bc2e9f2231
|
Merge branch 'cxt_course' into develop
|
2016-09-09 15:55:54 +08:00 |
 Tim
|
f6efefd38d
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-09-09 15:50:05 +08:00 |
|
Tim
|
862bbd1a1f
|
班级名称前增加课程名，一系列更改
|
2016-09-09 15:49:31 +08:00 |
|
cxt
|
355f0580cb
|
作业状态的api
|
2016-09-09 15:28:32 +08:00 |
|
daiao
|
19d925d592
|
项目列表中公开项目无法点击
|
2016-09-09 14:22:47 +08:00 |
|
Tim
|
b796ac3b53
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/exercise/_student_table.html.erb
db/schema.rb
|
2016-09-09 13:30:10 +08:00 |
|
cxt
|
b3f738ee5d
|
与班级相关平台班级名称规范调整
|
2016-09-09 10:23:18 +08:00 |
|
cxt
|
cf25dc8dfd
|
首页的项目列表
|
2016-09-08 15:00:20 +08:00 |
|
cxt
|
3efc158fb5
|
班级作业：当已经发布了作业再去编辑作业时，现在是“发布时间”就不能再编辑了，建议代码判断只有当学生已经提交了作品或关联了项目才禁止再编辑发布时间，且要给出必要提示
|
2016-09-08 10:54:41 +08:00 |
|
cxt
|
e6ddb3cec0
|
个人主页动态过滤中点击全部动态要显示当前用户关联的所有动态
|
2016-09-07 11:30:26 +08:00 |
|
cxt
|
e084543030
|
新建作业时给出截止日期和发布日期的提示
|
2016-09-07 10:45:22 +08:00 |
|
daiao
|
cdd4dfcf09
|
项目列表中：私有项目对非成员显示，非成员不点击进入
|
2016-09-05 16:55:56 +08:00 |
|
cxt
|
7123c66481
|
课程列表中：点击课程的名称就弹出新的tab页，进入课程的页面
|
2016-09-05 16:20:38 +08:00 |
|
daiao
|
3dc0e8407a
|
Merge branch 'develop' into dev_shcool
Conflicts:
app/views/organizations/_org_member_list.html.erb
app/views/organizations/setting.html.erb
app/views/users/_project_news.html.erb
|
2016-09-05 13:47:39 +08:00 |
|
daiao
|
bb0bafb0fd
|
1.修复项目名称太长，导致动态显示名称与issue编辑图标按钮重叠
|
2016-09-05 13:27:41 +08:00 |
|
cxt
|
36e541a6d0
|
消息列表报500
|
2016-09-05 11:30:13 +08:00 |
|
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 |
|
daiao
|
548a263f0f
|
1.修复项目新闻发送至其他项目后，位于讨论区下的bug
2.资料未完善情况下，“修改资料”可操作
3.组织成员列表增加分页功能（配置成员页面分页为完成）
4.修复回复表情显示不对
|
2016-08-31 17:09:02 +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 |