 huang
|
07ff420a6a
|
退出项目的时候清楚申请信息
|
9 years ago |
 daiao
|
db690bedab
|
单位名称列表缺陷修复
|
9 years ago |
|
huang
|
21eed9ebb3
|
去掉同意拒绝“：”
|
9 years ago |
|
huang
|
08b1f0c266
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
b1fd7048fe
|
报告人员问题
|
9 years ago |
|
huang
|
97288d4eb4
|
按钮样式
|
9 years ago |
 cxt
|
bf529f07a5
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
23bb010315
|
课程列表的资源数显示不对
|
9 years ago |
 yuanke
|
7d0d208676
|
Merge branch 'dev_shcool' of https://git.trustie.net/jacknudt/trustieforge into dev_shcool
|
9 years ago |
|
yuanke
|
dce84484ff
|
修改单位的省市个人资料省市也得修改
|
9 years ago |
|
daiao
|
911a769670
|
Merge branch 'develop' into dev_shcool
Conflicts:
app/models/applied_message.rb
|
9 years ago |
|
daiao
|
5b93d40f67
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/assets/wechat/app.html
public/assets/wechat/new_project.html
public/javascripts/wechat/directives/ellipsis.js
public/stylesheets/weui/weixin.css
|
9 years ago |
|
daiao
|
641ccee631
|
修改名称过长问题
|
9 years ago |
|
cxt
|
98a2ebd682
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
4a800b67d8
|
消息列表报500
|
9 years ago |
|
cxt
|
a41fbdb985
|
课程大纲报500
|
9 years ago |
|
daiao
|
39478eb4e4
|
Merge branch 'dev_shcool' of https://git.trustie.net/jacknudt/trustieforge into dev_shcool
Conflicts:
app/views/admin/applied_schools.html.erb
app/views/admin/has_applied_schools.html.erb
|
9 years ago |
|
cxt
|
ebb336afa0
|
课程大纲的二级回复
|
9 years ago |
|
daiao
|
d6178ec7dd
|
管理员界面单位申请
|
9 years ago |
|
yuanke
|
1704462986
|
管理员界面单位申请修改
|
9 years ago |
|
cxt
|
04b9c35a05
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
807db1ac40
|
课程角色申请链接的样式
|
9 years ago |
|
huang
|
847cae6d41
|
Merge branch 'develop' into rep_quality
Conflicts:
app/models/applied_message.rb
db/schema.rb
|
9 years ago |
|
huang
|
cf63d252e2
|
局部刷新
|
9 years ago |
|
huang
|
5414080646
|
删除用户和拒绝用户可以再申请
|
9 years ago |
|
yuanke
|
1f47eb5ea8
|
单位申请列表修改
|
9 years ago |
|
huang
|
f857ceab32
|
消息中项目添加title
|
9 years ago |
|
huang
|
8d625eff5e
|
修改方式就用户图像显示
|
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 |
|
daiao
|
430a93e4b2
|
单位名称列表功能代码
|
9 years ago |
|
cxt
|
02bee33ad2
|
身份切换加提示
|
9 years ago |
|
huang
|
0bf9b5c6e6
|
消息红点记录 个人主页添加加入项目入口
|
9 years ago |
|
cxt
|
d0f83aab64
|
去掉姓和名之间的空格
|
9 years ago |
|
cxt
|
b3d34d6e0f
|
配置班级列表的名称显示全
|
9 years ago |
|
huang
|
153efb7eda
|
局部刷新
|
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
|
60417b2db7
|
项目邀请消息样式问题
|
9 years ago |
|
cxt
|
5a8d2407e2
|
放开新建课程、新建班级的权限
|
9 years ago |
|
cxt
|
335b82c046
|
加入班级的弹框
|
9 years ago |
|
huang
|
48a72ff816
|
代码分析结果入口放置在版本库
|
9 years ago |
|
huang
|
824b430fbd
|
解决质量分支弹出空白页面问题
|
9 years ago |
|
cxt
|
a1553c7a8f
|
角色的修改
|
9 years ago |
|
daiao
|
5b30036639
|
单位名称列表功能
|
9 years ago |
|
huang
|
769a07bd94
|
去掉配置页面的成员申请
|
9 years ago |
|
huang
|
450217e7c2
|
同意加入消息发送，及添加成员
|
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 |
|
yuanke
|
22897af6c3
|
Merge branch 'weixin_guange' into develop
|
9 years ago |
|
yuanke
|
ca60496e7b
|
微信 新建项目默认为私有
|
9 years ago |
|
yuanke
|
603a00fde3
|
Merge branch 'weixin_guange' into develop
|
9 years ago |
|
yuanke
|
1489ab015a
|
微信模版消息标题加上句号
|
9 years ago |
|
yuanke
|
de46c5d9ca
|
Merge branch 'weixin_guange' into develop
|
9 years ago |
|
yuanke
|
93844e757c
|
微信：角色配置后返回角色界面、修改开发为开放、创建项目发送消息项目名称修改
|
9 years ago |
|
huang
|
a8fa4a55e3
|
项目申请消息发送
|
9 years ago |
|
yuanke
|
283dc86a8b
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
Conflicts:
db/schema.rb
public/assets/wechat/homework_detail.html
public/javascripts/wechat/controllers/activity.js
|
9 years ago |
|
yuanke
|
6d594cfcbe
|
git pull后重新commit
|
9 years ago |
|
yuanke
|
cf65e6748b
|
微信项目相关功能开发，班级角色功能等
|
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
|
7413298aad
|
项目邀请码申请及弹框
|
9 years ago |
|
cxt
|
e275cd9aa0
|
邀请码
|
9 years ago |
|
cxt
|
e2546cdcb7
|
邀请码的提示
|
9 years ago |
|
cxt
|
2fea69359d
|
非本课程成员无法看到邀请码
|
9 years ago |
|
cxt
|
0dfc887f74
|
复制班级中资源的提示修改
|
9 years ago |
|
yuanke
|
4fe60bfc97
|
微信课程角色修改
|
9 years ago |
|
huang
|
b1f69140c7
|
issue用户添加链接，issue链接颜色修改
|
9 years ago |
 Tim
