 huang
|
e7fc0ca6d3
|
休整消息样式
|
10 years ago |
|
huang
|
cfcf1f8103
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
7cdebab5e5
|
1、修改系统消息样式
2、解决新注册用户系统消息红点不显示问题
3、调整消息样式
|
10 years ago |
 sw
|
3573179403
|
匿评作品列表 标题头没有对齐
|
10 years ago |
 Tim
|
0930815086
|
回复头像模糊效果
|
10 years ago |
|
sw
|
90d70e7c88
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
 ouyangxuhua
|
d5432a8464
|
修改发送项目请求列表样式
|
10 years ago |
|
sw
|
9a859d28bf
|
增加匿评时作品的显示
|
10 years ago |
|
Tim
|
1085c9c53f
|
添加，取消关注图标恢复
|
10 years ago |
|
huang
|
94f91a85e6
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
1476489921
|
增加鼠标经过提示title
|
10 years ago |
|
huang
|
c9d52571f0
|
1、项目邀请中添加两种特殊情况的判断。
2、完成邀请状态列表界面。
3、优化之前的邀请状态逻辑。
|
10 years ago |
|
Tim
|
3d5f93b938
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/_course_message.html.erb
app/views/users/_course_news.html.erb
app/views/users/_project_issue.html.erb
app/views/users/_project_message.html.erb
app/views/users/_user_activities.html.erb
public/stylesheets/new_user.css
|
10 years ago |
|
sw
|
fa00285529
|
css文件更新
|
10 years ago |
|
sw
|
5f08ecc7e3
|
1、作业的开启匿评、关闭匿评功能
2、提交作品时，迟交扣分、缺评扣分的计算--->改为只计算数量
3、
|
10 years ago |
|
Tim
|
77a8c18a77
|
1.关于我们样式修改；
2.登录界面格式调整；
3.个人动态回复样式调整；
|
10 years ago |
|
sw
|
4a959523c1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
b0ccf9037a
|
邮件邀请：
1、修改私有项目跳入403问题
2、增加同一个用户反复邀请的邮箱提醒。
3、修改邮箱的发送策略
|
10 years ago |
|
sw
|
cd96fd99a8
|
快速创建项目
|
10 years ago |
 cxt
|
069c1ddf3c
|
课程通知页面的评论提示
|
10 years ago |
|
sw
|
f79b2cda94
|
提交作品关联项目功能
|
10 years ago |
|
sw
|
6127e0cee0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
a999897efa
|
动态回复头像的调整
|
10 years ago |
|
ouyangxuhua
|
9ba89b3fe7
|
系统消息样式
|
10 years ago |
|
ouyangxuhua
|
9ba0d3293e
|
修改系统消息提示样式
|
10 years ago |
|
sw
|
2ce29b7dcc
|
删除应该忽略的文件
|
10 years ago |
|
sw
|
4a9fd15bfd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
8f3889e2c5
|
编程作品提交框自动增高
|
10 years ago |
|
cxt
|
b3c73811fc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
f1a6e3d7e3
|
“关于我们”的样式调整
|
10 years ago |
|
huang
|
0d595c5feb
|
修改系统消息提交按钮
|
10 years ago |
|
sw
|
b6452bb652
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
ecf2ac5e19
|
课程内发布作业增加提示
|
10 years ago |
 lizanle
