 ouyangxuhua
|
2076c9b449
|
Merge branch 'develop' into dev_hjq
Conflicts:
app/controllers/organizations_controller.rb
app/views/layouts/_footer.html.erb
app/views/layouts/base_org.html.erb
app/views/organizations/_org_activities.html.erb
db/schema.rb
public/stylesheets/new_user.css
public/stylesheets/org.css
public/stylesheets/public.css
|
10 years ago |
 cxt
|
d2f56693b4
|
课程通知新建报404
|
10 years ago |
|
cxt
|
11bf8f77dc
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
 huang
|
a16d6803ae
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
3e39eacd19
|
新建课程通知时通知标题框自动获取焦点
|
10 years ago |
|
cxt
|
f26f71c07a
|
课程通知改成动态的模式
|
10 years ago |
|
huang
|
00711f1100
|
issue编辑、添加邮件中去掉token
|
10 years ago |
|
ouyangxuhua
|
b9ae579622
|
将课程帖子转发至组织帖子栏目
|
10 years ago |
|
ouyangxuhua
|
2220e0b7cc
|
增加帖子-组织栏目关联表
|
10 years ago |
guange
|
1724ae430e
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
guange
|
b235e8de70
|
改为默认模板
|
10 years ago |
|
huang
|
4092401e68
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
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 |
|
guange
|
57b1c0c7d8
|
at是否开启加入到配置
|
10 years ago |
|
guange
|
d703f75c98
|
merge
|
10 years ago |
 houxiang
|
5f2e6284ce
|
增加了两个template文件，大家下拉代码后将template文件复制去掉后尾的template就行
|
10 years ago |
|
guange
|
eb97f7dfb2
|
merge
|
10 years ago |
|
huang
|
b87943ff1d
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
处理冲突
|
10 years ago |
 lizanle
|
5f8c04e3a0
|
Merge branch 'szzh' into dev_zanle
|
10 years ago |
|
lizanle
|
8ce2dbc4b8
|
issue回复
|
10 years ago |
|
lizanle
|
1dbccd81d6
|
issue回复的删除功能
|
10 years ago |
|
ouyangxuhua
|
de229c0f1c
|
组织资源栏目的文件可以被引用至当前组织下的资源栏目
|
10 years ago |
|
huang
|
074d8f62c2
|
delete the two config files on gitlab
|
10 years ago |
|
ouyangxuhua
|
977100e92e
|
双击资源栏目标签可编辑，编辑标签后更新标签
|
10 years ago |
|
ouyangxuhua
|
af157a9c63
|
组织资源栏目增加标签功能
|
10 years ago |
|
guange
|
4f57e48b92
|
merge
|
10 years ago |
|
ouyangxuhua
|
a5fa68c928
|
资源栏目增加资源
|
10 years ago |
|
ouyangxuhua
|
0602a03e12
|
组织资源类型的栏目，增加搜索功能
|
10 years ago |
|
ouyangxuhua
|
de0b5d1897
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
ouyangxuhua
|
e98338bf22
|
栏目增加资源类型，可以添加文件、删除文件、显示文件等
|
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
|
75fecc0402
|
项目删除功能
项目删除权限
课程列表用户颜色
|
10 years ago |
|
huang
|
c7b2c9e3af
|
课程删除功能
admin中课程列表取消删除按钮
|
10 years ago |
|
huang
|
4f7f4acb1f
|
课程删除
|
10 years ago |
|
huang
|
4e0b442309
|
修改邮箱的时候同步到gitlab
|
10 years ago |
|
cxt
|
4e04df7a8a
|
分组作业的动态显示及关联项目
|
10 years ago |
|
cxt
|
53f9141cf1
|
分组作业动态
|
10 years ago |
|
guange
|
3476731b83
|
将at js data整合到文件中
|
10 years ago |
|
cxt
|
a9f6e817b4
|
分组作业关联项目
|
10 years ago |
|
lizanle
|
5fcbde2ff1
|
资源库监听回车键
|
10 years ago |
|
ouyangxuhua
|
e45ce0fb95
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
76db95aa03
|
1.组织页面中，退出后刷新组织页面；
2.组织页面中，点击“个人主页”，打开新的页面；
3.组织页面页首部分，用户名不链接用户页面。
|
10 years ago |
|
huang
|
9ff41c214b
|
Merge branch 'develop' into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
c229104d78
|
修改编辑组织标题
|
10 years ago |
|
huang
|
ab1c945a30
|
修改版本库库权限
自己不能fork自己的项目
|
10 years ago |
|
huang
|
9d7bc17115
|
Merge branch 'develop' into dev_hjq
|
10 years ago |
|
huang
|
4cb58211ad
|
邮件消息提示语修改
|
10 years ago |
|
ouyangxuhua
|
ab4d0e4678
|
组织界面增加分栏
|
10 years ago |
|
huang
|
120a7274d3
|
fork样式显示
|
10 years ago |
|
cxt
|
8fe53468e1
|
作品追加附件
|
10 years ago |
|
cxt
|
77e96af78f
|
还原分组作业
|
10 years ago |
|
cxt
|
68a29d8131
|
学生提交作品后可点击重试重新上传作品
|
10 years ago |
|
ouyangxuhua
|
6f9c89d67b
|
1.更改首页内容，不显示作者等信息，增加取消首页、编辑首页、删除首页等功能；
2.增加editor_of_documents表，记录文章编辑的作者、时间等，并显示首页的最后编辑人；
3.在首页编辑文章后，应返回首页。
|
10 years ago |
|
lizanle
|
3c946c034a
|
Merge branch 'szzh' into dev_zanle
Conflicts:
db/schema.rb
kaminari分页添加上一页下一页
|
10 years ago |
|
lizanle
|
582cd6f5d4
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/models/attachment.rb
db/schema.rb
|
10 years ago |
|
cxt
|
85aade79ce
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
Conflicts:
public/stylesheets/courses.css
|
10 years ago |
|
cxt
|
f7ac2b0ef5
|
老师查看学生的答卷结果
|
10 years ago |
|
huang
|
36b1649fbd
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
2ec78d07fa
|
Merge branch 'szzh' into hjq_new_course
|
10 years ago |
|
lizanle
|
0992ddd0f6
|
全站搜索
|
10 years ago |
|
lizanle
|
6be917e052
|
全站搜索
|
10 years ago |
|
lizanle
|
768aff89da
|
全站搜索
|
10 years ago |
|
lizanle
|
f448b5f8e2
|
全站搜索
|
10 years ago |
|
houxiang
|
c6b5abba4e
|
hide the the count of project'repo
|
10 years ago |
|
lizanle
|
ee47187a61
|
全站搜索
|
10 years ago |
|
ouyangxuhua
|
58365e8892
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/new_user.css
2.组织增加项目功能
|
10 years ago |
|
lizanle
|
dcd441a9db
|
全站搜索
|
10 years ago |
|
ouyangxuhua
|
9c3aed8028
|
增加组织加入课程功能
|
10 years ago |
|
lizanle
|
4efb660214
|
全站搜索
|
10 years ago |
 Tim
