 huang
|
500527a12d
|
gitlab同步问题
|
10 years ago |
guange
|
1b177a8498
|
默认禁用自动高度
|
10 years ago |
|
huang
|
1a549eda46
|
版本库显示问题
|
10 years ago |
|
huang
|
ab1397d982
|
恢复版本
|
10 years ago |
|
huang
|
3de4c7129a
|
版本库读取错误问题
|
10 years ago |
|
huang
|
52adcb378d
|
注释任务
|
10 years ago |
|
huang
|
dae6e68623
|
renwu
|
10 years ago |
|
huang
|
747493993b
|
上线测试
|
10 years ago |
|
huang
|
88cdb5a3ed
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/controllers/repositories_controller.rb
解决冲突
|
10 years ago |
 cxt
|
2eaa05306f
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
app/views/boards/_course_show.html.erb
|
10 years ago |
|
cxt
|
b65e84d166
|
未答测验的学生在测验截止时间到了后算作零分
|
10 years ago |
|
guange
|
d703f75c98
|
merge
|
10 years ago |
 houxiang
|
fc2eae4c62
|
add something by hx
|
10 years ago |
|
huang
|
1dae37f613
|
添加commit总数 api
|
10 years ago |
|
houxiang
|
0324282641
|
查询每个项目的各个成员中的提交贡献次数
|
10 years ago |
|
guange
|
4f57e48b92
|
merge
|
10 years ago |
|
guange
|
d1315e35b5
|
merge
|
10 years ago |
|
guange
|
f61f639af2
|
转换为remote js
|
10 years ago |
|
cxt
|
bb2f49439e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
27ed6df9d6
|
Merge branch 'szzh' into develop
|
10 years ago |
|
cxt
|
a3715051b1
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
f880ccd749
|
分组作业
|
10 years ago |
|
huang
|
f2c1595d0d
|
1、同步没成功检测程序
2、注册验证修改
|
10 years ago |
|
huang
|
da04607859
|
Merge branch 'gitlab_guange' of http://git.trustie.net/jacknudt/trustieforge into gitlab_guange
|
10 years ago |
 lizanle
