 lizanle
|
348a4df8d8
|
合并出错
|
10 years ago |
|
lizanle
|
80ec5b0b50
|
合并出错
|
10 years ago |
|
lizanle
|
07a2263b16
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/courses_controller.rb
public/stylesheets/new_user.css
|
10 years ago |
guange
|
9303dfd5ae
|
IE下载xls乱码问题
|
10 years ago |
 huang
|
7970a46469
|
1、添加功能：依据分支切换显示不同的提交记录
2、切换分支刷新页面
3、版本库显示页面修稿
|
10 years ago |
 ouyangxuhua
|
268575ceec
|
加入课程申请样式调整
|
10 years ago |
 cxt
|
afd02d90a5
|
学生提交作品的作业信息页面显示作业附件
|
10 years ago |
|
lizanle
|
0cad264620
|
elsif写错了
|
10 years ago |
|
cxt
|
7c34927b3a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
25d6ed520e
|
首页的问题动态增加附件上传时间
|
10 years ago |
|
lizanle
|
4c4f9ce10f
|
取消按钮变灰色
|
10 years ago |
|
ouyangxuhua
|
f5a498a595
|
1.加入课程申请发送邮件；
2.解决360浏览器不能正确显示“重新评阅了作品”消息的问题
|
10 years ago |
|
ouyangxuhua
|
fc70c8bfab
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
b0b1a27908
|
1.用户请求加入课程成为老师或者教师时，给课程创建者发送邮件；
2.更新相应消息的状态
|
10 years ago |
|
lizanle
|
6c5c7988dc
|
博客删除报错的问题
|
10 years ago |
|
huang
|
34a8d0890c
|
相政新界面
|
10 years ago |
|
cxt
|
aa5bda8884
|
首页中的作业动态增加附件的显示
|
10 years ago |
|
cxt
|
2f4b29085c
|
首页动态中的表格超出边框
|
10 years ago |
|
cxt
|
5f5a235e4b
|
点击加入课程后首页样式发生变化
|
10 years ago |
|
ouyangxuhua
|
5fb1291bf8
|
消息状态修改
|
10 years ago |
|
ouyangxuhua
|
d509ef01e8
|
更新用户申请加入项目以及反馈的消息的状态
|
10 years ago |
|
cxt
|
efe4b8609f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
2824b56481
|
增加首页教师加入课程的入口
|
10 years ago |
|
lizanle
|
69bc26033e
|
防止url删减报错
url博客内容长度限制改为20000
|
10 years ago |
|
lizanle
|
eaf4ad354f
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/courses_controller.rb
app/services/courses_service.rb
app/views/courses/join.js.erb
public/stylesheets/new_user.css
|
10 years ago |
|
ouyangxuhua
|
586cde6f87
|
更新用户申请成为课程的老师或教辅消息的状态
|
10 years ago |
|
lizanle
|
3b5b203b2e
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
4431f4664f
|
点击确定自动关闭
|
10 years ago |
|
ouyangxuhua
|
6924a3e7bb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
1705bd169e
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
479b23a1fd
|
重复加入问题给出提示
并不发送消息
不允许重复发送相同的申请
点击确定自动关闭
|
10 years ago |
|
lizanle
|
5e4e5419f1
|
只有编辑的时候才允许删除资源
|
10 years ago |
|
lizanle
|
2a76461cd1
|
简单博客功能
|
10 years ago |
|
ouyangxuhua
|
c7688b981a
|
更新启动匿评提示信息，以便用户更清楚匿评过程
|
10 years ago |
|
cxt
|
274db8d080
|
作品列表页面的作业信息添加附件的显示
|
10 years ago |
|
cxt
|
882d64fc02
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
e43822cc30
|
无法同时引用多个资源库的资源
|
10 years ago |
|
lizanle
|
cf83209c58
|
原来的提交被覆盖了。
|
10 years ago |
|
huang
|
0a4fd92d8c
|
查看代码，显示在project右侧
翻滚
代码展示编辑状态（颜色区分样式）
|
10 years ago |
|
lizanle
|
b27a0f2e51
|
学校分页
|
10 years ago |
|
lizanle
|
0be91202d7
|
学校分页
|
10 years ago |
|
lizanle
|
69d5f8b97b
|
课程不存在的时候的提示
|
10 years ago |
|
lizanle
|
389792bd11
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
b448e1a4c5
|
课程加入消息错误
|
10 years ago |
|
lizanle
|
9d89da7e66
|
课程加入消息错误
|
10 years ago |
|
cxt
|
787b9af429
|
编辑作业时选不了资源库资源
|
10 years ago |
|
ouyangxuhua
|
16f0868df3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
bc3fbc270f
|
将学生改成同学
|
10 years ago |
|
huang
|
2221fb4d7a
|
committers跳转问题
按钮样式
|
10 years ago |
 Tim