|
3a66b1859c
|
reserved修改
|
10 years ago |
|
huang
|
55ff5f4931
|
Merge branch 'develop' into gitlab_guange
Conflicts:
app/views/projects/settings/_join_org.html.erb
db/schema.rb
处理冲突
|
10 years ago |
|
huang
|
a174cade83
|
commit by hx , 2015/11/13
|
10 years ago |
|
huang
|
dd148fb7c5
|
Merge branch 'szzh' into sw_new_course
Conflicts:
db/schema.rb
|
10 years ago |
|
ouyangxuhua
|
e01a7c2627
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
40a44c3568
|
增加文章二级回复功能
|
10 years ago |
|
huang
|
74343a4929
|
发布问卷、取消问卷
|
10 years ago |
|
huang
|
348488383c
|
Merge branch 'develop' into szzh
Conflicts:
app/views/projects/settings/_join_org.html.erb
|
10 years ago |
|
huang
|
2296a2f50c
|
添加学生提交作业
老师发布作业功能
|
10 years ago |
|
cxt
|
3d3d50f1ea
|
编辑
|
10 years ago |
|
cxt
|
d407610740
|
填空题
|
10 years ago |
|
ouyangxuhua
|
219774afab
|
将课程动态加入组织动态中
|
10 years ago |
|
cxt
|
b635fdaeb7
|
路由
|
10 years ago |
|
ouyangxuhua
|
71bf80c7a5
|
1.创建组织课程关联表，建立相应模型及控制器；
2.在课程设置中，添加加入组中功能；
3.解决添加项目后，组织列表的上一页和下一页链接问题。
|
10 years ago |
|
huang
|
42a499815a
|
修改配置
|
10 years ago |
|
cxt
|
167d001b3f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
5400b907e6
|
学生测验列表
|
10 years ago |
|
ouyangxuhua
|
bd6a1a9d49
|
增加组织动态中的项目问题的回复框
|
10 years ago |
|
ouyangxuhua
|
de32745eef
|
1.将项目动态数据迁移至组织动态；
2.在组织动态中，按时间倒排显示组织动态；
3.增加我的组织中搜索功能。
|
10 years ago |
|
cxt
|
62d80c27d6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
huang
|
ca8b62b8bd
|
Merge branch 'szzh' into gitlab_guange
|
10 years ago |
|
lizanle
|
56613b6358
|
增加项目的显示
|
10 years ago |
|
huang
|
ddbc9003c2
|
每个用户不能创建同名版本库
不同的用户可以创建不同版本库
更新fork接口方法
|
10 years ago |
|
huang
|
a40e5c5b54
|
frok功能开发--权限还未完成
|
10 years ago |
|
ouyangxuhua
|
78e1ae4188
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
|
10 years ago |
 sw
