 cxt
|
bc2e9f2231
|
Merge branch 'cxt_course' into develop
|
2016-09-09 15:55:54 +08:00 |
|
cxt
|
547e786a10
|
“全部”添加链接
|
2016-09-09 15:54:51 +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
|
724ae058db
|
班级左侧添加“分班”入口
|
2016-09-09 15:49:24 +08:00 |
 yuanke
|
564da2ed72
|
微信课件下载修改
|
2016-09-09 15:36:15 +08:00 |
|
cxt
|
355f0580cb
|
作业状态的api
|
2016-09-09 15:28:32 +08:00 |
 daiao
|
de769454a7
|
修复公共贴吧：回复非汉字类型内容超出边框的问题
|
2016-09-09 15:16:08 +08:00 |
|
yuanke
|
9997de0d96
|
微信课件下载不需要登录
|
2016-09-09 15:14:24 +08:00 |
|
daiao
|
96dfa4281d
|
修复：强制修改页面，左侧编辑个人资料可用
|
2016-09-09 15:03:46 +08:00 |
|
daiao
|
89f3e0ee0d
|
项目iuss:编辑issue时，弹出空白弹框的问题
|
2016-09-09 14:43:47 +08:00 |
 huang
|
4900ff5492
|
里程碑中添加 完成者姓名
|
2016-09-09 14:36:03 +08:00 |
|
daiao
|
19d925d592
|
项目列表中公开项目无法点击
|
2016-09-09 14:22:47 +08:00 |
|
daiao
|
4959910ebe
|
ucloud无法发布新issue
|
2016-09-09 14:20:56 +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 |
|
Tim
|
a88a36bd35
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-09 13:27:53 +08:00 |
|
cxt
|
d0686b46d7
|
在线测验：如图截止时间未到，是不能点击查看作品详情的，建议去掉左侧提示“点击查看详情”，测验结果列表的样式调整
|
2016-09-09 11:09:47 +08:00 |
|
huang
|
b308100d3e
|
去掉管理员界面项目复制功能
|
2016-09-09 10:50:30 +08:00 |
|
daiao
|
d9ad0fa1d7
|
issue详情界面回复之后，图片附件是下载，而不是放大
|
2016-09-09 10:39:39 +08:00 |
|
cxt
|
b3f738ee5d
|
与班级相关平台班级名称规范调整
|
2016-09-09 10:23:18 +08:00 |
|
huang
|
e0e66b00b9
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-09-09 09:51:25 +08:00 |
|
huang
|
c025e40905
|
解决正式版管理员界面选择跟踪标签500问题
|
2016-09-09 09:51:02 +08:00 |
|
daiao
|
ed448f0087
|
Merge branch 'develop' into dev_shcool
Conflicts:
db/schema.rb
|
2016-09-09 09:31:17 +08:00 |
|
daiao
|
2ee9c22186
|
Merge branch 'dev_shcool' of https://git.trustie.net/jacknudt/trustieforge into dev_shcool
|
2016-09-09 09:16:49 +08:00 |
|
daiao
|
aa27d7def2
|
修复编辑issue，更新附件时，自动回复提示问题（不同Issue下，重名不显示，同意issue下，会更新创建时的附件）
|
2016-09-09 09:16:22 +08:00 |
|
yuanke
|
d6ae177885
|
Merge branch 'weixin_guange' into develop
|
2016-09-09 09:05:59 +08:00 |
|
huang
|
8bb2b5e8d9
|
change sonar reuslts
|
2016-09-09 09:00:21 +08:00 |
|
yuanke
|
4adc988ec1
|
微信图片url修改
|
2016-09-09 08:35:08 +08:00 |
|
yuanke
|
7a71a7bd47
|
Merge branch 'weixin_guange' into develop
|
2016-09-08 18:54:18 +08:00 |
|
yuanke
|
a6b03ed9f1
|
微信头像刷新修改
|
2016-09-08 18:53:36 +08:00 |
|
yuanke
|
5b8ecf6657
|
微信头像刷新修改
|
2016-09-08 18:50:09 +08:00 |
|
Tim
|
2c719feacd
|
无用的内联样式
|
2016-09-08 18:34:35 +08:00 |
|
yuanke
|
8c71cf1946
|
Merge branch 'weixin_guange' into develop
|
2016-09-08 18:18:13 +08:00 |
|
yuanke
|
5c626f94b5
|
微信二级回复框不显示修改
|
2016-09-08 18:04:37 +08:00 |
|
yuanke
|
2ad432c5ce
|
调试
|
2016-09-08 17:51:36 +08:00 |
|
huang
|
6dbb2e4e94
|
Pull request数量为0的时候显示在更多中
|
2016-09-08 16:03:32 +08:00 |
|
huang
|
08c64d2ac7
|
解决新建及复制issue时点击取消没反应的问题
|
2016-09-08 15:38:01 +08:00 |
|
cxt
|
cf25dc8dfd
|
首页的项目列表
|
2016-09-08 15:00:20 +08:00 |
|
yuanke
|
be0158fbb0
|
微信二级回复BUG修改
|
2016-09-08 14:10:58 +08:00 |
|
cxt
|
d8e04e7923
|
暂时隐藏“复制班级”
|
2016-09-08 14:04:40 +08:00 |
|
cxt
|
ab0863c9fb
|
平台的邀请码提示
|
2016-09-08 13:59:48 +08:00 |
|
cxt
|
3efc158fb5
|
班级作业：当已经发布了作业再去编辑作业时，现在是“发布时间”就不能再编辑了，建议代码判断只有当学生已经提交了作品或关联了项目才禁止再编辑发布时间，且要给出必要提示
|
2016-09-08 10:54:41 +08:00 |
|
yuanke
|
18fbf305c1
|
微信上传头像大小限制为1M
|
2016-09-07 16:16:53 +08:00 |
|
cxt
|
49e8a6f1ff
|
作业匿评时：学生点击作业列表中“追加附件”，进入作品列表后要默认打开自己提交的作品且弹出追加附件的弹框
|
2016-09-07 15:45:12 +08:00 |
|
cxt
|
775ed19129
|
admin界面-班级列表：课程列表中不显示已经删除的班级，全部班级列表中显示已经删除的班级
|
2016-09-07 15:26:15 +08:00 |
|
yuanke
|
d8a4eb56cf
|
微信上传头像修改
|
2016-09-07 15:14:46 +08:00 |
|
yuanke
|
c234a8d2cb
|
个人资料修改功能
|
2016-09-07 14:19:07 +08:00 |
|
cxt
|
e6ddb3cec0
|
个人主页动态过滤中点击全部动态要显示当前用户关联的所有动态
|
2016-09-07 11:30:26 +08:00 |
|
Tim
|
95824e3b6b
|
新建课程增加名称正确错误示例，课程说明
|
2016-09-07 11:24:38 +08:00 |
|
cxt
|
e084543030
|
新建作业时给出截止日期和发布日期的提示
|
2016-09-07 10:45:22 +08:00 |
|
cxt
|
5433e6d714
|
多重角色，教师/助教查看自己作为学生身份时提交的作品，追加附件重复显示
|
2016-09-07 09:29:06 +08:00 |
|
cxt
|
7b2943c37a
|
重试
|
2016-09-06 18:01:16 +08:00 |
|
cxt
|
8edfec258b
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-06 17:51:20 +08:00 |
|
cxt
|
7b2ce93acc
|
分组作业添加成员
|
2016-09-06 17:51:13 +08:00 |
|
Tim
|
99e63b1477
|
班级推荐数字block颜色字体更改；测验学号超出省略号显示
|
2016-09-06 17:22:38 +08:00 |
|
cxt
|
e2aef37114
|
分组作品的提交出错
|
2016-09-06 17:06:31 +08:00 |
|
cxt
|
bf4c6d049c
|
新建分组作业时不创建作品列表
|
2016-09-06 16:38:29 +08:00 |
|
cxt
|
17f6b9c286
|
管理员界面的被留言内容加上“RE: ”
|
2016-09-06 15:17:49 +08:00 |
|
cxt
|
1e7f3db946
|
分组作业：组内每个成员都复制一份组长的作业，得分相同
|
2016-09-06 15:07:43 +08:00 |
|
yuanke
|
c9c63eeb85
|
微信修改资料后台代码
|
2016-09-06 14:41:22 +08:00 |
|
yuanke
|
f5ef2bac50
|
微信回复的回复后台修改
|
2016-09-05 17:06:25 +08:00 |
|
daiao
|
cdd4dfcf09
|
项目列表中：私有项目对非成员显示，非成员不点击进入
|
2016-09-05 16:55:56 +08:00 |
|
yuanke
|
a07462076d
|
微信回复的回复后台功能完善
|
2016-09-05 16:38:25 +08:00 |
|
cxt
|
252851b4ad
|
课程导航的修改
|
2016-09-05 16:36:43 +08:00 |
|
cxt
|
7123c66481
|
课程列表中：点击课程的名称就弹出新的tab页，进入课程的页面
|
2016-09-05 16:20:38 +08:00 |
|
yuanke
|
fd3c0effe5
|
Merge branch 'develop' into weixin_guange
|
2016-09-05 14:50:06 +08:00 |
|
yuanke
|
6f7b40b5ad
|
微信增加回复的回复后台代码
|
2016-09-05 14:49:22 +08:00 |
|
cxt
|
ad0acb5188
|
课程大纲的内容图片自适应大小
|
2016-09-05 14:31:49 +08:00 |
|
cxt
|
2974833533
|
新建班级页面--创建课程后面，增加： 然后 【刷新】
|
2016-09-05 14:14:25 +08:00 |
|
cxt
|
573eb13283
|
课程导航中的用户是创建该课程的老师，课程链接应跳到该用户的课程列表
|
2016-09-05 13:52:42 +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 |
|
Tim
|
f94b048af2
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-05 13:18:55 +08:00 |
|
Tim
|
9ec6074260
|
将头部帮助中心改为贴吧交流
|
2016-09-05 13:18:35 +08:00 |
|
cxt
|
36e541a6d0
|
消息列表报500
|
2016-09-05 11:30:13 +08:00 |
|
yuanke
|
10017d2c69
|
微信增加解除绑定功能
|
2016-09-05 11:02:34 +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
|
c794c6197d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-02 18:19:43 +08:00 |
|
huang
|
7b6657a3e6
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-02 16:51:23 +08:00 |
|
huang
|
2c03bfbf3a
|
资源提示权限控制
|
2016-09-02 16:51:05 +08:00 |
|
cxt
|
22e914eec2
|
查看他人的留言动态报500
|
2016-09-02 16:42:19 +08:00 |
|
cxt
|
b8d04c1352
|
课程列表的主讲老师改为创建老师
|
2016-09-02 16:40:07 +08:00 |
|
cxt
|
2a9ac3c11e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-02 16:22:07 +08:00 |
|
cxt
|
01ca94bc98
|
未读消息弹框
|
2016-09-02 16:21:58 +08:00 |
|
daiao
|
9a3603c778
|
1.基本资料页面，身份为从业者时，直接点确定报提示问题
2.强制修改基本资料，修改资料按键错误
|
2016-09-02 16:11:14 +08:00 |
|
yuanke
|
66aec27714
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-02 16:09:00 +08:00 |
|
yuanke
|
6571b94bf1
|
Merge branch 'weixin_guange' into develop
|
2016-09-02 16:08:49 +08:00 |
|
cxt
|
0d2a3cbe36
|
测试版消息列表报500
|
2016-09-02 16:00:54 +08:00 |
|
cxt
|
877d1930f0
|
超级管理员应该有权限查看不公开学生列表班级的学生列表
|
2016-09-02 15:35:20 +08:00 |
|
cxt
|
b588495847
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-02 15:26:23 +08:00 |
|
huang
|
6c0bcadf6d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-02 15:27:08 +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 |
|
huang
|
58176456e1
|
Merge branch 'develop' into rep_quality
|
2016-09-02 15:23:00 +08:00 |
|
cxt
|
4cdef4a22b
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-02 15:22:20 +08:00 |
|
cxt
|
613f974440
|
项目的管理员和课程的老师都有权限删除帖子和新闻/通知的回复
|
2016-09-02 15:22:09 +08:00 |
|
huang
|
3881e5c5c5
|
资源搜索的是时候tip局部刷新
组织资源更新公开私有问题
|
2016-09-02 14:50:06 +08:00 |
|
Tim
|
0d7e9d4f9b
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-02 14:45:11 +08:00 |
|
Tim
|
396664d4e7
|
课程右侧增加下间距
|
2016-09-02 14:45:01 +08:00 |
|
cxt
|
e70334ea16
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-02 14:43:07 +08:00 |
|
cxt
|
51ef4a96e6
|
课程导航添加链接
|
2016-09-02 14:42:59 +08:00 |
|
yuanke
|
11f3060ca5
|
自己建的issue指向自己不发微信消息
|
2016-09-02 14:40:40 +08:00 |
|
Tim
|
d0a2ea02f2
|
学生列表名字学号过长省略号显示；课程教师团队名称过长省略号显示
|
2016-09-02 14:27:49 +08:00 |
|
cxt
|
ded6753ce1
|
访问他人的主页只显示他本人的动态
|
2016-09-02 14:23:02 +08:00 |
|
Tim
|
0974153364
|
课程加入路径显示
|
2016-09-02 13:49:08 +08:00 |
|
daiao
|
27ad94eac2
|
组织配置界面，成员列表分页
|
2016-09-02 13:25:01 +08:00 |
|
huang
|
2e36cf6d6a
|
课程资源库添加资源提示及
|
2016-09-02 12:12:26 +08:00 |
|
huang
|
fa25a78f62
|
项目资源库 添加私有资源提示及局部过滤刷新
|
2016-09-02 11:27:35 +08:00 |
|
yuanke
|
12f854f31b
|
Merge branch 'weixin_guange' into develop
|
2016-09-02 10:55:43 +08:00 |
|
yuanke
|
a6bb19eb60
|
微信动态回复增加点赞
|
2016-09-02 10:54:40 +08:00 |
|
cxt
|
231c660744
|
老师对帖子的删除权限
|
2016-09-02 10:06:03 +08:00 |
|
cxt
|
f78595bbbb
|
管理员界面中的学校列表支持按用户数排序
|
2016-09-01 17:11:39 +08:00 |
|
huang
|
e798381feb
|
项目资源数改成实时获取
|
2016-09-01 16:39:09 +08:00 |
|
huang
|
17440ca5dc
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-09-01 16:04:00 +08:00 |
|
huang
|
79e30862e9
|
change sonar method into restart and cancel push events
|
2016-09-01 15:58:53 +08:00 |
|
Tim
|
4d93b860f9
|
作品信息确认时，描述文字折行
|
2016-09-01 15:35:45 +08:00 |
|
Tim
|
d080f0bb16
|
Merge branch 'cs_optimize_txz' into develop
|
2016-09-01 14:34:56 +08:00 |
|
cxt
|
1e740525b4
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-01 14:31:45 +08:00 |
|
huang
|
0efd724b26
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-01 14:31:17 +08:00 |
|
huang
|
742c84bb26
|
项目隐藏之 issue详情页面发送隐藏课程信息
|
2016-09-01 14:30:56 +08:00 |
|
cxt
|
e61cf5dd4f
|
多重身份的成员：教师模拟答题和学生答题作为两条记录
|
2016-09-01 14:21:19 +08:00 |
|
yuanke
|
05e72dcc7b
|
教师修改用户角色的BUG
|
2016-09-01 14:17:14 +08:00 |
|
yuanke
|
11ed1ea345
|
Merge branch 'weixin_guange' into develop
|
2016-09-01 14:11:20 +08:00 |
|
yuanke
|
7c928703b5
|
修改老师无法修改班级成员角色的BUG
|
2016-09-01 14:10:27 +08:00 |
|
Tim
|
27a2da8b7b
|
意见反馈增加二维码
|
2016-09-01 13:56:13 +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 |
|
yuanke
|
d4f8bd29f4
|
班级项目成员管理BUG修改
|
2016-09-01 11:18:42 +08:00 |
|
huang
|
1444511fd9
|
项目隐藏之 项目讨论区详情页面 发送隐藏课程信息
|
2016-09-01 11:18:07 +08:00 |
|
huang
|
efa162fdeb
|
项目隐藏之组织资源发送
|
2016-09-01 11:16:09 +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 |
|
yuanke
|
8644ad178c
|
修复班级项目 删除成员的BUG
|
2016-09-01 10:21:29 +08:00 |
|
yuanke
|
c3c2516e6b
|
微信班级、项目增加删除成员和退出功能
|
2016-08-31 17:19:12 +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 |
|
cxt
|
7efdda5b45
|
班级老师也可以点击班级logo进行编辑
|
2016-08-31 17:01:31 +08:00 |
|
huang
|
9b14b86b64
|
隐藏项目之 隐藏组织左侧的信息
|
2016-08-31 16:01:23 +08:00 |
|
huang
|
ac85eadc30
|
资源库点击切换样式
|
2016-08-31 15:42:17 +08:00 |
|
huang
|
1f6bd68e61
|
隐藏项目 组织隐藏课程信息
|
2016-08-31 15:37:28 +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
|
2df6047b03
|
隐藏项目信息之 新用户注册但是未完善资料页面修改
|
2016-08-31 15:14:55 +08:00 |
|
cxt
|
4c59acf5a3
|
issue编辑后点赞按钮不见了
|
2016-08-31 15:04:56 +08:00 |
|
cxt
|
9b3e1e0275
|
Merge branch 'develop' into cxt_course
|
2016-08-31 15:02:13 +08:00 |
|
huang
|
9e9b4d12c9
|
新注册用户不发送留言
|
2016-08-31 15:00:34 +08:00 |
|
huang
|
02fbdb57bd
|
隐藏项目中用户消息信息
|
2016-08-31 14:44:31 +08:00 |