|
52475099dc
|
博客设为主页后，文字整个容器宽度显示；班级配置图标菜单css冲突处理；大纲样式冲突处理
|
9 years ago |
|
yuanke
|
653b98d832
|
微信增加项目相关内容
|
9 years ago |
|
cxt
|
35b3993c0c
|
未提交的作品去掉提示
|
9 years ago |
|
cxt
|
a1149c1104
|
班级列表的公开私有
|
9 years ago |
|
huang
|
43cb2a0d18
|
单位申请消息显示
|
9 years ago |
|
huang
|
2f79e521ca
|
单位批准发送消息；申请单位给系统每位管理员发送消息
|
9 years ago |
|
huang
|
29edd60ce6
|
Merge branch 'daiao_dev' into dev_shcool
|
9 years ago |
|
daiao
|
9e788c9b6f
|
单位批准及消息框架搭建
|
9 years ago |
|
daiao
|
f35b33b09e
|
单位申请记录用户信息（添加user_id）
|
9 years ago |
|
cxt
|
aafe0aa4ae
|
删除班级留言时左侧导航栏的样式问题
|
9 years ago |
|
cxt
|
4422bb1bc0
|
课程列表中的私有班级不可访问
|
9 years ago |
|
cxt
|
76eca76728
|
作业发布时资源库的提示修改
|
9 years ago |
guange
|
c5dd2eaf41
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
9 years ago |
|
cxt
|
a0f2f518cf
|
回复他人的博客首页不应跳到自己的博客首页
|
9 years ago |
|
cxt
|
1f8fa1c70a
|
班级动态去掉“>”
|
9 years ago |
|
cxt
|
d17a9dabd8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/helpers/courses_helper.rb
|
9 years ago |
|
daiao
|
0d59f5a358
|
Merge branch 'daiao_dev' into develop
|
9 years ago |
|
cxt
|
04207609cb
|
未配置课程的班级打开报500
|
9 years ago |
|
cxt
|
feb45a07bf
|
课程列表分为我创建的课程和我加入的课程
|
9 years ago |
|
huang
|
f12423e8a6
|
issue动态中不能删除问题
|
9 years ago |
|
huang
|
d51295127d
|
issue删除回复删除附件的问题 同事关联删除
|
9 years ago |
|
daiao
|
3661969528
|
修改课程下，课件名称，显示尽可能全
|
9 years ago |
|
daiao
|
1dcf4918b9
|
非管理员用户在新建帖子时，置顶及锁定功能在页面不显示
|
9 years ago |
|
huang
|
e7f862458f
|
issue回复问题； 二级回复编辑issue弹空白框问题
|
9 years ago |
|
daiao
|
6ab2c15504
|
修复先删除课程下的某班级，再删除该课程报错
|
9 years ago |
|
huang
|
b01e228d51
|
修复issue回复不能点击的问题
|
9 years ago |
|
huang
|
2c8f94c899
|
去掉ID转换成用户login
|
9 years ago |
|
huang
|
463c09f02c
|
项目邀请弹框
|
9 years ago |
|
yuanke
|
04e9551450
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
daiao
|
67bdea314a
|
作品列表-分班过滤：点击“请选择分班”过滤显示所有学生
|
9 years ago |
|
daiao
|
4646d13234
|
1.修改资源课程名称，竟可能显示全。
2.班级动态下，去掉“班级动态>”
|
9 years ago |
|
daiao
|
5883b451ca
|
在管理员界面添加单位名称列表
|
9 years ago |
|
guange
|
6a871e2116
|
.
|
9 years ago |
|
yuanke
|
4f803ce0de
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
db7c267a47
|
微信单个项目动态
|
9 years ago |
|
guange
|
9d2900d58f
|
解决没绑定用户不跳转到绑定页问题
|
9 years ago |
|
guange
|
fb91309646
|
merge
|
9 years ago |
|
huang
|
774650c819
|
项目邀请码直接数据库读取，权限修改
|
9 years ago |
|
yuanke
|
b9b9a867f4
|
项目
|
9 years ago |
|
cxt
|
1e0ed2bfba
|
新建课程和班级时的占位符需要更改
|
9 years ago |
|
cxt
|
812481d5fa
|
非班级成员邀请码显示为*****
|
9 years ago |
|
huang
|
84d1adbf25
|
生成邀请码
|
9 years ago |
|
huang
|
920a599417
|
Merge branch 'develop' into rep_quality
|
9 years ago |
|
huang
|
7984affe36
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
be88914e39
|
去掉id转换用户名
|
9 years ago |
|
cxt
|
0564ddb6ea
|
课程大纲的回复
|
9 years ago |
|
huang
|
35172dab59
|
管理员界面单位申请框架
|
9 years ago |
|
daiao
|
9ff728f080
|
Merge branch 'develop' into daiao_dev
Conflicts:
app/views/layouts/_syllabus_base_info.html.erb
|
9 years ago |
|
cxt
|
df80362899
|
增加空格
|
9 years ago |
|
huang
|
1320097bf9
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
43c6301223
|
id转换成用户名
|
9 years ago |
|
cxt
|
11c9fba7e7
|
提示信息修改
|
9 years ago |
|
cxt
|
dc9c0f924b
|
教师列表和学生列表的样式
|
9 years ago |
|
cxt
|
48d5b89338
|
课程推荐为0的不显示
|
9 years ago |
|
cxt
|
60fe1854cd
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
ab4d85dcb7
|
组织500问题
|
9 years ago |
|
cxt
|
6c7925a7b4
|
样式调整
|
9 years ago |
|
cxt
|
45fb2d0a3e
|
Merge branch 'develop' into cxt_course
|
9 years ago |
|
cxt
|
6d4835c6cc
|
样式调整
|
9 years ago |
|
cxt
|
808b553e43
|
班级动态只有10条，底部却显示“点击展开更多”
|
9 years ago |
|
huang
|
0e1a52726f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/base_syllabus.html.erb
|
9 years ago |
|
huang
|
4d79f93079
|
Merge branch 'cs_optimize_txz' into develop
|
9 years ago |
|
cxt
|
27fa113de1
|
组织动态报500
|
9 years ago |
|
cxt
|
27afee03b2
|
编辑课程的英文名称时输入框不清空
|
9 years ago |
|
cxt
|
02a5254943
|
课程大纲的回复展开更多无反应
|
9 years ago |
|
huang
|
8dbdebe02e
|
修改动态问题
|
9 years ago |
|
cxt
|
6b1116dfd1
|
课程的回复和名称的编辑
|
9 years ago |
|
huang
|
19734c1aa4
|
组织匿名用户问题
|
9 years ago |
|
yuanke
|
cdb7782849
|
除了issue 和news都增加了二级回复显示
|
9 years ago |
|
cxt
|
9422e2886c
|
新版班级主页
|
9 years ago |
|
huang
|
6fea64afe2
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
537cc20e06
|
已repository_id为范围，version唯一性控制
|
9 years ago |
|
cxt
|
1e28ff880d
|
新版课程大纲
|
9 years ago |
|
huang
|
ff8cad5cf2
|
项目动态中添加提交动态
|
9 years ago |
|
huang
|
4e4ff4958f
|
修改changeset触发事件
|
9 years ago |
|
huang
|
466a25c121
|
提交后更新项目动态表update时间
|
9 years ago |
|
huang
|
246923a335
|
版本库新增提交次数表，增加至项目动态
|
9 years ago |
|
yuanke
|
86731c34d5
|
单个课程作业不显示的BUG修改，加入班级时如果班级已被删除需要提示!
|
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 |
|
yuanke
|
f0840d0f31
|
Merge branch 'develop' into weixin_guange
|
9 years ago |
|
cxt
|
60bbe89c0d
|
博客的自动保存
|
9 years ago |
|
yuanke
|
7cd505ea4b
|
博客详情动态加入二级回复的展开功能一级一级回复的更多功能。
|
9 years ago |
|
cxt
|
9a4c210d16
|
组织文章的“点击展开隐藏楼层”
|
9 years ago |
|
cxt
|
0146ac1f11
|
访问他人主页时，对于动态过滤按钮，“我的动态”应改为“他的动态”；但浏览自己的主页时，应该显示为“我的动态”。
|
9 years ago |
|
cxt
|
c84a9e6e10
|
个人主页，不需要对其他用户显示关注人的动态。例如，我看周老师的个人主页时，不应该显示我的博客动态；但他本人看自己的主页时，应该显示尹刚的博客动态，因为他关注我了。
|
9 years ago |
|
cxt
|
f3c95906d8
|
项目缺陷的二级回复
|
9 years ago |
|
Tim
|
53c515b8d1
|
课程大纲侧导航js控制
|
9 years ago |
|
daiao
|
7c2495c8a1
|
统一在线测验新建单选选项时，样式出现的bug
|
9 years ago |
|
daiao
|
b7cf7a2468
|
Merge branch 'develop' into daiao_dev
|
9 years ago |
|
huang
|
d58167f4bc
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
9 years ago |
|
huang
|
6357f5be2a
|
解决成员列表获取单位不准确的问题
|
9 years ago |
|
huang
|
f979e80f24
|
Gitlab数据清理及迁移，主要是历史数据
|
9 years ago |
|
cxt
|
7853b8aa54
|
班级通知、项目新闻、帖子栏目通知的动态和详情页的二级回复， 二级回复代码的整合
|
9 years ago |
|
Tim
|
635b3beb32
|
新建issue版本图标问题
|
9 years ago |
|
Tim
|
5adc4e1e5a
|
项目issue上传附件与填写正确加间距
|
9 years ago |
|
Tim
|
bf87ffb992
|
组织历史版本弹框文件夹图标问题
|
9 years ago |
|
Tim
|
f3494489c2
|
Merge branch 'develop' into cs_optimize_txz
|
9 years ago |
|
Tim
|
78e4d37d8b
|
大纲base页引入弹框样式；作业列表调整
|
9 years ago |
|
daiao
|
a55e64dfb3
|
保持组织动态用户名颜色与其他动态用户名颜色显示一直
|
9 years ago |
|
yuanke
|
67e87df4d5
|
微信动态详情回复显示修改
|
9 years ago |
|
huang
|
3a43b7beb5
|
redirect to repository when delete jenkins job
|
9 years ago |
|
huang
|
e99c76a0de
|
resolve edit problem of jenkins job
|
9 years ago |
|
yuanke
|
1ce7b22c0e
|
博客动态回复二级回复修改
|
9 years ago |
|
huang
|
1935176500
|
Merge branch 'develop' into rep_quality
|
9 years ago |
|
huang
|
14e6db457b
|
rake
|
9 years ago |
|
guange
|
674c45f1d9
|
去掉上传的csrf报错
|
9 years ago |
|
daiao
|
763ebcbf74
|
修复课程总学时结果，总学时=理论学时+时间学时
|
9 years ago |
|
huang
|
0c0dfbd093
|
changeset关联
|
9 years ago |
|
daiao
|
7808bb5ebe
|
修复非管理远用户帖子出现管理员帖子置顶的问题
|
9 years ago |
|
Tim
|
eb503cc3e8
|
Merge branch 'develop' into cs_optimize_txz
|
9 years ago |
|
huang
|
cf04bb5ec6
|
迁移上线
|
9 years ago |
|
huang
|
26d4be6518
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
1a129722eb
|
Merge branch 'rep_quality' into develop
|
9 years ago |
|
huang
|
4e3bfd9254
|
some bugs for sonar show
|
9 years ago |
|
yuanke
|
ea88c92d31
|
测试用
|
9 years ago |
|
yuanke
|
bc1b4c1b85
|
班级邀请码弹框修改，我的动态回复数计算修改
|
9 years ago |
|
huang
|
c50ca34b0e
|
代码质量分析部分数据转换成整型
|
9 years ago |
|
huang
|
04fe06eff9
|
gitlab数据迁移
|
9 years ago |
|
Tim
|
1fc2bbd56a
|
作业资源库弹框，资源名称与上传者栏增加宽度限制
|
9 years ago |
|
huang
|
facf3ae8f8
|
提交次数写入动态中
|
9 years ago |
|
cxt
|
fdf925a0b8
|
个人主页留言动态：如图回复当前用户自己的留言却不能删除，“展开回复”后又可删除了，刷新网页后又删除不了
|
9 years ago |
|
guange
|
6c36ee2c28
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
guange
|
058b1e9d69
|
自动加载
|
9 years ago |
|
daiao
|
03d6afd1c4
|
优化上周动态获取代码
|
9 years ago |
|
cxt
|
8e3488132b
|
导入作业：公共题库中显示的却是我的题库，我的题库中显示的却是公共题库
|
9 years ago |
|
Tim
|
e966972750
|
Merge branch 'develop' into cs_optimize_txz
Conflicts:
app/views/versions/index.html.erb
|
9 years ago |
|
yuanke
|
ff13d2e572
|
微信增加作业发送，修改发送的权限，修改菜单
|
9 years ago |
|
cxt
|
9e5e7a75b0
|
编程作业关闭匿评后，老师点击模拟答题，却弹出匿评提示
|
9 years ago |
|
huang
|
412d74e295
|
优化最近动态获取方法
|
9 years ago |