|
e6cd104ead
|
index界面以及试卷统计相关路由添加
|
10 years ago |
|
ouyangxuhua
|
71e6a8b135
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
70c5b27a43
|
相关路由
|
10 years ago |
|
ouyangxuhua
|
3451ced888
|
添加我的组织页面及修改bug
|
10 years ago |
|
ouyangxuhua
|
866c2feaa1
|
修改组织模块的bug
|
10 years ago |
|
ouyangxuhua
|
ef1bc8aea7
|
组织用户不能为空提示
|
10 years ago |
|
ouyangxuhua
|
5aea2250c4
|
组织加入成员时，如果没有选择用户，弹窗给出提示
|
10 years ago |
|
ouyangxuhua
|
2a5eeaa527
|
在组织页面左边，增加项目名称一栏
|
10 years ago |
|
ouyangxuhua
|
6ec27761fb
|
组织功能实现及缺陷修改
|
10 years ago |
|
ouyangxuhua
|
d508cfa381
|
组织模块功能实现
|
10 years ago |
|
ouyangxuhua
|
a3443ba968
|
组织模块功能实现
|
10 years ago |
|
lizanle
|
d13205bd3d
|
文件正在上传提示
|
10 years ago |
|
lizanle
|
20b49385de
|
更改时区设置
作业发布消息添加发布时间
|
10 years ago |
|
ouyangxuhua
|
283af137c6
|
组织模块动态及配置
|
10 years ago |
|
lizanle
|
59e95b08d7
|
feed_back
|
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 |
|
lizanle
|
8d25b5676c
|
tag_name名称长度扩大至120个字符
|
10 years ago |
|
ouyangxuhua
|
eadab840b6
|
建立组织、成员表及模型控制器；
编写创建组织页面。
|
10 years ago |
|
huang
|
4d5d012ecf
|
版本库相关界面调整
|
10 years ago |
|
cxt
|
6e7a6909d6
|
作业动态中的未发布作业显示发布时间
|
10 years ago |
|
lizanle
|
b7a6bc3614
|
outline url
|
10 years ago |
|
huang
|
89507b2b47
|
版本库域名写入配置文件中
|
10 years ago |
|
huang
|
aa4710d872
|
git中忽略配置文件
提交记录新界面
修改获取用户路径
|
10 years ago |
|
huang
|
470fb3bfa6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
578bb2537d
|
课程大纲功能
|
10 years ago |
|
huang
|
df8d2f8dd4
|
gitlab调用commits接口
|
10 years ago |
|
lizanle
|
ac82910aa5
|
大纲
|
10 years ago |
|
lizanle
|
b67afc2b95
|
大纲
|
10 years ago |
|
lizanle
|
c2be8b4eec
|
课程大纲界面
|
10 years ago |
|
huang
|
294a517251
|
查看所有提交记录入口
点击自动复制版本库地址
|
10 years ago |
|
huang
|
4c61e7490b
|
Merge branch 'develop' into gitlab_guange
Conflicts:
db/schema.rb
|
10 years ago |
|
lizanle
|
07a2263b16
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/courses_controller.rb
public/stylesheets/new_user.css
|
10 years ago |
|
ouyangxuhua
|
b0b1a27908
|
1.用户请求加入课程成为老师或者教师时，给课程创建者发送邮件；
2.更新相应消息的状态
|
10 years ago |
|
lizanle
|
eaf4ad354f
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/courses_controller.rb
app/services/courses_service.rb
app/views/courses/join.js.erb
public/stylesheets/new_user.css
|
10 years ago |
|
lizanle
|
9d89da7e66
|
课程加入消息错误
|
10 years ago |
|
huang
|
7ab6c45262
|
1、转换界面添加提示。
2、url样式
|
10 years ago |
|
cxt
|
fde4ce74ba
|
作业配置菜单增加评分设置
|
10 years ago |
|
huang
|
03c2948a7c
|
查看内容对比
|
10 years ago |
|
huang
|
bd793a00fe
|
贡献者页面
|
10 years ago |
|
lizanle
|
35719f9c28
|
消息处理路由
|
10 years ago |
|
huang
|
1157dcaa06
|
版本库summary
文件目录
新版本库地址
按分支显示提交记录
相关界面
|
10 years ago |
|
cxt
|
7e21c00aed
|
添加作业的回复功能
|
10 years ago |
|
lizanle
|
e44d95cca5
|
添加申请课程的加入身份
|
10 years ago |
|
guange
|
acbd690bc6
|
添加转换页面
|
10 years ago |
|
guange
|
f1af041f24
|
gitlab key 更改
|
10 years ago |
|
huang
|
150ee3d28d
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
db/schema.rb
|
10 years ago |
|
lizanle
|
bbd3999ab2
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
e3a660cf18
|
添加学校
|
10 years ago |
|
huang
|
778ff80b55
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
94d60e4150
|
修改邮件配置文件
更新gem镜像路径
|
10 years ago |
|
cxt
|
caa278d9f5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/boards_controller.rb
db/schema.rb
|
10 years ago |
|
huang
|
464fc461ea
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
b3d15b886a
|
学校的查询与现实问题重做
|
10 years ago |
|
huang
|
9399063886
|
创建版本库控制层及国际化
|
10 years ago |
|
huang
|
61bcdd4643
|
只允许创建一个版本库
|
10 years ago |
|
huang
|
8ab04c652f
|
Merge branch 'develop' into gitlab_guange
|
10 years ago |
|
cxt
|
03e8c3802d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
ebb7ed1f1a
|
讨论区单个帖子页面的二级回复
|
10 years ago |
|
lizanle
|
c85e1401f0
|
引用资源支持多页选择
|
10 years ago |
|
huang
|
fbeb6585d2
|
去掉初始化输出提示
|
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 |
|
huang
|
530d101024
|
项目邀请--姓名、长度JS验证
|
10 years ago |
|
huang
|
654ebfca46
|
项目邀请添加：姓、名、性别
|
10 years ago |
|
huang
|
e054f8045c
|
去掉Git的中英文说明
新的提交代码指定入口
|
10 years ago |
|
huang
|
5b0738a4cb
|
匿评启动失败邮件通知:实现程序及界面
|
10 years ago |
|
cxt
|
15b45e6706
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/header.css
public/stylesheets/new_user.css
public/stylesheets/public_new.css
|
10 years ago |
|
cxt
|
bb0db1e21d
|
课程动态页面
|
10 years ago |
|
lizanle
|
531b264a8f
|
Merge branch 'dev_zanle' into szzh
|
10 years ago |
|
huang
|
99473c6880
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/issues/show.html.erb
|
10 years ago |
|
huang
|
4c71e2c256
|
项目类型提示JS
|
10 years ago |
|
lizanle
|
d512c25c03
|
Merge branch 'szzh' into dev_zanle
Conflicts:
public/javascripts/new_user.js
public/stylesheets/header.css
public/stylesheets/new_user.css
|
10 years ago |
|
huang
|
b94c57691a
|
项目新建重构
项目先建添加项目类型
|
10 years ago |
|
sw
|
fa13ccfaa8
|
匿评参数设置功能完成
|
10 years ago |
|
guange
|
186bf9070c
|
配置丢失
|
10 years ago |
|
huang
|
db1dfa34ac
|
恢复邮件配置文件
|
10 years ago |
|
huang
|
810c0d8fe5
|
作业开启/关闭匿评邮件通知
|
10 years ago |
|
lizanle
|
9443c139f0
|
update forum
|
10 years ago |
|
huang
|
f041c80d0a
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/users/user_messages.html.erb
db/schema.rb
public/stylesheets/new_user.css
解决冲突
|
10 years ago |
|
huang
|
0fead3b801
|
1、课程留言发送对象为老师
2、作业截止时间邮件通知不适用delay_job
3、添加作业截止时间邮件通知界面
|
10 years ago |
|
sw
|
7cc5ce92c6
|
完成评分比例设置功能
|
10 years ago |
|
sw
|
9c20368274
|
1、系统评分的时候对成绩进行赋值
2、去掉错误的编程得分计算方法
|
10 years ago |
|
huang
|
d00ad2e14d
|
1、作业截止时间邮件通知
2、系统消息通知路由、方法定义
|
10 years ago |
|
huang
|
7a014e1f79
|
解决bug：自动注册用户时，邮箱名过长超过login限制
解决方法：login长度和邮箱长度同步
|
10 years ago |
|
huang
|
b9fc410802
|
添加系统消息单独新页面
|
10 years ago |
|
huang
|
67f7fc7de3
|
注释掉“邀请系统注册用户”，因为邀请用户中已经包含该功能
|
10 years ago |
|
huang
|
c9d52571f0
|
1、项目邀请中添加两种特殊情况的判断。
2、完成邀请状态列表界面。
3、优化之前的邀请状态逻辑。
|
10 years ago |
|
huang
|
78ca55f121
|
优化邮件邀请策略
|
10 years ago |
|
huang
|
b0ccf9037a
|
邮件邀请：
1、修改私有项目跳入403问题
2、增加同一个用户反复邀请的邮箱提醒。
3、修改邮箱的发送策略
|
10 years ago |
|
huang
|
295921c89d
|
邮件：邀请新用户的时候过滤掉邮箱和已注册用户名重叠的问题
|
10 years ago |
|
lizanle
|
1ae302621f
|
课程资源的标签库可点击更改
|
10 years ago |
|
huang
|
8c0f9d24f8
|
系统消息没保存成功添加验证
系统消息样式修改
|
10 years ago |
|
huang
|
cc3990de44
|
修改发系统消息后跳转路劲
|
10 years ago |
|
huang
|
66251c8d30
|
添加功能：管理员界面发送系统消息
|
10 years ago |
|
cxt
|
d845b8373a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
21565b74fe
|
冲突
|
10 years ago |
|
guange
|
8ad521d4ab
|
merge
|
10 years ago |
|
guange
|
41f9daed6d
|
编程作业放入到users controller
|
10 years ago |
|
cxt
|
d4dfd97b97
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
4a1b2fbbd6
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
b2eb846a23
|
关于我们
隐藏招聘信息
联系我们改为服务协议
|
10 years ago |
|
sw
|
5f42ce4c80
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/_course_message.html.erb
app/views/users/_course_news.html.erb
app/views/users/_project_issue.html.erb
app/views/users/_project_message.html.erb
|
10 years ago |
|
sw
|
00a8dc94c3
|
缺陷的回复功能
|
10 years ago |
|
lizanle
|
798326d6ef
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
b3e3737fb5
|
发布作业时从资源库选择资源功能
|
10 years ago |
|
cxt
|
1e320e63c6
|
底部导航的论坛反馈改为贴吧交流，帮助中心版权信息的换行修复
|
10 years ago |
|
guange
|
8f426ca040
|
merge
|
10 years ago |
|
sw
|
a23ec96508
|
学校首页报404
|
10 years ago |
|
sw
|
51bf1cd678
|
作业搜索支持enter键
|
10 years ago |
|
guange
|
e8fe397158
|
added
|
10 years ago |
|
sw
|
014881bd42
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/new_user.css
|
10 years ago |
|
sw
|
76ec0d5d48
|
资源库导入资源到作业静态页面
|
10 years ago |
|
lizanle
|
7f9289d6c3
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
18e2d05f41
|
重置邮件标题改变
|
10 years ago |
|
guange
|
1d8fdbf8f1
|
可以提交答案
|
10 years ago |
|
guange
|
1462ea09f3
|
测试代码功能完成
|
10 years ago |
|
sw
|
2fa03c3102
|
导入作业功能完成
|
10 years ago |
|
sw
|
007a39b5d5
|
作业列表的过滤查询
|
10 years ago |
|
sw
|
cb5abc6d74
|
导入作业弹框
|
10 years ago |
|
guange
|
b9e08b22cd
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
guange
|
631283ae79
|
remove grack
|
10 years ago |
|
sw
|
b7cbb9b0c2
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/controllers/users_controller.rb
public/stylesheets/new_user.css
|
10 years ago |
|
sw
|
049e27f15f
|
发布作业功能
|
10 years ago |
|
huang
|
a54de0c8fb
|
Merge branch 'dev_hjq' into sw_new_course
|
10 years ago |
|
lizanle
|
ccfd69602c
|
服务协议
|
10 years ago |
|
huang
|
b824c3fa46
|
1、去掉多余的代码
2、消息样式列表过宽显示跨行问题
|
10 years ago |
|
huang
|
bc563119d6
|
Merge branch 'sw_new_course' into dev_hjq
Conflicts:
app/controllers/users_controller.rb
public/stylesheets/new_user.css
|
10 years ago |
|
sw
|
d132c08a11
|
增加footer
|
10 years ago |
|
huang
|
5306d7e2a4
|
列表排序（未完）
|
10 years ago |
|
huang
|
4fd90464d9
|
Merge branch 'sw_new_course' into dev_hjq
|
10 years ago |
|
huang
|
e129404b4c
|
解决图标点两次的问题
|
10 years ago |
|
sw
|
f6d122e37f
|
Merge branch 'guange_dev' into sw_new_course
|
10 years ago |
|
sw
|
111478ec72
|
Merge branch 'szzh' into sw_new_course
Conflicts:
app/controllers/users_controller.rb
config/routes.rb
|
10 years ago |
|
guange
|
3a601bbd2c
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
sw
|
2a522f144e
|
编辑个人简介
|
10 years ago |
|
lizanle
|
9138f46301
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/users_controller.rb
|
10 years ago |
|
lizanle
|
705d31b1d0
|
资源库 修改
|
10 years ago |
|
lizanle
|
76c2c47adf
|
资源库
|
10 years ago |
|
lizanle
|
76be15f79b
|
资源库
|
10 years ago |
|
lizanle
|
25460cd255
|
资源库
|
10 years ago |
|
guange
|
d36da76685
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
huang
|
a38e91b3d3
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
cxt
|
58613e843b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
da20f6bc89
|
超级管理员新增功能：留言列表、帖子、通知、最近登录用户列表、作业
|
10 years ago |
|
lizanle
|
89b9a5c09d
|
资源库
|
10 years ago |
|
sw
|
ac4d529ebc
|
编程作业取消，并设定匿评为内置功能
|
10 years ago |
|
huang
|
2c865069d3
|
所有消息显示功能
|
10 years ago |
|
huang
|
510613f9a4
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
11ad8d6d42
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
ee778b5968
|
1、增加issue消息提醒（发送给指派的人）
2、下拉框形式区分消息
3、相关关联
|
10 years ago |
|
ouyangxuhua
|
a5f7f8e622
|
项目--版本：如图提示信息不合适问题修改
|
10 years ago |
|
cxt
|
a872692984
|
为activities表添加created_at字段，并导入数据
|
10 years ago |
|
lizanle
|
d0bca180ca
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
5d82f3336e
|
导入作者是我，但是问卷在其他课程里的问卷，可以多选
|
10 years ago |
|
huang
|
bc6b6b0536
|
底部国际化
|
10 years ago |
|
guange
|
9d8596a14c
|
新增gitlab adapter用于适配gitlab命令
|
10 years ago |
|
huang
|
15b3d527dc
|
footer
|
10 years ago |
|
sw
|
fe2d621dc3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/helpers/users_helper.rb
|
10 years ago |
|
sw
|
1cd50693b5
|
登录失败错误信息提示
|
10 years ago |
|
huang
|
a915a35819
|
优化版本代码加提示
|
10 years ago |
|
huang
|
c376c0e38f
|
新建版本 --新页面设计
|
10 years ago |
|
huang
|
e70748fd81
|
去掉项目辅助工具（dts、yun）
|
10 years ago |
|
guange
|
909521df54
|
Merge remote-tracking branch 'origin/szzh' into gitlab_guange
|
10 years ago |
|
sw
|
3e5af49281
|
点击测试时增加事件的发送
|
10 years ago |
|
sw
|
a68fcf74aa
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
ce89c7d119
|
用户留言后界面的刷新，留言的分页显示
|
10 years ago |
|
sw
|
9c704b7dc1
|
个人主页留言静态页面
更新css
路由及相关代码整理
|
10 years ago |
|
lizanle
|
db2a030981
|
导入其他问卷
|
10 years ago |
|
sw
|
6091369e02
|
增加学校logo的上传功能，以及实时预览效果
|
10 years ago |
|
sw
|
7c818ce59a
|
admin界面增加学校列表显示，以及按名称过滤功能
|
10 years ago |
|
lizanle
|
ebfa2f6749
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
e74ca78b0e
|
日志级别在debug环境下 调整为debug
|
10 years ago |
|
huang
|
f37cbd3e0d
|
修订改为提交次数
|
10 years ago |
|
huang
|
839cbf2a55
|
添加一年提交次数
|
10 years ago |
|
huang
|
69b9cbee80
|
版本库代码统计（未完成）
|
10 years ago |
|
huang
|
518ce15df5
|
修改添加成员提示
|
10 years ago |
|
huang
|
b6812d8810
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
127a243bd2
|
版本库：用户最近一月提交次数统计
|
10 years ago |
|
huang
|
a2c2f41908
|
版本库：最近一月的提交次数统计
|
10 years ago |
|
sw
|
95af2ab20b
|
作品列表界面导出列表功能：
普通作业：不显示匿评评分
匿评作业：显示匿评评分
编程作业：显示系统评分
|
10 years ago |
|
huang
|
ae4eed45c3
|
添加 新项目工具
|
10 years ago |
|
guange
|
7d0a53ec86
|
merge
|
10 years ago |
|
huang
|
069dad053b
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/controllers/projects_controller.rb
app/views/projects/_tools_expand.html.erb
config/locales/projects/zh.yml
|
10 years ago |
|
huang
|
ce6320747a
|
项目工具改进
|
10 years ago |
|
huang
|
ff8db8fecc
|
添加1、软件知识库
2、软件资源库
3、在线开发平台
4、软工服务平台
|
10 years ago |
|
huang
|
654a8078de
|
添加软件知识库
|
10 years ago |
|
huang
|
8f1a7f47d1
|
dts测试添加测试进度效果
|
10 years ago |
|
huang
|
e0687c0ab3
|
云化部署
|
10 years ago |
|
huang
|
c198a03a90
|
DTS测试工具
|
10 years ago |
|
huang
|
415f457dd4
|
dts接口（未完）
|
10 years ago |
 yutao