|
c701eefb42
|
暂时不添加 我要回复
|
10 years ago |
|
lizanle
|
b99663a773
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
9f871ababb
|
添加 我要回复
|
10 years ago |
|
huang
|
27fde3f642
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
sw
|
37f235c2ab
|
导入编程作业
|
10 years ago |
|
huang
|
4d4b48ef99
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
6209250e6d
|
内容长度提醒
|
10 years ago |
|
huang
|
8c0f9d24f8
|
系统消息没保存成功添加验证
系统消息样式修改
|
10 years ago |
|
sw
|
96405d7c0c
|
取消之后编程按钮无效
|
10 years ago |
guange
|
ca8f943a97
|
js函数重构
|
10 years ago |
|
guange
|
e9f9dd44b9
|
编程作业的修改功能搞定
|
10 years ago |
|
ouyangxuhua
|
22e2510482
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
3044b07df7
|
系统消息颜色
|
10 years ago |
|
huang
|
c0437ae992
|
作业截止时间提醒界面！
|
10 years ago |
|
sw
|
6004fe1b4d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
8848b3975e
|
防止生成的kindeditor太高
|
10 years ago |
|
sw
|
f4c19c0fb0
|
1、homework.js on改为live
2、导入作业之后，编程功能按钮消失
|
10 years ago |
|
sw
|
a94521f2e1
|
编辑普通作业功能完成
|
10 years ago |
|
lizanle
|
795ce09d5e
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
e5e3eeca2c
|
kindeditor icon顺序调整
|
10 years ago |
|
sw
|
f0bd113a5e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
93b179c958
|
修改普通作业
|
10 years ago |
|
lizanle
|
80e38287dd
|
所有baselayout都引入prttefy.css .js
调整资源库宽度
|
10 years ago |
|
lizanle
|
cc6fe754d4
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
756aae0cf2
|
发布issue编辑器可以上传代码并高亮显示了
|
10 years ago |
|
sw
|
fce5405c41
|
发布作业界面样式调整
|
10 years ago |
|
sw
|
97f9d4fa60
|
增加教师节祝福语
|
10 years ago |
|
sw
|
a841c20896
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
28d4bae9e7
|
修改课程/项目的导航栏区域的文字样式
|
10 years ago |
|
sw
|
e30abd2a81
|
提交、修改作品界面宽度
|
10 years ago |
|
cxt
|
5b14dbba45
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
6ed0a151dc
|
头像下拉框的样式修改
|
10 years ago |
|
lizanle
|
f892beebc1
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
763939f176
|
这个可以不用了
|
10 years ago |
|
sw
|
519f079bcc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
401b0bc7e3
|
textarea自动拉伸高度优化，编辑普通作业作品功能完成
|
10 years ago |
|
sw
|
b1463f0864
|
学生提交匿评作业作品功能实现
|
10 years ago |
|
lizanle
|
24dce81b31
|
高度参数用一个
|
10 years ago |
|
lizanle
|
c393a0ea01
|
个人中心 留言界面 编辑框 ie浏览器下报错
|
10 years ago |
|
lizanle
|
b2afe18ccd
|
个人中心 留言界面 编辑框自适应高度
|
10 years ago |
|
lizanle
|
4ad139e6fd
|
添加一点注释
|
10 years ago |
|
lizanle
|
4b1153d0a5
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
1dd4700eb2
|
个人中心留言功能 编辑框自适应高度
|
10 years ago |
|
cxt
|
7474d19120
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
040f3f588d
|
鼠标移到头像上方，才显示账户下拉菜单
|
10 years ago |
|
lizanle
|
6adbceec7b
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
95f66a304c
|
通过 kindeditor_tag f.kindeditor生产的编辑框可以自动长高缩短
课程模块的通知，讨论区，留言都可以自动的长高，缩短
|
10 years ago |
|
cxt
|
8fec99114a
|
"关于我们"的样式调整
|
10 years ago |
|
cxt
|
a991500e55
|
登录首页的样式修改
|
10 years ago |
|
sw
|
2e59584031
|
作业编辑功能按钮、加入课程、项目等按钮样式
|
10 years ago |
|
ouyangxuhua
|
966bd8f94c
|
admin配置界面编辑框样式修改
|
10 years ago |
|
sw
|
137a0b16a0
|
1、文件的样式图片
2、点击编程弹框时，测试输入获取焦点
|
10 years ago |
|
guange
|
52c2719a46
|
去掉老式的编程作业提交
|
10 years ago |
|
lizanle
|
23e60bf007
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
de822daf44
|
个人动态编辑框高度自动变高缩短
其他编辑框自动长高缩短
|
10 years ago |
|
sw
|
e4209007b1
|
Merge branch 'guange_homework' into szzh
|
10 years ago |
|
guange
|
9e9f373a76
|
发布作业优化
|
10 years ago |
|
guange
|
04dffb2f89
|
模拟回答界面调整
|
10 years ago |
|
cxt
|
a86d2aaadd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
32b2d4f874
|
点击动态中的图片即显示大图
|
10 years ago |
|
lizanle
|
e8c5627c41
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
6bcaf01fe2
|
课程弹出框样式不对
|
10 years ago |
|
ouyangxuhua
|
8c66adec1b
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
ef011ad473
|
项目--邀请--发送邮件邀请用户,对输入的邮箱名进行判断，同时，修改提示样式
|
10 years ago |
|
ouyangxuhua
|
a159af8139
|
项目--邀请--发送邮件邀请用户对输入的邮箱进行判断，同时修改提示样式
|
10 years ago |
|
guange
|
53cea36329
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
guange
|
216bc7f70f
|
动态中作业的提交状态修改
|
10 years ago |
|
sw
|
fe91ec1a85
|
1、历史数据导致项目动态中部分数据连接到课程相关页面
2、项目缺陷列表显示为整个系统的缺陷
3、用户得分的还原
4、样式调整
|
10 years ago |
|
guange
|
a0c611378b
|
提交作业跳转报错
|
10 years ago |
|
guange
|
bacb5f859b
|
merge
|
10 years ago |
|
guange
|
a69cee4b26
|
老师测试功能
|
10 years ago |
|
sw
|
359e34471b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
ee60905eda
|
回复之后回复框消失
|
10 years ago |
|
huang
|
c7f15d3a3e
|
修改留言html样式
|
10 years ago |
|
sw
|
5be3a9e03f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
893ae35039
|
新建作品、编辑作品界面修改
|
10 years ago |
|
sw
|
6a6fbea446
|
提交作品样式
|
10 years ago |
|
huang
|
1ba0c86828
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
70f80bb36f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
b4a7cb24b9
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
0e68bbc5bd
|
调整回复框高度
|
10 years ago |
|
sw
|
2e51d0e833
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
5135f749a4
|
调整回复框高度
|
10 years ago |
|
sw
|
6af0d8f40c
|
屏蔽课程内发布作业功能，频闭编辑作业功能
|
10 years ago |
|
huang
|
86405b8a3c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
f05270a519
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
6fdd3a8e86
|
调整回复框高度
|
10 years ago |
|
huang
|
4c76292e5e
|
message--viewed
|
10 years ago |
suntao
|
b24909df8f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
suntao
|
1fff00bab0
|
回复模块改动
|
10 years ago |
|
huang
|
273e1ea6b1
|
修改项目讨论区引用样式
|
10 years ago |
|
sw
|
8fc7760c02
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
suntao
|
4259540f53
|
作业列表宽度调整
|
10 years ago |
|
sw
|
c8eb7804df
|
增加发布时间和发送课程的js验证
|
10 years ago |
|
suntao
|
b2b2537df8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
a05a3074dd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
a94d5928d4
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
suntao
|
ea4a005048
|
作业界面排版微调
|
10 years ago |
|
sw
|
594faabcbe
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
487881bb92
|
Merge branch 'szzh' into dev_hjq
Conflicts:
public/stylesheets/new_user.css
|
10 years ago |
|
suntao
|
9b8270aed1
|
Banner padding调整
|
10 years ago |
|
sw
|
0bb0a97fd5
|
个人主页新增留言回复按钮无作用
|
10 years ago |
|
sw
|
e55b61cb81
|
课程留言回复
|
10 years ago |
|
suntao
|
023bb3d95f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
suntao
|
c9d46f17f3
|
回复blockquote调整
|
10 years ago |
|
ouyangxuhua
|
16e018a444
|
更改未读消息样式的字体大小
|
10 years ago |
|
suntao
|
9bbf658fdb
|
回复框样式调整
|
10 years ago |
|
guange
|
d5be41eebc
|
merge
|
10 years ago |
|
guange
|
ccc4d94212
|
修复合并出错问题
|
10 years ago |
|
ouyangxuhua
|
2fc337cb07
|
修改已读和未读消息样式
|
10 years ago |
|
suntao
|
f036b322b9
|
忘记密码页面提示位置调整
|
10 years ago |
|
suntao
|
ed4153faef
|
作业界面宽度还原
|
10 years ago |
|
suntao
|
313ee0f9d8
|
footer对齐调整
|
10 years ago |
|
suntao
|
59bbfeb0b5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
suntao
|
56644ca173
|
点击展开更多样式
|
10 years ago |
|
guange
|
8ad521d4ab
|
merge
|
10 years ago |
|
guange
|
41f9daed6d
|
编程作业放入到users controller
|
10 years ago |
|
suntao
|
ded497a5f2
|
个人主页左侧导航配置按钮
|
10 years ago |
|
lizanle
|
4a1b2fbbd6
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
b2eb846a23
|
关于我们
隐藏招聘信息
联系我们改为服务协议
|
10 years ago |
|
sw
|
5f42ce4c80
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/_course_message.html.erb
app/views/users/_course_news.html.erb
app/views/users/_project_issue.html.erb
app/views/users/_project_message.html.erb
|
10 years ago |
|
huang
|
8b9ee2260a
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
fede611fea
|
鼠标经过显示内容效果
公共贴吧数据迁移
|
10 years ago |
|
suntao
|
00de825050
|
作业界面颜色更改，删掉冗余头部导航css
|
10 years ago |
|
suntao
|
acb46d520c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/_user_homework_form.html.erb
|
10 years ago |
|
suntao
|
ae3f56c758
|
提交作业界面对齐
|
10 years ago |
|
sw
|
b1de662338
|
讨论区回复功能，修改引用样式
|
10 years ago |
|
lizanle
|
798326d6ef
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
b3e3737fb5
|
发布作业时从资源库选择资源功能
|
10 years ago |
|
sw
|
62360175d1
|
课程通知回复时，所有回复框都会提交
|
10 years ago |
|
sw
|
84ff3450d2
|
在动态中回复通知动态
|
10 years ago |
|
ouyangxuhua
|
fd0e4a7afd
|
项目wiki：输入wiki为非汉字类型且长度够长，显示超出边框问题解决
|
10 years ago |
|
suntao
|
fe664b5e5c
|
回复模块调整
|
10 years ago |
|
suntao
|
e917a68bd3
|
消息页面li间距调整，回复块调整
|
10 years ago |
|
ouyangxuhua
|
316f660ca4
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
suntao
|
1d1d2f738d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
suntao
|
acf5db7067
|
placeholder显示等
|
10 years ago |
|
ouyangxuhua
|
8403d5365c
|
修改项目新闻提示
|
10 years ago |
|
huang
|
311634abf1
|
修改消息列表样式
|
10 years ago |
|
cxt
|
1113a7938c
|
修复点击空白处返回新建课程/项目的页面
|
10 years ago |
|
suntao
|
2804d7d730
|
resource图片替换
|
10 years ago |
|
cxt
|
4ab91984f2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
fa57a6c889
|
主页动态的样式修改
|
10 years ago |
|
suntao
|
ac353841b0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
suntao
|
d3869b03cd
|
资源库版面样式调整
|
10 years ago |
|
lizanle
|
9a1fa316bb
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
19dfd77cad
|
将资源发送至 会换行，调宽
|
10 years ago |
|
suntao
|
3e9bb8a596
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/new_base_user.html.erb
|
10 years ago |
|
suntao
|
b0ff7f0ee2
|
页面间距调整，头像大小调整
|
10 years ago |
|
cxt
|
23c1ac5a4a
|
项目问题的动态内容显示超出边框
|
10 years ago |
|
guange
|
a142103091
|
Merge remote-tracking branch 'origin/develop' into guange_homework
|
10 years ago |
|
guange
|
8f426ca040
|
merge
|
10 years ago |
|
guange
|
85ee2b86cd
|
.
|
10 years ago |
|
sw
|
faea706683
|
Revert "Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh"
This reverts commit 3776689661, reversing
changes made to d48cc8073a.
|
10 years ago |
|
sw
|
655054a8ad
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
cc50d0d85e
|
布置作业界面调整删除按钮和文件的距离
|
10 years ago |
|
suntao
|
3776689661
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
suntao
|
efe5c1e3f4
|
课程宽度调整
|
10 years ago |
|
sw
|
17e9b2d293
|
编辑个人简介文本框
|
10 years ago |
|
suntao
|
0d8624a642
|
颜色更新
|
10 years ago |
|
suntao
|
886a00e18d
|
footer间距调整
|
10 years ago |
|
suntao
|
a22727efb2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
suntao
|
5e25b64004
|
提交按钮对齐
|
10 years ago |
|
sw
|
4ade77f3d0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
e455f93ee1
|
上传图片；浏览图片按钮
|
10 years ago |
|
guange
|
18bfe1fc73
|
jquery升到1.11
|
10 years ago |
|
suntao
|
977f81e031
|
关注和取消关注，导航圆角
|
10 years ago |
