 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
|
bc6ff57de2
|
修改开发组、朋友圈、研发组切换js
|
10 years ago |
|
whimlex
|
04698c3e53
|
项目描述展开信息和收起信息
|
10 years ago |
|
whimlex
|
d23ac832ca
|
项目页面搜索按钮功能实现；问题跟踪页面编辑按钮功能实现；问题跟踪页面样式调整
|
10 years ago |
|
whimlex
|
ba0535e127
|
完成新建缺陷页面
|
10 years ago |
 sw
|
1dc8190aa0
|
1、修改无跳转的href链接为javascript:void(0)
2、增加课程资源库的界面
|
10 years ago |
 alanlong9278
|
b704555628
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
.gitignore
Gemfile
app/controllers/discuss_demos_controller.rb
app/models/user.rb
app/views/bids/_bid_homework_show.html.erb
app/views/issues/index.html.erb
app/views/layouts/_base_feedback.html.erb
app/views/poll/publish_poll.js.erb
app/views/poll/republish_poll.js.erb
public/javascripts/application.js
Signed-off-by: alanlong9278 <547533434@qq.com>
|
10 years ago |
|
alanlong9278
|
a51ba0c104
|
Signed-off-by: alanlong9278 <547533434@qq.com>
|
10 years ago |
|
sw
|
61df6e144d
|
修复学生作业列表QQ浏览器显示超出边框
|
10 years ago |
|
huang
|
b3689377a3
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
b98a67f50d
|
完成项目配置-成员模块
|
10 years ago |
|
sw
|
8c122a35f7
|
项目类型切换到其他类型后，再切回开发组，更多按钮不可用
|
10 years ago |
|
sw
|
fadca9128f
|
完成项目朋友圈、开发组、科研组直接的切换功能
|
10 years ago |
|
sw
|
7b60998952
|
修改点击课程名称，url连接错误
|
10 years ago |
|
huang
|
33abbaffe1
|
修改isuue显示界面
附件显示形式
国际化
部分样式调整
|
10 years ago |
|
sw
|
ece4a67f97
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
600003e48c
|
公共贴吧中使用新编辑器上传大图片，图片超出界面
|
10 years ago |
|
sw
|
400d1a147d
|
课程新编辑器导致图片超出页面
|
10 years ago |
|
sw
|
ea0bd7e0dd
|
1、技术支持只有白羽
2、修改鼠标悬浮在白羽上有下划线
|
10 years ago |
|
sw
|
596bc213ca
|
1、课程导航懒点击课程跳到动态页面
2、右上角课程下拉条增宽
3、课程通知 截至时间-->创建时间
|
10 years ago |
|
whimlex
|
1fae44b201
|
用户主页国际化修改
|
10 years ago |
|
huang
|
e907f5e3e4
|
1.解决缺陷列表图片不显示
2、项目种类页面局部刷新
3、工具栏调整
4.项目新增字段（判断种类）
|
10 years ago |
|
sw
|
b8760c6403
|
个人描述最长为200
|
10 years ago |
|
sw
|
4fbbd7ceb7
|
公共贴吧，描述显示问题
|
10 years ago |
|
sw
|
4b83296a97
|
课程作业列表开启、关闭匿评
|
10 years ago |
|
sw
|
a737342a66
|
完成个人信息下拉、首页下标的隐藏非项目信息的定制
|
10 years ago |
|
huang
|
b415575e0e
|
修改新缺陷列表
完成部分项目配置
|
10 years ago |
|
sw
|
d192a564b4
|
课程作业列表、课程动态页面描述出现html标签
|
10 years ago |
|
huang
|
bf36da8dcb
|
修改醒目新闻新建页面
退出项目样式
|
10 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
处理冲突
修改项目动态分页
项目到航天中添加“新建项目”
|
10 years ago |
|
huang
|
df43274565
|
新版项目界面（部分未完成，先合并）
1、项目框架整理
2、各页面样式
|
10 years ago |
|
whimlex
|
aa64b47d74
|
资源按时间倒序显示；新建课程设置公开私有属性；课程动态（动态统计主要在作业和作品上存在问题，动态显示在作品和留言中存在权限问题）；课程动态格式调整
|
10 years ago |
|
sw
|
a84af9d138
|
课程私有资源不显示在没有权限查看的用户上
|
10 years ago |
|
sw
|
e7da022564
|
课程界面默认图片路径修改
|
10 years ago |
|
sw
|
72d683bdb7
|
加入课程与退出课程js刷新
|
10 years ago |
|
sw
|
fcc4275a36
|
Merge branch 'sw_new_course' into szzh
|
10 years ago |
|
whimlex
|
54908423bc
|
课程--作业附件显示问题;问题跟踪附件显示问题
|
10 years ago |
|
whimlex
|
3d2fc8e5ef
|
IE8
|
10 years ago |
|
whimlex
|
762c83b26c
|
commit
|
10 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
|
10 years ago |
|
sw
|
83dfcdcc02
|
学生可以发帖
|
10 years ago |
 z9hang
