 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 |
 huang
|
8a8860bd6c
|
gemfile注释后恢复
|
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 |
|
daiao
|
4004e30216
|
Merge branch 'develop' into dev_shcool
|
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 |
|
daiao
|
20195d2496
|
Merge branch 'dev_shcool' into develop
|
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
|
8513ae133e
|
Merge branch 'dev_shcool' into develop
|
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
|
bef6828166
|
Merge branch 'rep_quality' into develop
|
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 |
