huang
|
7c91a40e4f
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
huang
|
1fe35fc063
|
配置中添加角色权限判断
不同角色通过admin配置显示不同模块
|
10 years ago |
whimlex
|
51aeb40d31
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
whimlex
|
6441d298a2
|
版本库修订SVG图样式修改
|
10 years ago |
whimlex
|
9fa3d25e3f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
whimlex
|
b99f8d8056
|
上传头像,上传课程项目logo提示
|
10 years ago |
lizanle
|
d6527f1f7e
|
去掉学生列表分页
|
10 years ago |
lizanle
|
da7528c780
|
重定向到项目配置里的新建版本页面
|
10 years ago |
whimlex
|
0d26f64afd
|
搜索课程——授课时间”与“课程简介”显示异常
|
10 years ago |
huang
|
2043b963c8
|
添加意见反馈
项目配置权限
|
10 years ago |
whimlex
|
ab93d19b56
|
动态中显示更新项目缺陷样式异常
|
10 years ago |
huang
|
861469e39f
|
1、修改回复帖子和新建帖子标题冲突
2、对齐新建框
3、版本库新建按钮样式
|
10 years ago |
huang
|
86027e077f
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
huang
|
5bfef259de
|
去掉缺陷列表空白处的链接
|
10 years ago |
whimlex
|
84d7e63d54
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
whimlex
|
6195f0a150
|
课程动态添加问卷发布,为通过问卷动态访问课程问卷做权限判断
|
10 years ago |
huang
|
c510f14edb
|
流程碑添加新建版本
|
10 years ago |
huang
|
2521e802bf
|
缺陷统计添加冒号
|
10 years ago |
huang
|
b6f34045db
|
修改缺陷:缺陷上传附件后,第一条回复中会显示附件。
|
10 years ago |
huang
|
5c2fdf7aee
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
huang
|
dd25cdc065
|
1、修改项目三种类型术语
2、未登录情况下缺陷提交bug
3、width果断空白处点击进入
|
10 years ago |
lizanle
|
457b86a861
|
版本配置
|
10 years ago |
lizanle
|
2987253303
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
10 years ago |
lizanle
|
3b70ab964d
|
issue过滤
|
10 years ago |
huang
|
4cddb214fd
|
修改资源库站内搜索不能搜索的bug
|
10 years ago |
huang
|
3bd4f2d0f6
|
修改资源库样式
|
10 years ago |
huang
|
692500af2e
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
huang
|
93e3247685
|
项目名称不能为空提示
|
10 years ago |
whimlex
|
86ef3e680a
|
项目简介展开更多信息不超过一定内容不显示
|
10 years ago |
huang
|
8dd0e985a0
|
完成
|
10 years ago |
whimlex
|
05712c4c06
|
学生作业改为作品
|
10 years ago |
whimlex
|
ab39d54b45
|
版本库文件列表样式
|
10 years ago |
sw
|
6df1f55ac4
|
添加课程成员后不自动刷新
|
10 years ago |
sw
|
d5e71e9803
|
增加课程成员收索功能后、添加课程成员,成员列表不自动刷新
|
10 years ago |
huang
|
7340ef793c
|
修改新建项目的显示样式
|
10 years ago |
whimlex
|
65e6b41d91
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
whimlex
|
22a4bf9216
|
查看修订样式
|
10 years ago |
huang
|
7d87915413
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/helpers/application_helper.rb
app/helpers/files_helper.rb
app/views/courses/_course_members.html.erb
app/views/courses/settings.html.erb
app/views/homework_attach/_homework.html.erb
public/javascripts/course.js
public/stylesheets/courses.css
public/stylesheets/public.css
|
10 years ago |
whimlex
|
92bf340786
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
whimlex
|
af28461cf0
|
动态中创建项目样式调整
|
10 years ago |
lizanle
|
17838acddb
|
提示信息数组 flatten
|
10 years ago |
lizanle
|
0ca96a5500
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
10 years ago |
lizanle
|
ade32aae02
|
列宽修改
|
10 years ago |
sw
|
3a8bfbf880
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
lizanle
|
3c17492901
|
列宽
|
10 years ago |
sw
|
7239f6a641
|
1、成员列表分页空间翻页不可用
2、当五输入时显示,无用户显示
|
10 years ago |
lizanle
|
17f9ed52ce
|
Wiki列宽度
|
10 years ago |
lizanle
|
15e54dd765
|
版本 输入名字不能为空
|
10 years ago |
lizanle
|
b6db00643e
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
10 years ago |
lizanle
|
532a8cb5c3
|
返回的时候展开输入框
|
10 years ago |
whimlex
|
1382f9a0cd
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
whimlex
|
dc955c7e2d
|
编辑问题时,编辑问题状态,开始时间、计划完成时间右侧的时间选择器不见了
|
10 years ago |
sw
|
9814a859c3
|
项目添加TAG页面不刷新
|
10 years ago |
huang
|
14a0d885f0
|
settings
|
10 years ago |
huang
|
04af919c77
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
huang
|
fc8dacbd5f
|
引入资源列表界面调整
|
10 years ago |
lizanle
|
f8951c0044
|
国际化
|
10 years ago |
lizanle
|
5e8848f962
|
国际化
|
10 years ago |
lizanle
|
42b798e111
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
10 years ago |
lizanle
|
3620cd99b6
|
去掉错误的符号
|
10 years ago |
sw
|
cdbe95f6ec
|
修改老师配置界面成员搜索
|
10 years ago |
huang
|
0607cf326c
|
版本库里面页面验证
|
10 years ago |
whimlex
|
7e0120e029
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
huang
|
917701f09d
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
huang
|
c2c9660a46
|
项目得分界面调整
|
10 years ago |
whimlex
|
51e0217eb8
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
whimlex
|
eb1f8acbd3
|
版本库样式修改
|
10 years ago |
lizanle
|
8290741746
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
10 years ago |
lizanle
|
d2b0eae119
|
格式修改
|
10 years ago |
sw
|
9f862ad7a7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
huang
|
1ffa447767
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
huang
|
640f6a1ca7
|
邮件发送框距离
去掉讨论区不必要的*
|
10 years ago |
lizanle
|
1902d557c0
|
有日期label
|
10 years ago |
lizanle
|
43442d6f62
|
字符截断
|
10 years ago |
lizanle
|
8cee159cb7
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
10 years ago |
lizanle
|
e4abc86093
|
版本和版本库bug修改
|
10 years ago |
huang
|
1961768031
|
新建问题前去掉不必要的*
去掉跟踪功能
|
10 years ago |
sw
|
a8b1ca10b3
|
1、学生作业 --> 作品
2、学生交了作品之后显示修改作品
|
10 years ago |
huang
|
f1e86ace25
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
huang
|
54b81bdfb3
|
项目类型图标
|
10 years ago |
whimlex
|
54e63cf4d9
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
app/views/issues/_history.html.erb
public/stylesheets/project.css
|
10 years ago |
huang
|
258a023abd
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
huang
|
fec0a7472d
|
新闻换行处理
|
10 years ago |
huang
|
fbcd9f9a96
|
wiki页面调整
|
10 years ago |
huang
|
0ea683e1b4
|
修改issue中图片附件的缩略图显示方式
|
10 years ago |
whimlex
|
8633ba3325
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
whimlex
|
8babe384fd
|
缺陷历史记录调整
|
10 years ago |
huang
|
d1e7777040
|
关注列表样式
|
10 years ago |
huang
|
63a457674a
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
huang
|
440eb8dc7f
|
1、修改项目成员一排显示
2、项目动态显示强制换行
3、讨论区提示用语
|
10 years ago |
whimlex
|
fc106fef49
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
huang
|
fb06571918
|
项目讨论区引用强制换行
|
10 years ago |
whimlex
|
e9cf61e0f4
|
缺陷状态根据完成度调整
|
10 years ago |
huang
|
ce5b2d9996
|
项目讨论区回复按钮
|
10 years ago |
z9hang
|
47e6d5c909
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
z9hang
|
8a26fd4343
|
课程配置:成员配置处添加搜素成员功能
|
10 years ago |
sw
|
daef2c455a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
sw
|
57a5191fe5
|
课程资源列表样式调整
|
10 years ago |
whimlex
|
8b89110e41
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
sw
|
65bcaef911
|
修改TAG云样式
|
10 years ago |
whimlex
|
ca1e902a8f
|
#2279 搜索课程进入结果页面,如图,建议将“授课时间”与“课程简介”与上面的“课程名称”等信息对齐
|
10 years ago |
huang
|
c852e72e36
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
huang
|
611952eb05
|
新建项目时候设定默认项目类型
新建项目样式异常调整
|
10 years ago |
sw
|
a0c6a09e7d
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
sw
|
332a9b45fb
|
修改项目上传资源弹框样式
|
10 years ago |
huang
|
be97e4732d
|
目标版本为空的不显示
|
10 years ago |
sw
|
9819e1ce45
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
lizanle
|
61a938ef39
|
添加真名
|
10 years ago |
lizanle
|
e4597f9ccc
|
添加真名
|
10 years ago |
lizanle
|
45d5f9e58b
|
课程搜索按时间倒序排序
|
10 years ago |
huang
|
bfc83d1a8c
|
解决项目图片不能上传
|
10 years ago |
sw
|
6983764c44
|
修改课程名称过长时的样式
|
10 years ago |
huang
|
9fa7b04ce5
|
组织不需要必填
|
10 years ago |
huang
|
b92767bbb5
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
huang
|
b80251a247
|
链接空白处改成不能点击
修复项目标题过长,布局变形
|
10 years ago |
lizanle
|
9621c35e8b
|
项目 版本 和 版本库 标签改动
|
10 years ago |
sw
|
05c74960a8
|
1、增加当前选择的TAG云的样式
2、当选择TAG云过滤之后,对TAG进行添加、删除操作时继续选中该TAG
|
10 years ago |
lizanle
|
10bd7c2855
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
10 years ago |
lizanle
|
17f495e77b
|
项目 版本 和 版本库 标签改动
|
10 years ago |
huang
|
3c563eaecb
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
huang
|
bb7904b32f
|
引入JS文件
|
10 years ago |
whimlex
|
19cbc34b2b
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
whimlex
|
19dd5a9879
|
项目邀请功能和项目更多功能点击事件
|
10 years ago |
sw
|
5649f4c5a1
|
过滤之后现在所有的TAG云
|
10 years ago |
huang
|
890f36a2d5
|
优化缺陷
|
10 years ago |
sw
|
a2b529b38b
|
课程添加TAG后删除TAG按钮消失
|
10 years ago |
sw
|
b7e9442800
|
添加、删除TAG云时TAG云列表刷新
|
10 years ago |
huang
|
4afd9afd08
|
解决冲突。修改版本页面
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
public/stylesheets/project.css
|
10 years ago |
huang
|
08fb04aff4
|
修改版本库样式
|
10 years ago |
whimlex
|
20b17f5503
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
whimlex
|
301e44c695
|
修改附件上传功能无效
|
10 years ago |
huang
|
8803942a02
|
项目讨论区,引用样式调整
|
10 years ago |
huang
|
e34a00f66e
|
讨论区列表样式冲突
|
10 years ago |
sw
|
e334dd69f8
|
上传课件后TAG云消失
|
10 years ago |
huang
|
c1d997379f
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
lizanle
|
a4d6eaa46c
|
跳转回来自动选择tab页
|
10 years ago |
huang
|
284e4938f6
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
lizanle
|
38672458b0
|
新建版本 更改页面
|
10 years ago |
huang
|
dc81db1d8b
|
处理讨论区、缺陷列表样式显示异常
|
10 years ago |
sw
|
2db3ab9d13
|
修改课程时增加密码与课时的验证
|
10 years ago |
lizanle
|
86b05b8e6a
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
10 years ago |
lizanle
|
fe94efeb39
|
新建版本更改页面
|
10 years ago |
sw
|
94ca6cd2f9
|
新建课程时增加密码与课时的验证
|
10 years ago |
huang
|
e2f7da5b99
|
修改里程碑代码
|
10 years ago |
huang
|
95c5e6ac83
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/helpers/application_helper.rb
app/helpers/files_helper.rb
app/helpers/members_helper.rb
app/models/journals_for_message.rb
app/models/mailer.rb
app/models/user.rb
app/views/attachments/_form.html.erb
app/views/bids/_new_homework_form.html.erb
app/views/boards/_project_show.html.erb
app/views/courses/_courses_jours.html.erb
app/views/courses/feedback.html.erb
app/views/courses/new_homework.html.erb
app/views/courses/settings.html.erb
app/views/issues/_list.html.erb
app/views/issues/new.html.erb
app/views/messages/_project_show.html.erb
app/views/messages/edit.html.erb
app/views/news/_project_news.html.erb
app/views/projects/invite_members.html.erb
app/views/projects/settings/_modules.html.erb
app/views/projects/show.html.erb
config/configuration.yml
config/locales/zh.yml
db/schema.rb
public/assets/kindeditor/kindeditor.js
public/javascripts/course.js
public/stylesheets/courses.css
public/stylesheets/public.css
|
10 years ago |
huang
|
bd800a53e4
|
项目简介显示
|
10 years ago |
whimlex
|
7ce8ae0261
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
whimlex
|
9c07976751
|
展开和收起更多信息图片样式修改;跟踪者样式修改
|
10 years ago |
huang
|
115d77dd01
|
圈子JS和modulesJS
版本库删除按钮
|
10 years ago |
huang
|
bc6ff57de2
|
修改开发组、朋友圈、研发组切换js
|
10 years ago |
huang
|
61ce44af76
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
huang
|
c11fdc7273
|
版本库调整:未完成
|
10 years ago |
whimlex
|
1d8dee15f4
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
whimlex
|
04698c3e53
|
项目描述展开信息和收起信息
|
10 years ago |
whimlex
|
d23ac832ca
|
项目页面搜索按钮功能实现;问题跟踪页面编辑按钮功能实现;问题跟踪页面样式调整
|
10 years ago |
huang
|
fec751608a
|
完成里程碑界面
|
10 years ago |
huang
|
8e7b4868ca
|
wiki页面调整
|
10 years ago |
huang
|
6229acac71
|
完成wiki新建界面
|
10 years ago |
whimlex
|
d79de0a354
|
课程日期控件样式冲突
|
10 years ago |
sw
|
94580ba040
|
11
|
10 years ago |
whimlex
|
596e89a14f
|
缺陷更新页面
|
10 years ago |
sw
|
0cc809c3e0
|
实现课程资源TAG云功能
|
10 years ago |
huang
|
45c234bf9c
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
huang
|
aff58dd3a7
|
添加关注者
|
10 years ago |
sw
|
73ed8b9558
|
全站搜索是不输入条件搜索结果为空
|
10 years ago |
sw
|
0f6d2676e5
|
tag云显示搜索结果的TAG云
|
10 years ago |
whimlex
|
30dae089c6
|
新建缺陷页面主题不能为空
|
10 years ago |
whimlex
|
521e000c74
|
commmit
|
10 years ago |
sw
|
2e3294a341
|
1、增加根据资源列表,获取其TAG与每个TAG数量的hash的方法
2、增加课程资源列表的TAG云的显示
|
10 years ago |
whimlex
|
d68b0283eb
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
whimlex
|
a10ced61ec
|
缺陷跟踪者
|
10 years ago |
huang
|
3825252327
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
huang
|
104075b3fd
|
修改缺陷留言方式
|
10 years ago |
whimlex
|
7fa2338ce6
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
whimlex
|
ba0535e127
|
完成新建缺陷页面
|
10 years ago |
sw
|
676cf8f180
|
课程上传资源是根据上传的类型,对资源添加默认的TAG
|
10 years ago |
huang
|
4d0a9bd35c
|
部分描述增加强制换行
|
10 years ago |
huang
|
0023d0610b
|
缺陷主题、描述强制换行
跟踪按钮样式
引用样式修改
|
10 years ago |
sw
|
1dc8190aa0
|
1、修改无跳转的href链接为javascript:void(0)
2、增加课程资源库的界面
|
10 years ago |
sw
|
e579157604
|
更新public.css
课程讨论区文件按钮和editor靠的太近
|
10 years ago |
huang
|
c607bd5cbf
|
定义缺陷中样式
|
10 years ago |
huang
|
afa5c3a4f9
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
huang
|
bfe0176b74
|
修改附件显示样式
|
10 years ago |
lizanle
|
c42a63ea4e
|
添加判空
|
10 years ago |
lizanle
|
c2ccf6a1f8
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
lizanle
|
a7f1026828
|
current_user判空
|
10 years ago |
sw
|
7dbd20e5eb
|
修复刷新页面时只评论未评分表的作品在已评列表中
|
10 years ago |
sw
|
61df6e144d
|
修复学生作业列表QQ浏览器显示超出边框
|
10 years ago |
sw
|
d1f42a3954
|
教师只评论不评分的作品在未批和已批列表中都有
|
10 years ago |
sw
|
78dff36d7a
|
老师只评论不评分的学生作业却在已评列表
|
10 years ago |
sw
|
ee68828132
|
创建课程后跳转URL报错
|
10 years ago |
huang
|
4acad8088e
|
缺陷最新显示最上面
代码优化
|
10 years ago |
huang
|
e0695fa51d
|
讨论区。描述、主题换行
|
10 years ago |
huang
|
b7537ad518
|
修改新闻中测出的bug,
讨论区中附件显示形式
|
10 years ago |
whimlex
|
b3b9688072
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
whimlex
|
cdf1ce1c17
|
缺陷页面
|
10 years ago |
sw
|
81cbb76d78
|
课程/项目--添加成员:用真实姓名搜索用户时,需要在姓和名之间加个空格才可以搜到
|
10 years ago |
huang
|
b8058c3e12
|
用户邀请加入的时候增加拒绝功能
删除提示星系修改
申请加入模块样式调整
|
10 years ago |
sw
|
c60515ac50
|
学生作业增加按学生真实姓名、昵称、学号搜索功能
|
10 years ago |
sw
|
e4b2092c7f
|
实现项目成员列表增加成员,以及用户/角色留空时的提示信息
|
10 years ago |