 huang
|
75971120f7
|
Merge branch 'develop' into rep_quality
|
9 years ago |
 cxt
|
85cd113cf9
|
日志修改
|
9 years ago |
 yuanke
|
4e6c58ae37
|
动态点提交如果没绑定则自动创建一个帐号绑定，然后注册的时候将已绑定的用户信息修改为注册的信息
|
9 years ago |
|
cxt
|
322868f063
|
班级的课程id变为空时打印日志
|
9 years ago |
|
yuanke
|
ea926395c3
|
Merge branch 'develop' into weixin_guange
|
9 years ago |
|
yuanke
|
b8155cc1c2
|
班级通知修改
|
9 years ago |
|
cxt
|
7edb30754b
|
student_works添加字段commit_time，记录学生作品实际的提交时间
|
9 years ago |
|
huang
|
5ad063b830
|
记录接受PR用户信息，并且唯一性判断
|
9 years ago |
 Tim
|
e85f9373c8
|
点回复按钮回复框获取焦点；班级通知内容冗余；班级、项目邀请文字更友善；班级、项目中人数后箭头与人数对齐；邀请码提示增加间距；回复中@删除链接；二维码页面增加默认加入身份提示；公众号联系我们文字更改
|
9 years ago |
|
huang
|
1588f5cfca
|
开发环境下不启动elastic
|
9 years ago |
|
yuanke
|
2b7ff3c76b
|
修改各个页面验证绑定登录的方式。
|
9 years ago |
|
cxt
|
5b8883960b
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
f5a2d6acdb
|
班级作品：学生提交作品弹出作品校验框，点击重试后，作品列表中默认生成的作品记录就没有了
|
9 years ago |
|
cxt
|
3178700131
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
0d86a28c54
|
我的作业
|
9 years ago |
|
huang
|
81ce93e88b
|
Merge branch 'rep_quality' into develop
|
9 years ago |
|
yuanke
|
55afb84aef
|
模版消息标题加上句号，审核模版消息再次点击显示修改
|
9 years ago |
|
yuanke
|
a34272027e
|
微信菜单及项目班级审核修改
|
9 years ago |
|
yuanke
|
4ab2427827
|
微信项目及课程申请审核相关功能
|
9 years ago |
|
yuanke
|
a4281b4934
|
Merge branch 'develop' into weixin_guange
|
9 years ago |
 daiao
