 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 |
 yuanke
|
c6be37020f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_reply_to.html.erb
|
2016-06-24 15:11:52 +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 |