 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 |
|
daiao
|
4d3f4c358a
|
微信功能
|
2016-07-29 16:13:25 +08:00 |
|
daiao
|
45e33cc456
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-29 16:12:01 +08:00 |
|
Tim
|
4abce11004
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-29 16:11:52 +08:00 |
|
Tim
|
3d7b7b513b
|
隐藏文字超出省略号显示
|
2016-07-29 16:11:43 +08:00 |
|
daiao
|
5b30036639
|
单位名称列表功能
|
2016-07-29 16:11:26 +08:00 |
|
Tim
|
43498e79e8
|
项目说明居中对齐
|
2016-07-29 16:09:55 +08:00 |
|
yuanke
|
18862fdee9
|
编辑课程文字修改
|
2016-07-29 16:06:30 +08:00 |
|
huang
|
769a07bd94
|
去掉配置页面的成员申请
|
2016-07-29 16:00:46 +08:00 |
|
huang
|
450217e7c2
|
同意加入消息发送，及添加成员
|
2016-07-29 15:58:24 +08:00 |
|
yuanke
|
a4eb774fe9
|
Merge branch 'weixin_guange' into develop
|
2016-07-29 15:48:37 +08:00 |
|
yuanke
|
e478b050d1
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-29 15:47:47 +08:00 |
|
yuanke
|
ce8f915d7e
|
分享修改成原来的
|
2016-07-29 15:47:34 +08:00 |
|
Tim
|
a11dfcc9fb
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-29 15:40:58 +08:00 |
|
Tim
|
071ad88956
|
新建项目增加项目说明；动态多出文字以省略号显示； 文本内容单词不被强制拆分折行
|
2016-07-29 15:40:47 +08:00 |
|
huang
|
c07677ef99
|
项目邀请框架 拒绝消息
|
2016-07-29 14:49:37 +08:00 |
|
cxt
|
a1a2b3dd33
|
Merge branch 'rep_quality' into cxt_course
Conflicts:
db/schema.rb
|
2016-07-29 14:36:18 +08:00 |
|
cxt
|
848c56d54e
|
班级主页身份切换、成员管理页面的多重身份
|
2016-07-29 14:34:42 +08:00 |
|
yuanke
|
54e9367f71
|
分享标题内容修改
|
2016-07-29 10:52:35 +08:00 |
|
yuanke
|
59a8fb8b60
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-29 09:44:57 +08:00 |
|
yuanke
|
7cf1bf2786
|
Merge branch 'weixin_guange' into develop
|
2016-07-29 09:44:07 +08:00 |
|
yuanke
|
f1859151bc
|
修改新建项目、新建课程中的文字
|
2016-07-29 09:43:18 +08:00 |
|
daiao
|
6bd9f47222
|
Merge branch 'dev_shcool' into develop
Conflicts:
db/schema.rb
|
2016-07-28 20:02:57 +08:00 |
|
daiao
|
50ec127c5b
|
单位名称列表功能
|
2016-07-28 20:01:22 +08:00 |
|
yuanke
|
b3fef1b3ec
|
Merge branch 'weixin_guange' into develop
|
2016-07-28 19:06:27 +08:00 |
|
yuanke
|
14d0a91b0b
|
修改下微信菜单
|
2016-07-28 19:05:52 +08:00 |
|
yuanke
|
22897af6c3
|
Merge branch 'weixin_guange' into develop
|
2016-07-28 18:22:20 +08:00 |
|
yuanke
|
ca60496e7b
|
微信 新建项目默认为私有
|
2016-07-28 18:21:42 +08:00 |
|
yuanke
|
603a00fde3
|
Merge branch 'weixin_guange' into develop
|
2016-07-28 17:56:33 +08:00 |
|
yuanke
|
1489ab015a
|
微信模版消息标题加上句号
|
2016-07-28 17:55:37 +08:00 |
|
yuanke
|
de46c5d9ca
|
Merge branch 'weixin_guange' into develop
|
2016-07-28 17:27:57 +08:00 |
|
yuanke
|
8bf69a2e4d
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-28 17:27:06 +08:00 |
|
yuanke
|
93844e757c
|
微信：角色配置后返回角色界面、修改开发为开放、创建项目发送消息项目名称修改
|
2016-07-28 17:26:57 +08:00 |
|
Tim
|
6b89460295
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-28 17:11:56 +08:00 |