guange
|
9ecb119aa4
|
task中也改为pdf
|
10 years ago |
|
guange
|
c331e5a9c8
|
转html改为转pdf
|
10 years ago |
|
guange
|
00745f1270
|
修复文件预览bug
|
10 years ago |
|
guange
|
57f8c7d04f
|
added timeout
|
10 years ago |
|
guange
|
670f9598e4
|
添加后台转换office任务
|
10 years ago |
|
guange
|
c9b46e4e3a
|
头像上传bug修复
|
10 years ago |
|
guange
|
eb73ba0b43
|
kindeditor界面打开时，有一个这个界面的过渡
|
10 years ago |
|
guange
|
7b5021c4fd
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
 huang
|
3f744d46f2
|
超级管理员界面--贴吧回复成功
|
10 years ago |
|
guange
|
49d836d331
|
上传头像大小和图片类型在后台加入限制,且通过测试
|
10 years ago |
|
guange
|
39308dacfd
|
将setting中的domain合并到host配置中
|
10 years ago |
|
guange
|
06b17581b1
|
图片撑出在firefox上的问题
|
10 years ago |
|
guange
|
aab94676bb
|
在lib里不能直接用logger,要用Rails.logger
|
10 years ago |
|
guange
|
092af28476
|
修正编辑器在火狐下粘贴不成功
|
10 years ago |
|
guange
|
5c4ad1ce7d
|
merge
|
10 years ago |
|
guange
|
eed39ef0ef
|
上传头像会进行压缩
|
10 years ago |
 alanlong9278
|
336b59f606
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
.gitignore
Gemfile
app/views/issues/index.html.erb
app/views/layouts/_base_feedback.html.erb
app/views/tags/_tag_name.html.erb
Signed-off-by: alanlong9278 <547533434@qq.com>
|
10 years ago |
|
guange
|
3f88a67eef
|
编辑器支持直接粘贴QQ截屏
|
10 years ago |
|
guange
|
86347cab89
|
现在可以通过rake redmine📧test[guange] 发送测试邮件
|
10 years ago |
|
guange
|
3baba9c95e
|
清理gemfile
|
10 years ago |
whimlex
|
6195f0a150
|
课程动态添加问卷发布，为通过问卷动态访问课程问卷做权限判断
|
10 years ago |
|
alanlong9278
|
0668af4f89
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
app/views/bids/_bid_homework_show.html.erb
Signed-off-by: alanlong9278 <547533434@qq.com>
|
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 |
 z9hang
|
8a26fd4343
|
课程配置：成员配置处添加搜素成员功能
|
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 |
|
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 |
|
whimlex
|
e030c12be8
|
课程动态计数和显示统一；问卷计数对学生和老师和显示统一；课程资源库排序
|
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 |
|
guange
|
113e11f6cd
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
Conflicts:
app/models/comment.rb
app/models/message.rb
app/models/news.rb
|
10 years ago |
 lizanle
|
ceb6af7365
|
课程相关模块添加编辑器
|
10 years ago |
|
guange
|
56df5ce9a7
|
优化zip重复打包问题
|
10 years ago |
|
guange
|
618e8c017c
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
Conflicts:
db/schema.rb
|
10 years ago |
|
guange
|
02e83ea776
|
将邮件发送放到后台进程中
|
10 years ago |
|
guange
|
77134c8dde
|
将每日邮件移入crontab
|
10 years ago |
 sw