|
73bd8fbef5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
yutao
|
3e3bcc32a6
|
个人主页
|
10 years ago |
|
huang
|
2e78ea3d58
|
按月提交显示每月的代码统计量（以前是ASCII码）
|
10 years ago |
|
huang
|
9c4eab4e04
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
9c63e2a87e
|
1、版本库添加成员代码提交统计
2、版本库成员过多拥挤问题
|
10 years ago |
|
yutao
|
f4b88dce70
|
个人主页
|
10 years ago |
|
sw
|
a7666af597
|
Merge branch 'yutao' into szzh
Conflicts:
app/controllers/users_controller.rb
|
10 years ago |
|
guange
|
59a4b4656b
|
change git config
|
10 years ago |
|
sw
|
f909fbb835
|
作品列表增加分班过滤
|
10 years ago |
|
guange
|
006ed66d7a
|
新注册用户可以同步到gitlab
|
10 years ago |
|
yutao
|
00c50d8114
|
个人主页->访客
|
10 years ago |
|
sw
|
aa5255c430
|
创建作品之后再调用编程作业接口，参数传递增加作品的ID
|
11 years ago |
|
sw
|
aeb0d23289
|
Merge branch 'develop' into sw_new_course
Conflicts:
app/views/homework_common/index.html.erb
|
11 years ago |
|
sw
|
e73517cfd0
|
扣分规则显示
|
11 years ago |
|
sw
|
4b275bcbdf
|
根据返回值，作业获取question的id
|
11 years ago |
|
yutao
|
5c011fd342
|
个人主页
|
11 years ago |
|
huang
|
3bb3cbe2bd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
898ef29116
|
用户得分：项目得分中添加发帖得分（帖子回复在协同得分）
|
11 years ago |
 zhangshenjerry
