cxt
|
2befcd6634
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
|
2016-04-13 16:52:52 +08:00 |
cxt
|
062af3c57a
|
作业积分出现负分
|
2016-04-13 16:11:57 +08:00 |
huang
|
1bf494f661
|
课程推荐资源统计数
|
2016-03-25 20:11:26 +08:00 |
huang
|
cca570e75c
|
课程相关优化
|
2016-03-25 16:30:00 +08:00 |
huang
|
cb4b26762d
|
课程base优化
|
2016-03-25 09:56:45 +08:00 |
alan
|
a165657915
|
Merge branch 'develop' into hjq_new_course
|
2016-03-23 14:03:41 +08:00 |
huang
|
70d594659e
|
课程英雄榜代码封装
|
2016-03-21 16:50:24 +08:00 |
huang
|
e06695b56b
|
课程活跃度代码封装
|
2016-03-21 16:45:49 +08:00 |
cxt
|
d967a31ec9
|
课程报500
|
2016-03-18 16:07:34 +08:00 |
ouyangxuhua
|
a1fbe8b886
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-18 15:33:17 +08:00 |
cxt
|
9917e802cb
|
课程推荐的资源统计
|
2016-03-18 15:15:25 +08:00 |
cxt
|
e167a28d49
|
课程推荐的作业统计
|
2016-03-18 14:59:34 +08:00 |
ouyangxuhua
|
1eafad6468
|
鼠标经过用户头像显示用户信息后,持续显示用户信息半秒钟,以便用户及时操作用户信息
|
2016-03-18 10:05:31 +08:00 |
ouyangxuhua
|
098844a910
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/helpers/application_helper.rb
app/views/organizations/_org_course_homework.html.erb
app/views/organizations/_org_course_news.html.erb
app/views/organizations/_org_project_issue.html.erb
app/views/organizations/_project_message.html.erb
app/views/organizations/_show_org_document.html.erb
app/views/users/_user_message_course.html.erb
|
2016-03-15 13:40:33 +08:00 |
cxt
|
7d2bb572b2
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/student_work_controller.rb
public/stylesheets/new_user.css
|
2016-03-11 19:43:36 +08:00 |
luoquan
|
1900a824e8
|
0
|
2016-03-11 14:39:17 +08:00 |
cxt
|
2812fcd2fb
|
删除无用代码
|
2016-03-11 10:45:29 +08:00 |
cxt
|
a7b9d8424a
|
只有全部列表中的学生可编辑分班
|
2016-03-10 17:41:53 +08:00 |
cxt
|
0d8052da28
|
老师把学生加入某一个分班
|
2016-03-10 17:04:26 +08:00 |
cxt
|
c255325300
|
添加分班
|
2016-03-10 15:47:03 +08:00 |
yuanke
|
7f7979e955
|
修改回复时可多次点击发送按钮的问题。
|
2016-03-10 15:12:16 +08:00 |
cxt
|
cd1409f950
|
还原学生分班
|
2016-03-10 14:51:31 +08:00 |
Tim
|
61ce439e74
|
添加老师对学生的分班操作
|
2016-03-10 10:02:24 +08:00 |
ouyangxuhua
|
713c28c0b5
|
个人页面快捷操作课程/项目的设置公开/私有属性,确定的提示信息要正确
|
2016-03-09 10:25:57 +08:00 |
Tim
|
d6d8e231e6
|
课程推荐在ie中显示bug
|
2016-03-09 09:46:07 +08:00 |
cxt
|
fcae91ecc1
|
“课程通知”改为“通知”
|
2016-03-07 11:27:47 +08:00 |
cxt
|
4f3055c990
|
讨论区改为问答区,且放开课程的“问答区”,就是课外的用户也能在公开课内发帖或回帖。
|
2016-03-04 17:11:52 +08:00 |
huang
|
97e6299a2b
|
Merge branch 'hjq_new_course' into develop
Conflicts:
app/views/layouts/_logined_header.html.erb
|
2016-03-04 09:33:38 +08:00 |
huang
|
5cf198c61a
|
课程教师、学生列表添加成员管理入口,项目成员列表入口
|
2016-03-03 17:59:36 +08:00 |
cxt
|
7d66c06a56
|
复制学期多次点击“完成”会复制多个学期
|
2016-02-26 17:44:46 +08:00 |
Tim
|
e8234092ec
|
复制学期弹框调整
|
2016-02-26 11:16:12 +08:00 |
cxt
|
09c8e57f1c
|
复制课程时可复制资源和作业
|
2016-02-26 10:41:14 +08:00 |
ouyangxuhua
|
5c9d8954ec
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-02-23 16:20:07 +08:00 |
ouyangxuhua
|
f785277d42
|
解决回复框工具栏乱码、组织子域名等问题
|
2016-02-23 16:17:14 +08:00 |
Tim
|
87f5f9c380
|
上传头像预览图片排版,课程关联组织取消按钮
|
2016-02-23 15:26:34 +08:00 |
ouyangxuhua
|
39c913f941
|
解决某些页面二级回复工具栏乱码问题
|
2016-02-23 14:52:15 +08:00 |
cxt
|
278139104b
|
允许老师修改开始学期
|
2016-02-22 15:09:07 +08:00 |
cxt
|
cb2fdc7388
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/words/create_reply.js.erb
|
2016-02-02 15:57:23 +08:00 |
cxt
|
6e93a5af33
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/users/user_import_homeworks.js.erb
db/schema.rb
|
2016-02-02 15:55:07 +08:00 |
cxt
|
368e4cd14a
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-02-02 15:51:49 +08:00 |
ouyangxuhua
|
d820977d5d
|
Merge branch 'develop' into ouyang
Conflicts:
app/views/blog_comments/show.html.erb
app/views/courses/syllabus.html.erb
app/views/messages/_org_subfield_show.html.erb
|
2016-02-02 15:51:18 +08:00 |
Tim
|
105393548b
|
点击详情页面文本格式调整
|
2016-02-02 11:23:17 +08:00 |
ouyangxuhua
|
cdd997e45e
|
kindeditor回复框修改
|
2016-02-01 14:50:45 +08:00 |
cxt
|
4d048ec596
|
课程推荐的课程列表中,为0的不显示
|
2016-02-01 11:12:04 +08:00 |
ouyangxuhua
|
25e32f09e1
|
Merge branch 'develop' into ouyang
Conflicts:
app/views/words/create_reply.js.erb
|
2016-02-01 10:14:04 +08:00 |
guange
|
71778ba948
|
拷贝课程图标
|
2016-01-29 22:10:04 +08:00 |
cxt
|
82fb50ccd2
|
课程学生列表的作业积分不一致
|
2016-01-29 19:22:10 +08:00 |
ouyangxuhua
|
dc3278274d
|
修改kindeditor的工具栏
|
2016-01-29 16:55:07 +08:00 |
cxt
|
d3ba23bc64
|
课程的作业列表增加搜索按钮
|
2016-01-29 15:37:03 +08:00 |
huang
|
154417378e
|
精品课程默认推荐
|
2016-01-24 10:58:58 +08:00 |
cxt
|
4530e7896a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-01-22 20:55:31 +08:00 |
cxt
|
fc0b589760
|
Merge branch 'cxt_course' into szzh
|
2016-01-22 20:54:14 +08:00 |
huang
|
b3caa01540
|
修改课程作业链接
|
2016-01-22 20:45:25 +08:00 |
cxt
|
6ae7da99be
|
帖子、博客、通知、文章详情页面的单词折行
|
2016-01-22 18:33:43 +08:00 |
huang
|
ea6a78893f
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-01-22 17:29:33 +08:00 |
huang
|
faf1fcaf22
|
issue回复局部刷新
附件浏览问题
昵称改成登录名
|
2016-01-22 17:27:21 +08:00 |
cxt
|
338c224846
|
课程配置页面的结束学期可修改
|
2016-01-22 15:17:11 +08:00 |
huang
|
c7522067e6
|
修改base界面
|
2016-01-20 18:37:39 +08:00 |
huang
|
e1a84de213
|
Merge branch 'cxt_course' into hjq_new_course
Conflicts:
app/models/course.rb
public/stylesheets/courses.css
|
2016-01-20 17:05:28 +08:00 |
Tim
|
ffba281de5
|
弹框蓝色边框与关闭键替换
|
2016-01-20 16:03:28 +08:00 |
huang
|
18c3c23d2c
|
课程推荐
|
2016-01-20 15:43:33 +08:00 |
huang
|
ef0a2a54c5
|
精品课程推荐
|
2016-01-18 15:48:26 +08:00 |
huang
|
f52b0c1cc6
|
标记精品课程,精品课程推荐
|
2016-01-18 10:16:29 +08:00 |
huang
|
b6ae14a1ce
|
课程更多字体12
|
2016-01-15 12:51:50 +08:00 |
ouyangxuhua
|
6b7ce68e4a
|
各种bug解决
|
2016-01-14 17:52:48 +08:00 |
ouyangxuhua
|
582880e54d
|
设置课程/项目的公开私有属性,使用局部刷新
|
2016-01-13 16:59:48 +08:00 |
ouyangxuhua
|
6cfda615d6
|
1.解决一些bug;2.组织子目录功能实现
|
2016-01-13 15:17:13 +08:00 |
cxt
|
eab8cc7231
|
复制学期的默认图片
|
2016-01-08 21:22:36 +08:00 |
cxt
|
cc135503c2
|
Merge branch 'cxt_course' into szzh
|
2016-01-08 20:36:08 +08:00 |
cxt
|
75e2eecc37
|
课程配置中点击开课学期或结束学期弹框中,“复制学期”入口要开通
|
2016-01-08 20:23:27 +08:00 |
ouyangxuhua
|
626e3da1e6
|
Merge branch 'szzh' into dev_hjq
Conflicts:
public/stylesheets/new_user.css
public/stylesheets/public.css
|
2016-01-08 18:09:21 +08:00 |
cxt
|
f1e9718f56
|
隐藏复制学期的上传图片按钮
|
2016-01-08 18:03:17 +08:00 |
cxt
|
c5a10c504e
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-01-08 14:53:20 +08:00 |
cxt
|
7d663ce66f
|
动态内容统一高度
|
2016-01-08 14:53:12 +08:00 |
Tim
|
125479f671
|
课程复制样式调整
|
2016-01-08 10:49:02 +08:00 |
ouyangxuhua
|
e763a7a8ca
|
课程/项目/组织动态,鼠标经过显示详细信息,并且可以留言、私信等
|
2016-01-07 15:58:22 +08:00 |
cxt
|
151c08ac5c
|
复制学期
|
2016-01-07 15:29:25 +08:00 |
cxt
|
3ddbeae100
|
课程的“更多”模式的文字不用粗体
|
2016-01-04 11:32:48 +08:00 |
cxt
|
3dac8d2944
|
课程/项目帖子的编辑/删除跳转 所有用户都有发送帖子的权限
|
2015-12-31 17:53:05 +08:00 |
cxt
|
ec631691e3
|
新建课程和课程配置页面增加结束学期
|
2015-12-31 11:12:09 +08:00 |
cxt
|
605ec52f8a
|
测验答题失败时提示网络异常
|
2015-12-29 16:31:19 +08:00 |
cxt
|
6bdd6d3e03
|
课程添加设置菜单,设置页面的信息更改
|
2015-12-29 10:15:53 +08:00 |
cxt
|
1623d846f4
|
动态的展开更多改成点击展开更多
|
2015-12-22 15:14:03 +08:00 |
guange
|
b4016faeb6
|
编辑框消失
|
2015-12-18 10:40:12 +08:00 |
guange
|
eb97f7dfb2
|
merge
|
2015-12-18 09:20:51 +08:00 |
cxt
|
0ed58d4898
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-17 19:07:17 +08:00 |
ouyangxuhua
|
ef46191c80
|
Merge branch 'szzh' into dev_hjq
|
2015-12-17 17:42:48 +08:00 |
ouyangxuhua
|
acb604883d
|
项目/课程配置关联组织,左边的组织列表由每页10个组织增至15个组织。
|
2015-12-17 10:01:28 +08:00 |
cxt
|
44ce4fe592
|
多次点击留言不会重复提交
|
2015-12-15 17:34:08 +08:00 |
guange
|
4f57e48b92
|
merge
|
2015-12-14 18:20:32 +08:00 |
guange
|
d1315e35b5
|
merge
|
2015-12-14 17:26:40 +08:00 |
guange
|
f61f639af2
|
转换为remote js
|
2015-12-14 17:13:57 +08:00 |
huang
|
b981f3dcea
|
修复项目删除403问题
课程回复的时候不显示删除按钮
|
2015-12-11 15:39:38 +08:00 |
huang
|
75fecc0402
|
项目删除功能
项目删除权限
课程列表用户颜色
|
2015-12-11 12:53:01 +08:00 |
huang
|
9c472b9358
|
课程成员列表乱的问题
|
2015-12-11 11:23:02 +08:00 |
huang
|
01b21ceda1
|
项目留言重复提交问题
|
2015-12-11 09:52:17 +08:00 |
huang
|
1ba0dae3c4
|
修复课程留言重复提交问题
|
2015-12-11 09:42:19 +08:00 |
huang
|
9710731a2c
|
课程配置添加登录名
|
2015-12-10 20:03:59 +08:00 |
huang
|
c7b2c9e3af
|
课程删除功能
admin中课程列表取消删除按钮
|
2015-12-10 18:59:54 +08:00 |
huang
|
4f7f4acb1f
|
课程删除
|
2015-12-10 17:26:03 +08:00 |
huang
|
068c305c06
|
Merge branch 'hjq_new_course' of http://repository.trustie.net/xianbo/trustie2 into hjq_new_course
Conflicts:
app/views/courses/member.html.erb
app/views/courses/settings.html.erb
app/views/repositories/show.html.erb
db/schema.rb
处理冲突
|
2015-12-08 09:10:21 +08:00 |
guange
|
0c7db76371
|
tag没闭合的错误
|
2015-12-07 13:54:52 +08:00 |
guange
|
3d2ac4b59f
|
KE引用统一使用import_ke
|
2015-12-06 15:03:36 +08:00 |
huang
|
9716e99533
|
课程成员提交“修改角色”
|
2015-12-04 16:33:56 +08:00 |
huang
|
7daaa59010
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
|
2015-12-04 16:22:02 +08:00 |
huang
|
b6edabed9c
|
修改角色
|
2015-12-04 16:21:48 +08:00 |
Tim
|
dfa9b4cf74
|
学生列表调整
|
2015-12-04 16:13:55 +08:00 |
huang
|
5d18b14e73
|
Merge branch 'hjq_new_course' of http://repository.trustie.net/xianbo/trustie2 into hjq_new_course
|
2015-12-04 00:16:21 +08:00 |
huang
|
057d9a3337
|
0
|
2015-12-04 00:15:47 +08:00 |
huang
|
b91c65798d
|
课程成员添加设置
|
2015-12-03 20:44:29 +08:00 |
huang
|
e3e0f4ab37
|
鼠标移动+号显示留言
|
2015-11-27 16:00:43 +08:00 |
huang
|
2ec78d07fa
|
Merge branch 'szzh' into hjq_new_course
|
2015-11-27 14:47:16 +08:00 |
huang
|
042b197767
|
课程英雄榜界面调整
动作触发的时候更新总分
更换迁移顺序
|
2015-11-27 10:49:41 +08:00 |
ouyangxuhua
|
b05708f6e8
|
解决一下三个bug:
1.新建组织文章时,置标题和描述为空,点击取消按钮,却弹出“标题不能为空”的提示信息
2.课程/项目关联组织:点击取消按钮不应该直接收起关联组织列表
3.组织详情页面内再编辑组织,点击确定编辑的按钮后又返回组织列表页面,应返回组织详情页面
|
2015-11-27 10:43:21 +08:00 |
huang
|
8c83bbfff3
|
课程英雄榜数据
|
2015-11-27 00:48:08 +08:00 |
huang
|
061a1f602a
|
效果实现
|
2015-11-26 21:17:04 +08:00 |
huang
|
85515befc4
|
实现工具栏数字大于0显示,小于0隐藏
|
2015-11-24 17:29:57 +08:00 |
lizanle
|
34a2c2c90d
|
课程创建属性添加 是否允许学生上传资源
|
2015-11-19 15:13:34 +08:00 |
lizanle
|
dffabce806
|
Merge branch 'dev_zanle' into szzh
Conflicts:
db/schema.rb
|
2015-11-19 15:03:56 +08:00 |
ouyangxuhua
|
af981f841e
|
添加组织时,翻页提醒功能改善
|
2015-11-18 16:52:03 +08:00 |
ouyangxuhua
|
b231b44e81
|
1.项目和课程中,添加翻页提醒;
2.项目和课程中,删除组织关联时,给出弹窗,确认是否删除。
|
2015-11-18 11:12:40 +08:00 |
ouyangxuhua
|
fc7e41ebf9
|
1.在项目和课程在关联和删除关联组织后,翻页能链接到正确的位置
|
2015-11-18 10:57:17 +08:00 |
ouyangxuhua
|
71bf80c7a5
|
1.创建组织课程关联表,建立相应模型及控制器;
2.在课程设置中,添加加入组中功能;
3.解决添加项目后,组织列表的上一页和下一页链接问题。
|
2015-11-17 17:34:50 +08:00 |
lizanle
|
291868ba43
|
Merge branch 'szzh' into dev_zanle
Conflicts:
db/schema.rb
|
2015-11-17 16:48:03 +08:00 |
lizanle
|
0eff2bcb74
|
课程添加允许学生发布资源的配置
|
2015-11-17 16:43:50 +08:00 |
cxt
|
4adc6deabf
|
配置课程页面的开课学期不可更改,弹框提醒用户。
|
2015-11-10 14:18:39 +08:00 |
lizanle
|
0fdf898845
|
设置完成后跳转到大纲页面
|
2015-11-06 10:12:20 +08:00 |
lizanle
|
57730047d3
|
设置完成后跳转到大纲页面
|
2015-11-06 10:11:40 +08:00 |
lizanle
|
6741bb6960
|
取消大纲的提示
|
2015-11-06 10:00:43 +08:00 |
lizanle
|
99400ea160
|
学生 老师身份不同时默认身份也应该不同
学生的加入的时候去掉老师
|
2015-11-06 09:51:34 +08:00 |
lizanle
|
0d68262d3c
|
学生 老师身份不同时默认身份也应该不同
学生的加入的时候去掉老师
|
2015-11-06 09:48:51 +08:00 |
lizanle
|
9881ad103d
|
学生 老师身份不同时默认身份也应该不同
|
2015-11-06 09:34:56 +08:00 |
cxt
|
958532bedc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-04 11:16:25 +08:00 |
cxt
|
ee7b21de72
|
禁用匿评功能
|
2015-11-04 10:54:09 +08:00 |
lizanle
|
8ffbe8f300
|
course manager can not apply to join that course
|
2015-11-03 11:42:33 +08:00 |
lizanle
|
7df2a632fc
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-11-02 09:35:41 +08:00 |
lizanle
|
681f33ee2c
|
取消大纲 提示
|
2015-11-02 09:35:13 +08:00 |
cxt
|
0fb48a41cb
|
课程搜索页面的加入按钮
|
2015-10-30 19:03:49 +08:00 |
lizanle
|
4b9a60658f
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-30 17:51:20 +08:00 |
lizanle
|
7962bdf5a2
|
outline
after keyboard enter
_course_outline_list cannot disppear
|
2015-10-30 17:51:12 +08:00 |
huang
|
48d0553e8f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-30 17:47:04 +08:00 |
lizanle
|
b7a6bc3614
|
outline url
|
2015-10-30 17:21:12 +08:00 |
huang
|
e41a53cb8f
|
Merge branch 'szzh' into develop
|
2015-10-30 16:51:46 +08:00 |
lizanle
|
ae6fe6f9a7
|
申请加入课程,允许身份覆盖
|
2015-10-30 15:55:48 +08:00 |
lizanle
|
af14861b96
|
取消大纲
|
2015-10-30 14:26:50 +08:00 |
lizanle
|
27a2a2890f
|
大纲设置图标 鼠标放上去呈手型
图标一直显示
|
2015-10-30 14:10:08 +08:00 |
lizanle
|
4d7ca63a12
|
添加一个参数控制
在课程首页设置大纲不跳转
在大纲展示页面设置大纲,跳转大纲页面
|
2015-10-30 11:51:09 +08:00 |
lizanle
|
8dc730cd3e
|
大纲回复框改变
|
2015-10-30 11:31:42 +08:00 |
lizanle
|
a27c359df4
|
大纲设置的图标改动
|
2015-10-30 10:52:34 +08:00 |
lizanle
|
bc7ce290a2
|
没有选中任何大纲不能提交
|
2015-10-30 10:43:35 +08:00 |
huang
|
286b1a1f0d
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-10-29 17:31:03 +08:00 |
ouyangxuhua
|
c8a28ef060
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-29 17:26:51 +08:00 |
ouyangxuhua
|
070166e7c7
|
搜索课程后,点击退出按钮,执行操作后,刷新当前页面,使退出变成加入。
|
2015-10-29 17:26:37 +08:00 |
lizanle
|
0815cde772
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-29 17:09:18 +08:00 |
lizanle
|
578bb2537d
|
课程大纲功能
|
2015-10-29 17:09:03 +08:00 |
ouyangxuhua
|
1963434242
|
解决搜索课程后,点击加入按钮无反应的bug
|
2015-10-29 16:35:23 +08:00 |
lizanle
|
ac82910aa5
|
大纲
|
2015-10-29 11:53:52 +08:00 |
lizanle
|
b67afc2b95
|
大纲
|
2015-10-29 09:07:26 +08:00 |
lizanle
|
eaba915598
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2015-10-28 17:37:41 +08:00 |
cxt
|
33501f0f69
|
隐藏课程搜索页面的“加入”按钮
|
2015-10-28 16:11:41 +08:00 |
lizanle
|
c2be8b4eec
|
课程大纲界面
|
2015-10-28 15:54:27 +08:00 |
cxt
|
bd350536eb
|
弹出“加入课程”对话框后隐藏"加入/新建课程"的菜单
|
2015-10-28 10:30:31 +08:00 |
lizanle
|
a0683d4900
|
加入课程界面输入框没有对齐
博客关注粉丝文字也要加超链接
|
2015-10-27 15:17:40 +08:00 |
cxt
|
5f5a235e4b
|
点击加入课程后首页样式发生变化
|
2015-10-26 14:35:42 +08:00 |
lizanle
|
4431f4664f
|
点击确定自动关闭
|
2015-10-24 16:16:04 +08:00 |
lizanle
|
479b23a1fd
|
重复加入问题给出提示
并不发送消息
不允许重复发送相同的申请
点击确定自动关闭
|
2015-10-24 16:12:03 +08:00 |
lizanle
|
69d5f8b97b
|
课程不存在的时候的提示
|
2015-10-24 11:19:11 +08:00 |
cxt
|
1ddb21d0a9
|
动态中的描述展开时去掉line-height,收起时添加line-height
|
2015-10-23 14:53:53 +08:00 |
cxt
|
e2990fb55c
|
控制动态描述的高度为20行,可展开和收起。
|
2015-10-22 17:42:02 +08:00 |
lizanle
|
a817c3b81e
|
添加身份
|
2015-10-20 17:27:06 +08:00 |
lizanle
|
4f1f34ac58
|
暂时屏蔽掉加入课程的分类情况
|
2015-10-19 17:10:10 +08:00 |
cxt
|
770f2f14bd
|
个人动态、课程动态、讨论区、单个帖子页面的图片可点击
|
2015-10-16 10:18:51 +08:00 |
cxt
|
caa278d9f5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/boards_controller.rb
db/schema.rb
|
2015-10-15 16:22:49 +08:00 |
cxt
|
20ff1430fc
|
动态回复默认显示3个,“收起回复”、“展开更多”后去掉回复数
|
2015-10-14 14:19:59 +08:00 |
Tim
|
edbcb534c5
|
加入课程弹窗修改
|
2015-10-14 11:34:23 +08:00 |
lizanle
|
44b148b32f
|
act有可能为空,导致500错误
|
2015-10-12 16:15:27 +08:00 |
Tim
|
4c5b59ebc8
|
作业动态图标替换
|
2015-09-29 17:28:45 +08:00 |
cxt
|
e2a5819d74
|
课程动态首页的图片可点击
|
2015-09-29 15:02:36 +08:00 |
sw
|
35b1bc8069
|
课程内作业列表界面修改
|
2015-09-28 15:52:30 +08:00 |
cxt
|
223bac373f
|
课程动态的数据迁移
|
2015-09-25 16:29:47 +08:00 |
cxt
|
bb0db1e21d
|
课程动态页面
|
2015-09-24 16:30:14 +08:00 |
cxt
|
a37f39558d
|
项目和课程的列表符号样式修改
|
2015-09-22 15:54:50 +08:00 |
cxt
|
a714b10860
|
阻止配置课程、加入课程、新建课程、新建项目版本、新建版本库等页面输入框的自动填充
|
2015-09-16 12:39:08 +08:00 |
lizanle
|
95f66a304c
|
通过 kindeditor_tag f.kindeditor生产的编辑框可以自动长高缩短
课程模块的通知,讨论区,留言都可以自动的长高,缩短
|
2015-09-09 10:55:32 +08:00 |
sw
|
7424c82eae
|
留言框高度
|
2015-09-02 21:30:31 +08:00 |
sw
|
e55b61cb81
|
课程留言回复
|
2015-09-02 14:07:19 +08:00 |
cxt
|
ac419cef87
|
去掉课程/项目搜索列表的搜索框
|
2015-08-31 17:49:18 +08:00 |
sw
|
bfd13bf98a
|
课程回复按钮样式
|
2015-08-29 17:54:56 +08:00 |
sw
|
faea706683
|
Revert "Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh"
This reverts commit 3776689661 , reversing
changes made to d48cc8073a .
|
2015-08-29 17:50:15 +08:00 |
sw
|
f81bab6319
|
课程回复
|
2015-08-29 17:19:03 +08:00 |
suntao
|
efe5c1e3f4
|
课程宽度调整
|
2015-08-29 16:52:10 +08:00 |
sw
|
2d00eb982c
|
取消跳转到个人主页
|
2015-08-29 10:31:53 +08:00 |
sw
|
6051d0797d
|
课程搜索结果不正确
|
2015-08-14 16:24:43 +08:00 |
sw
|
5cf6b7e76a
|
课程发布时间--->创建时间
|
2015-08-14 09:38:24 +08:00 |
sw
|
23f8bd8312
|
搜索课程结果列表课程动态
|
2015-08-13 11:47:08 +08:00 |
sw
|
a240a2785f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-12 16:26:17 +08:00 |
sw
|
2f77adfe9c
|
课程动态公共表的完成,去掉课程动态表的与我相关功能,动态的页面显示
|
2015-08-12 16:24:27 +08:00 |
lizanle
|
fbcd19b54f
|
1.编辑分班的时候编辑框里要有默认是原来的该班级名字
2.课程通知搜索输入空格仍然返回所有的通知
|
2015-08-11 15:00:40 +08:00 |
lizanle
|
a282d81551
|
加入课程或者已经加入的课程,提示后进行跳转
|
2015-08-10 15:31:23 +08:00 |
sw
|
c200634c27
|
个人主页--课程列表:加入课程失败后,加入课程按钮却能变为提交作业按钮
|
2015-08-01 15:08:11 +08:00 |