|
fc1fc0bd7d
|
单位审核bug修复
|
9 years ago |
|
yuanke
|
fa43924330
|
微信项目二维码修改
|
9 years ago |
|
huang
|
c7f2ab0415
|
修复创建英文名字的项目标题为“为项目讨论区的问题”
|
9 years ago |
|
yuanke
|
f0cf7adcdf
|
加入项目邀请码
|
9 years ago |
|
daiao
|
911a769670
|
Merge branch 'develop' into dev_shcool
Conflicts:
app/models/applied_message.rb
|
9 years ago |
|
cxt
|
98a2ebd682
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
daiao
|
d6178ec7dd
|
管理员界面单位申请
|
9 years ago |
|
huang
|
847cae6d41
|
Merge branch 'develop' into rep_quality
Conflicts:
app/models/applied_message.rb
db/schema.rb
|
9 years ago |
|
daiao
|
3251890c91
|
Merge branch 'rep_quality' into dev_shcool
Conflicts:
app/models/applied_message.rb
db/schema.rb
|
9 years ago |
|
huang
|
643b06484b
|
消息表添加字段
|
9 years ago |
|
huang
|
0bf9b5c6e6
|
消息红点记录 个人主页添加加入项目入口
|
9 years ago |
|
cxt
|
d0f83aab64
|
去掉姓和名之间的空格
|
9 years ago |
|
cxt
|
e3d538c3fa
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/_course_base_info.html.erb
db/schema.rb
|
9 years ago |
|
cxt
|
72977886c7
|
Merge branch 'cs_optimize_txz' into cxt_course
Conflicts:
app/views/layouts/_course_base_info.html.erb
|
9 years ago |
|
huang
|
c07677ef99
|
项目邀请框架 拒绝消息
|
9 years ago |
|
cxt
|
a1a2b3dd33
|
Merge branch 'rep_quality' into cxt_course
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
848c56d54e
|
班级主页身份切换、成员管理页面的多重身份
|
9 years ago |
|
daiao
|
6bd9f47222
|
Merge branch 'dev_shcool' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
daiao
|
50ec127c5b
|
单位名称列表功能
|
9 years ago |
|
huang
|
a8fa4a55e3
|
项目申请消息发送
|
9 years ago |
|
yuanke
|
6d594cfcbe
|
git pull后重新commit
|
9 years ago |
|
huang
|
4a9eec0cce
|
完成项目邀请及公共弹框的封装
|
9 years ago |
|
huang
|
c6bc5c9cb8
|
Merge branch 'dev_shcool' into rep_quality
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
2f79e521ca
|
单位批准发送消息；申请单位给系统每位管理员发送消息
|
9 years ago |
|
daiao
|
9e788c9b6f
|
单位批准及消息框架搭建
|
9 years ago |
|
huang
|
d51295127d
|
issue删除回复删除附件的问题 同事关联删除
|
9 years ago |
|
huang
|
2c8f94c899
|
去掉ID转换成用户login
|
9 years ago |
guange
|
6a871e2116
|
.
|
9 years ago |
|
huang
|
774650c819
|
项目邀请码直接数据库读取，权限修改
|
9 years ago |
|
yuanke
|
b9b9a867f4
|
项目
|
9 years ago |
|
huang
|
84d1adbf25
|
生成邀请码
|
9 years ago |
|
huang
|
be88914e39
|
去掉id转换用户名
|
9 years ago |
|
huang
|
35172dab59
|
管理员界面单位申请框架
|
9 years ago |
|
huang
|
43c6301223
|
id转换成用户名
|
9 years ago |
|
huang
|
0e1a52726f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/base_syllabus.html.erb
|
9 years ago |
|
huang
|
537cc20e06
|
已repository_id为范围，version唯一性控制
|
9 years ago |
|
huang
|
4e4ff4958f
|
修改changeset触发事件
|
9 years ago |
|
huang
|
466a25c121
|
提交后更新项目动态表update时间
|
9 years ago |
|
huang
|
246923a335
|
版本库新增提交次数表，增加至项目动态
|
9 years ago |
|
cxt
|
71b5fe1273
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/issues_controller.rb
app/views/issues/_issue_replies.html.erb
app/views/issues/_issue_reply_ke_form.html.erb
db/schema.rb
|
9 years ago |
|
cxt
|
f3c95906d8
|
项目缺陷的二级回复
|
9 years ago |
|
huang
|
f979e80f24
|
Gitlab数据清理及迁移，主要是历史数据
|
9 years ago |
|
cxt
|
7853b8aa54
|
班级通知、项目新闻、帖子栏目通知的动态和详情页的二级回复， 二级回复代码的整合
|
9 years ago |
|
huang
|
14e6db457b
|
rake
|
9 years ago |
|
huang
|
0c0dfbd093
|
changeset关联
|
9 years ago |
|
huang
|
cf04bb5ec6
|
迁移上线
|
9 years ago |
|
huang
|
facf3ae8f8
|
提交次数写入动态中
|
9 years ago |
|
cxt
|
e260c0b7cc
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
05fe987a8b
|
新手注册三条留言
|
9 years ago |
|
yuanke
|
15ccf5cfbe
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
b4ac13c157
|
修改编程作业没main函数系统评分100的BUG
|
9 years ago |
|
guange
|
8279d9385c
|
区分是课程邀请，还是意见反馈
|
9 years ago |
|
guange
|
7c98e0f392
|
merge
|
9 years ago |
|
guange
|
5c0468f8fd
|
二维码过期改为一个月有效期
|
9 years ago |
|
guange
|
068c8967e1
|
新增班级时名称为1个字符时报错
|
9 years ago |
|
cxt
|
cc4b24cdb9
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
13bae8f8a5
|
线下作业
|
9 years ago |
|
huang
|
ef8b127225
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
public/javascripts/application.js
|
9 years ago |
|
huang
|
e588321ada
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
37dd447fcb
|
Merge branch 'daiao_dev' into cxt_course
Conflicts:
app/views/admin/courses.html.erb
public/stylesheets/new_user.css
|
9 years ago |
|
huang
|
b90c90bc60
|
add model error_list
|
9 years ago |
|
cxt
|
a99b03ff76
|
管理员界面增加配置课程
|
9 years ago |
|
cxt
|
c5840d75da
|
Merge branch 'daiao_dev' into cxt_course
Conflicts:
db/schema.rb
|
9 years ago |
|
yuanke
|
da19bbd3a0
|
优化了下修改资料界面的代码
|
9 years ago |
|
guange
|
48fb02a2d6
|
管理课程
|
9 years ago |
|
guange
|
60367415fa
|
新建课程功能完成
|
9 years ago |
|
cxt
|
18d677c5eb
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/courses.css
|
9 years ago |
|
cxt
|
bdaa9983e3
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
2c1e0f534c
|
课程大纲
|
9 years ago |
|
yuanke
|
dfd381fc99
|
Merge branch 'yuanke_org' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
yuanke
|
397c4cc2a5
|
1.重新发送注册邮件修改2.个人资料修改页面修改3.问题反馈处增加直接加入QQ群的按钮
|
9 years ago |
|
cxt
|
ebb697a49f
|
班级列表、课程大纲的编辑、回复、课程列表
|
9 years ago |
|
huang
|
2105d2bbdb
|
Merge branch 'develop' into rep_quality
Conflicts:
app/views/repositories/show.html.erb
db/migrate/20160624103411_add_name_to_quality_analyses.rb
db/schema.rb
|
9 years ago |
|
cxt
|
e066445036
|
课程大纲的显示和编辑
|
9 years ago |
|
guange
|
222855ea79
|
越过course表的validate,以防save invitecode 失败
|
9 years ago |
|
guange
|
3c425edc3c
|
修复邀请码会变的问题
|
9 years ago |
|
cxt
|
383483de26
|
课程大纲的左侧栏base，新建课程大纲、新建班级的调整
|
9 years ago |
Your Name
|
dd6b19a8b5
|
some status of sonar
|
9 years ago |
|
guange
|
1e6454efc0
|
加入我的资源
|
9 years ago |
|
guange
|
3b383dfa65
|
老师课程界面
|
9 years ago |
