 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
|
10 years ago |
|
sw
|
aeb0d23289
|
Merge branch 'develop' into sw_new_course
Conflicts:
app/views/homework_common/index.html.erb
|
10 years ago |
|
sw
|
e73517cfd0
|
扣分规则显示
|
10 years ago |
|
sw
|
4b275bcbdf
|
根据返回值，作业获取question的id
|
10 years ago |
|
yutao
|
5c011fd342
|
个人主页
|
10 years ago |
|
huang
|
3bb3cbe2bd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
898ef29116
|
用户得分：项目得分中添加发帖得分（帖子回复在协同得分）
|
10 years ago |
 zhangshenjerry
|
0c70169dfc
|
创新竞赛--编辑竞赛通知页面导航处不要显示“添加通知”
创新竞赛--竞赛通知：添加竞赛通知置条件为空，提示信息“竞赛标题/描述不能为空”错误
|
10 years ago |
|
sw
|
5e90684677
|
Merge branch 'szzh' into sw_new_course
Conflicts:
app/controllers/homework_common_controller.rb
|
10 years ago |
|
guange
|
f56e48d60a
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
guange
|
b762ae6bdd
|
报告人员只能克隆，不能提交，其他可以克隆和提交
|
10 years ago |
|
huang
|
be2b3a78d6
|
修改项目资源引用未选着项目时提示
|
10 years ago |
|
huang
|
02805fd145
|
1、修改邮件显示样式及国际化
2、发布作业代码更新
|
10 years ago |
|
huang
|
750070bdc7
|
configuration冲突处理
|
10 years ago |
|
huang
|
17280e78ab
|
引用模式的修改
|
10 years ago |
|
huang
|
e986ee4e4e
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/issues/_edit.html.erb
|
10 years ago |
|
sw
|
2344e3d07f
|
admin用户导出缺失文件列表功能
|
10 years ago |
|
huang
|
f9cecbee5c
|
缺陷显示中回复和留言修改
|
10 years ago |
|
guange
|
6fa67051e1
|
本项目的成员可以使用自己的用户名和密码克隆
|
10 years ago |
|
sw
|
07d95bdda9
|
课程列表内容
|
10 years ago |
|
sw
|
f9880a00fd
|
admin界面增加课程列表及相关路由
|
10 years ago |
|
sw
|
7338f0d44e
|
未完善个人资料的用户创建可以报错
|
10 years ago |
|
guange
|
797ed5081d
|
同步登录
|
10 years ago |
|
sw
|
fa31fe421b
|
匿评列表导出Excel
|
10 years ago |
|
sw
|
c2e21f7a0c
|
缺评列表导出
|
10 years ago |
|
huang
|
65ee86bb45
|
1，解决git中英文500错误
2.解决编辑器输入样式邮件显示异常问题
|
10 years ago |
|
huang
|
df910a9c2d
|
更改邮件提示语（同步国际化）
|
10 years ago |
|
huang
|
5b2202de75
|
处理配置文件冲突
|
10 years ago |
|
huang
|
f65f2dc926
|
课程通知、回复、发布缺陷、回复合二为一
|
10 years ago |
|
sw
|
fa19d4c066
|
Merge branch 'szzh' into sw_new_course
|
10 years ago |
|
huang
|
5d1b157cd7
|
更新邮件（特殊情况）：缺陷留言为空，只更新状态
|
10 years ago |
|
huang
|
a2e84de88f
|
解决issue为空情况
|
10 years ago |
|
huang
|
a7a7c57f6a
|
解决回复为空的情况不显示问题
|
10 years ago |
|
sw
|
810561c31b
|
老师才可以查看缺评情况
|
10 years ago |
|
huang
|
2f8c8ea6ca
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
sw
|
1c10775619
|
Merge branch 'guange_dev' into szzh
|
10 years ago |
|
sw
|
43363e8bcb
|
缺评情况功能
|
10 years ago |
|
huang
|
28e9c090ec
|
实时发送：发布作业邮件通知
|
10 years ago |
|
guange
|
f58b530484
|
给课程活动慢加上缓存，并且加入了开关
|
10 years ago |
|
guange
|
5bdad52e63
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
guange
|
742506f52b
|
IE8不能提交作业
|
10 years ago |
|
huang
|
e1b059b3d2
|
上传项目资源添加到邮件按天发送
|
10 years ago |
|
sw
|
61eb3ecc62
|
1、新建作业上一步下一步改为页面刷新
2、下一步路由改为post
|
10 years ago |
|
huang
|
5c36cf5c9d
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
a4f1edcdee
|
更新：wiki项目其它成员可以收到；
项目、课程留言其它成员可以收到
邮件显示页面国际化
|
10 years ago |
|
huang
|
15697e05ed
|
按天发送中添加项目留言
|
10 years ago |
|
sw
|
57804a118d
|
课程作业列表中展开按钮
|
10 years ago |
|
sw
|
574c7373ec
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
0d9bdae5b0
|
邮件按天发送新界面
|
10 years ago |
|
sw
|
857d3d5f62
|
问卷调查结果导出功能
|
10 years ago |
|
huang
|
c62d468ed3
|
修改项目新闻和课程通知冲突
|
10 years ago |
|
sw
|
59c4e04e37
|
删除bid相关路由
|
10 years ago |
|
guange
|
971755c74a
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
sw
|
1cff2a85e9
|
Merge branch 'dev_hjq' into szzh
|
10 years ago |
|
huang
|
0c19199be9
|
按天发送中添加项目新闻
|
10 years ago |
|
sw
|
89d15e7673
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
yutao
|
cd0752f5da
|
课程讨论区动态与我相关
|
10 years ago |
|
guange
|
36afb4d1f8
|
视频在公共贴吧的帖子回复里发不
|
10 years ago |
|
sw
|
0d292d8ee6
|
课程留言为空时的提示
|
10 years ago |
|
guange
|
3cc6fc1a64
|
删掉additional_enviroment.rb
|
10 years ago |
|
sw
|
b935f50b36
|
课程内作业列表、新建作业等路由关闭，相关页面、方法删除
|
10 years ago |
|
sw
|
cc5171bc1d
|
解决冲突
|
10 years ago |
|
guange
|
b6d22cfb31
|
添加文件预览接口
|
10 years ago |
|
guange
|
21a143651a
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
guange
|
2981d354ad
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
sw
|
a562cc7409
|
Merge branch 'dev_hjq' into szzh
|
10 years ago |
|
huang
|
d6aeb5b0e7
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
d9ae9c8061
|
修改邮件通知提醒（邀请：未激活
点击链接：激活并加入项目）
|
10 years ago |
 alan