|
0c70169dfc
|
创新竞赛--编辑竞赛通知页面导航处不要显示“添加通知”
创新竞赛--竞赛通知：添加竞赛通知置条件为空，提示信息“竞赛标题/描述不能为空”错误
|
11 years ago |
|
sw
|
5e90684677
|
Merge branch 'szzh' into sw_new_course
Conflicts:
app/controllers/homework_common_controller.rb
|
11 years ago |
|
guange
|
f56e48d60a
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
guange
|
b762ae6bdd
|
报告人员只能克隆，不能提交，其他可以克隆和提交
|
11 years ago |
|
huang
|
be2b3a78d6
|
修改项目资源引用未选着项目时提示
|
11 years ago |
|
huang
|
02805fd145
|
1、修改邮件显示样式及国际化
2、发布作业代码更新
|
11 years ago |
|
huang
|
750070bdc7
|
configuration冲突处理
|
11 years ago |
|
huang
|
17280e78ab
|
引用模式的修改
|
11 years ago |
|
huang
|
e986ee4e4e
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/issues/_edit.html.erb
|
11 years ago |
|
sw
|
2344e3d07f
|
admin用户导出缺失文件列表功能
|
11 years ago |
|
huang
|
f9cecbee5c
|
缺陷显示中回复和留言修改
|
11 years ago |
|
guange
|
6fa67051e1
|
本项目的成员可以使用自己的用户名和密码克隆
|
11 years ago |
|
sw
|
07d95bdda9
|
课程列表内容
|
11 years ago |
|
sw
|
f9880a00fd
|
admin界面增加课程列表及相关路由
|
11 years ago |
|
sw
|
7338f0d44e
|
未完善个人资料的用户创建可以报错
|
11 years ago |
|
guange
|
797ed5081d
|
同步登录
|
11 years ago |
|
sw
|
fa31fe421b
|
匿评列表导出Excel
|
11 years ago |
|
sw
|
c2e21f7a0c
|
缺评列表导出
|
11 years ago |
|
huang
|
65ee86bb45
|
1，解决git中英文500错误
2.解决编辑器输入样式邮件显示异常问题
|
11 years ago |
|
huang
|
df910a9c2d
|
更改邮件提示语（同步国际化）
|
11 years ago |
|
huang
|
5b2202de75
|
处理配置文件冲突
|
11 years ago |
|
huang
|
f65f2dc926
|
课程通知、回复、发布缺陷、回复合二为一
|
11 years ago |
|
sw
|
fa19d4c066
|
Merge branch 'szzh' into sw_new_course
|
11 years ago |
|
huang
|
5d1b157cd7
|
更新邮件（特殊情况）：缺陷留言为空，只更新状态
|
11 years ago |
|
huang
|
a2e84de88f
|
解决issue为空情况
|
11 years ago |
|
huang
|
a7a7c57f6a
|
解决回复为空的情况不显示问题
|
11 years ago |
|
sw
|
810561c31b
|
老师才可以查看缺评情况
|
11 years ago |
|
huang
|
2f8c8ea6ca
|
Merge branch 'szzh' into dev_hjq
|
11 years ago |
|
sw
|
1c10775619
|
Merge branch 'guange_dev' into szzh
|
11 years ago |
|
sw
|
43363e8bcb
|
缺评情况功能
|
11 years ago |
|
huang
|
28e9c090ec
|
实时发送：发布作业邮件通知
|
11 years ago |
|
guange
|
f58b530484
|
给课程活动慢加上缓存，并且加入了开关
|
11 years ago |
|
guange
|
5bdad52e63
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
guange
|
742506f52b
|
IE8不能提交作业
|
11 years ago |
|
huang
|
e1b059b3d2
|
上传项目资源添加到邮件按天发送
|
11 years ago |
|
sw
|
61eb3ecc62
|
1、新建作业上一步下一步改为页面刷新
2、下一步路由改为post
|
11 years ago |
|
huang
|
5c36cf5c9d
|
Merge branch 'szzh' into dev_hjq
|
11 years ago |
|
huang
|
a4f1edcdee
|
更新：wiki项目其它成员可以收到；
项目、课程留言其它成员可以收到
邮件显示页面国际化
|
11 years ago |
|
huang
|
15697e05ed
|
按天发送中添加项目留言
|
11 years ago |
|
sw
|
57804a118d
|
课程作业列表中展开按钮
|
11 years ago |
|
sw
|
574c7373ec
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
0d9bdae5b0
|
邮件按天发送新界面
|
11 years ago |
|
sw
|
857d3d5f62
|
问卷调查结果导出功能
|
11 years ago |
|
huang
|
c62d468ed3
|
修改项目新闻和课程通知冲突
|
11 years ago |
|
sw
|
59c4e04e37
|
删除bid相关路由
|
11 years ago |
|
guange
|
971755c74a
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
sw
|
1cff2a85e9
|
Merge branch 'dev_hjq' into szzh
|
11 years ago |
|
huang
|
0c19199be9
|
按天发送中添加项目新闻
|
11 years ago |
|
sw
|
89d15e7673
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
yutao
|
cd0752f5da
|
课程讨论区动态与我相关
|
11 years ago |
|
guange
|
36afb4d1f8
|
视频在公共贴吧的帖子回复里发不
|
11 years ago |
|
sw
|
0d292d8ee6
|
课程留言为空时的提示
|
11 years ago |
|
guange
|
3cc6fc1a64
|
删掉additional_enviroment.rb
|
11 years ago |
|
sw
|
b935f50b36
|
课程内作业列表、新建作业等路由关闭，相关页面、方法删除
|
11 years ago |
|
sw
|
cc5171bc1d
|
解决冲突
|
11 years ago |
|
guange
|
b6d22cfb31
|
添加文件预览接口
|
11 years ago |
|
guange
|
21a143651a
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
guange
|
2981d354ad
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
sw
|
a562cc7409
|
Merge branch 'dev_hjq' into szzh
|
11 years ago |
|
huang
|
d6aeb5b0e7
|
Merge branch 'szzh' into dev_hjq
|
11 years ago |
|
huang
|
d9ae9c8061
|
修改邮件通知提醒（邀请：未激活
点击链接：激活并加入项目）
|
11 years ago |
 alan