|
bdaf574266
|
修改发布新帖，发布课程通知链接
|
10 years ago |
|
whimlex
|
7fd77f0354
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
89a001ad9d
|
IE8浏览器及以下低版本浏览器提示
|
10 years ago |
|
sw
|
cba678a357
|
课程是否启用匿评
课程作业列表样式
加入与退出课程按钮样式
|
10 years ago |
|
sw
|
8f90fed8be
|
新建课程界面完成
|
10 years ago |
 lizanle
|
05cf90062f
|
论坛的描述如果有图片的话，图片会显示。使排版出现问题
|
10 years ago |
|
lizanle
|
cd976f9515
|
如果论坛的description上传了图片，那么这个图片会显示，使得论坛的界面被图片占据。
|
10 years ago |
|
lizanle
|
d1d40e1867
|
添加一个输入框的id，在论坛模块里，自动生成的id会和编辑器kindeditor生成的id冲突：都叫memo_content
|
10 years ago |
|
sw
|
53eef164c9
|
新建课程时layout修改
|
10 years ago |
|
whimlex
|
82fb9325c5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/_point_browser.html.erb
|
10 years ago |
|
whimlex
|
4de0255ce6
|
邀请邮件国际化；js冲突
|
10 years ago |
|
huang
|
eac6f814a8
|
解决浏览器提示关闭按钮与邮件邀请界面冲突
|
10 years ago |
|
sw
|
27e7bc21b5
|
当课程简介内容很少时（点击显示更多没有反应），取消显示更多按钮的显示
|
10 years ago |
|
huang
|
792a87dcaf
|
修改提示框引起的首页行距过高的问题
|
10 years ago |
|
huang
|
75567585d2
|
浏览器版本过低提示样式调整！
|
10 years ago |
|
sw
|
61d7d65b55
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/views/courses/_courses_jours.html.erb
|
10 years ago |
|
sw
|
bcf9d5919c
|
1、处理部分a标签调用js函数时会刷新页面的BUG
2、修改弹出框样式，制作弹出框demo
|
10 years ago |
|
huang
|
525a6394ca
|
1、公共贴吧邮件提醒
2、浏览器版本过低提醒（样式需要再调试）
|
10 years ago |
|
z9hang
|
13245282d4
|
修正讨论区帖子数量显示不正确问题
|
10 years ago |
|
huang
|
f1b8d74a07
|
修改加入项目字体大小、宽度
|
10 years ago |
|
whimlex
|
d73d842e31
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
34579e395f
|
附件上传bug修改；意见反馈收拉一致
|
10 years ago |
|
huang
|
cea43cb045
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
69eb7fbd77
|
关注、加入项目样式，处理样式冲突
|
10 years ago |
|
sw
|
b6b479f6f9
|
1、增加开启关闭匿评时弹框
2、增加js调用是等待的样式
|
10 years ago |
|
whimlex
|
6995ead66c
|
项目ID
|
10 years ago |
|
whimlex
|
b400c9bb11
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
|
10 years ago |
|
whimlex
|
b95852dfcd
|
附件上传国际化：修改页面一些bug：用户主页个人得分身份信息修改
|
10 years ago |
 dingxu