|
94ecc3e59e
|
1、课程新增成员分页控件样式
2、课程老师列表翻页不可用
|
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 |
|
lizanle
|
d1bc2b85d0
|
kindeditor。
|
10 years ago |
|
whimlex
|
1452e09154
|
邮件邀请邮箱格式自动填充；部分国际化
|
10 years ago |
|
sw
|
1ab0215592
|
修改课程动态报错
|
10 years ago |
|
sw
|
90df8056c8
|
1、修改分页控件中省略号颜色
2、更新样式文件
3、修改课程首页用新建问卷换行
|
10 years ago |
|
sw
|
258d9bf33a
|
1、调整分页控件显示样式
2、修改课程动态分页算法
3、更新样式文件
|
10 years ago |
|
sw
|
8f5d8c86a3
|
新版样式header调整
|
10 years ago |
|
guange
|
fdee890694
|
git优化上线文档补充
|
10 years ago |
|
guange
|
c45850eb8a
|
git hook改为异步
|
10 years ago |
|
guange
|
dc29ccf3b7
|
1. git仓库新建时加入hook代码
2. 对现有的旧hook代码进行更新的rake任务
|
10 years ago |
|
sw
|
ec1ff6dfc3
|
1、修改课程界面未登录时，先显示注册，再显示登录
2、增加课程相关的css引用
3、增加top、left、content的静态页面
|
10 years ago |
|
sw
|
e4c0c840bf
|
1、完成课程模块导航栏样式调整
2、修改意见反馈默认在右下角位置
3、调整我的课程、我的项目js
4、ruby生成的菜单栏添加样式及部分方法重写
5、封装部分页面的ruby代码到helper
|
10 years ago |
|
guange
|
39f1fb879f
|
对Gemfile作了一些优化
1. 源可以从taobao源安装
2. 所有放在lib下的gem删除，从网上下载
|
10 years ago |
|
guange
|
08eae0e5eb
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
guange
|
ab6c21314d
|
#1503 老师发布的作业可以在课程动态中显示了
|
10 years ago |
|
whimlex
|
5732f0ed03
|
国际化问题修改，新添加en.yml存在中文字符，格式问题
|
10 years ago |
|
whimlex
|
a4a9b2dfdd
|
国际化插件
|
10 years ago |
|
sw
|
770704790d
|
还原修改
|
10 years ago |
|
sw
|
c6788e2f40
|
修复首页报错
|
10 years ago |
|
huang
|
f898e2aa91
|
16:22
|
10 years ago |
|
z9hang
|
c1c05067e7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/admin_controller.rb
db/schema.rb
|
10 years ago |
|
huang
|
9e2c479590
|
new project
|
10 years ago |
|
z9hang
|
3334299808
|
app版本管理功能（表添加，页面部分添加）
|
10 years ago |
|
alan
|
22ac578ede
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
config/locales/zh.yml
|
10 years ago |
|
alan
|
f374bfd7e2
|
修复《窗口跳转问题》
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
alan
|
4bfc4493eb
|
添加《邮件周日发送》功能，修改《贴吧》邮件发送策略
Signed-off-by: alan <547533434@qq.com>
|
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 |
|
alan
|
d61199f66b
|
merge szzh
|
10 years ago |
|
alan
|
4ebd34722d
|
email_verifier 插件
|
10 years ago |
|
alan
|
2f168dd4d7
|
修改《课程动态》样式
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
lizanle
|
0785384813
|
修改bug，课程动态报错
|
10 years ago |
|
lizanle
|
43e9f738c0
|
添加注释，修改变量命名
|
10 years ago |
|
lizanle
|
475ef12cd5
|
添加注释，修改变量命名
|
10 years ago |
|
lizanle
|
6c76cacb61
|
解决项目动态很慢，数据量很大的问题
|
10 years ago |
|
lizanle
|
d112c5a911
|
调整了注释
|
10 years ago |
|
lizanle
|
6c02c96342
|
去掉了增加时间跨度的代码
|
10 years ago |
|
lizanle
|
0147b30133
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
Gemfile
|
10 years ago |
|
alan
|
432e3a05f2
|
增加贴吧创建，发帖时发送邮件功能，修改《邮件重发多次》bug
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
lizanle
|
aca74bf937
|
Merge remote-tracking branch 'origin/dev_zanle' into szzh
Conflicts:
Gemfile
app/views/welcome/index.html.erb
|
11 years ago |
|
alan
|
90925edce2
|
修改《意见反馈页面css引起的css错乱》和《课程首页动态太少》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
9f807438d6
|
教师数目显示：-1 ，同时动态大量不显示。是不是只显示近期3个月的？
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
lizanle
|
10cde37582
|
cache using version
|
11 years ago |
|
sw
|
8dc9b223b1
|
修改竞赛模块，重复评分不会以最后一次评分为准的BUG
|
11 years ago |
|
sw
|
f934824175
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
d8e9dba404
|
#1647 正式版--资源搜索窗口搜索课程资源进行下载返回500错误（资源可见性判断修复）
|
11 years ago |
|
sw
|
9a61354328
|
1.评分、评论作为一个action发送到服务器
2.修改作业的show方法获取参数不正确的问题
|
11 years ago |
|
sw
|
512f16a036
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
alan
|
a4e659d8e1
|
修改bug<代码评审模块请在左下角显示，不要在tab中显示>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
a24d1493f9
|
1.修复点击课程动态，课程动态tab页不高亮显示
2.修复点击新建作业，课程作业tab页不高亮显示
|
11 years ago |
|
sw
|
460ba55dde
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/models/user.rb
app/views/courses/_course_form.html.erb
db/schema.rb
|
11 years ago |
|
z9hang
|
9b4e9bd04a
|
1、部分星星显示不正确问题，2、评分初始值设置为0
|
11 years ago |
|
sw
|
9b64027ed6
|
1.当用户真实姓名为空时作业列表界面显示为昵称
2.修改分页控件样式
3.作业用户图像增加链接，修改鼠标悬浮样式
4.增加当前选中页显示样式
|
11 years ago |
|
sw
|
fd5b7ac468
|
1.更新css样式文件
2.增加相关图片
3.分页空间支持ajax刷新界面
4.修改分页控件显示样式
|
11 years ago |
|
alan
|
7696e34ecf
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
7487c538f3
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
7c331cf49c
|
还原对tags做的修改(上次的修改对一个系统文件做了修改，无法应用到本系统)
|
11 years ago |
|
z9hang
|
20e12327c4
|
点击标签报错问题
|
11 years ago |
|
alan
|
66aa72d210
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
8f4b994b11
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb
|
11 years ago |
|
sw
|
ed7dac6126
|
1
|
11 years ago |
|
alan
|
e044f5b615
|
修改contest中出现的逻辑错误
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
2e3bdf1179
|
将上传资源权限从添加、编辑、缺陷及编辑缺陷注释权限中分离出来，修正未加入任何课程、项目的用户无法上传资源附件bug
|
11 years ago |
|
z9hang
|
e4ff85894d
|
1、部分代码优化。2、未参加课程或项目的用户个人主页界面不显示对应的tab页
|
11 years ago |
|
z9hang
|
57776d67c5
|
优化代码
|
11 years ago |
|
z9hang
|
dfc536bff9
|
附件编辑时设置私有为公开无效问题
|
11 years ago |
|
z9hang
|
97522f273e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
ef3e0798cc
|
1、课程、项目讨论区编辑附件没有公开字样问题。2、设置附件私有属性遗漏讨论区的附件的情况添加。3、编辑附件的描述、公开属性无效的问题，原因编辑保存逻辑存在问题，修正
|
11 years ago |
|
sw
|
3b9704ed4e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
0f492047a5
|
修复项目首页的用户动态会显示私有项目中的动态的BUG
|
11 years ago |
|
z9hang
|
a6efe10984
|
1、#1313 课程/项目：资源库“下载次数“字样显示错误,解决修改其样式。2、项目缺陷模块勾上也不显示问题，原因：模块名称匹配错误，修正之
|
11 years ago |
|
z9hang
|
75b9fccb84
|
#1309 项目--配置--模块：不勾选相关模块，却也能在项目主页显示,解决添加条件判断，不勾选的模块不再显示。admin首页定制中设置不显示课程时，个人主页出的课程tab页也不在显示
|
11 years ago |
|
z9hang
|
de8e3e5fac
|
课程、项目讨论区添加删除自己上传的附件功能
|
11 years ago |
|
z9hang
|
2f2c6c39b5
|
去掉教师列表的学号
|
11 years ago |
|
z9hang
|
1b98572bc2
|
查看课程资源附件权限恢复
|
11 years ago |
|
z9hang
|
da853bf4eb
|
修复redmin.rb被重置的修改
|
11 years ago |
|
sw
|
c2b8c30949
|
还原redmine.rb文件
|
11 years ago |
|
alan
|
b9e242a7f7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
lib/redmine.rb
|
11 years ago |
|
alan
|
43e940eb1d
|
修复竞赛作品附件删除报错的bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
d998f80060
|
课程讨论区附件无法查看问题，权限项目被删，恢复之
|
11 years ago |
|
z9hang
|
418615e7bc
|
课程通知无法查看问题，查看课程新闻权限项被删，解决：重新添加
|
11 years ago |
|
z9hang
|
045a09e2ed
|
添加贴吧资源下载权限控制
|
11 years ago |
|
z9hang
|
21343a0111
|
超级管理员权限报表界面项目权限与课程权限分开整理，#1300 配置管理--角色和权限--权限报表，显示超出边框 解决：修改css样式
|
11 years ago |
|
z9hang
|
67162bd8fb
|
admin编辑角色，项目权限、课程、；竞赛权限分开显示
|
11 years ago |
|
z9hang
|
9ae553bace
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
5482ba3207
|
后台统计所有用户分数算法优化
|
11 years ago |
|
z9hang
|
1e234a9adf
|
优化积分计算速度问题
|
11 years ago |
linhk
|
4252e52d1d
|
公共贴吧下载文件异常
|
11 years ago |
|
z9hang
|
2b6a376d31
|
修复数据库为初始状态时会出现的部分bug、去除部分连接的域名
|
11 years ago |
|
z9hang
|
c6271e2aa9
|
修复由项目积分改动引起的一个页面无法查看bug、添加项目得分统计任务
|
11 years ago |
|
z9hang
|
0eca547ec5
|
修复两个导航栏丢失问题、版本库=》查看差别，没有对应的文件或修订版本时报错问题
|
11 years ago |
|
sw
|
2141fcc3ca
|
将是否启用DTS测试移入项目模块配置
|
11 years ago |
 nwb