|
98f38b0a5b
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache
|
11 years ago |
|
sw
|
4d43cd2765
|
点赞功能
|
11 years ago |
|
huang
|
e2ec7d5f3e
|
QQ在线支持功能
|
11 years ago |
|
alan
|
1c760e8117
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache
|
11 years ago |
|
sw
|
3f9855f25c
|
老师删除作业功能
|
11 years ago |
|
guange
|
6f15738817
|
换一个autologin,解决老数据问题
|
11 years ago |
|
sw
|
e1a3ed4b82
|
到处Excel
|
11 years ago |
|
guange
|
1fe49c8cb1
|
添加删除作业功能
|
11 years ago |
|
guange
|
47e3e93a2f
|
cookies 删除也需要domain
|
11 years ago |
|
alan
|
32a6c29c7c
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache
Conflicts:
Gemfile
app/views/layouts/base_projects.html.erb
app/views/projects/_development_group.html.erb
app/views/projects/_research_team.html.erb
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
59c77e870c
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache
Conflicts:
db/schema.rb
public/javascripts/course.js
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
fea784cbcc
|
1、添加评分回复路由改变
2、删除回复功能及界面刷新
|
11 years ago |
|
sw
|
a0324f5e39
|
增加评分回复，以及相关显示
评分回复真实信息显示
评分回复以及回复删除
|
11 years ago |
|
guange
|
f3a15ce313
|
加入性能分析 oneapm
|
11 years ago |
|
alanlong9278
|
b1a60d3118
|
Signed-off-by: alanlong9278 <547533434@qq.com>
|
11 years ago |
|
sw
|
c289af2e7c
|
评分
|
11 years ago |
|
guange
|
b5d9cf55ff
|
将域名配置加入到管理员后台
|
11 years ago |
|
guange
|
7b5021c4fd
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
alan
|
799f561d77
|
Merge branch 'szzh' into memcached_alan
Conflicts:
Gemfile
app/views/issues/index.html.erb
db/schema.rb
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
25672aa229
|
编辑作业功能完成
|
11 years ago |
|
sw
|
40f6295609
|
1、新建作业功能完成
2、修改新建作业时传递参数不完整
3、进入编辑作业界面，部分界面显示的初始化
4、提交新建作业按钮
|
11 years ago |
|
huang
|
3f744d46f2
|
超级管理员界面--贴吧回复成功
|
11 years ago |
|
sw
|
a7fd5b950d
|
1、老师新建作业界面，数据i初始化
2、部分help方法添加
|
11 years ago |
|
yutao
|
a35abf1f1f
|
修复bug#2180:课程资源库：成功引入资源后，“选人我的课程”未自动刷新为“选入我的其他课程”
|
11 years ago |
|
sw
|
7684a6b253
|
1、实现作业列表展示页面
2、新建作业、修改作业、开启/关闭匿评路由以及页面跳转
3、注释掉bid相关的路由
4、作品列表、新建作品、修改作品、删除作品路由及页面跳转
|
11 years ago |
|
guange
|
9b0602fd9c
|
新增学生作业下载spec
|
11 years ago |
|
guange
|
49d836d331
|
上传头像大小和图片类型在后台加入限制,且通过测试
|
11 years ago |
|
guange
|
d2a7d41963
|
头像加入大小限制
|
11 years ago |
|
guange
|
39308dacfd
|
将setting中的domain合并到host配置中
|
11 years ago |
|
huang
|
6c500109c9
|
修改项目上传资源
|
11 years ago |
|
guange
|
5c4ad1ce7d
|
merge
|
11 years ago |
|
sw
|
cfe3021391
|
用户收索国际化丢失
|
11 years ago |
|
sw
|
cba473269d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
f08357d300
|
用户反馈添加提示：课程问题反馈给老师
|
11 years ago |
|
sw
|
cba760b8b0
|
课程、项目搜索提示
|
11 years ago |
|
sw
|
c0b7819870
|
修改资料时昵称提示以及样式
|
11 years ago |
|
guange
|
297cb9182e
|
开发本地还是采用filecache
|
11 years ago |
|
guange
|
bd54edd770
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
guange
|
05428213a2
|
让session保持，防止长时间编辑时session丢失
|
11 years ago |
|
huang
|
b39e00b5c7
|
项目讨论区--内容必填
添加国际化
|
11 years ago |
|
huang
|
0b524b8a40
|
登录后主页只显示我的项目
方法定义
功能实现
|
11 years ago |
|
guange
|
86af233042
|
修正autologin多终端登录问题
|
11 years ago |
|
alan
|
14a4cfa0db
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
54078e114c
|
redis缓存服务器的搭建以及对首页的缓存设置
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
c80263a66e
|
Merge branch 'guange_dev' into memcached_alan
Conflicts:
.gitignore
Gemfile
app/views/issues/index.html.erb
app/views/layouts/_base_feedback.html.erb
app/views/tags/_tag_name.html.erb
config/environments/production.rb
db/schema.rb
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
huang
|
119e540373
|
邮件邀请系统已注册的用户
|
11 years ago |
|
guange
|
273b360b51
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
guange
|
b70ada57e6
|
邮件未处理text发送类型，导致每日发送失败
|
11 years ago |
whimlex
|
e30c446847
|
项目私有问题提示信息
|
11 years ago |
|
guange
|
86347cab89
|
现在可以通过rake redmine📧test[guange] 发送测试邮件
|
11 years ago |
|
whimlex
|
b61d76d94e
|
意见反馈
|
11 years ago |
|
guange
|
828d2caefa
|
邮件加入三个邮件设置
|
11 years ago |
|
guange
|
3f9abf170e
|
#2363 按天发送邮件相关标题修改
|
11 years ago |
|
whimlex
|
15d7cde055
|
意见反馈
|
11 years ago |
|
sw
|
de192761b8
|
Merge branch 'szzh' into guange_dev
Conflicts:
Gemfile
config/application.rb
|
11 years ago |
|
whimlex
|
86bd708c5d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
21f08830df
|
意见反馈功能修改
|
11 years ago |
|
guange
|
336dba414e
|
缓存修改为redis存储
|
11 years ago |
|
huang
|
154ee9f38b
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
2f021aecee
|
项目成员列表添加角色。用户得分
|
11 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
|
11 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
|
11 years ago |
|
huang
|
49f33dd50c
|
类型bug修复
|
11 years ago |
|
lizanle
|
0de5ddd14c
|
题型用户上传百度云
|
11 years ago |
|
huang
|
be5c7ac6dd
|
修改项目类型术语
图标
|
11 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
|
11 years ago |
|
whimlex
|
ab93d19b56
|
动态中显示更新项目缺陷样式异常
|
11 years ago |
|
whimlex
|
84d7e63d54
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
whimlex
|
6195f0a150
|
课程动态添加问卷发布，为通过问卷动态访问课程问卷做权限判断
|
11 years ago |
|
huang
|
dd25cdc065
|
1、修改项目三种类型术语
2、未登录情况下缺陷提交bug
3、width果断空白处点击进入
|
11 years ago |
|
alanlong9278
|
945192f1d8
|
添加memcached配置
Signed-off-by: alanlong9278 <547533434@qq.com>
|
11 years ago |
|
whimlex
|
05712c4c06
|
学生作业改为作品
|
11 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
|
11 years ago |
|
lizanle
|
54f8079ba6
|
去掉html符号
|
11 years ago |
|
lizanle
|
3bba1f93b4
|
版本库名输入条件描述去掉换行符
|
11 years ago |
|
sw
|
9f862ad7a7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
a8b1ca10b3
|
1、学生作业 --> 作品
2、学生交了作品之后显示修改作品
|
11 years ago |
|
huang
|
d1e7777040
|
关注列表样式
|
11 years ago |
|
huang
|
440eb8dc7f
|
1、修改项目成员一排显示
2、项目动态显示强制换行
3、讨论区提示用语
|
11 years ago |
 z9hang
