 sw
|
cfe0635804
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
 huang
|
de23c3c2a8
|
配置中子页面调整
隔行换色显示
显示页面左对齐
|
10 years ago |
|
sw
|
5b5423b8c5
|
修改贴吧新建帖子、回复显示样式的问题
|
10 years ago |
|
huang
|
ee1c53bacc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
whimlex
|
2070d69d44
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
348eae5c45
|
修改项目模式提示样式
版本库
版本
|
10 years ago |
|
whimlex
|
19fe973b5b
|
上传头像
|
10 years ago |
|
whimlex
|
d66af82478
|
新建竞赛页面日历插件显示错误
|
10 years ago |
|
sw
|
9a07989917
|
调整header的login的样式
|
10 years ago |
|
sw
|
427f26b058
|
header的login显示
|
10 years ago |
|
whimlex
|
36f2643ad8
|
上传logo
|
10 years ago |
|
sw
|
2f2d4257c2
|
调整提交作业按钮样式
|
10 years ago |
|
sw
|
d279881daf
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
app/views/courses/settings.html.erb
|
10 years ago |
|
sw
|
7b3edb59b0
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/courses/_course_members.html.erb
app/views/courses/settings.html.erb
app/views/members/create.js.erb
app/views/members/destroy.js.erb
app/views/members/update.js.erb
public/javascripts/course.js
|
10 years ago |
|
whimlex
|
0f037e78fa
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
public/stylesheets/public.css
|
10 years ago |
|
whimlex
|
5123ca1047
|
版本库样式调整
|
10 years ago |
|
huang
|
ca26b0d819
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/courses/_course_members.html.erb
app/views/courses/settings.html.erb
app/views/members/create.js.erb
app/views/members/destroy.js.erb
app/views/members/update.js.erb
app/views/users/show.html.erb
public/javascripts/course.js
|
10 years ago |
|
huang
|
8b77079f44
|
公开。私有标识强制不换行
|
10 years ago |
|
sw
|
57193b077e
|
作品列表取消分页显示
|
10 years ago |
|
whimlex
|
b99f8d8056
|
上传头像，上传课程项目logo提示
|
10 years ago |
|
huang
|
5bfef259de
|
去掉缺陷列表空白处的链接
|
10 years ago |
|
huang
|
dd25cdc065
|
1、修改项目三种类型术语
2、未登录情况下缺陷提交bug
3、width果断空白处点击进入
|
10 years ago |
|
whimlex
|
86ef3e680a
|
项目简介展开更多信息不超过一定内容不显示
|
10 years ago |
|
whimlex
|
11d83a863a
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
app/views/projects/show.html.erb
|
10 years ago |
|
whimlex
|
ab39d54b45
|
版本库文件列表样式
|
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
|
0a97bbba9d
|
项目问题跟踪图片点击空白处关闭
|
10 years ago |
|
whimlex
|
dc955c7e2d
|
编辑问题时，编辑问题状态，开始时间、计划完成时间右侧的时间选择器不见了
|
10 years ago |
|
sw
|
cdbe95f6ec
|
修改老师配置界面成员搜索
|
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 |
|
sw
|
9f862ad7a7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
640f6a1ca7
|
邮件发送框距离
去掉讨论区不必要的*
|
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
|
fbcd9f9a96
|
wiki页面调整
|
10 years ago |
|
whimlex
|
8babe384fd
|
缺陷历史记录调整
|
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
|
b040981c22
|
调整course.css
|
10 years ago |
|
sw
|
11a4febecb
|
调整course.css
|
10 years ago |
|
sw
|
65bcaef911
|
修改TAG云样式
|
10 years ago |
|
sw
|
332a9b45fb
|
修改项目上传资源弹框样式
|
10 years ago |
|
huang
|
bfc83d1a8c
|
解决项目图片不能上传
|
10 years ago |
|
sw
|
6983764c44
|
修改课程名称过长时的样式
|
10 years ago |
|
sw
|
4202ec4bad
|
个人主页样式
|
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
|
10bd7c2855
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
10 years ago |
|
lizanle
|
17f495e77b
|
项目 版本 和 版本库 标签改动
|
10 years ago |
|
whimlex
|
19dd5a9879
|
项目邀请功能和项目更多功能点击事件
|
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
|
dc81db1d8b
|
处理讨论区、缺陷列表样式显示异常
|
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 |
|
sw
|
9905f91228
|
修改TAG云的显示样式
|
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
|
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 |
|
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
|
898d15aa7a
|
更新course.css文件
|
10 years ago |
|
sw
|
e579157604
|
更新public.css
课程讨论区文件按钮和editor靠的太近
|
10 years ago |
|
huang
|
c607bd5cbf
|
定义缺陷中样式
|
10 years ago |
|
sw
|
be08a9afbb
|
修改application.css中错误css
|
10 years ago |
|
sw
|
61df6e144d
|
修复学生作业列表QQ浏览器显示超出边框
|
10 years ago |
|
huang
|
b7537ad518
|
修改新闻中测出的bug，
讨论区中附件显示形式
|
11 years ago |
|
whimlex
|
cdf1ce1c17
|
缺陷页面
|
11 years ago |
|
sw
|
c60515ac50
|
学生作业增加按学生真实姓名、昵称、学号搜索功能
|
11 years ago |
|
sw
|
bb9513b313
|
课程学生作业列表增加搜索的静态页面
|
11 years ago |
|
whimlex
|
cf4451e998
|
pre标签换行；contest主页样式调整
|
11 years ago |
|
sw
|
01f56a761f
|
完成配置---模块
|
11 years ago |
|
sw
|
fb935f124c
|
完成修改项目界面
|
11 years ago |
|
huang
|
78868b34f0
|
修改缺陷中四中颜色按钮会折断换行的bug
区别新闻和通知
|
11 years ago |
|
huang
|
4adfec5640
|
解决样式冲突
添加新闻展示页面
|
11 years ago |
|
sw
|
b06e9ce468
|
干掉重复样式
|
11 years ago |
|
sw
|
633a53d1d4
|
更新css文件
|
11 years ago |
|
sw
|
9ad00e437f
|
1、修改引用的样式
2、修改错误图片链接
|
11 years ago |
|
huang
|
b8b8a12ca8
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
8f6b095fdb
|
新闻页面调整
|
11 years ago |
|
sw
|
3313bef0b1
|
路由报错
|
11 years ago |
|
huang
|
33abbaffe1
|
修改isuue显示界面
附件显示形式
国际化
部分样式调整
|
11 years ago |
|
whimlex
|
e148917865
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
69153d2d95
|
项目界面缺失翻译调整
|
11 years ago |
|
sw
|
600003e48c
|
公共贴吧中使用新编辑器上传大图片，图片超出界面
|
11 years ago |
|
sw
|
400d1a147d
|
课程新编辑器导致图片超出页面
|
11 years ago |
|
sw
|
ea0bd7e0dd
|
1、技术支持只有白羽
2、修改鼠标悬浮在白羽上有下划线
|
11 years ago |
|
sw
|
172e69a552
|
1、课程导航懒点击课程跳到动态页面
2、右上角课程下拉条增宽
3、课程通知 截至时间-->创建时间
|
11 years ago |
|
sw
|
0c949b7117
|
1、课程导航懒点击课程跳到动态页面
2、右上角课程下拉条增宽
3、课程通知 截至时间-->创建时间
|
11 years ago |
|
sw
|
596bc213ca
|
1、课程导航懒点击课程跳到动态页面
2、右上角课程下拉条增宽
3、课程通知 截至时间-->创建时间
|
11 years ago |
|
huang
|
f2cf46f0a0
|
修改缺陷列表显示bug
|
11 years ago |
|
huang
|
e907f5e3e4
|
1.解决缺陷列表图片不显示
2、项目种类页面局部刷新
3、工具栏调整
4.项目新增字段（判断种类）
|
11 years ago |
|
sw
|
6abdc4c7e1
|
课程成员配置界面，显示学生真实姓名，无真实姓名的蔡先生login
|
11 years ago |
|
huang
|
4d4e1cac8b
|
完成新的邮件邀请界面
|
11 years ago |
|
huang
|
b415575e0e
|
修改新缺陷列表
完成部分项目配置
|
11 years ago |
|
sw
|
c5b55042d4
|
1、修复课程讨论区引用功能
2、回复时回复框自动获得焦点
3、引用样式
4、修改提交回复时下面出现的提示信息
|
11 years ago |
|
sw
|
dae907d0b8
|
1、课程通知无法添加评论
2、课程通知界面显示
3、课程通知评论取消按钮
|
11 years ago |
|
sw
|
15567e7d7b
|
1、新的编辑起未对其
2、老师新建作业增加marting-bottom
|
11 years ago |
|
huang
|
069f59805d
|
修改左侧新建按钮居中
|
11 years ago |
|
huang
|
34321d35ec
|
添加相关图片
动态箭头
|
11 years ago |
|
huang
|
d832514a55
|
新增项目成员列表
|
11 years ago |
|
huang
|
bf36da8dcb
|
修改醒目新闻新建页面
退出项目样式
|
11 years ago |
|
huang
|
8b379711d9
|
1、修改附件列表排列和样式
2、谈论区样式显示
3、讨论区：“编辑” “引用”， “回复”
4、讨论区与课程分离
|
11 years ago |
|
sw
|
0bea5dbb4e
|
修改课程动态标题a标签过长
|
11 years ago |
|
huang
|
c1fea1c7e2
|
课程资源新界面
项目动态分页调整
|
11 years ago |
|
huang
|
12eaac5683
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/boards/_project_show.html.erb
public/javascripts/course.js
处理冲突
修改项目动态分页
项目到航天中添加“新建项目”
|
11 years ago |
|
huang
|
df43274565
|
新版项目界面（部分未完成，先合并）
1、项目框架整理
2、各页面样式
|
11 years ago |
|
sw
|
b971147aa8
|
1、添加通知会alert
2、添加通知描述样式
3、通知添加评论样式
|
11 years ago |
|
sw
|
ec8e609ddc
|
打爆下载增加权限、增加打包下载功能
|
11 years ago |
|
sw
|
b344bf3ea6
|
分页空间样式调整
|
11 years ago |
|
sw
|
94ecc3e59e
|
1、课程新增成员分页控件样式
2、课程老师列表翻页不可用
|
11 years ago |
|
sw
|
ed02959e00
|
修改成员角色
|
11 years ago |
|
sw
|
083a3b9de6
|
1、课程成员列表显示昵称
2、添加课程成员功能
|
11 years ago |
|
sw
|
98bf8dd494
|
课程成员列表显示
|
11 years ago |
guange
|
f139427f03
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
Conflicts:
app/controllers/zipdown_controller.rb
app/views/bids/_homework_list.html.erb
config/routes.rb
db/schema.rb
public/javascripts/attachments.js
|
11 years ago |
|
sw
|
21db854adb
|
Merge branch 'develop' into szzh
|
11 years ago |
|
sw
|
fcc4275a36
|
Merge branch 'sw_new_course' into szzh
|
11 years ago |
|
huang
|
582c70a96c
|
修改项目讨论区未选择置顶/锁定选项时显示异常
|
11 years ago |
|
z9hang
|
38b4967eb5
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
11 years ago |
|
sw
|
07de1f3de1
|
教师字体颜色不正确
|
11 years ago |
|
z9hang
|
35e0f73345
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
11 years ago |
|
z9hang
|
cc2cce22cf
|
讨论区附件样式修改
|
11 years ago |
|
sw
|
61ddfc6363
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
11 years ago |
|
sw
|
6a9abf12b9
|
1、当问卷描述过长，显示超过页面
2、描述未对齐
|
11 years ago |
|
z9hang
|
1c53731966
|
留言框样式调整
|
11 years ago |
|
sw
|
1e3b28d4bd
|
修改上传图片样式
|
11 years ago |
|
z9hang
|
e6e1d5342f
|
图片预览框样式问题
|
11 years ago |
|
sw
|
b9031095d4
|
Merge branch 'szzh' into sw_new_course
Conflicts:
Gemfile
app/controllers/courses_controller.rb
app/views/attachments/_form.html.erb
app/views/attachments/_form_course.html.erb
app/views/files/_attachement_list.html.erb
app/views/layouts/base.html.erb
app/views/layouts/base_projects.html.erb
config/locales/zh.yml
public/javascripts/attachments.js
|
11 years ago |
|
sw
|
c68349803e
|
1、课程讨论区、通知提示信息样式
2、整理js
|
11 years ago |
|
sw
|
9629e3be11
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
11 years ago |
|
sw
|
65824be778
|
修改css
|
11 years ago |
|
z9hang
|
15f0058374
|
修正课程资源界面搜索按钮样式
|
11 years ago |
|
sw
|
240fc240e6
|
修改默认图片
修改上传按钮样式
|
11 years ago |
|
sw
|
8c795edf9e
|
解决冲突
|
11 years ago |
|
sw
|
fcbcdffa44
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
public/stylesheets/courses.css
|
11 years ago |
|
sw
|
519c119543
|
修改上传文件样式
|
11 years ago |
|
z9hang
|
d8da3bb73c
|
课程通知列表显示多一个空行问题
|
11 years ago |
|
sw
|
a99dda837a
|
课程动态描述过长超出界面
|
11 years ago |
|
z9hang
|
b8ab3770f1
|
资源样式冲突调整
|
11 years ago |
|
z9hang
|
a59677c22e
|
课程通知展开信息按钮显示隐藏控制
|
11 years ago |
|
sw
|
cba678a357
|
课程是否启用匿评
课程作业列表样式
加入与退出课程按钮样式
|
11 years ago |
