 cxt
|
951390092b
|
我的作业报500
|
9 years ago |
|
cxt
|
322868f063
|
班级的课程id变为空时打印日志
|
9 years ago |
 huang
|
8eaeea299a
|
相同分支和项目消息JS提示
|
9 years ago |
 yuanke
|
03551dfba9
|
项目申请BUG修改
|
9 years ago |
|
yuanke
|
96bc405a19
|
修改项目申请相关BUG
|
9 years ago |
|
cxt
|
80b8fc4444
|
“我的作业”中有挂起的作业时会报500
|
9 years ago |
|
huang
|
3df8a46634
|
PUll request代码简化及reverse评论
|
9 years ago |
|
yuanke
|
14e70541db
|
平台加入项目发微信模版消息
|
9 years ago |
|
yuanke
|
ea926395c3
|
Merge branch 'develop' into weixin_guange
|
9 years ago |
|
yuanke
|
72a7a1e9f2
|
已是项目成员则之前的申请都改为拒绝
|
9 years ago |
|
huang
|
41ad5ca444
|
修改Gitlab接口返回创建时间
|
9 years ago |
|
yuanke
|
b8155cc1c2
|
班级通知修改
|
9 years ago |
 Tim
|
f4445619d2
|
题库预览弹框样式调整
|
9 years ago |
|
yuanke
|
f100d3ebea
|
项目发起人显示名称修改
|
9 years ago |
|
yuanke
|
a1dfdae58d
|
修改班级通知模版消息的跳转
|
9 years ago |
|
huang
|
a9942fd4b3
|
change integer to A
|
9 years ago |
|
Tim
|
59a76c3b9a
|
调整组织上传资源弹窗位置
|
9 years ago |
|
yuanke
|
0d69fa0cc0
|
微信私有动态内容加上提示
|
9 years ago |
|
cxt
|
bae0562b97
|
适用专业和先修课程的换行显示
|
9 years ago |
|
cxt
|
9b8470b813
|
编辑分组作业后点确定，原来设置的基于项目实施会被取消
|
9 years ago |
|
huang
|
88e35c7431
|
quality list
|
9 years ago |
|
yuanke
|
7c5240b386
|
微信 没登录动态回复会跳到绑定登录界面，私有内容需要是成员才能回复
|
9 years ago |
|
huang
|
1605ef601c
|
conflict
|
9 years ago |
|
huang
|
56afad9242
|
质量分析列表中添加时间和版本
|
9 years ago |
|
huang
|
b14cdb0b6d
|
some log
|
9 years ago |
|
cxt
|
d99348c245
|
测验描述超出边框
|
9 years ago |
|
Tim
|
83323e7d18
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
Tim
|
ba7f9ed735
|
班级、项目侧导航文字缩小
|
9 years ago |
|
huang
|
b046f24b44
|
合并信息提交
|
9 years ago |
|
cxt
|
7edb30754b
|
student_works添加字段commit_time，记录学生作品实际的提交时间
|
9 years ago |
|
huang
|
98a8702ba6
|
记录谁合并的pull request请求
|
9 years ago |
|
huang
|
5ad063b830
|
记录接受PR用户信息，并且唯一性判断
|
9 years ago |
|
cxt
|
71326c901d
|
学生在启动匿评后再提交作品，此时该学生及该学生的作品是不被匿评的，应该是“查看作品”
|
9 years ago |
|
Tim
|
f5f88c5204
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
57737ff15d
|
微信细节优化
|
9 years ago |
|
Tim
|
e85f9373c8
|
点回复按钮回复框获取焦点；班级通知内容冗余；班级、项目邀请文字更友善；班级、项目中人数后箭头与人数对齐；邀请码提示增加间距；回复中@删除链接；二维码页面增加默认加入身份提示；公众号联系我们文字更改
|
9 years ago |
|
huang
|
8af8147ebb
|
代码分析列表加上时间
|
9 years ago |
|
cxt
|
a50ac2d79d
|
禁用匿评的作业提交时不要显示“提示：作品名称和描述中不要出现真实的姓名信息”的提示
|
9 years ago |
|
huang
|
8270344794
|
job
|
9 years ago |
|
huang
|
f2a13540a2
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
9 years ago |
|
huang
|
e2557aede8
|
test jenkins
|
9 years ago |
|
cxt
|
0cc9fafddb
|
“关注、粉丝”页面中分页显示要紧跟上面的内容
|
9 years ago |
|
cxt
|
0ed508a887
|
题库预览弹窗的调整
|
9 years ago |
|
huang
|
5ae59f6b6c
|
邀请码去掉前后空格
|
9 years ago |
|
yuanke
|
66357c4024
|
修改分享链接
|
9 years ago |
|
cxt
|
9594aada50
|
Merge branch 'cxt_course' into develop
Conflicts:
public/javascripts/application.js
|
9 years ago |
|
cxt
|
a3011c319b
|
我的题库显示我的所有作业
|
9 years ago |
|
huang
|
1588f5cfca
|
开发环境下不启动elastic
|
9 years ago |
|
cxt
|
8de8035441
|
班级首页顶部加上主讲老师的链接
|
9 years ago |
|
huang
|
4f3b41f323
|
详情页面提供分页（评论、变更、提交）
|
9 years ago |
|
cxt
|
65f6b0fc70
|
新建课程报500
|
9 years ago |
|
huang
|
867434531d
|
pull request 列表页面添加分页
|
9 years ago |
|
cxt
|
4a527dc84e
|
Merge branch 'cs_optimize_txz' into develop
|
9 years ago |
|
cxt
|
739edd68bf
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
c891a41ef1
|
打印log
|
9 years ago |
|
huang
|
dcdc09d864
|
修改gitlab api接口
|
9 years ago |
|
huang
|
87c5f50545
|
PULL request 评论创建及局部刷新
|
9 years ago |
|
yuanke
|
001b48869d
|
微信：修改一些头像的路径
|
9 years ago |
|
huang
|
b7bccc7d22
|
PR添加评论 列表页面
|
9 years ago |
|
yuanke
|
c787bb5bcd
|
动态去掉认证，加上出错提示
|
9 years ago |
|
huang
|
e7f01e5363
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
9 years ago |
|
huang
|
6319a1bac6
|
PR添加评论定义
|
9 years ago |
|
Tim
|
5838e8f810
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
9 years ago |
|
Tim
|
5dd6244a34
|
pull request添加留言
|
9 years ago |
|
cxt
|
547aae0743
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
2951259d23
|
左侧项目列表的展开
|
9 years ago |
|
cxt
|
153e02c4fa
|
消息列表报500
|
9 years ago |
|
cxt
|
40dc9b761f
|
未配置课程的班级报404
|
9 years ago |
|
cxt
|
6c9a4a6620
|
首页的左侧项目栏无法展开
|
9 years ago |
|
huang
|
d1b4e83fee
|
完成pull request 关闭功能
|
9 years ago |
|
yuanke
|
b53979d91c
|
修改微信头像不显示的BUG，动态暂时全部去掉认证！
|
9 years ago |
|
yuanke
|
2b7ff3c76b
|
修改各个页面验证绑定登录的方式。
|
9 years ago |
|
huang
|
26c11693fd
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
9 years ago |
|
huang
|
518d6bacbe
|
添加关闭pull request功能
|
9 years ago |
|
yuanke
|
762fdfe634
|
微信修改
|
9 years ago |
|
huang
|
ecc6f5601e
|
接受请求后显示admin问题
|
9 years ago |
|
huang
|
2bdf3d573b
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
20fac3852d
|
合并信息
|
9 years ago |
 daiao
