 huang
|
3afdeda4d3
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
af7e507279
|
合并权限
|
9 years ago |
|
huang
|
3ef2509d27
|
报告人员加入项目不用提醒
|
9 years ago |
 cxt
|
e7e873e0df
|
Merge branch 'dev_shcool' into develop
Conflicts:
app/helpers/users_helper.rb
|
9 years ago |
|
cxt
|
fb5a969fd3
|
消息弹窗
|
9 years ago |
|
cxt
|
3178700131
|
Merge branch 'cxt_course' into develop
|
9 years ago |
 daiao
|
7fbca5f260
|
单位审查消息及其BUG修复
|
9 years ago |
|
cxt
|
0d86a28c54
|
我的作业
|
9 years ago |
|
huang
|
dd768c2913
|
Merge branch 'cs_optimize_txz' into develop
Conflicts:
public/stylesheets/css/common.css
|
9 years ago |
|
huang
|
81ce93e88b
|
Merge branch 'rep_quality' into develop
|
9 years ago |
|
huang
|
43a4e0a2bf
|
fork成功不跳转提示
|
9 years ago |
|
huang
|
308b050612
|
link to路由问题
|
9 years ago |
|
huang
|
b62ac02c15
|
自身分支创建PR修改
|
9 years ago |
 Tim
|
56452d69f4
|
侧导航字体大小，颜色更改
|
9 years ago |
|
huang
|
4ec8cc9a50
|
PR新建相关功能完善
|
9 years ago |
|
huang
|
f3c0c25d76
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
9 years ago |
|
huang
|
b86b2299a7
|
fork分支选择 js
|
9 years ago |
|
Tim
|
c679b986d6
|
侧导航新增请求快捷链接
|
9 years ago |
|
huang
|
b297446778
|
select选择框
|
9 years ago |
|
huang
|
ab6acb460e
|
forke项目发送pull request API
|
9 years ago |
|
huang
|
f4bda16469
|
fork分支PR
|
9 years ago |
|
huang
|
5419103268
|
修改API(gitlab中创建所有pullrequest为Admin的问题)
|
9 years ago |
|
cxt
|
b7c05fed4a
|
首页样式和js调整
|
9 years ago |
|
huang
|
99fa39371d
|
接受请求ajax刷新
|
9 years ago |
|
huang
|
9eb084c3bd
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
Conflicts:
app/views/pull_requests/_show.html.erb
|
9 years ago |
|
huang
|
515649beb6
|
接受PR局部刷新及跳转
|
9 years ago |
|
Tim
|
33467d3152
|
已处理页面样式；新建时选择项目刷新分支js
|
9 years ago |
|
huang
|
54a9fadbd1
|
判断合并和未合并的pr
|
9 years ago |
|
huang
|
362e95d103
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
9 years ago |
|
huang
|
7084a3fed9
|
新建pull request的时候JS控制标题不能为空
|
9 years ago |
|
Tim
|
6f1b7f827e
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
9 years ago |
|
Tim
|
b8a40862ce
|
改变行代码格式化，不折行
|
9 years ago |
|
huang
|
1f5c4a800f
|
代码没有改动时候提示
|
9 years ago |
|
huang
|
0b3e1f558c
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
Conflicts:
app/views/pull_requests/show.html.erb
|
9 years ago |
|
huang
|
21747d02a2
|
新建PR成功后JS跳转HTML跳转，相关页面局部刷新，及错误提示
|
9 years ago |
|
cxt
|
6c7b53f7d4
|
首页左侧栏
|
9 years ago |
 yuanke