|
98f38b0a5b
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache
|
10 years ago |
|
sw
|
4d43cd2765
|
点赞功能
|
10 years ago |
|
huang
|
e2ec7d5f3e
|
QQ在线支持功能
|
10 years ago |
|
alan
|
1c760e8117
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache
|
10 years ago |
|
sw
|
3f9855f25c
|
老师删除作业功能
|
10 years ago |
|
guange
|
6f15738817
|
换一个autologin,解决老数据问题
|
10 years ago |
|
sw
|
e1a3ed4b82
|
到处Excel
|
10 years ago |
|
guange
|
1fe49c8cb1
|
添加删除作业功能
|
10 years ago |
|
guange
|
47e3e93a2f
|
cookies 删除也需要domain
|
10 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>
|
10 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>
|
10 years ago |
|
sw
|
fea784cbcc
|
1、添加评分回复路由改变
2、删除回复功能及界面刷新
|
10 years ago |
|
sw
|
a0324f5e39
|
增加评分回复，以及相关显示
评分回复真实信息显示
评分回复以及回复删除
|
10 years ago |
|
guange
|
f3a15ce313
|
加入性能分析 oneapm
|
10 years ago |
|
alanlong9278
|
b1a60d3118
|
Signed-off-by: alanlong9278 <547533434@qq.com>
|
10 years ago |
|
sw
|
c289af2e7c
|
评分
|
10 years ago |
|
guange
|
b5d9cf55ff
|
将域名配置加入到管理员后台
|
10 years ago |
|
guange
|
7b5021c4fd
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 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>
|
10 years ago |
|
sw
|
25672aa229
|
编辑作业功能完成
|
10 years ago |
|
sw
|
40f6295609
|
1、新建作业功能完成
2、修改新建作业时传递参数不完整
3、进入编辑作业界面，部分界面显示的初始化
4、提交新建作业按钮
|
10 years ago |
|
huang
|
3f744d46f2
|
超级管理员界面--贴吧回复成功
|
10 years ago |
|
sw
|
a7fd5b950d
|
1、老师新建作业界面，数据i初始化
2、部分help方法添加
|
10 years ago |
|
yutao
|
a35abf1f1f
|
修复bug#2180:课程资源库：成功引入资源后，“选人我的课程”未自动刷新为“选入我的其他课程”
|
10 years ago |
|
sw
|
7684a6b253
|
1、实现作业列表展示页面
2、新建作业、修改作业、开启/关闭匿评路由以及页面跳转
3、注释掉bid相关的路由
4、作品列表、新建作品、修改作品、删除作品路由及页面跳转
|
10 years ago |
|
guange
|
9b0602fd9c
|
新增学生作业下载spec
|
10 years ago |
|
guange
|
49d836d331
|
上传头像大小和图片类型在后台加入限制,且通过测试
|
10 years ago |
|
guange
|
d2a7d41963
|
头像加入大小限制
|
10 years ago |
|
guange
|
39308dacfd
|
将setting中的domain合并到host配置中
|
10 years ago |
|
huang
|
6c500109c9
|
修改项目上传资源
|
10 years ago |
|
guange
|
5c4ad1ce7d
|
merge
|
10 years ago |
|
sw
|
cfe3021391
|
用户收索国际化丢失
|
10 years ago |
|
sw
|
cba473269d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
f08357d300
|
用户反馈添加提示：课程问题反馈给老师
|
10 years ago |
|
sw
|
cba760b8b0
|
课程、项目搜索提示
|
10 years ago |
|
sw
|
c0b7819870
|
修改资料时昵称提示以及样式
|
10 years ago |
|
guange
|
297cb9182e
|
开发本地还是采用filecache
|
10 years ago |
|
guange
|
bd54edd770
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
guange
|
05428213a2
|
让session保持，防止长时间编辑时session丢失
|
10 years ago |
|
huang
|
b39e00b5c7
|
项目讨论区--内容必填
添加国际化
|
10 years ago |
|
huang
|
0b524b8a40
|
登录后主页只显示我的项目
方法定义
功能实现
|
10 years ago |
|
guange
|
86af233042
|
修正autologin多终端登录问题
|
10 years ago |
|
alan
|
14a4cfa0db
|
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
alan
|
54078e114c
|
redis缓存服务器的搭建以及对首页的缓存设置
Signed-off-by: alan <547533434@qq.com>
|
10 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>
|
10 years ago |
|
huang
|
119e540373
|
邮件邀请系统已注册的用户
|
10 years ago |
|
guange
|
273b360b51
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
guange
|
b70ada57e6
|
邮件未处理text发送类型，导致每日发送失败
|
10 years ago |
whimlex
|
e30c446847
|
项目私有问题提示信息
|
10 years ago |
|
guange
|
86347cab89
|
现在可以通过rake redmine📧test[guange] 发送测试邮件
|
10 years ago |
|
whimlex
|
b61d76d94e
|
意见反馈
|
10 years ago |
|
guange
|
828d2caefa
|
邮件加入三个邮件设置
|
10 years ago |
|
guange
|
3f9abf170e
|
#2363 按天发送邮件相关标题修改
|
10 years ago |
|
whimlex
|
15d7cde055
|
意见反馈
|
10 years ago |
|
sw
|
de192761b8
|
Merge branch 'szzh' into guange_dev
Conflicts:
Gemfile
config/application.rb
|
10 years ago |
|
whimlex
|
86bd708c5d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
21f08830df
|
意见反馈功能修改
|
10 years ago |
|
guange
|
336dba414e
|
缓存修改为redis存储
|
10 years ago |
|
huang
|
154ee9f38b
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
2f021aecee
|
项目成员列表添加角色。用户得分
|
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 |
|
huang
|
49f33dd50c
|
类型bug修复
|
10 years ago |
 lizanle