|
4bedc81524
|
作品列表提交按钮位置调整
|
10 years ago |
|
huang
|
b45d140a74
|
没有上传代码显示页面
目录接头top修改
|
10 years ago |
|
huang
|
7ab6c45262
|
1、转换界面添加提示。
2、url样式
|
10 years ago |
|
cxt
|
1ddb21d0a9
|
动态中的描述展开时去掉line-height，收起时添加line-height
|
10 years ago |
|
cxt
|
adfe9ce7df
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
fde4ce74ba
|
作业配置菜单增加评分设置
|
10 years ago |
|
ouyangxuhua
|
4a188dc81d
|
对所有作业消息，统一在内容前加圆点，并且调整颜色
|
10 years ago |
|
ouyangxuhua
|
9375227250
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
7845a0e712
|
修改作业消息的内容及样式
|
10 years ago |
|
cxt
|
717baed23b
|
匿评结束后动态和作业列表中的“作品匿评”改为“匿评结束”
|
10 years ago |
|
cxt
|
e2990fb55c
|
控制动态描述的高度为20行，可展开和收起。
|
10 years ago |
|
cxt
|
5e7b774111
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
4b6f8efc5a
|
作品列表添加作业信息
|
10 years ago |
|
huang
|
03c2948a7c
|
查看内容对比
|
10 years ago |
|
huang
|
13a1579395
|
代码显示
|
10 years ago |
|
huang
|
bd793a00fe
|
贡献者页面
|
10 years ago |
|
huang
|
4c5843a169
|
1、title数据更新
2、summary调整
3、本版库显示，变更页面
4、相关CSS
|
10 years ago |
|
ouyangxuhua
|
f7545e623b
|
解决作业提交截止日期快到时，多发送一条消息的bug
|
10 years ago |
|
ouyangxuhua
|
4b8c65d12e
|
消息处理
|
10 years ago |
|
huang
|
c7204576cc
|
版本库创建人为projectowner
修改新的版本库地址
|
10 years ago |
|
huang
|
57e48d4921
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
|
10 years ago |
|
huang
|
1157dcaa06
|
版本库summary
文件目录
新版本库地址
按分支显示提交记录
相关界面
|
10 years ago |
|
cxt
|
32ad320cef
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
7e21c00aed
|
添加作业的回复功能
|
10 years ago |
|
ouyangxuhua
|
1c6f17936f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/_user_message_course.html.erb
|
10 years ago |
|
ouyangxuhua
|
7f1524ebe1
|
修复当学生被剔除课程成员时，消息页面报错的bug.
|
10 years ago |
|
guange
|
d802992e96
|
merge
|
10 years ago |
|
guange
|
11d1cac40d
|
可以通过gitlab创建项目
|
10 years ago |
|
lizanle
|
75ee45b2d1
|
消息已阅！
|
10 years ago |
|
lizanle
|
e44d95cca5
|
添加申请课程的加入身份
|
10 years ago |
|
ouyangxuhua
|
0b8053c5d5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
ab97ba4aa0
|
增加请求加入课程消息
|
10 years ago |
|
lizanle
|
0fffed55a6
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
a817c3b81e
|
添加身份
|
10 years ago |
|
huang
|
511fda0b40
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
9e7adaf5bc
|
Merge branch 'dev_hjq' into szzh
|
10 years ago |
|
ouyangxuhua
|
87b4c83247
|
修改不能参与匿评消息的关联删除；
看完消息后，更新相应的字段。
|
10 years ago |
|
cxt
|
edf3cc9cc8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
cc59b4c877
|
课程讨论区编辑帖子报错
|
10 years ago |
|
lizanle
|
5da45ac806
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
a8b4bde77c
|
学校列表div 下拉分页 最大页 计算方法错误
|
10 years ago |
|
huang
|
147cdf3018
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
5a5cf430d3
|
0
|
10 years ago |
|
huang
|
af4523815c
|
课程从公开改成私有
则该课程中所有的资源都变成私有
|
10 years ago |
|
huang
|
290e61599f
|
对课程资源公开私有单独处理
|
10 years ago |
|
huang
|
b172fa7512
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
515dad66e2
|
课程资源库附件单独JS实现
|
10 years ago |
|
ouyangxuhua
|
a5c220eac9
|
Merge branch 'dev_hjq' into szzh
|
10 years ago |
|
Tim
|
ad77104485
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
Tim
|
f59593cc1c
|
学校信息修改样式更改
|
10 years ago |
|
huang
|
ffc42e22f2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
b3cd3c48d2
|
修改私有样式
|
10 years ago |
|
lizanle
|
4c4188835a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
9330418668
|
学校列表div 下拉分页
|
10 years ago |
|
ouyangxuhua
|
d0c4230e69
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
1cfa8326aa
|
解决课程作业500问题
|
10 years ago |
|
ouyangxuhua
|
50abd3785a
|
修改作业提示信息，在前面统一加上“某某您好！”
|
10 years ago |
|
huang
|
ce4da2e4af
|
去掉日志打印
|
10 years ago |
|
huang
|
dc1e72a64b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
588bc2ed98
|
页面显示公开/私有
|
10 years ago |
|
ouyangxuhua
|
ec1eddbf07
|
1.学生的“发布了作业”消息，链接到提交作业界面，而非作业提交列表；
2.开课学期具体到某年，如“秋季学期”，改为“2015年秋季学期”
|
10 years ago |
|
lizanle
|
3386c53d76
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
4f1f34ac58
|
暂时屏蔽掉加入课程的分类情况
|
10 years ago |
|
huang
|
dc5721497e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
1f1a8e0770
|
管理员修改学校的功能
|
10 years ago |
|
huang
|
a8f5a7ea48
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
74284e1e71
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
7898208b16
|
私有课程上传资源都为私有
|
10 years ago |
|
ouyangxuhua
|
efbae1f003
|
修改作业消息的内容：把“你”统一改成“您”；发布作业是本人的话，改成“您发布了作业”，而非“某某老师发布了作业”等
|
10 years ago |
|
Tim
|
39d347d5c2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
Tim
|
2ca83bc7c4
|
学校修改界面修改
|
10 years ago |
|
ouyangxuhua
|
4deeaa0f34
|
1.增加消息：用户迟交作业时，发送不能参与匿评的消息；
2.增加消息：用户创建课程时，发送创建课程消息。
|
10 years ago |
|
cxt
|
9cf1278e99
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
cf0fd2022d
|
课程创建动态 项目创建动态
|
10 years ago |
|
huang
|
64fa435a3a
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
|
10 years ago |
|
huang
|
f189e3cde8
|
0
|
10 years ago |
|
cxt
|
7359081fd2
|
开启匿评后学生不可删除作品附件
|
10 years ago |
|
lizanle
|
f914d21c3f
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
5652a60c68
|
js函数节流
|
10 years ago |
|
guange
|
74fd461fac
|
.
|
10 years ago |
|
guange
|
acbd690bc6
|
添加转换页面
|
10 years ago |
|
huang
|
765d2b875d
|
还原目录显示
|
10 years ago |
|
cxt
|
bfdfde8028
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
7dd6618345
|
非课程成员不能将帖子置顶和锁定
|
10 years ago |
|
ouyangxuhua
|
86cd27eb17
|
消息中，系统消息的标题显示“系统消息”，而非“消息”
|
10 years ago |
|
lizanle
|
f25015c6b8
|
学校名字中有换行的话，需要将换行变成空格
如果聚焦的时候，学校id存在的话，那么就不需要去查询了。
如果是因为学校不存在的缘故，给出提示，说明学校必须是从下拉列表中选择
|
10 years ago |
|
lizanle
|
7e4694f71e
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
1b2bbdc577
|
学校名字中有换行的话，需要将换行变成空格
如果聚焦的时候，学校id存在的话，那么就不需要去查询了。
如果是因为学校不存在的缘故，给出提示，说明学校必须是从下拉列表中选择
|
10 years ago |
|
huang
|
b1ba6d576a
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
5c57403041
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
f58d68c61a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
26eda763fe
|
帖子锁定时动态的样式调整
|
10 years ago |
|
huang
|
178752ba8f
|
将“作品”改成“提交”
|
10 years ago |
|
huang
|
07ff8d2eb7
|
老师，非课程成员 课程动态中显示 -- 提交（作品数）
|
10 years ago |
|
ouyangxuhua
|
4d246de1c6
|
对于被拉入或者移出某私有项目对应的消息，当用户没有访问权限，应给出提示
|
10 years ago |
|
cxt
|
bdf7bdc13e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
5f3c8d928d
|
作业批次下拉列表的样式修改
|
10 years ago |
|
lizanle
|
f53867a841
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
707244886c
|
学校列表分页
|
10 years ago |
|
Tim
|
1414924c78
|
课程留言格式调整
|
10 years ago |
|
Tim
|
4dddbe9dc7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/_course_journalsformessage.html.erb
|
10 years ago |
|
lizanle
|
7a17186ca3
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
5b76ae50ef
|
创建学校成功给出提示
|
10 years ago |
|
Tim
|
49b994b3fe
|
个人动态、系统消息动态、课程动态格式调整
|
10 years ago |
|
cxt
|
76921b184d
|
讨论区单个帖子的二级回复显示不对
|
10 years ago |
|
ouyangxuhua
|
2160d508f3
|
1.更改加入项目以及移出项目消息的提示；
2.对于发布作业消息，当作业消息为空时，不显示；
3.消息列表中，“全部”改成“所有消息”
|
10 years ago |
|
cxt
|
770f2f14bd
|
个人动态、课程动态、讨论区、单个帖子页面的图片可点击
|
10 years ago |
|
ouyangxuhua
|
dd08a8232d
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
2f2ad38cdf
|
1.用户被拉入项目，发送相应消息给该用户；
2.用户被移出项目，发送消息给该用户。
|
10 years ago |
|
cxt
|
a16dc09afa
|
讨论区帖子图片可点击
|
10 years ago |
|
huang
|
150ee3d28d
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
9a0c9ecc77
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
bbd3999ab2
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
cxt
|
998c7e1c1b
|
课程讨论区单个帖子页面的图片超出边框
|
10 years ago |
|
lizanle
|
e3a660cf18
|
添加学校
|
10 years ago |
|
cxt
|
c5b881cb43
|
发布帖子按钮的样式调整
|
10 years ago |
|
cxt
|
0a43f462f5
|
帖子动态添加置顶显示
|
10 years ago |
|
cxt
|
0f0351b343
|
解决冲突
|
10 years ago |
|
cxt
|
caa278d9f5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/boards_controller.rb
db/schema.rb
|
10 years ago |
|
cxt
|
8ea5d98b6c
|
课程讨论区发布帖子、编辑帖子的实现
|
10 years ago |
|
huang
|
464fc461ea
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
6b7800c36b
|
Merge branch 'dev_hjq' into szzh
|
10 years ago |
|
huang
|
c11905707d
|
非课程成员 --课程动态中不显示 提交 ，匿评等信息
|
10 years ago |
|
huang
|
e747599925
|
作品匿评不显示
|
10 years ago |
|
huang
|
0945fecee6
|
匿评开启后，显示“作品匿评”，点击进入匿评作业列表
|
10 years ago |
|
huang
|
02d4a8383a
|
用户作品提交完成后，框框自动收起
|
10 years ago |
|
huang
|
4917d5917b
|
解决缺陷 --匿评作品列表，点击下拉的区域不展开问题
|
10 years ago |
|
lizanle
|
0c1d7d420e
|
学校的查询与现实问题重做
|
10 years ago |
|
lizanle
|
e382cb5899
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
b3d15b886a
|
学校的查询与现实问题重做
|
10 years ago |
|
huang
|
32b02f397a
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
8daecd3ead
|
解决作品提交者链接错误问题
|
10 years ago |
|
ouyangxuhua
|
c13558f78f
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
5f689090b8
|
完善作业消息的内容
|
10 years ago |
|
huang
|
d0ea49d1e9
|
解决项目讨论区置顶功能不能使用问题
|
10 years ago |
|
huang
|
7c8525298c
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
554927d517
|
删除项目的时候，项目动态级联删除
|
10 years ago |
|
ouyangxuhua
|
9dc1b75fab
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
b261eed24c
|
提取作业评分消息的评分及评语，用适当的样式显示出来
|
10 years ago |
|
huang
|
9399063886
|
创建版本库控制层及国际化
|
10 years ago |
|
huang
|
a45722b0f5
|
一个项目只能建一个版本库
|
10 years ago |
|
huang
|
61bcdd4643
|
只允许创建一个版本库
|
10 years ago |
|
ouyangxuhua
|
69ad8495c7
|
修改作业消息中，评阅了某作评的消息内容
|
10 years ago |
|
Tim
|
7f59902a23
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
5d8ebad25c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
20ff1430fc
|
动态回复默认显示3个，“收起回复”、“展开更多”后去掉回复数
|
10 years ago |
|
lizanle
|
d012820a54
|
显示用户的真姓名
|
10 years ago |
|
cxt
|
ea66ca5e00
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
public/javascripts/init_activity_KindEditor.js
|
10 years ago |
|
cxt
|
8abc97ae84
|
个人主页添加个人留言动态
|
10 years ago |
|
Tim
|
edbcb534c5
|
加入课程弹窗修改
|
10 years ago |
|
lizanle
|
e5808f3fe8
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
918c6f46ba
|
资源全站搜索出现bug
|
10 years ago |
|
Tim
|
58c8851a99
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
Tim
|
64ec465126
|
意见反馈窗口调整
|
10 years ago |
|
huang
|
8ab04c652f
|
Merge branch 'develop' into gitlab_guange
|
10 years ago |
|
guange
|
f2dd1c9467
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
guange
|
af03d6c00c
|
IE11乱码问题
|
10 years ago |
|
huang
|
9eb498dbc4
|
版本库 文件目录（未完成--）
|
10 years ago |
|
lizanle
|
bd8f2f20a5
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
a227e37598
|
取消掉贴吧字符长度的限制
|
10 years ago |
|
cxt
|
3ebbcedf1b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
b9b7f6fa9e
|
个人主页留言动态的实现
|
10 years ago |
|
guange
|
3a98224f6a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
guange
|
5b2fb66468
|
解决ie11下载乱码问题
|
10 years ago |
|
lizanle
|
2d60555041
|
单个帖子的回复全部展示
|
10 years ago |
|
lizanle
|
26e0f7db0b
|
是老师，就都能编辑，有id，就是只能编辑资源里的tag
|
10 years ago |
|
ouyangxuhua
|
d006c2691b
|
issue模块中，搜索问题时，给出提示信息“请输入问题名称”
|
10 years ago |
|
cxt
|
78e552ddee
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
53a7b1dda4
|
课程讨论区动态按最后更新时间排序
|
10 years ago |
|
cxt
|
a77f7e6f75
|
课程讨论区单个帖子页面的功能实现
|
10 years ago |
|
huang
|
73898953d9
|
project表添加字段，记录project对应gitlba中project id
|
10 years ago |
|
lizanle
|
e1c5c02c0d
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
71c55667ac
|
forum tag双击可编辑的函数错误，导致编辑器在火狐浏览器插入图片bug
|
10 years ago |
|
lizanle
|
1c72d59f71
|
forum tag双击可编辑的函数错误，导致编辑器在火狐浏览器插入图片bug
|
10 years ago |
|
cxt
|
03e8c3802d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
ebb7ed1f1a
|
讨论区单个帖子页面的二级回复
|
10 years ago |
|
ouyangxuhua
|
4d2215646a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
57475f3420
|
作业截止时间快到时，由“某用户发布的作业”，改为“某老师发布的作业”
|
10 years ago |
|
lizanle
|
f024723f8c
|
去掉js的调试语句
|
10 years ago |
|
lizanle
|
d3590b6a6e
|
提交作品 那里 也有引入资源库的需求，也需要分页多选。
|
10 years ago |
|
lizanle
|
44b148b32f
|
act有可能为空，导致500错误
|
10 years ago |
|
lizanle
|
cb4d62d3b6
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
c85e1401f0
|
引用资源支持多页选择
|
10 years ago |
|
ouyangxuhua
|
155dff7e27
|
1.增加消息列表对应的图标；
|
10 years ago |
|
lizanle
|
590a2480ba
|
没有资源的情况下不要显示全部
|
10 years ago |
|
lizanle
|
122145dbb2
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
e9055dd113
|
发布作业的时候引入资源的情况，分页列表中的文字被遮挡
|
10 years ago |
|
huang
|
0205fd62d9
|
Merge branch 'dev_hjq' into szzh
|
10 years ago |
|
ouyangxuhua
|
8133ba33c7
|
将消息分类为：课程消息、项目消息等
|
10 years ago |
|
huang
|
7c1bb8b9ed
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
Gemfile
app/models/user.rb
db/schema.rb
lib/trustie.rb
解决冲突
|
10 years ago |
|
ouyangxuhua
|
491e4d12c6
|
1.增加课程问卷、项目讨论、项目新闻对应界面的标题
2.将下拉菜单放在一个局部页面中，以便User_messages页面和User_system_messages都调用它，避免代码重复。
|
10 years ago |
|
ouyangxuhua
|
3d993304e3
|
1.修复作业消息的一些代码bug;
2.调整消息下拉单间距
|
10 years ago |
|
lizanle
|
5ea5cada00
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
d80dffb31c
|
只有课程里才用到了tag 云，
|
10 years ago |
|
ouyangxuhua
|
3955075d03
|
消息中，将用户留言前面的空行去掉
|
10 years ago |
|
ouyangxuhua
|
1fc7bed486
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
3957ca5dc2
|
邮件中，让用户留言以html格式显示
|
10 years ago |
|
huang
|
a7b14e973d
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
a9456ca82f
|
让项目留言的内容以html形式显示
|
10 years ago |
|
ouyangxuhua
|
2752512471
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
c365f32a17
|
修改邮件中，有些邮件内容不能正常显示的问题。
|
10 years ago |
