 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
|
5b66489b61
|
Merge branch 'develop' into cxt_course
|
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
|
e41a14fa04
|
Merge branch 'develop' into rep_quality
|
9 years ago |
|
Tim
|
1eff394498
|
Merge branch 'develop' into cs_optimize_txz
|
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 |
|
yuanke
|
f3ae53dc97
|
Merge branch 'develop' into weixin_guange
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 |
|
yuanke
|
94a4ee9525
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
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 |