|
8a26fd4343
|
课程配置：成员配置处添加搜素成员功能
|
11 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
|
11 years ago |
|
huang
|
bd800a53e4
|
项目简介显示
|
11 years ago |
|
sw
|
0cc809c3e0
|
实现课程资源TAG云功能
|
11 years ago |
|
huang
|
104075b3fd
|
修改缺陷留言方式
|
11 years ago |
|
sw
|
676cf8f180
|
课程上传资源是根据上传的类型，对资源添加默认的TAG
|
11 years ago |
|
huang
|
b7537ad518
|
修改新闻中测出的bug，
讨论区中附件显示形式
|
11 years ago |
|
huang
|
b8058c3e12
|
用户邀请加入的时候增加拒绝功能
删除提示星系修改
申请加入模块样式调整
|
11 years ago |
|
huang
|
5ae5cfda03
|
项目配置添加申请加入
删除成员局部刷新
编辑成员局部刷新
项目动态国际化错误
|
11 years ago |
|
sw
|
ead0ffb2f4
|
Merge branch 'develop' into szzh
|
11 years ago |
|
sw
|
fadca9128f
|
完成项目朋友圈、开发组、科研组直接的切换功能
|
11 years ago |
|
guange
|
eb4d9a4ffc
|
1. 将session改为跨子域。 2. 将session的存储改到files/cache_store下，用于nfs
|
11 years ago |
|
whimlex
|
cf4451e998
|
pre标签换行；contest主页样式调整
|
11 years ago |
|
huang
|
78868b34f0
|
修改缺陷中四中颜色按钮会折断换行的bug
区别新闻和通知
|
11 years ago |
|
whimlex
|
7e46885f3d
|
修改上传附件数目限制
|
11 years ago |
|
whimlex
|
5936d8d8e9
|
评论显示
|
11 years ago |
|
whimlex
|
38391b7e96
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
6ff1a7d692
|
问题顶和踩国际化
|
11 years ago |
|
guange
|
8454e56ff4
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
guange
|
123fa079b3
|
smtp配置放入production
|
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 |
|
guange
|
a344fcdfc7
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
guange
|
f94184bc81
|
个人动态权限部分性能优化
|
11 years ago |
|
whimlex
|
1fae44b201
|
用户主页国际化修改
|
11 years ago |
|
whimlex
|
2a35e771c2
|
项目界面国际化及样式调整；标签模块国际化及样式调整
|
11 years ago |
|
guange
|
c489d2400b
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
guange
|
e6780cc2fb
|
加入delayedjob配置文件
|
11 years ago |
|
whimlex
|
9ef212b6d3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
bcf83328f2
|
项目界面国际化
|
11 years ago |
|
huang
|
e907f5e3e4
|
1.解决缺陷列表图片不显示
2、项目种类页面局部刷新
3、工具栏调整
4.项目新增字段（判断种类）
|
11 years ago |
|
sw
|
7303253c07
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
988f8b7918
|
增加隐藏非项目信息按钮以及路由
实现点击按钮事数据的存储与修改
修改配置文件
|
11 years ago |
|
huang
|
4d4e1cac8b
|
完成新的邮件邀请界面
|
11 years ago |
|
lizanle
|
13273cecf1
|
app的创建动态描述
|
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 |
|
lizanle
|
5299d2d332
|
删除demo代码
|
11 years ago |
|
sw
|
a1a761266b
|
Merge branch 'szzh' into guange_dev
|
11 years ago |
|
whimlex
|
2ef224556e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
aa64b47d74
|
资源按时间倒序显示；新建课程设置公开私有属性；课程动态（动态统计主要在作业和作品上存在问题，动态显示在作品和留言中存在权限问题）；课程动态格式调整
|
11 years ago |
|
guange
|
56df5ce9a7
|
优化zip重复打包问题
|
11 years ago |
|
guange
|
9cefb9f339
|
每日发送取日期不对
|
11 years ago |
|
guange
|
b23892e29e
|
在application中去除observer
|
11 years ago |
|
guange
|
618e8c017c
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
Conflicts:
db/schema.rb
|
11 years ago |
|
z9hang
|
5eac727584
|
项目资源模块功能完成（样式尚未调整，代码尚未应用）
|
11 years ago |
|
guange
|
02e83ea776
|
将邮件发送放到后台进程中
|
11 years ago |
|
guange
|
77134c8dde
|
将每日邮件移入crontab
|
11 years ago |
|
z9hang
|
eabcd4e92b
|
项目资源模块新界面（列表显示，排序等功能，样式尚未调）
|
11 years ago |
|
guange
|
c1ed8bd36d
|
#2096 course、forge的邮件通知系统，改为可以每日一报、一事一报、不报
|
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 |
|
whimlex
|
54908423bc
|
课程--作业附件显示问题;问题跟踪附件显示问题
|
11 years ago |
