 Tim
|
950b18c250
|
加入班级提示
|
2016-08-03 16:39:22 +08:00 |
 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
|
2016-08-01 09:21:31 +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
|
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 |
|
daiao
|
430a93e4b2
|
单位名称列表功能代码
|
2016-07-29 20:48:36 +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 |
|
cxt
|
335b82c046
|
加入班级的弹框
|
2016-07-29 19:19:58 +08:00 |
|
Tim
|
24a6aabb6b
|
新建项目说明列表圆点大小与间距调整
|
2016-07-29 16:56:55 +08:00 |
|
Tim
|
4e5f3e56c7
|
新建项目说明文字居中
|
2016-07-29 16:24:42 +08:00 |
|
daiao
|
4d3f4c358a
|
微信功能
|
2016-07-29 16:13:25 +08:00 |
|
Tim
|
071ad88956
|
新建项目增加项目说明；动态多出文字以省略号显示； 文本内容单词不被强制拆分折行
|
2016-07-29 15:40:47 +08:00 |
|
cxt
|
a1a2b3dd33
|
Merge branch 'rep_quality' into cxt_course
Conflicts:
db/schema.rb
|
2016-07-29 14:36:18 +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 |
|
Tim
|
37e29404ba
|
微信班级管理图标可点击区域放大
|
2016-07-28 17:11:46 +08:00 |
|
yuanke
|
283dc86a8b
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
Conflicts:
db/schema.rb
public/assets/wechat/homework_detail.html
public/javascripts/wechat/controllers/activity.js
|
2016-07-28 15:23:12 +08:00 |
|
yuanke
|
6d594cfcbe
|
git pull后重新commit
|
2016-07-28 15:11:04 +08:00 |
|
Tim
|
4bbd72ecd2
|
发送班级页面发送按钮定位
|
2016-07-28 14:58:19 +08:00 |
 huang
|
4a9eec0cce
|
完成项目邀请及公共弹框的封装
|
2016-07-28 14:42:36 +08:00 |
|
Tim
|
6078db7e39
|
sy_public.css样式重用处理
|
2016-07-27 16:44:21 +08:00 |
|
Tim
|
9d7fa86cb6
|
syllabus.css样式重用处理
|
2016-07-27 16:33:27 +08:00 |
|
Tim
|
52475099dc
|
博客设为主页后，文字整个容器宽度显示；班级配置图标菜单css冲突处理；大纲样式冲突处理
|
2016-07-27 14:36:46 +08:00 |
|
yuanke
|
653b98d832
|
微信增加项目相关内容
|
2016-07-27 14:30:19 +08:00 |
|
cxt
|
a1149c1104
|
班级列表的公开私有
|
2016-07-27 14:07:16 +08:00 |
|
cxt
|
4422bb1bc0
|
课程列表中的私有班级不可访问
|
2016-07-27 10:11:00 +08:00 |
|
Tim
|
a2acbba34a
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-26 17:30:27 +08:00 |
|
Tim
|
e3057566c8
|
各详情页面内容和二级回复样式调整；回复详情内容不显示bug
|
2016-07-26 17:30:02 +08:00 |
|
huang
|
463c09f02c
|
项目邀请弹框
|
2016-07-26 08:55:07 +08:00 |
 guange
|
6a871e2116
|
.
|
2016-07-25 17:09:14 +08:00 |
|
cxt
|
6c7925a7b4
|
样式调整
|
2016-07-22 18:20:11 +08:00 |
|
huang
|
0e1a52726f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/base_syllabus.html.erb
|
2016-07-22 16:46:01 +08:00 |
|
huang
|
4d79f93079
|
Merge branch 'cs_optimize_txz' into develop
|
2016-07-22 16:43:17 +08:00 |
|
txz
|
cef08a717c
|
课程名称过长时，邀请码无法点击bug
|
2016-07-22 16:09:47 +08:00 |
|
cxt
|
9422e2886c
|
新版班级主页
|
2016-07-22 15:32:37 +08:00 |
|
cxt
|
1e28ff880d
|
新版课程大纲
|
2016-07-22 10:20:28 +08:00 |
|
txz
|
19781ded4e
|
输入框padding调整
|
2016-07-21 17:22:03 +08:00 |
|
txz
|
4a58777bb9
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-21 15:56:31 +08:00 |
|
txz
|
0a0f8aefac
|
微信加入班级弹框css兼容；app页面meta标签修改
|
2016-07-21 15:56:27 +08:00 |
|
yuanke
|
f0840d0f31
|
Merge branch 'develop' into weixin_guange
|
2016-07-21 14:29:04 +08:00 |
|
yuanke
|
92ffbcfce6
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-21 14:03:16 +08:00 |
|
yuanke
|
7cd505ea4b
|
博客详情动态加入二级回复的展开功能一级一级回复的更多功能。
|
2016-07-21 14:03:04 +08:00 |
|
txz
|
24ee25e095
|
课程列表点击管理课程图标，列表展开bug修复
|
2016-07-21 13:54:03 +08:00 |
|
Tim
|
fe105c84ad
|
弹框定位改为fixed
|
2016-07-21 10:18:58 +08:00 |
|
Tim
|
541440135f
|
css中引用图片路径修改
|
2016-07-21 10:11:02 +08:00 |
|
Tim
|
dcb541e889
|
资源库资源列表取消虚线
|
2016-07-20 17:10:51 +08:00 |
|
Tim
|
2850fe1b2b
|
预览图片边框阴影效果
|
2016-07-20 17:08:31 +08:00 |
|
Tim
|
85c9fb5dce
|
二级回复图片超出显示
|
2016-07-20 17:00:54 +08:00 |
|
Tim
|
bf87ffb992
|
组织历史版本弹框文件夹图标问题
|
2016-07-20 16:21:58 +08:00 |
|
Tim
|
78e4d37d8b
|
大纲base页引入弹框样式；作业列表调整
|
2016-07-20 15:09:01 +08:00 |