|
aaa1c01eed
|
微信动态分享图片修改
|
9 years ago |
|
Tim
|
f444d6fab0
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
Conflicts:
app/views/pull_requests/_form.html.erb
|
9 years ago |
|
Tim
|
cedff021ad
|
分支下拉框样式；改动样式；无合并内容提示
|
9 years ago |
|
huang
|
a62ede1a33
|
先建pull request及局部刷新
|
9 years ago |
|
huang
|
2e91da4f28
|
项目分支获取
|
9 years ago |
|
daiao
|
7f62de59e1
|
优化周二代码审查的代码
|
9 years ago |
|
huang
|
c20b679c22
|
PR new调整
|
9 years ago |
|
huang
|
f8b53b8dfc
|
Pull request列表页面分类
|
9 years ago |
|
huang
|
9f9eed2e27
|
隐藏编辑功能
|
9 years ago |
|
huang
|
22a8adb64e
|
添加统计数目
|
9 years ago |
|
huang
|
b8cccdffda
|
完成changes数据获取及展示
|
9 years ago |
|
huang
|
8e329db4d8
|
pull request commits样式调整
|
9 years ago |
|
huang
|
27e755a0a9
|
数据获取及展示
|
9 years ago |
|
cxt
|
f262447ff1
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/users/user_homeworks.html.erb
|
9 years ago |
|
cxt
|
cecf917764
|
从题库选用作业时增加提示：“您选中的题是“我收到的作业”，不能选用”
|
9 years ago |
|
Tim
|
a5fe620452
|
题库翻页居中对齐
|
9 years ago |
|
huang
|
0a9224d036
|
每次请求提交的代码
|
9 years ago |
|
cxt
|
bae775ec34
|
题库的搜索调整
|
9 years ago |
|
huang
|
be081f5c66
|
添加Api（提交内容，改动）及相关方法路由
|
9 years ago |
|
cxt
|
acc3ba121f
|
测试集的显示、新版分页
|
9 years ago |
|
cxt
|
718b13e6c1
|
新版题库
|
9 years ago |
|
huang
|
1cb6809bdf
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
Conflicts:
app/views/pull_requests/new.html.erb
|
9 years ago |
|
huang
|
182c861b30
|
创建pull request
|
9 years ago |
|
Tim
|
e7fa38e52c
|
pull request show页面
|
9 years ago |
|
yuanke
|
6ee6cdf28f
|
微信项目加入审核修改
|
9 years ago |
|
daiao
|
5f969c6593
|
单位审核相关Bug修复
|
9 years ago |
|
yuanke
|
65719add19
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
guange
|
6f2b84570f
|
去除调试模式
|
9 years ago |
|
guange
|
2a67ec5407
|
配置登录页菜单
|
9 years ago |
|
guange
|
2632f7aa59
|
引入wechat js sdk
|
9 years ago |
|
huang
|
5e9c27b63d
|
代码封装
|
9 years ago |
|
Tim
|
b91bb1f0d2
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
9 years ago |
|
Tim
|
c8dce2c2fc
|
请求处理页面
|
9 years ago |
|
huang
|
56a444dac0
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
9 years ago |
|
huang
|
3ce1ac80b4
|
pull_request ---> new
|
9 years ago |
|
Tim
|
09f25588a8
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
9 years ago |
|
Tim
|
7e440596ab
|
新建请求，js效果
|
9 years ago |
|
huang
|
20bdd23665
|
pull requtst show
|
9 years ago |
|
huang
|
d286d3fe06
|
pullrequest头部
|
9 years ago |
|
Tim
|
3e95b070d0
|
合并请求代码
|
9 years ago |
|
huang
|
7658844a28
|
鼠标经过弹框消息提示
|
9 years ago |
|
huang
|
94b36e227c
|
申请加入项目消息刷新，同时更新其它管理员的消息状态
|
9 years ago |
|
Tim
|
9af8757ceb
|
项目合并请求
|
9 years ago |
|
Tim
|
1fc617d5fa
|
pull request页面删除
|
9 years ago |
|
Tim
|
e33bbfff3f
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
9 years ago |
|
huang
|
b718803bd9
|
修改控制器名称及控制器查询访问权限
|
9 years ago |
|
Tim
|
be36755d95
|
代码合并页面
|
9 years ago |
|
huang
|
685f9d8090
|
项目左侧权限控制
|
9 years ago |
|
daiao
|
24783705b5
|
Merge branch 'dev_shcool' into develop
|
9 years ago |
|
daiao
|
0ffeec64e3
|
单位审核bug修复
|
9 years ago |
|
huang
|
7c4759f3b7
|
项目左侧添加pull request入口
|
9 years ago |
|
daiao
|
fc1fc0bd7d
|
单位审核bug修复
|
9 years ago |
|
huang
|
96b04f39b1
|
pull requests框架搭建（路由控制器、views）
|
9 years ago |
|
Tim
|
08b8e3f1cb
|
加入班级，项目弹框定位js重写
|
9 years ago |
|
cxt
|
18539b45de
|
Merge branch 'dev_shcool' into develop
|
9 years ago |
|
daiao
|
5272f20de8
|
单位审核bug的修复
|
9 years ago |
|
huang
|
3feb0680cc
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
f7e8c5232c
|
个人主页加入项目，如果已经申请了则提示已申请
|
9 years ago |
|
cxt
|
87e3707b52
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
0ac906a5cf
|
消息列表报500
|
9 years ago |
|
daiao
|
6ea829131b
|
单位列表发送消息样式调整
|
9 years ago |
|
daiao
|
15227907ea
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
daiao
|
db690bedab
|
单位名称列表缺陷修复
|
9 years ago |
|
huang
|
21eed9ebb3
|
去掉同意拒绝“：”
|
9 years ago |
|
cxt
|
bf529f07a5
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
97288d4eb4
|
按钮样式
|
9 years ago |
|
cxt
|
23bb010315
|
课程列表的资源数显示不对
|
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 |
|
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
|
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 |
|
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
|
de46c5d9ca
|
Merge branch 'weixin_guange' into develop
|
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 |
|
huang
|
b1f69140c7
|
issue用户添加链接，issue链接颜色修改
|
9 years ago |
|
Tim
|
52475099dc
|
博客设为主页后，文字整个容器宽度显示；班级配置图标菜单css冲突处理；大纲样式冲突处理
|
9 years ago |
|
cxt
|
35b3993c0c
|
未提交的作品去掉提示
|
9 years ago |
|
cxt
|
a1149c1104
|
班级列表的公开私有
|
9 years ago |
|
huang
|
43cb2a0d18
|
单位申请消息显示
|
9 years ago |
|
huang
|
29edd60ce6
|
Merge branch 'daiao_dev' into dev_shcool
|
9 years ago |
|
daiao
|
9e788c9b6f
|
单位批准及消息框架搭建
|
9 years ago |
|
cxt
|
aafe0aa4ae
|
删除班级留言时左侧导航栏的样式问题
|
9 years ago |
|
cxt
|
4422bb1bc0
|
课程列表中的私有班级不可访问
|
9 years ago |
|
cxt
|
76eca76728
|
作业发布时资源库的提示修改
|
9 years ago |
|
cxt
|
a0f2f518cf
|
回复他人的博客首页不应跳到自己的博客首页
|
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
|
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
|
463c09f02c
|
项目邀请弹框
|
9 years ago |
|
daiao
|
4646d13234
|
1.修改资源课程名称，竟可能显示全。
2.班级动态下，去掉“班级动态>”
|
9 years ago |
|
daiao
|
5883b451ca
|
在管理员界面添加单位名称列表
|
9 years ago |
|
huang
|
774650c819
|
项目邀请码直接数据库读取，权限修改
|
9 years ago |
|
cxt
|
1e0ed2bfba
|
新建课程和班级时的占位符需要更改
|
9 years ago |
|
cxt
|
812481d5fa
|
非班级成员邀请码显示为*****
|
9 years ago |
|
huang
|
84d1adbf25
|
生成邀请码
|
9 years ago |
|
cxt
|
0564ddb6ea
|
课程大纲的回复
|
9 years ago |
|
daiao
|
9ff728f080
|
Merge branch 'develop' into daiao_dev
Conflicts:
app/views/layouts/_syllabus_base_info.html.erb
|
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 |
|
huang
|
8dbdebe02e
|
修改动态问题
|
9 years ago |
|
cxt
|
6b1116dfd1
|
课程的回复和名称的编辑
|
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 |
