 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
|
aaefd8b4aa
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_news_replies.html.erb
|
2016-09-02 15:24:55 +08:00 |
|
daiao
|
27ad94eac2
|
组织配置界面，成员列表分页
|
2016-09-02 13:25:01 +08:00 |
|
daiao
|
548a263f0f
|
1.修复项目新闻发送至其他项目后，位于讨论区下的bug
2.资料未完善情况下，“修改资料”可操作
3.组织成员列表增加分页功能（配置成员页面分页为完成）
4.修复回复表情显示不对
|
2016-08-31 17:09:02 +08:00 |
 huang
|
9b14b86b64
|
隐藏项目之 隐藏组织左侧的信息
|
2016-08-31 16:01:23 +08:00 |
|
huang
|
1f6bd68e61
|
隐藏项目 组织隐藏课程信息
|
2016-08-31 15:37:28 +08:00 |
|
cxt
|
9b3e1e0275
|
Merge branch 'develop' into cxt_course
|
2016-08-31 15:02:13 +08:00 |
|
cxt
|
a8575f2a15
|
暂时隐藏个人名片
|
2016-08-31 14:08:19 +08:00 |
|
cxt
|
f803a23298
|
组织头像编辑的小笔调整
|
2016-08-29 16:49:54 +08:00 |
 Tim
|
ea0211c9ca
|
组织搜索成员时，页数过多折行问题
|
2016-08-29 16:39:13 +08:00 |
|
cxt
|
45f0234ff7
|
组织logo点击可编辑
|
2016-08-29 16:19:06 +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
|
b33136c59b
|
班级问答区改成讨论区
|
2016-08-25 15:59:09 +08:00 |
|
daiao
|
5088770214
|
修复：文章附件和资源栏目下载权限一致
|
2016-08-23 16:34:11 +08:00 |
|
daiao
|
9ff728f080
|
Merge branch 'develop' into daiao_dev
Conflicts:
app/views/layouts/_syllabus_base_info.html.erb
|
2016-07-25 10:03:50 +08:00 |
|
huang
|
ab4d85dcb7
|
组织500问题
|
2016-07-22 18:21:27 +08:00 |
|
cxt
|
27fa113de1
|
组织动态报500
|
2016-07-22 16:40:28 +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
|
f3c95906d8
|
项目缺陷的二级回复
|
2016-07-21 10:30:48 +08:00 |
|
daiao
|
b7cf7a2468
|
Merge branch 'develop' into daiao_dev
|
2016-07-21 09:55:47 +08:00 |
|
cxt
|
7853b8aa54
|
班级通知、项目新闻、帖子栏目通知的动态和详情页的二级回复， 二级回复代码的整合
|
2016-07-20 17:00:18 +08:00 |
|
daiao
|
a55e64dfb3
|
保持组织动态用户名颜色与其他动态用户名颜色显示一直
|
2016-07-20 14:46:33 +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
|
b77779ca55
|
文章的二级回复和组织帖子的二级回复
|
2016-07-14 17:23:48 +08:00 |
|
Tim
|
a0db221ffc
|
Merge branch 'develop' into cs_optimize_txz
|
2016-07-11 13:57:04 +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 |
|
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 |
|
cxt
|
c5840d75da
|
Merge branch 'daiao_dev' into cxt_course
Conflicts:
db/schema.rb
|
2016-07-05 16:49:50 +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
|
2956b08f40
|
分组作业：去掉组员“追加附件”的入口
|
2016-07-05 10:32:46 +08:00 |
|
yuanke
|
a7ecfba23b
|
Merge branch 'yuanke_org' into develop
|
2016-07-01 17:52:23 +08:00 |
|
yuanke
|
547d5409bb
|
组织中的课程字样改为班级
|
2016-07-01 17:43:38 +08:00 |
|
cxt
|
bdaa9983e3
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-07-01 11:30:24 +08:00 |
|
cxt
|
2c1e0f534c
|
课程大纲
|
2016-07-01 11:11:53 +08:00 |
|
yuanke
|
ab99645148
|
Merge branch 'yuanke' into develop
|
2016-06-27 15:52:01 +08:00 |
|
yuanke
|
5c2ac3e02f
|
修改删除组织成员跨域的BUG
|
2016-06-27 15:47:06 +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 |
|
yuanke
|
c61c14fa97
|
Merge branch 'yuanke' into develop
|
2016-06-24 14:35:59 +08:00 |
|
yuanke
|
86a5eccae6
|
组织设置中添加成员BUG解决
|
2016-06-24 14:16:39 +08:00 |
|
yuanke
|
64d87b7398
|
修改组织添加成员的BUG
|
2016-06-24 13:50:28 +08:00 |
|
yuanke
|
2a971c3bc6
|
修改有的组织添加成员的BUG
|
2016-06-24 11:24:48 +08:00 |
|
Tim
|
8a6bbf50a9
|
css文件替换
|
2016-06-24 09:30:46 +08:00 |
|
cxt
|
3f8beaf97c
|
动态回复banner的代码重构
|
2016-06-21 16:53:31 +08:00 |
|
huang
|
fce93de296
|
500问题
|
2016-06-17 18:03:58 +08:00 |
|
huang
|
6af0bf7b83
|
组织样式
|
2016-06-17 17:35:46 +08:00 |
|
yuanke
|
811afbdf33
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-17 14:43:25 +08:00 |
|
huang
|
7d68df79a0
|
组织合并凌彬代码500问题
|
2016-06-17 14:44:12 +08:00 |