|
79588489e2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
dingxu
|
440855c0e6
|
修改项目tag样式
|
10 years ago |
|
sw
|
7541a83b16
|
改课程首页用新建问卷
|
10 years ago |
|
sw
|
90df8056c8
|
1、修改分页控件中省略号颜色
2、更新样式文件
3、修改课程首页用新建问卷换行
|
10 years ago |
|
sw
|
b9ed34f86e
|
1、右边内容区域、增加js：最短为左侧长度
2、修改课程首页动态显示
3、修改course.css文件
|
10 years ago |
|
lizanle
|
0424fc55db
|
项目资源数显示错误
|
10 years ago |
|
lizanle
|
966f93012d
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
c209bccba0
|
项目资源数显示错误
|
10 years ago |
|
alan
|
cf3d836cf3
|
删除邮件发送时出现《"亲爱的Trustie用户，您好！"》
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
sw
|
d92ac2d909
|
1、课程跳到其他页面后没有分块
2、修改course_show界面
|
10 years ago |
|
sw
|
423849ca84
|
加入课程、退出课程、配置、关闭、复制等按钮
|
10 years ago |
|
sw
|
1c30b8c81c
|
1、增加获取某个课程动态数的方法
2、修改首页配置、关闭、复制课程等按钮的样式
|
10 years ago |
|
sw
|
8f5d8c86a3
|
新版样式header调整
|
10 years ago |
|
sw
|
64b0646281
|
base_course基本完成
|
10 years ago |
|
sw
|
e7cce1fd28
|
修改项目html错误
|
10 years ago |
|
sw
|
642cf80bf8
|
调整课程主页分块显示
|
10 years ago |
|
sw
|
278854156a
|
调整课程信息样式
|
10 years ago |
|
sw
|
16872597b6
|
实现课程搜索
|
10 years ago |
|
sw
|
ec1ff6dfc3
|
1、修改课程界面未登录时，先显示注册，再显示登录
2、增加课程相关的css引用
3、增加top、left、content的静态页面
|
10 years ago |
|
sw
|
4d60a6dabc
|
1、修改版权
2、增加footer
|
10 years ago |
|
huang
|
4111e2a940
|
1、讨论区新子界面
2、项目右侧优化
|
10 years ago |
|
sw
|
4c482e1fac
|
完成新的用户反馈界面
|
10 years ago |
|
sw
|
d2c7861706
|
1、添加缺少图片
2、修改意见反馈框默认为关闭
3、修改css中部分图片链接错误
|
10 years ago |
|
sw
|
e4c0c840bf
|
1、完成课程模块导航栏样式调整
2、修改意见反馈默认在右下角位置
3、调整我的课程、我的项目js
4、ruby生成的菜单栏添加样式及部分方法重写
5、封装部分页面的ruby代码到helper
|
10 years ago |
|
sw
|
747a109638
|
1、添加CSS文件
2、调整首页HTML
3、去掉base_header中没用的erb语句
|
10 years ago |
|
sw
|
3b0a229c43
|
1.修改意见反馈框默认关闭
2、FIle--->资源库
|
10 years ago |
|
sw
|
e4895731ae
|
Merge branch 'develop' into szzh
|
10 years ago |
|
sw
|
ca7c970094
|
修改意见反馈框位置
|
10 years ago |
|
huang
|
cc5a22f2c6
|
修改新建按钮样式
|
10 years ago |
|
huang
|
a010c800d6
|
修改权限库为空情况下403问题
修改项目标题样式
确认发送国际化
添加小图标
|
10 years ago |
|
huang
|
47e1427ead
|
左侧工具栏添加功能：左侧统计数目为零的手不显示
|
10 years ago |
|
huang
|
77bf3be20d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_users.html.erb
|
10 years ago |
|
huang
|
b809e8844c
|
修改项目中添加标签按钮显示异常
|
10 years ago |
|
sw
|
d18e9ff66b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
4bfc72dc28
|
用新表统计动态
修改关注样式
|
10 years ago |
|
sw
|
717be2b045
|
修改部分用户的用户首页报错
|
10 years ago |
|
sw
|
69eecf49d1
|
还原冲突
|
10 years ago |
|
whimlex
|
65ee3fdc74
|
项目主页国际化，项目主页JS冲突解决
|
10 years ago |
|
huang
|
c773e0fd39
|
JS冲突，去掉多余标点
|
10 years ago |
|
huang
|
29655838f0
|
项目超过的部分用“展示更多信息”拉开
|
10 years ago |
|
huang
|
c36db9fd63
|
项目左侧按钮实现配置-模块进行显示/隐藏管理
|
10 years ago |
|
whimlex
|
11da65c9ad
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
config/locales/en.yml
config/locales/zh.yml
|
10 years ago |
|
whimlex
|
57c8575470
|
新版项目模块国际化，目前完成各项目主页，项目动态，项目评分
|
10 years ago |
|
huang
|
3ee9ac2b50
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
|
10 years ago |
|
huang
|
8f0af4c00d
|
修改了未登陆情况下通过URL访问不允访问的
|
10 years ago |
|
sw
|
52dfb0b0ed
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
27e72c1f39
|
#2000 增加项目每个模块的访问控制
|
10 years ago |
|
huang
|
cbfb72bd5b
|
修改新建资源库显示
|
10 years ago |
|
whimlex
|
540ddd4a1b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
10 years ago |
|
whimlex
|
0eafbb92d5
|
意见反馈模块国际化
|
10 years ago |
|
huang
|
32a2e7ae1f
|
修改默认情况下 用户反馈框处于关闭状态
|
10 years ago |
|
sw
|
9060c9acbc
|
#1977 项目发布新贴跳转有问题
|
10 years ago |
|
whimlex
|
4b19463db7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
app/views/users/show.html.erb
config/locales/zh.yml
|
10 years ago |
|
whimlex
|
115eb38a02
|
完善用户资料模块，用户主页课程栏、留言栏、项目栏和标签模块国际化；对一些存储在数据表中的固定的中文属性，比如学期，职称，在helper和model中定义方法封装；平台导航模块，包括各模块内部导航的国际化；课程平台模块国际化整理和修改，去除重复功能标签
|
10 years ago |
|
sw
|
81b58e5c87
|
修改base_project中代码错误
|
10 years ago |
|
huang
|
d947ebff0c
|
添加国际化
|
10 years ago |
|
huang
|
e22b389971
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
b043d07d61
|
修改发布新贴显示问题
|
10 years ago |
|
alan
|
5ff43fdea7
|
项目添加新用户邮件发送功能
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
huang
|
ce792f6ce8
|
修改邮件发送界面
|
10 years ago |
|
huang
|
b3cbfd39ca
|
修改一些缺陷，删掉多余的文件
|
10 years ago |
|
huang
|
c159bb2c48
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/projects_controller.rb
app/views/issues/show.html.erb
app/views/layouts/base_projects.html.erb
app/views/projects/_form.html.erb
app/views/projects/new.html.erb
app/views/projects/show.html.erb
|
10 years ago |
|
huang
|
beac15475d
|
新项目及用户反馈框的修改！！
|
10 years ago |
|
sw
|
1f2b5eedb8
|
Merge branch 'dev_zanle' into szzh
Conflicts:
app/views/projects/show.html.erb
db/schema.rb
|
10 years ago |
|
sw
|
a2d986f70c
|
修改页面代码
|
10 years ago |
|
sw
|
032e28067d
|
#1959 项目评分是0的，就不显示了！
|
10 years ago |
|
sw
|
5bba54432d
|
#1930 项目缺陷显示个数修改
|
10 years ago |
|
whimlex
|
22aae1910b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/welcome/_search_project.html.erb
config/locales/en.yml
config/locales/zh.yml
|
10 years ago |
|
whimlex
|
59a2c8283a
|
国际化结构调整
|
10 years ago |
|
lizanle
|
d902d76ae2
|
将google统计换为了百度统计
|
10 years ago |
|
sw
|
78d8a0a1c6
|
修改意见反馈折叠后背景为透明
|
10 years ago |
|
alan
|
b5e49e2e1c
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
10 years ago |
|
sw
|
a265556cfe
|
搜索项目时增加js验证增加
|
10 years ago |
|
whimlex
|
617107f0cb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/welcome/index.html.erb
config/locales/zh.yml
|
10 years ago |
|
whimlex
|
f05e046751
|
首页国际化
|
10 years ago |
|
sw
|
ce526fde77
|
Merge branch 'dev_zanle' into szzh
Conflicts:
config/routes.rb
|
10 years ago |
|
sw
|
2978d9020f
|
Merge branch 'develop' into szzh
|
11 years ago |
|
sw
|
b71d714103
|
#1887 用户职称显示问题
|
11 years ago |
