huang
|
420a17a7e4
|
资源提示统计数字及权限修改
|
2016-08-26 17:34:17 +08:00 |
cxt
|
6eb518c465
|
Merge branch 'cxt_course' into develop
Conflicts:
app/helpers/application_helper.rb
app/views/at/show.json.erb
app/views/layouts/new_base_user.html.erb
|
2016-08-26 16:23:07 +08:00 |
Tim
|
3f7c623163
|
新增资源提示框
|
2016-08-26 15:57:45 +08:00 |
cxt
|
62e28f638c
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/layouts/_course_base_info.html.erb
app/views/layouts/base_projects.html.erb
app/views/layouts/new_base_user.html.erb
|
2016-08-26 14:33:18 +08:00 |
cxt
|
774b5eca89
|
课程和项目的头像点击可编辑
|
2016-08-26 14:31:14 +08:00 |
Tim
|
a8f30fe85f
|
个人主页,课程,项目头像、logo增加编辑按钮
|
2016-08-26 11:31:54 +08:00 |
yuanke
|
82779c99ea
|
字符串去掉空白时,空格不去掉。
|
2016-08-26 09:59:00 +08:00 |
cxt
|
f4b5a5cf4e
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-08-26 09:23:33 +08:00 |
Tim
|
fbad4ecd8a
|
班级页面logo及行间距调整;测导航数字大小背景调整
|
2016-08-25 17:52:19 +08:00 |
Tim
|
3e78dec32a
|
将课程、项目公用类放至public.css中
|
2016-08-25 16:07:57 +08:00 |
cxt
|
cb5e5f18ce
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-08-25 15:59:15 +08:00 |
cxt
|
b33136c59b
|
班级问答区改成讨论区
|
2016-08-25 15:59:09 +08:00 |
Tim
|
df1039cd09
|
项目收藏按钮位置调整
|
2016-08-25 15:55:36 +08:00 |
yuanke
|
ea238cd407
|
微信班级发布问题改为发起讨论
|
2016-08-25 15:45:39 +08:00 |
yuanke
|
589df7e498
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-25 15:34:22 +08:00 |
yuanke
|
5b73e7dc19
|
修改发布帖子标题的长度及班级动态中不显示头像
|
2016-08-25 15:34:13 +08:00 |
Tim
|
6b4e25520d
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-25 14:30:50 +08:00 |
Tim
|
78123b5db7
|
iphone设备输入时,自动定位到输入框
|
2016-08-25 14:30:42 +08:00 |
yuanke
|
bb2a1de98c
|
资源详情返回更多按钮BUG修改
|
2016-08-25 14:26:31 +08:00 |
yuanke
|
fd2021a1fe
|
微信资源界面发送后返回处理
|
2016-08-25 14:05:21 +08:00 |
Tim
|
ae09d7ff27
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-25 13:39:13 +08:00 |
Tim
|
bb935e42a8
|
发帖时,标题字符限制;发布按钮不遮住输入框
|
2016-08-25 13:39:02 +08:00 |
yuanke
|
aa11f39b2d
|
Merge branch 'develop' into weixin_guange
Conflicts:
public/assets/wechat/class.html
public/javascripts/wechat/controllers/class.js
|
2016-08-25 11:24:27 +08:00 |
yuanke
|
3673ed3f1d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-25 10:55:59 +08:00 |
yuanke
|
4932b9fad8
|
班级留言不显示
|
2016-08-25 10:55:22 +08:00 |
huang
|
61fe0fc77c
|
项目讨论区发帖时 标题为空 内容为空给出提示
|
2016-08-25 10:50:18 +08:00 |
yuanke
|
f35c3e8528
|
微信新闻、issue增加二级回复等
|
2016-08-25 09:45:23 +08:00 |
Tim
|
7682a4d45d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-24 17:03:11 +08:00 |
Tim
|
a13ec60173
|
修复无效的css
|
2016-08-24 17:02:59 +08:00 |
cxt
|
7d89f69981
|
班级和项目收藏夹
|
2016-08-24 15:58:23 +08:00 |
cxt
|
6af43070c7
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-08-24 13:56:53 +08:00 |
yuanke
|
f8dfe85156
|
项目issue增加模版消息
|
2016-08-24 11:03:38 +08:00 |
Tim
|
57ecffc130
|
班级新增收藏功能
|
2016-08-24 10:28:09 +08:00 |
yuanke
|
c26f59e697
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-23 16:53:05 +08:00 |
yuanke
|
c612104fab
|
微信增加发帖功能
|
2016-08-23 16:52:35 +08:00 |
Tim
|
c8c5f5d415
|
iphone下flex无效
|
2016-08-23 16:36:59 +08:00 |
Tim
|
7d671c7758
|
调整输入框padding值
|
2016-08-23 15:04:48 +08:00 |
Tim
|
34acb1aa2f
|
课程项目增加发布按钮
|
2016-08-23 11:05:49 +08:00 |
yuanke
|
e473a18487
|
提交错分支 还原
|
2016-08-23 10:26:39 +08:00 |
yuanke
|
55512f9eb2
|
Merge branch 'develop' into weixin_guange
|
2016-08-23 10:24:46 +08:00 |
Tim
|
bbc0277d39
|
iphone端输入框js控制
|
2016-08-23 10:23:55 +08:00 |
yuanke
|
965d8930dc
|
班级增加动态
|
2016-08-23 10:23:46 +08:00 |
Tim
|
863ec9d396
|
iphone下输入框位置调整
|
2016-08-22 16:50:14 +08:00 |
yuanke
|
864c6c821f
|
Merge branch 'weixin_guange' into develop
|
2016-08-22 16:50:13 +08:00 |
Tim
|
4f3f6358fc
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-22 14:30:00 +08:00 |
Tim
|
a846eda77b
|
输入框padding调整;发帖样式新增
|
2016-08-22 14:29:43 +08:00 |
yuanke
|
75d81d5dba
|
前端判断是否绑定屏蔽
|
2016-08-22 14:09:29 +08:00 |
cxt
|
572ad5a162
|
个人主页的课程和项目展开出现重复数据
|
2016-08-22 10:49:46 +08:00 |
Tim
|
19becbfdf3
|
邀请内容更改
|
2016-08-14 16:06:37 +08:00 |
Tim
|
2659b742fd
|
成员管理头像高度不一致;邀请内容格式调整
|
2016-08-14 15:30:57 +08:00 |
yuanke
|
9446760258
|
Merge branch 'weixin_guange' into develop
Conflicts:
db/schema.rb
|
2016-08-14 09:56:17 +08:00 |
yuanke
|
8ab003d5ee
|
分享页提交回复未关注公众号会跳到二维码界面
|
2016-08-14 09:38:47 +08:00 |
huang
|
d7faed7f6d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-13 15:39:06 +08:00 |
guange
|
70d58ccf85
|
恢复授权页
|
2016-08-13 15:24:52 +08:00 |
huang
|
0c6e1b2ccb
|
版本库样式修改,显示全时间
|
2016-08-13 14:42:51 +08:00 |
guange
|
4a88fbe3db
|
.
|
2016-08-13 13:36:15 +08:00 |
huang
|
1b19d227f9
|
项目列表样式及连接
|
2016-08-13 10:17:38 +08:00 |
Tim
|
083d5453d4
|
加入课程、项目弹框,在内容部分不能拖拽
|
2016-08-13 10:00:31 +08:00 |
huang
|
75971120f7
|
Merge branch 'develop' into rep_quality
|
2016-08-12 17:14:18 +08:00 |
Tim
|
6734904945
|
班级详情页面定位
|
2016-08-12 15:34:53 +08:00 |
Tim
|
5eb397aa2a
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
Conflicts:
public/assets/wechat/login_tip.html
|
2016-08-12 14:49:21 +08:00 |
Tim
|
bdeb8297cb
|
关注提示页面
|
2016-08-12 14:45:33 +08:00 |
yuanke
|
2cfd876f2f
|
调试
|
2016-08-12 14:17:50 +08:00 |
yuanke
|
3b42861a54
|
分享修改
|
2016-08-12 13:33:57 +08:00 |
yuanke
|
822ca15c78
|
分享修改
|
2016-08-12 11:34:09 +08:00 |
yuanke
|
c0dc070c15
|
分享修改
|
2016-08-12 11:25:43 +08:00 |
yuanke
|
5c42cdb39c
|
分享内容时改为用户信息授权方式
|
2016-08-12 10:40:36 +08:00 |
yuanke
|
6af15b7121
|
微信自动绑定用户修改
|
2016-08-12 09:23:09 +08:00 |
yuanke
|
4e6c58ae37
|
动态点提交如果没绑定则自动创建一个帐号绑定,然后注册的时候将已绑定的用户信息修改为注册的信息
|
2016-08-11 17:22:48 +08:00 |
yuanke
|
c26e2a9acc
|
私有动态BUG修改
|
2016-08-11 14:09:41 +08:00 |
yuanke
|
d74924ff67
|
私有动态提示修改
|
2016-08-11 13:51:20 +08:00 |
yuanke
|
ea926395c3
|
Merge branch 'develop' into weixin_guange
|
2016-08-11 11:19:52 +08:00 |
yuanke
|
0d69fa0cc0
|
微信私有动态内容加上提示
|
2016-08-11 10:33:22 +08:00 |
yuanke
|
61ffa58896
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-11 09:59:00 +08:00 |
yuanke
|
7c5240b386
|
微信 没登录动态回复会跳到绑定登录界面,私有内容需要是成员才能回复
|
2016-08-11 09:58:45 +08:00 |
huang
|
56afad9242
|
质量分析列表中添加时间和版本
|
2016-08-11 09:48:29 +08:00 |
Tim
|
8d753f55dc
|
班级、项目动态增加“私有内容,谨慎传播”提示
|
2016-08-10 17:10:22 +08:00 |
Tim
|
b5af6f2c7f
|
绑定说明页面
|
2016-08-10 16:45:31 +08:00 |
Tim
|
f5f88c5204
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-10 16:09:13 +08:00 |
yuanke
|
57737ff15d
|
微信细节优化
|
2016-08-10 16:08:30 +08:00 |
Tim
|
e85f9373c8
|
点回复按钮回复框获取焦点;班级通知内容冗余;班级、项目邀请文字更友善;班级、项目中人数后箭头与人数对齐;邀请码提示增加间距;回复中@删除链接;二维码页面增加默认加入身份提示;公众号联系我们文字更改
|
2016-08-10 15:37:08 +08:00 |
cxt
|
fa07f2532f
|
题库弹框样式修改
|
2016-08-10 11:16:04 +08:00 |
cxt
|
0ed508a887
|
题库预览弹窗的调整
|
2016-08-09 17:09:36 +08:00 |
yuanke
|
66357c4024
|
修改分享链接
|
2016-08-09 17:01:06 +08:00 |
cxt
|
9594aada50
|
Merge branch 'cxt_course' into develop
Conflicts:
public/javascripts/application.js
|
2016-08-09 16:42:23 +08:00 |
cxt
|
fc3df1c26f
|
题库预览弹框的样式调整
|
2016-08-09 16:38:17 +08:00 |
huang
|
867434531d
|
pull request 列表页面添加分页
|
2016-08-09 15:28:06 +08:00 |
cxt
|
4a527dc84e
|
Merge branch 'cs_optimize_txz' into develop
|
2016-08-09 15:25:01 +08:00 |
huang
|
87c5f50545
|
PULL request 评论创建及局部刷新
|
2016-08-09 14:51:48 +08:00 |
Tim
|
5dd6244a34
|
pull request添加留言
|
2016-08-09 10:45:14 +08:00 |
yuanke
|
b53979d91c
|
修改微信头像不显示的BUG,动态暂时全部去掉认证!
|
2016-08-09 10:20:21 +08:00 |
yuanke
|
bd908af765
|
修改报错BUG
|
2016-08-09 09:33:34 +08:00 |
yuanke
|
61ba668818
|
函数写错名称
|
2016-08-09 09:30:30 +08:00 |
yuanke
|
57f3aaa9e8
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-09 09:23:19 +08:00 |
yuanke
|
2b7ff3c76b
|
修改各个页面验证绑定登录的方式。
|
2016-08-09 09:23:06 +08:00 |
Tim
|
cd30f94d72
|
题库发送预览弹框位置及可拖拽js更新
|
2016-08-05 18:01:11 +08:00 |
Tim
|
d4f08f6498
|
课程logo替换,邀请码样式更改,班级路径显示主讲教师
|
2016-08-05 17:30:13 +08:00 |
cxt
|
e7e873e0df
|
Merge branch 'dev_shcool' into develop
Conflicts:
app/helpers/users_helper.rb
|
2016-08-05 16:32:10 +08:00 |
cxt
|
3178700131
|
Merge branch 'cxt_course' into develop
|
2016-08-05 16:14:56 +08:00 |
Tim
|
e8d4bc0772
|
弹框可拖拽
|
2016-08-05 16:13:37 +08:00 |
cxt
|
0d86a28c54
|
我的作业
|
2016-08-05 16:12:53 +08:00 |
huang
|
dd768c2913
|
Merge branch 'cs_optimize_txz' into develop
Conflicts:
public/stylesheets/css/common.css
|
2016-08-05 15:30:03 +08:00 |
huang
|
81ce93e88b
|
Merge branch 'rep_quality' into develop
|
2016-08-05 15:28:39 +08:00 |
Tim
|
be5e74897a
|
项目弹框位置调整
|
2016-08-05 15:26:15 +08:00 |
Tim
|
cb6750cd01
|
输入时,忘记密码和绑定按钮重合的bug
|
2016-08-05 14:50:10 +08:00 |
Tim
|
82644bcd81
|
加入班级、项目弹框可拖拽
|
2016-08-05 14:36:01 +08:00 |
Tim
|
56452d69f4
|
侧导航字体大小,颜色更改
|
2016-08-05 14:11:35 +08:00 |
huang
|
b86b2299a7
|
fork分支选择 js
|
2016-08-05 11:10:39 +08:00 |
huang
|
b297446778
|
select选择框
|
2016-08-05 10:42:06 +08:00 |
yuanke
|
491b6fcb72
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-04 18:10:47 +08:00 |
yuanke
|
bb46aa4745
|
微信点击已审批模版消息进入界面显示修改
|
2016-08-04 18:09:54 +08:00 |
Tim
|
1335dc1b76
|
提示文字取消粗体
|
2016-08-04 17:27:53 +08:00 |
Tim
|
28a29fa724
|
拖拽删除
|
2016-08-04 16:50:33 +08:00 |
yuanke
|
d5df45e8fb
|
项目动态点入详情后返回需回到点入的项目动态处
|
2016-08-04 16:35:07 +08:00 |
cxt
|
b7c05fed4a
|
首页样式和js调整
|
2016-08-04 16:33:51 +08:00 |
yuanke
|
55afb84aef
|
模版消息标题加上句号,审核模版消息再次点击显示修改
|
2016-08-04 15:32:25 +08:00 |
yuanke
|
e4a414e550
|
微信菜单跳入加入项目和班级界面点取消要能返回公众号界面
|
2016-08-04 14:37:04 +08:00 |
yuanke
|
12a9c95c01
|
微信项目及班级邀请码相关BUG修改
|
2016-08-04 14:07:35 +08:00 |
Tim
|
b8a40862ce
|
改变行代码格式化,不折行
|
2016-08-04 14:04:55 +08:00 |
yuanke
|
3c2ab32121
|
微信动态分享修改
|
2016-08-04 11:17:50 +08:00 |
cxt
|
6c7b53f7d4
|
首页左侧栏
|
2016-08-04 11:05:34 +08:00 |
yuanke
|
4bae4527a2
|
微信分享URL修改
|
2016-08-04 10:48:13 +08:00 |
yuanke
|
aaa1c01eed
|
微信动态分享图片修改
|
2016-08-04 10:47:35 +08:00 |
yuanke
|
c0579de57d
|
微信分享内容修改
|
2016-08-04 10:00:55 +08:00 |
yuanke
|
13d59be389
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-04 09:09:50 +08:00 |
yuanke
|
17c98eb9fe
|
微信分享修改
|
2016-08-04 09:08:18 +08:00 |
Tim
|
7b6675ed6a
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
Conflicts:
public/assets/wechat/join_project.html
|
2016-08-03 16:41:15 +08:00 |
Tim
|
950b18c250
|
加入班级提示
|
2016-08-03 16:39:22 +08:00 |
yuanke
|
29e707a88d
|
微信加入项目修改、二级回复三个回复时多了个边框BUG修改等
|
2016-08-03 16:31:33 +08:00 |
Tim
|
a5fe620452
|
题库翻页居中对齐
|
2016-08-03 14:57:02 +08:00 |
yuanke
|
a34272027e
|
微信菜单及项目班级审核修改
|
2016-08-03 14:55:54 +08:00 |
cxt
|
acc3ba121f
|
测试集的显示、新版分页
|
2016-08-03 13:46:59 +08:00 |
cxt
|
718b13e6c1
|
新版题库
|
2016-08-03 11:12:55 +08:00 |
Tim
|
e7fa38e52c
|
pull request show页面
|
2016-08-03 11:00:31 +08:00 |
yuanke
|
6ee6cdf28f
|
微信项目加入审核修改
|
2016-08-03 10:56:55 +08:00 |
daiao
|
5f969c6593
|
单位审核相关Bug修复
|
2016-08-03 10:36:03 +08:00 |
yuanke
|
65719add19
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-03 09:37:36 +08:00 |
yuanke
|
4ab2427827
|
微信项目及课程申请审核相关功能
|
2016-08-03 09:37:24 +08:00 |
guange
|
6f2b84570f
|
去除调试模式
|
2016-08-02 17:48:51 +08:00 |
guange
|
56d6f4b9bc
|
定制分享内容
|
2016-08-02 17:36:59 +08:00 |
guange
|
2a67ec5407
|
配置登录页菜单
|
2016-08-02 17:27:40 +08:00 |
yuanke
|
614e877e6e
|
微信项目和班级加入修改
|
2016-08-02 15:50:15 +08:00 |
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 |
Tim
|
08b8e3f1cb
|
加入班级,项目弹框定位js重写
|
2016-08-01 15:21:23 +08:00 |
yuanke
|
fa43924330
|
微信项目二维码修改
|
2016-08-01 13:54:10 +08:00 |
yuanke
|
f0cf7adcdf
|
加入项目邀请码
|
2016-08-01 11:14:03 +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
|
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
|
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 |
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 |