 yuanke
|
7d0d208676
|
Merge branch 'dev_shcool' of https://git.trustie.net/jacknudt/trustieforge into dev_shcool
|
2016-07-29 22:10:06 +08:00 |
|
yuanke
|
dce84484ff
|
修改单位的省市个人资料省市也得修改
|
2016-07-29 22:09:03 +08:00 |
 daiao
|
8513ae133e
|
Merge branch 'dev_shcool' into develop
|
2016-07-29 22:07:02 +08:00 |
|
daiao
|
911a769670
|
Merge branch 'develop' into dev_shcool
Conflicts:
app/models/applied_message.rb
|
2016-07-29 22:05:56 +08:00 |
|
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
|
2016-07-29 22:03:45 +08:00 |
|
daiao
|
641ccee631
|
修改名称过长问题
|
2016-07-29 22:02:23 +08:00 |
 cxt
|
98a2ebd682
|
Merge branch 'cxt_course' into develop
|
2016-07-29 21:54:33 +08:00 |
|
cxt
|
4a800b67d8
|
消息列表报500
|
2016-07-29 21:53:00 +08:00 |
|
cxt
|
a41fbdb985
|
课程大纲报500
|
2016-07-29 21:50:44 +08:00 |
|
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
|
2016-07-29 21:50:19 +08:00 |
|
cxt
|
ebb336afa0
|
课程大纲的二级回复
|
2016-07-29 21:48:10 +08:00 |
|
daiao
|
d6178ec7dd
|
管理员界面单位申请
|
2016-07-29 21:45:52 +08:00 |
|
yuanke
|
1704462986
|
管理员界面单位申请修改
|
2016-07-29 21:45:32 +08:00 |
|
cxt
|
04b9c35a05
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-29 21:41:26 +08:00 |
|
cxt
|
807db1ac40
|
课程角色申请链接的样式
|
2016-07-29 21:41:19 +08:00 |
 huang
|
bef6828166
|
Merge branch 'rep_quality' into develop
|
2016-07-29 21:39:57 +08:00 |
|
huang
|
847cae6d41
|
Merge branch 'develop' into rep_quality
Conflicts:
app/models/applied_message.rb
db/schema.rb
|
2016-07-29 21:39:00 +08:00 |
|
huang
|
cf63d252e2
|
局部刷新
|
2016-07-29 21:37:35 +08:00 |
|
huang
|
5414080646
|
删除用户和拒绝用户可以再申请
|
2016-07-29 21:21:59 +08:00 |
|
yuanke
|
1f47eb5ea8
|
单位申请列表修改
|
2016-07-29 21:19:09 +08:00 |
|
huang
|
f857ceab32
|
消息中项目添加title
|
2016-07-29 21:07:15 +08:00 |
|
huang
|
8d625eff5e
|
修改方式就用户图像显示
|
2016-07-29 21:04:01 +08:00 |
|
daiao
|
3251890c91
|
Merge branch 'rep_quality' into dev_shcool
Conflicts:
app/models/applied_message.rb
db/schema.rb
|
2016-07-29 20:52:18 +08:00 |
|
huang
|
643b06484b
|
消息表添加字段
|
2016-07-29 20:50:55 +08:00 |
|
daiao
|
430a93e4b2
|
单位名称列表功能代码
|
2016-07-29 20:48:36 +08:00 |
|
cxt
|
02bee33ad2
|
身份切换加提示
|
2016-07-29 20:33:35 +08:00 |
|
huang
|
0bf9b5c6e6
|
消息红点记录 个人主页添加加入项目入口
|
2016-07-29 20:31:24 +08:00 |
|
cxt
|
d0f83aab64
|
去掉姓和名之间的空格
|
2016-07-29 20:24:04 +08:00 |
|
cxt
|
b3d34d6e0f
|
配置班级列表的名称显示全
|
2016-07-29 20:18:26 +08:00 |
|
huang
|
153efb7eda
|
局部刷新
|
2016-07-29 19:42:21 +08:00 |
|
cxt
|
e3d538c3fa
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/_course_base_info.html.erb
db/schema.rb
|
2016-07-29 19:39:42 +08:00 |
|
cxt
|
72977886c7
|
Merge branch 'cs_optimize_txz' into cxt_course
Conflicts:
app/views/layouts/_course_base_info.html.erb
|
2016-07-29 19:37:15 +08:00 |
|
huang
|
60417b2db7
|
项目邀请消息样式问题
|
2016-07-29 19:30:53 +08:00 |
|
cxt
|
5a8d2407e2
|
放开新建课程、新建班级的权限
|
2016-07-29 19:28:50 +08:00 |
|
cxt
|
335b82c046
|
加入班级的弹框
|
2016-07-29 19:19:58 +08:00 |
|
huang
|
48a72ff816
|
代码分析结果入口放置在版本库
|
2016-07-29 17:46:24 +08:00 |
|
huang
|
824b430fbd
|
解决质量分支弹出空白页面问题
|
2016-07-29 17:38:21 +08:00 |
 Tim
|
b100651185
|
控制显示较多文字后显示省略号
|
2016-07-29 17:09:53 +08:00 |
|
Tim
|
9a3acdd1db
|
删除注释
|
2016-07-29 17:07:22 +08:00 |
|
Tim
|
6342137972
|
微信动态文字过多显示省略号：中文省略号，英文单词可能被拆分显示省略号
|
2016-07-29 17:06:25 +08:00 |
|
Tim
|
24a6aabb6b
|
新建项目说明列表圆点大小与间距调整
|
2016-07-29 16:56:55 +08:00 |
|
yuanke
|
ac125cef64
|
Merge branch 'weixin_guange' into develop
|
2016-07-29 16:31:17 +08:00 |
|
yuanke
|
28ce8a6dc8
|
Merge branch 'develop' into weixin_guange
|
2016-07-29 16:30:42 +08:00 |
|
Tim
|
9e6575211f
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-29 16:29:58 +08:00 |
|
yuanke
|
244368e206
|
Merge branch 'weixin_guange' into develop
|
2016-07-29 16:28:25 +08:00 |
|
cxt
|
a1553c7a8f
|
角色的修改
|
2016-07-29 16:27:02 +08:00 |
|
Tim
|
4e5f3e56c7
|
新建项目说明文字居中
|
2016-07-29 16:24:42 +08:00 |
|
daiao
|
38f9bf0482
|
Merge branch 'develop' into dev_shcool
|
2016-07-29 16:15:35 +08:00 |
|
yuanke
|
27a2f8f13b
|
Merge branch 'develop' into weixin_guange
|
2016-07-29 16:14:47 +08:00 |
|
yuanke
|
78e44617e3
|
Merge branch 'weixin_guange' into develop
|
2016-07-29 16:13:38 +08:00 |