|
74de064cca
|
1.文件删除权限判断优化
2.课程通知附件删除BUG修改
|
11 years ago |
|
z9hang
|
97531960da
|
首页定制添加剂修改图片大小功能
|
11 years ago |
|
z9hang
|
ca52de614d
|
修正错误
|
11 years ago |
|
z9hang
|
3b54def1c7
|
首页定制修改
|
11 years ago |
|
nwb
|
5d22bc5510
|
文件上传修改
|
11 years ago |
|
nwb
|
a5d829b95e
|
1.优化课程通知模块
2.优化文件上传
|
11 years ago |
 yanxd
|
6af11fea68
|
course class period
|
11 years ago |
|
yanxd
|
ec2384f110
|
自动化测试框架
|
11 years ago |
|
nwb
|
0950ac2329
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
nwb
|
0031f90c64
|
1.课程动态中的私有的资源、文档进行权限判断
2.项目动态中的私有的资源、文档进行权限判断
|
11 years ago |
|
yanxd
|
fd5747f4dc
|
test 3-framework
|
11 years ago |
|
z9hang
|
fcdfeae326
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
nwb
|
9b3ffc90ba
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/repositories_controller.rb
db/schema.rb
|
11 years ago |
|
nwb
|
6688ba61dd
|
1.用户申请加入项目向管理员发送邮件
2.资源文件添加文件密级设置
|
11 years ago |
|
z9hang
|
b4dd8409eb
|
添加项目托管平台首页定制功能
|
11 years ago |
|
z9hang
|
720c75478a
|
修正上传图片可传非图片文件bug
|
11 years ago |
|
sw
|
76db0e61c3
|
调整页面样式
|
11 years ago |
|
z9hang
|
9634046d11
|
权限管理机制优化
|
11 years ago |
|
z9hang
|
b87abf1f68
|
权限管理优化
|
11 years ago |
|
z9hang
|
5e3a763776
|
添加引用项目权限、修改引用判断
|
11 years ago |
|
z9hang
|
470f40db82
|
去除绝对网址
|
11 years ago |
|
z9hang
|
a7fa444f9e
|
修正项目个人得分问题：统计时只计算项目成员，user_grade表user_id和project_id联合不重复验证，user_grade分数部位负验证
|
11 years ago |
