 Tim
|
3e95b070d0
|
合并请求代码
|
2016-08-02 15:00:05 +08:00 |
|
Tim
|
9af8757ceb
|
项目合并请求
|
2016-08-02 10:03:42 +08:00 |
|
Tim
|
be36755d95
|
代码合并页面
|
2016-08-01 16:53:33 +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
|
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 |
 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 |
 yuanke
|
1f47eb5ea8
|
单位申请列表修改
|
2016-07-29 21:19:09 +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
|
9e6575211f
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-29 16:29:58 +08:00 |
|
Tim
|
4e5f3e56c7
|
新建项目说明文字居中
|
2016-07-29 16:24:42 +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 |
|
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 |
|
Tim
|
43498e79e8
|
项目说明居中对齐
|
2016-07-29 16:09:55 +08:00 |
|
yuanke
|
18862fdee9
|
编辑课程文字修改
|
2016-07-29 16:06:30 +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 |
|
yuanke
|
54e9367f71
|
分享标题内容修改
|
2016-07-29 10:52:35 +08:00 |
|
yuanke
|
f1859151bc
|
修改新建项目、新建课程中的文字
|
2016-07-29 09:43:18 +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 |
|
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 |
|
yuanke
|
cf65e6748b
|
微信项目相关功能开发，班级角色功能等
|
2016-07-28 14:49:45 +08:00 |
|
huang
|
4a9eec0cce
|
完成项目邀请及公共弹框的封装
|
2016-07-28 14:42:36 +08:00 |
|
Tim
|
318ef2bb30
|
微信定位高度
|
2016-07-28 14:35:50 +08:00 |
|
Tim
|
40bb59ea9d
|
微信定位
|
2016-07-28 10:43:54 +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 |
|
cxt
|
feb45a07bf
|
课程列表分为我创建的课程和我加入的课程
|
2016-07-26 16:45:36 +08:00 |
|
yuanke
|
e6e8d73a66
|
修改动态详情
|
2016-07-26 09:46:55 +08:00 |