|
ef2ef7111c
|
添加对帖子的全文搜索
|
10 years ago |
|
guange
|
af31946586
|
issue列表开启AT功能
|
10 years ago |
|
lizanle
|
4c00312f45
|
Merge branch 'szzh' into dev_zanle
|
10 years ago |
|
huang
|
4d0956dff1
|
Merge branch 'develop' into gitlab_guange
|
10 years ago |
|
huang
|
c1747ab217
|
fork重名，提交
|
10 years ago |
|
lizanle
|
dbfc4969e0
|
测验消息bug
|
10 years ago |
|
lizanle
|
e2f5dcc3f9
|
当天截止的测验需要发布截止消息
|
10 years ago |
|
lizanle
|
06122dab1d
|
当天截止的测验需要发布截止消息
|
10 years ago |
|
lizanle
|
03588ca88d
|
发布测验的时候发布消息
|
10 years ago |
|
lizanle
|
e3c594a7ca
|
Merge branch 'develop' into dev_zanle
|
10 years ago |
|
lizanle
|
6553559929
|
发送消息
|
10 years ago |
|
cxt
|
838140ada8
|
在线测验的自动发布和截止
|
10 years ago |
|
cxt
|
259cb67c58
|
rake命令的消息通知
|
10 years ago |
|
cxt
|
b16acda21e
|
匿评结束消息暂时不发送
|
10 years ago |
|
cxt
|
fee438cc0b
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
10 years ago |
|
cxt
|
ebeaac5798
|
作业匿评的结束状态未更新
|
10 years ago |
|
huang
|
364c9a3a9e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
合并
|
10 years ago |
|
cxt
|
7f4e47eadc
|
删除匿评评分数据
|
10 years ago |
Gan Yi.ang
|
3516cde555
|
sync_gitlab_user加验证加日志
|
10 years ago |
|
lizanle
|
582cd6f5d4
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/models/attachment.rb
db/schema.rb
|
10 years ago |
|
huang
|
2749066908
|
单个项目同步输出
|
10 years ago |
|
Gan Yi.ang
|
e9caf0980a
|
同步用户sync_gitlab_user，加异常处理
|
10 years ago |
|
huang
|
36b1649fbd
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
db/schema.rb
|
10 years ago |
|
lizanle
|
3d9f632105
|
全站搜索
|
10 years ago |
|
lizanle
|
7cb39d1754
|
全站搜索
|
10 years ago |
|
huang
|
8c83bbfff3
|
课程英雄榜数据
|
10 years ago |
|
huang
|
aca7684414
|
课程英雄榜
各模块动作 触发加分
|
10 years ago |
|
huang
|
1426557b6d
|
解决密码500问题
|
10 years ago |
|
huang
|
591984ba63
|
密码问题
|
10 years ago |
|
houxiang
|
4a9da97f9b
|
modify by hx add commit_count_detail_show
|
10 years ago |
|
huang
|
55d3b8abb3
|
去掉同步过程中输出
|
10 years ago |
|
houxiang
|
9350841d50
|
change by hx
|
10 years ago |
|
huang
|
ca8b62b8bd
|
Merge branch 'szzh' into gitlab_guange
|
10 years ago |
|
cxt
|
7a93fddb83
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
3f60893591
|
禁用匿评的作业在截止时作业状态变为3
|
10 years ago |
|
huang
|
af70dc0ca3
|
Merge branch 'develop' into gitlab_guange
|
10 years ago |
|
huang
|
3aa73fba35
|
Gitlab权限修改
更新项目Gitlab同步更新
|
10 years ago |
|
huang
|
16c31e254e
|
区分Gitlab公开项目和私有项目
|
10 years ago |
|
huang
|
cc0afa7d9b
|
添加删除迁移版本库
|
10 years ago |
|
huang
|
8164ffc1b2
|
Merge branch 'szzh' into gitlab_guange
|
10 years ago |
|
huang
|
d8dc7786ca
|
fork接口
|
10 years ago |
|
huang
|
ef74d8d956
|
添加任务--解决用户同步不成功的问题
|
10 years ago |
|
huang
|
48547f3e11
|
1/添加members迁移
2、过滤掉版本库identifier重复值的版本库
3、添加puts打印
|
10 years ago |
|
huang
|
71728a15e4
|
迁移类型为Git
|
10 years ago |
|
huang
|
7e5585bdd2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
58b7250d39
|
同步项目
修改同步参数问题
|
10 years ago |
|
huang
|
a996e658a9
|
单个版本库自动同步任务
|
10 years ago |
|
cxt
|
958532bedc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
ee7b21de72
|
禁用匿评功能
|
10 years ago |
|
huang
|
6e7950983b
|
1、数据任务迁移
2、添加commits总数统计
|
10 years ago |
|
huang
|
1c45afac89
|
增加提示
修改链接参数
|
10 years ago |
|
huang
|
f4b12d191a
|
更新repository的type
|
10 years ago |
|
huang
|
36d61cd82f
|
添加历史记录迁移
|
10 years ago |
|
guange
|
fa0332babd
|
只有在同步项目时才同步用户
|
10 years ago |
|
guange
|
be25a57eaf
|
同步用户bug解决
|
10 years ago |
|
cxt
|
f5aaf7ac58
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
6dcc97d5d1
|
添加作业的发布功能
|
10 years ago |
|
huang
|
0158fe023d
|
修改 最近一次提交记录 接口
数据同步 validate类型控制
|
10 years ago |
|
huang
|
bf06a6cafd
|
解决数据同步问题（历史邮件通知validate问题）
|
10 years ago |
|
huang
|
5bcc9c21f2
|
修复课程成员不能编辑、删除、添加的问题
|
10 years ago |
|
guange
|
9cea468401
|
解决空项目时取trees会报错
|
10 years ago |
|
guange
|
d802992e96
|
merge
|
10 years ago |
|
guange
|
11d1cac40d
|
可以通过gitlab创建项目
|
10 years ago |
|
huang
|
147cdf3018
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
1cfa8326aa
|
解决课程作业500问题
|
10 years ago |
|
huang
|
a8f5a7ea48
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
7898208b16
|
私有课程上传资源都为私有
|
10 years ago |
|
guange
|
65e6444272
|
.
|
10 years ago |
|
guange
|
98bd46ceb4
|
通过url识别project
|
10 years ago |
|
guange
|
07084a94c5
|
.
|
10 years ago |
|
guange
|
b80a0d6366
|
.
|
10 years ago |
|
guange
|
3a21e9f2b0
|
修复重构错误
|
10 years ago |
|
guange
|
6086c9304e
|
merge
|
10 years ago |
|
guange
|
9e8e77f3e1
|
方法重构
|
10 years ago |
|
huang
|
150ee3d28d
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
94d60e4150
|
修改邮件配置文件
更新gem镜像路径
|
10 years ago |
|
guange
|
9266eccdff
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
|
10 years ago |
|
guange
|
716f0f31b3
|
merge
|
10 years ago |
|
guange
|
6472367b68
|
firefox粘贴图片只能一张的bug
|
10 years ago |
|
huang
|
73898953d9
|
project表添加字段，记录project对应gitlba中project id
|
10 years ago |
|
huang
|
7c1bb8b9ed
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
Gemfile
app/models/user.rb
db/schema.rb
lib/trustie.rb
解决冲突
|
10 years ago |
|
lizanle
|
94bffb5458
|
插入头像 ， 粘贴图片 ，插入图片，都要加入域名。防止邮件中出现图片不显示的问题
|
10 years ago |
|
lizanle
|
5f8d21f1cb
|
暂时去掉 工具栏聚焦和不聚焦的时候 的隐藏和显示控制
|
10 years ago |
|
lizanle
|
b04e20ed7d
|
工具栏聚焦和不聚焦的时候 的隐藏和显示控制
|
10 years ago |
|
huang
|
3f6d64877a
|
1、老师发布作业自己能收到
2、关闭给所有人发
3、修改参数member问题
|
10 years ago |
 ouyangxuhua