|
85c16ca9e8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
daiao
|
e89d7398aa
|
申请管理消息通知
|
9 years ago |
|
cxt
|
90e480f7e9
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
5b8883960b
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
Tim
|
0200590a70
|
待处理合并无更新内容时，页尾显示偏移bug
|
9 years ago |
|
cxt
|
d3db6719eb
|
“我的作业”中编辑作业不跳转到“题库”，而是返回到“我的作业”
|
9 years ago |
|
huang
|
910fe0f48c
|
css
|
9 years ago |
|
huang
|
f54eafce76
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
a46aba1491
|
样式调整
|
9 years ago |
|
cxt
|
55637808ff
|
班级作品：两种角色的成员，先学生身份提交作品，再教辅身份评阅自己的作品，评阅结果不能自动刷新
|
9 years ago |
|
Tim
|
ee1d30b277
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
Tim
|
cd30f94d72
|
题库发送预览弹框位置及可拖拽js更新
|
9 years ago |
|
huang
|
42e616bdea
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
7c484b4f4a
|
页面显示问题
|
9 years ago |
|
Tim
|
920e470f6d
|
pull request列表省略号显示
|
9 years ago |
|
cxt
|
f5a2d6acdb
|
班级作品：学生提交作品弹出作品校验框，点击重试后，作品列表中默认生成的作品记录就没有了
|
9 years ago |
|
Tim
|
d4f08f6498
|
课程logo替换，邀请码样式更改，班级路径显示主讲教师
|
9 years ago |
|
cxt
|
ea4f0d7d9d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
aaaeb4b8da
|
子域名申请消息报错
|
9 years ago |
|
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 |
|
cxt
|
f9bfe278c0
|
多重身份的学生匿评变为了教辅评分
|
9 years ago |
|
huang
|
ab6acb460e
|
forke项目发送pull request API
|
9 years ago |
|
huang
|
f4bda16469
|
fork分支PR
|
9 years ago |
|
yuanke
|
bb46aa4745
|
微信点击已审批模版消息进入界面显示修改
|
9 years ago |
|
huang
|
5419103268
|
修改API(gitlab中创建所有pullrequest为Admin的问题)
|
9 years ago |
|
cxt
|
b7c05fed4a
|
首页样式和js调整
|
9 years ago |
|
huang
|
99fa39371d
|
接受请求ajax刷新
|
9 years ago |
|
yuanke
|
55afb84aef
|
模版消息标题加上句号，审核模版消息再次点击显示修改
|
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 |
|
yuanke
|
ee019cd364
|
修改测试版微信加入项目审核通知
|
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 |
|
yuanke
|
12a9c95c01
|
微信项目及班级邀请码相关BUG修改
|
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 |
|
yuanke
|
c0579de57d
|
微信分享内容修改
|
9 years ago |
|
yuanke
|
17c98eb9fe
|
微信分享修改
|
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 |
|
yuanke
|
29e707a88d
|
微信加入项目修改、二级回复三个回复时多了个边框BUG修改等
|
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 |
|
yuanke
|
a34272027e
|
微信菜单及项目班级审核修改
|
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 |
|
yuanke
|
4ab2427827
|
微信项目及课程申请审核相关功能
|
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 |
|
yuanke
|
a4281b4934
|
Merge branch 'develop' into weixin_guange
|
9 years ago |
|
yuanke
|
614e877e6e
|
微信项目和班级加入修改
|
9 years ago |
|
huang
|
d286d3fe06
|
pullrequest头部
|
9 years ago |
|
Tim
|
3e95b070d0
|
合并请求代码
|
9 years ago |
|
huang
|
7658844a28
|
鼠标经过弹框消息提示
|
9 years ago |
|
huang
|
94b36e227c
|
申请加入项目消息刷新，同时更新其它管理员的消息状态
|
9 years ago |
|
huang
|
0b113bb985
|
项目邀请码识别小写
|
9 years ago |
|
Tim
|
65d4af1307
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
9 years ago |
|
Tim
|
9af8757ceb
|
项目合并请求
|
9 years ago |
|
huang
|
3660f8cbce
|
gitlab相关方法的封装
|
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 |
|
yuanke
|
dde89b72fa
|
加入项目二维码修改
|
9 years ago |
|
daiao
|
fc1fc0bd7d
|
单位审核bug修复
|
9 years ago |
|
yuanke
|
f016027e8f
|
微信加入项目修改
|
9 years ago |
|
huang
|
96b04f39b1
|
pull requests框架搭建（路由控制器、views）
|
9 years ago |
|
Tim
|
08b8e3f1cb
|
加入班级，项目弹框定位js重写
|
9 years ago |
|
yuanke
|
2c86ae3eb2
|
二维码识别 项目和班级区分
|
9 years ago |
|
yuanke
|
c1bd3b6bf1
|
增加日志测试
|
9 years ago |
|
cxt
|
18539b45de
|
Merge branch 'dev_shcool' into develop
|
9 years ago |
|
cxt
|
6d17329a6d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
3bc696a597
|
申请学校的更改
|
9 years ago |
|
daiao
|
5272f20de8
|
单位审核bug的修复
|
9 years ago |
|
yuanke
|
fa43924330
|
微信项目二维码修改
|
9 years ago |
|
huang
|
c7f2ab0415
|
修复创建英文名字的项目标题为“为项目讨论区的问题”
|
9 years ago |
|
yuanke
|
84f0069cbd
|
打开项目邀请码信息
|
9 years ago |
|
yuanke
|
4c9e183cd0
|
微信菜单点击加入项目修改
|
9 years ago |
|
yuanke
|
bb0bfa21cc
|
加入项目邀请码修改
|
9 years ago |
|
yuanke
|
f0cf7adcdf
|
加入项目邀请码
|
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
|
8e805d382a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
daiao
|
6ea829131b
|
单位列表发送消息样式调整
|
9 years ago |
|
huang
|
30ce469483
|
申请加入项目删除邮件
|
9 years ago |
|
daiao
|
15227907ea
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
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 |