|
0de5ddd14c
|
题型用户上传百度云
|
10 years ago |
|
huang
|
be5c7ac6dd
|
修改项目类型术语
图标
|
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 |
|
whimlex
|
ab93d19b56
|
动态中显示更新项目缺陷样式异常
|
10 years ago |
|
whimlex
|
84d7e63d54
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
whimlex
|
6195f0a150
|
课程动态添加问卷发布，为通过问卷动态访问课程问卷做权限判断
|
10 years ago |
|
huang
|
dd25cdc065
|
1、修改项目三种类型术语
2、未登录情况下缺陷提交bug
3、width果断空白处点击进入
|
10 years ago |
|
alanlong9278
|
945192f1d8
|
添加memcached配置
Signed-off-by: alanlong9278 <547533434@qq.com>
|
10 years ago |
|
whimlex
|
05712c4c06
|
学生作业改为作品
|
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 |
|
lizanle
|
54f8079ba6
|
去掉html符号
|
10 years ago |
|
lizanle
|
3bba1f93b4
|
版本库名输入条件描述去掉换行符
|
10 years ago |
|
sw
|
9f862ad7a7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
a8b1ca10b3
|
1、学生作业 --> 作品
2、学生交了作品之后显示修改作品
|
10 years ago |
|
huang
|
d1e7777040
|
关注列表样式
|
10 years ago |
|
huang
|
440eb8dc7f
|
1、修改项目成员一排显示
2、项目动态显示强制换行
3、讨论区提示用语
|
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 |
|
huang
|
bd800a53e4
|
项目简介显示
|
10 years ago |
|
sw
|
0cc809c3e0
|
实现课程资源TAG云功能
|
10 years ago |
|
huang
|
104075b3fd
|
修改缺陷留言方式
|
10 years ago |
|
sw
|
676cf8f180
|
课程上传资源是根据上传的类型，对资源添加默认的TAG
|
10 years ago |
|
huang
|
b7537ad518
|
修改新闻中测出的bug，
讨论区中附件显示形式
|
10 years ago |
|
huang
|
b8058c3e12
|
用户邀请加入的时候增加拒绝功能
删除提示星系修改
申请加入模块样式调整
|
10 years ago |
|
huang
|
5ae5cfda03
|
项目配置添加申请加入
删除成员局部刷新
编辑成员局部刷新
项目动态国际化错误
|
10 years ago |
|
sw
|
ead0ffb2f4
|
Merge branch 'develop' into szzh
|
10 years ago |
|
sw
|
fadca9128f
|
完成项目朋友圈、开发组、科研组直接的切换功能
|
10 years ago |
|
guange
|
eb4d9a4ffc
|
1. 将session改为跨子域。 2. 将session的存储改到files/cache_store下，用于nfs
|
10 years ago |
|
whimlex
|
cf4451e998
|
pre标签换行；contest主页样式调整
|
10 years ago |
|
huang
|
78868b34f0
|
修改缺陷中四中颜色按钮会折断换行的bug
区别新闻和通知
|
10 years ago |
|
whimlex
|
7e46885f3d
|
修改上传附件数目限制
|
10 years ago |
|
whimlex
|
5936d8d8e9
|
评论显示
|
10 years ago |
|
whimlex
|
38391b7e96
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
6ff1a7d692
|
问题顶和踩国际化
|
10 years ago |
|
guange
|
8454e56ff4
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
guange
|
123fa079b3
|
smtp配置放入production
|
10 years ago |
|
huang
|
33abbaffe1
|
修改isuue显示界面
附件显示形式
国际化
部分样式调整
|
10 years ago |
|
whimlex
|
e148917865
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
69153d2d95
|
项目界面缺失翻译调整
|
10 years ago |
|
guange
|
a344fcdfc7
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
guange
|
f94184bc81
|
个人动态权限部分性能优化
|
10 years ago |
|
whimlex
|
1fae44b201
|
用户主页国际化修改
|
10 years ago |
|
whimlex
|
2a35e771c2
|
项目界面国际化及样式调整；标签模块国际化及样式调整
|
10 years ago |
|
guange
|
c489d2400b
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
guange
|
e6780cc2fb
|
加入delayedjob配置文件
|
10 years ago |
|
whimlex
|
9ef212b6d3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
bcf83328f2
|
项目界面国际化
|
10 years ago |
|
huang
|
e907f5e3e4
|
1.解决缺陷列表图片不显示
2、项目种类页面局部刷新
3、工具栏调整
4.项目新增字段（判断种类）
|
10 years ago |
|
sw
|
7303253c07
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
988f8b7918
|
增加隐藏非项目信息按钮以及路由
实现点击按钮事数据的存储与修改
修改配置文件
|
10 years ago |
|
huang
|
4d4e1cac8b
|
完成新的邮件邀请界面
|
10 years ago |
|
lizanle
|
13273cecf1
|
app的创建动态描述
|
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 |
|
lizanle
|
5299d2d332
|
删除demo代码
|
10 years ago |
|
sw
|
a1a761266b
|
Merge branch 'szzh' into guange_dev
|
10 years ago |
|
whimlex
|
2ef224556e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
aa64b47d74
|
资源按时间倒序显示；新建课程设置公开私有属性；课程动态（动态统计主要在作业和作品上存在问题，动态显示在作品和留言中存在权限问题）；课程动态格式调整
|
10 years ago |
|
guange
|
56df5ce9a7
|
优化zip重复打包问题
|
10 years ago |
|
guange
|
9cefb9f339
|
每日发送取日期不对
|
10 years ago |
|
guange
|
b23892e29e
|
在application中去除observer
|
10 years ago |
|
guange
|
618e8c017c
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
Conflicts:
db/schema.rb
|
10 years ago |
|
z9hang
|
5eac727584
|
项目资源模块功能完成（样式尚未调整，代码尚未应用）
|
10 years ago |
|
guange
|
02e83ea776
|
将邮件发送放到后台进程中
|
10 years ago |
|
guange
|
77134c8dde
|
将每日邮件移入crontab
|
10 years ago |
|
z9hang
|
eabcd4e92b
|
项目资源模块新界面（列表显示，排序等功能，样式尚未调）
|
10 years ago |
|
guange
|
c1ed8bd36d
|
#2096 course、forge的邮件通知系统，改为可以每日一报、一事一报、不报
|
10 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
|
10 years ago |
|
sw
|
21db854adb
|
Merge branch 'develop' into szzh
|
10 years ago |
|
sw
|
fcc4275a36
|
Merge branch 'sw_new_course' into szzh
|
10 years ago |
|
whimlex
|
54908423bc
|
课程--作业附件显示问题;问题跟踪附件显示问题
|
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
|
2bb7153131
|
去掉作业打包下载功能
|
10 years ago |
|
sw
|
090190f3e6
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
sw
|
ab7d12e514
|
1、修改、删除分班是js方法重构
2、验证分班名是否重复重构
|
10 years ago |
|
whimlex
|
4de0255ce6
|
邀请邮件国际化；js冲突
|
10 years ago |
|
z9hang
|
30cb622abd
|
评论显示页面修改
|
10 years ago |
|
whimlex
|
05d17361e9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/projects/invite_members_by_mail.html.erb
|
10 years ago |
|
whimlex
|
1452e09154
|
邮件邀请邮箱格式自动填充；部分国际化
|
10 years ago |
|
guange
|
15accd7d9f
|
下载功能优化, 功能已实现
|
10 years ago |
|
z9hang
|
19eaa012b7
|
讨论区样式调整
|
10 years ago |
|
z9hang
|
cb278e65a2
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
public/javascripts/course.js
public/stylesheets/courses.css
|
10 years ago |
|
sw
|
5139ac30dc
|
修改老师新建作业界面
|
10 years ago |
|
z9hang
|
aaf14d5d1a
|
修改课程通知页面
|
10 years ago |
|
huang
|
a17458f132
|
1、户登录名可以在“修改信息”中修改
2、缺陷统计国家化及显示样式调整。
|
10 years ago |
|
sw
|
36bd04cc7a
|
国际化课程作业列表
|
10 years ago |
|
huang
|
1e1ee9a248
|
修改邮箱匹配错误后提示语
|
10 years ago |
|
huang
|
fd9eaa93d6
|
关注添加+号；去掉css文件中多余符号引起的样式问题
|
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 |
|
z9hang
|
5278d4dd2b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
z9hang
|
4ca5687b3b
|
#2072测试版--项目--问题跟踪：成功新建问题后建议提示信息为“问题已创建”就好
|
10 years ago |
|
whimlex
|
93838f604d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
3837e1fcf5
|
申请加入：附件上传
|
10 years ago |
|
guange
|
e007920cb6
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
Conflicts:
Gemfile
app/views/attachments/_form.html.erb
|
10 years ago |
|
whimlex
|
45475c3612
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
6995ead66c
|
项目ID
|
10 years ago |
 dingxu
|
f4dff55377
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
dingxu
|
073cb07f70
|
邀请平台用户：角色、用户都为空添加提示、单一角色提示信息修改、
展开条样式修改
|
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 |
|
z9hang
|
2a3a70b7d5
|
app接口部分信息国际化
|
10 years ago |
|
whimlex
|
7e8ee49298
|
资源库国际化
|
10 years ago |
|
sw
|
423849ca84
|
加入课程、退出课程、配置、关闭、复制等按钮
|
10 years ago |
|
sw
|
64b0646281
|
base_course基本完成
|
10 years ago |
|
guange
|
6c87cd40c1
|
加入git回调接口
|
10 years ago |
|
whimlex
|
cfaf788e37
|
新版项目成员，关注者，资源库国际化；修改国际化缺失的bug
|
10 years ago |
|
sw
|
4d60a6dabc
|
1、修改版权
2、增加footer
|
10 years ago |
|
whimlex
|
e8da6ef871
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
50fe8f2bb7
|
项目配置模块
|
10 years ago |