|
073761781d
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
2557e9063d
|
修改开启匿评中的send_message_anonymous_comment方法成对应代码
|
10 years ago |
|
ouyangxuhua
|
769a4a1bcf
|
1.增加issue截止日期提醒消息；
2.修改相应rake代码
|
10 years ago |
|
huang
|
f4e2f6c4ff
|
作业截止日期消息时间调整，代码优化
|
10 years ago |
|
huang
|
5b0738a4cb
|
匿评启动失败邮件通知:实现程序及界面
|
10 years ago |
|
huang
|
0336cc2cf6
|
issue截止时间消息提醒
|
10 years ago |
|
huang
|
5f26e331c6
|
缺陷截止时间到了消息通知
|
10 years ago |
|
huang
|
ba569403c3
|
1、匿评关闭/开启发送对象为所有成员
2、匿评方法封装
3、匿评开启/关闭邮件通知发送对象为课程所有成员
|
10 years ago |
|
huang
|
38ba47f8c8
|
讨论区结构修改
任务中添加：自动开启/关闭匿评消息通知
匿评开启失败消息通知
|
10 years ago |
 sw
|
d727097ed2
|
1、已开启匿评代码没有匿评设置功能
2、匿评结束不显示
|
10 years ago |
|
sw
|
7b37f3a9f4
|
开启匿评、关闭匿评任务编写
|
10 years ago |
|
huang
|
0fead3b801
|
1、课程留言发送对象为老师
2、作业截止时间邮件通知不适用delay_job
3、添加作业截止时间邮件通知界面
|
10 years ago |
|
huang
|
d00ad2e14d
|
1、作业截止时间邮件通知
2、系统消息通知路由、方法定义
|
10 years ago |
|
huang
|
4d4b48ef99
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
bb3fc97528
|
作业截止时间消息通知：
1、时间区段设置为24小时
2、只进行一次消息提醒
|
10 years ago |
|
huang
|
92a3d78dcc
|
完成作业截止定时发送消息
|
10 years ago |
|
lizanle
|
756aae0cf2
|
发布issue编辑器可以上传代码并高亮显示了
|
10 years ago |
|
huang
|
6b0432c04c
|
添加job任务
|
10 years ago |
|
huang
|
66251c8d30
|
添加功能：管理员界面发送系统消息
|
10 years ago |
|
lizanle
|
faf5f1eab5
|
通过 kindeditor_tag f.kindeditor生产的编辑框可以自动长高缩短
|
10 years ago |
|
lizanle
|
de822daf44
|
个人动态编辑框高度自动变高缩短
其他编辑框自动长高缩短
|
10 years ago |
|
guange
|
d36da76685
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
cxt
|
da20f6bc89
|
超级管理员新增功能：留言列表、帖子、通知、最近登录用户列表、作业
|
10 years ago |
|
guange
|
f082ff745e
|
同步members
|
10 years ago |
|
guange
|
9d8596a14c
|
新增gitlab adapter用于适配gitlab命令
|
10 years ago |
|
guange
|
909521df54
|
Merge remote-tracking branch 'origin/szzh' into gitlab_guange
|
10 years ago |
|
sw
|
7c818ce59a
|
admin界面增加学校列表显示，以及按名称过滤功能
|
10 years ago |
|
guange
|
bf5f7f8d4f
|
加入分支参数
|
10 years ago |
|
guange
|
5732d9cee2
|
加入输出日志
|
10 years ago |
|
guange
|
71970e1942
|
支持按时间段来统计每人的提交量
|
10 years ago |
|
guange
|
7d0a53ec86
|
merge
|
10 years ago |
|
guange
|
006ed66d7a
|
新注册用户可以同步到gitlab
|
10 years ago |
|
guange
|
3614c6ee9b
|
project同步
|
10 years ago |
|
guange
|
f56e48d60a
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
guange
|
b762ae6bdd
|
报告人员只能克隆，不能提交，其他可以克隆和提交
|
10 years ago |
|
guange
|
8da9805bcc
|
兼容ruby 1.9
|
10 years ago |
|
guange
|
2f86874c6c
|
Merge branch 'grack' into guange_dev
|
10 years ago |
|
guange
|
88491e7e2a
|
清除提交错误
|
10 years ago |
|
guange
|
acd4f33d72
|
添加grack
|
10 years ago |
|
guange
|
6fa67051e1
|
本项目的成员可以使用自己的用户名和密码克隆
|
10 years ago |
|
sw
|
f9880a00fd
|
admin界面增加课程列表及相关路由
|
10 years ago |
|
guange
|
797ed5081d
|
同步登录
|
10 years ago |
|
guange
|
489f62edb7
|
删除帖子也要更新动态
|
10 years ago |
|
guange
|
7a9b5712c0
|
message的动态单独处理
|
10 years ago |
|
guange
|
f58b530484
|
给课程活动慢加上缓存，并且加入了开关
|
10 years ago |
|
guange
|
d793a8119a
|
修改粘图的加载方式
|
10 years ago |
|
sw
|
6d8f0e728d
|
课程 作业、通知模块，新版编辑器相关BUG
|
10 years ago |
|
sw
|
1c808464d5
|
新版编辑器不可以拉宽
|
10 years ago |
|
sw
|
8b0eb21d08
|
关注需求功能取消，部分用户进入个人主页报错
|
10 years ago |
|
guange
|
444658d0b3
|
转换变为既时转换
|
10 years ago |
|
guange
|
f86acbb10f
|
需要迁移的预览文件优化
|
10 years ago |
|
guange
|
e4d68e988e
|
加上utf8头
|
10 years ago |
|
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重复打包问题
|
11 years ago |
|
guange
|
618e8c017c
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
Conflicts:
db/schema.rb
|
11 years ago |
|
guange
|
02e83ea776
|
将邮件发送放到后台进程中
|
11 years ago |
|
guange
|
77134c8dde
|
将每日邮件移入crontab
|
11 years ago |
|
sw
|
94ecc3e59e
|
1、课程新增成员分页控件样式
2、课程老师列表翻页不可用
|
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 |
|
lizanle
|
d1bc2b85d0
|
kindeditor。
|
11 years ago |
|
whimlex
|
1452e09154
|
邮件邀请邮箱格式自动填充；部分国际化
|
11 years ago |
