Tim
|
78e4d37d8b
|
大纲base页引入弹框样式;作业列表调整
|
2016-07-20 15:09:01 +08:00 |
yuanke
|
ff42de619b
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-20 14:06:16 +08:00 |
txz
|
c56f7732a1
|
二级回复新样式
|
2016-07-20 14:05:17 +08:00 |
yuanke
|
67e87df4d5
|
微信动态详情回复显示修改
|
2016-07-20 13:34:58 +08:00 |
yuanke
|
bf600e8f76
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-20 10:09:37 +08:00 |
yuanke
|
1ce7b22c0e
|
博客动态回复二级回复修改
|
2016-07-20 10:09:27 +08:00 |
txz
|
53feb0bbd4
|
课程列表课程名称宽度限制
|
2016-07-20 09:11:05 +08:00 |
txz
|
707df88c7f
|
tab容器宽度百分百
|
2016-07-19 16:05:39 +08:00 |
txz
|
5b3c6cc012
|
输入框高度控制
|
2016-07-19 15:41:40 +08:00 |
txz
|
2af1a5ffb9
|
新增班级和管理班级输入框高度控制
|
2016-07-19 15:07:11 +08:00 |
txz
|
27965bee01
|
加入班级弹框样式统一
|
2016-07-19 11:17:46 +08:00 |
yuanke
|
80843d5084
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-19 10:50:46 +08:00 |
yuanke
|
bc1b4c1b85
|
班级邀请码弹框修改,我的动态回复数计算修改
|
2016-07-19 10:50:36 +08:00 |
txz
|
bc0d8cd299
|
管理班级重命名字体变灰
|
2016-07-19 10:25:45 +08:00 |
Tim
|
73401d6b41
|
下拉图标等显示
|
2016-07-19 09:09:13 +08:00 |
cxt
|
fdf925a0b8
|
个人主页留言动态:如图回复当前用户自己的留言却不能删除,“展开回复”后又可删除了,刷新网页后又删除不了
|
2016-07-18 16:40:04 +08:00 |
Tim
|
e966972750
|
Merge branch 'develop' into cs_optimize_txz
Conflicts:
app/views/versions/index.html.erb
|
2016-07-18 14:32:17 +08:00 |
Tim
|
76555680e0
|
项目css统一
|
2016-07-18 14:30:01 +08:00 |
yuanke
|
ff13d2e572
|
微信增加作业发送,修改发送的权限,修改菜单
|
2016-07-18 14:24:59 +08:00 |
yuanke
|
f3d74fcd55
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-18 11:08:09 +08:00 |
yuanke
|
8968c991ff
|
微信:作业增加发送功能
|
2016-07-18 11:08:02 +08:00 |
guange
|
51692eadd6
|
改进上线流程
|
2016-07-17 00:49:35 +08:00 |
guange
|
c14979d878
|
assets
|
2016-07-15 19:53:38 +08:00 |
yuanke
|
6ae57ef23a
|
Merge branch 'weixin_guange' into develop
|
2016-07-15 19:53:33 +08:00 |
yuanke
|
67fa6da8ae
|
我的资源界面加载前 不显示暂无数据
|
2016-07-15 19:18:30 +08:00 |
yuanke
|
596bfe4bfc
|
邀请码分享问题修改
|
2016-07-15 19:08:05 +08:00 |
yuanke
|
7dd26bb5d9
|
邀请码BUG修改
|
2016-07-15 18:19:37 +08:00 |
guange
|
82aa369687
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-15 18:11:01 +08:00 |
guange
|
c02245adfb
|
邀请码分享
|
2016-07-15 18:08:19 +08:00 |
txz
|
b7477a73e4
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-15 17:31:36 +08:00 |
txz
|
6491e16c64
|
微信课程列表底边重合问题
|
2016-07-15 17:31:33 +08:00 |
huang
|
f9e03434c2
|
Merge branch 'develop' into rep_quality
|
2016-07-15 16:51:31 +08:00 |
yuanke
|
6385cc892f
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-15 16:46:36 +08:00 |
yuanke
|
60dc0e72cf
|
微信我我的资源更多按钮显示
|
2016-07-15 16:46:27 +08:00 |
huang
|
2af3c50dbc
|
里程碑区分issue状态“已解决”“已关闭” 对应不同样式
|
2016-07-15 16:43:07 +08:00 |
yuanke
|
0a1ecd65e8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
2016-07-15 16:31:42 +08:00 |
huang
|
b2a8a0fed6
|
修复里程碑进度条数据显示错误的问题
|
2016-07-15 16:28:33 +08:00 |
txz
|
0d08d6b192
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-15 16:14:55 +08:00 |
txz
|
6063932840
|
课程管理中,对课程,班级名称编辑时,字体变灰
|
2016-07-15 16:14:52 +08:00 |
yuanke
|
9b17724ebf
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-15 16:08:42 +08:00 |
yuanke
|
c476dae15b
|
微信我的资源中 更多按钮暂时隐藏
|
2016-07-15 16:08:04 +08:00 |
guange
|
a177c48a29
|
erge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-15 16:00:19 +08:00 |
yuanke
|
2cc42a8f5a
|
微信修改资源更多问题
|
2016-07-15 15:32:40 +08:00 |
guange
|
fff6f4b310
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-15 14:50:21 +08:00 |
guange
|
dd892993dd
|
assets
|
2016-07-15 14:49:23 +08:00 |
cxt
|
b7e6725e1f
|
管理员界面的课程名称双击可点击
|
2016-07-15 14:48:39 +08:00 |
guange
|
0e415fffff
|
merge
|
2016-07-15 14:48:10 +08:00 |
yuanke
|
ae0a4f8ce4
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-15 14:44:48 +08:00 |
yuanke
|
b540ff7017
|
我的资源里增加更多按钮
|
2016-07-15 14:44:37 +08:00 |
txz
|
5a463721b8
|
资源来源限制宽度
|
2016-07-15 14:09:22 +08:00 |
txz
|
08c6c16cfd
|
课程,项目详情页面属性字体减小
|
2016-07-15 10:56:54 +08:00 |
txz
|
54887112e4
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-15 10:52:46 +08:00 |
txz
|
df8b995d41
|
作业,项目属性字体减小
|
2016-07-15 10:52:43 +08:00 |
yuanke
|
dc2ba96353
|
用户注册发送绑定成功消息通知,加入班级消息通知点击跳入班级
|
2016-07-15 10:26:37 +08:00 |
cxt
|
7ea5d7d934
|
新建班级页面,提示“如果列表中没有对应的课程,请您先创建课程”始终显示
|
2016-07-15 10:21:59 +08:00 |
yuanke
|
16e029d340
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-14 17:39:31 +08:00 |
yuanke
|
4c39dcc677
|
微信:修改班级下有挂起作业所有作业都不显示的BUG,将班级下作业、测验发送按钮屏蔽
|
2016-07-14 17:39:22 +08:00 |
txz
|
433f12f184
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-14 17:34:31 +08:00 |
txz
|
a43da43072
|
checked.png替换
|
2016-07-14 17:34:26 +08:00 |
yuanke
|
d50fd40307
|
Merge branch 'weixin_guange' into develop
|
2016-07-14 17:19:47 +08:00 |
Tim
|
c41a116378
|
博客上传附件后,编辑处文件夹图标显示;大纲引用css样式更改
|
2016-07-14 17:00:38 +08:00 |
yuanke
|
9c560e56b6
|
微信修改 不能直接给数据库对象增加新属性
|
2016-07-14 16:54:43 +08:00 |
Tim
|
1fdd1a2a21
|
作业列表css与develop分支同步;popup.css优化
|
2016-07-14 15:28:01 +08:00 |
cxt
|
e19efc1c8a
|
博客的二级回复
|
2016-07-14 14:44:47 +08:00 |
Tim
|
fdf147326c
|
Merge branch 'develop' into cs_optimize_txz
|
2016-07-14 11:01:12 +08:00 |
Tim
|
2b5e31cab9
|
样式与develop分支同步
|
2016-07-14 11:00:03 +08:00 |
yuanke
|
af2b306953
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-14 09:52:10 +08:00 |
yuanke
|
3c426c8d15
|
微信中英文逗号修改
|
2016-07-14 09:52:02 +08:00 |
txz
|
24821ba01d
|
登录与注册页面,输入文字显示不全bug
|
2016-07-14 09:44:35 +08:00 |
Tim
|
538303f4d1
|
导航头像处理
|
2016-07-14 09:11:38 +08:00 |
txz
|
e61aa9e0dc
|
回复框高度自动增减js同步
|
2016-07-13 16:53:17 +08:00 |
yuanke
|
a5acc2641e
|
微信点赞保证各个切换之间点赞状态保持一致
|
2016-07-13 14:06:56 +08:00 |
txz
|
f83d791de1
|
进入课程后,课件,作业,测验及学生管理tab样式更改
|
2016-07-13 09:54:37 +08:00 |
txz
|
2cc87f1dd8
|
课程页面各tab显示bug
|
2016-07-12 17:33:55 +08:00 |
yuanke
|
2844ac2e65
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-12 15:52:08 +08:00 |
yuanke
|
d75e2b740f
|
微信点击我的课程里面的两个按钮时没绑定会提示绑定
|
2016-07-12 15:51:58 +08:00 |
txz
|
78a6785b6b
|
微信回复框自动增高
|
2016-07-12 15:18:51 +08:00 |
txz
|
77f5ad09d2
|
各详情页面回复内容全部显示
|
2016-07-12 15:00:49 +08:00 |
txz
|
717bbe2ffa
|
回复框多行提交后初始化
|
2016-07-12 14:33:52 +08:00 |
txz
|
4434eb3620
|
回复框固定在最下显示
|
2016-07-12 14:10:30 +08:00 |
txz
|
9d91e9397b
|
微信邀请码提示文字修改
|
2016-07-12 11:01:01 +08:00 |
txz
|
f33feb7d84
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-12 10:43:26 +08:00 |
txz
|
243f0bbe7d
|
微信详情内容与回复中链接添加蓝色
|
2016-07-12 10:43:21 +08:00 |
yuanke
|
4111ae632c
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-12 10:25:28 +08:00 |
yuanke
|
d4681eea00
|
我的资源里面显示来源 和大小 并可以下载课件
|
2016-07-12 10:25:18 +08:00 |
txz
|
e3fe95213f
|
增加二级回复与文字间距离
|
2016-07-12 09:34:06 +08:00 |
yuanke
|
14b7b04e4d
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-11 16:55:56 +08:00 |
txz
|
dc6127eb78
|
微信我的资源样式更改
|
2016-07-11 16:54:58 +08:00 |
yuanke
|
70ed5790b8
|
修改在动态详情点赞返回和点赞状态不一致的BUG
|
2016-07-11 16:46:07 +08:00 |
cxt
|
b4e6561e50
|
Merge branch 'cxt_course' into develop
|
2016-07-11 15:16:27 +08:00 |
cxt
|
5d9bde3c95
|
课程发送资源到课程
|
2016-07-11 15:10:55 +08:00 |
txz
|
cf304c2b68
|
dot.png图片更新
|
2016-07-11 15:10:52 +08:00 |
yuanke
|
627135ec12
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-11 14:50:10 +08:00 |
yuanke
|
374aa9918c
|
我的资源里面都显示未发布的,新建课程后返回会刷新数据
|
2016-07-11 14:49:59 +08:00 |
txz
|
bd29859a28
|
创建课程和参与课程区分样式
|
2016-07-11 14:46:35 +08:00 |
txz
|
0093a0a509
|
微信邀请提示文字更改
|
2016-07-11 14:23:53 +08:00 |
Tim
|
a0db221ffc
|
Merge branch 'develop' into cs_optimize_txz
|
2016-07-11 13:57:04 +08:00 |
Tim
|
1aee5b6955
|
将大纲中共用样式提出;个性签名resize:none
|
2016-07-11 13:56:03 +08:00 |
huang
|
1283690250
|
Merge branch 'rep_quality' into develop
|
2016-07-11 11:34:07 +08:00 |
huang
|
93e79d9419
|
add hidden to css
|
2016-07-11 11:23:59 +08:00 |
txz
|
114512d3d9
|
资源宽度限制
|
2016-07-11 11:05:49 +08:00 |
txz
|
2e75fa4b23
|
课程动态中新建课程改为新建班级
|
2016-07-11 10:42:07 +08:00 |
txz
|
6ea1a605c9
|
flex布局兼容css更新
|
2016-07-11 10:37:56 +08:00 |
cxt
|
8e8d6a8439
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
db/schema.rb
|
2016-07-11 08:48:03 +08:00 |
guange
|
135b6ca64b
|
assets
|
2016-07-08 20:04:24 +08:00 |
guange
|
7c98e0f392
|
merge
|
2016-07-08 20:00:49 +08:00 |
guange
|
2b17828844
|
rge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-08 19:59:16 +08:00 |
guange
|
2604f3f0c7
|
资源搜索中只匹配name
|
2016-07-08 19:59:10 +08:00 |
yuanke
|
f8eb150530
|
新增班级不完成点返回班级会出现再课程列表的BUG
|
2016-07-08 19:12:26 +08:00 |
guange
|
1413fe82dc
|
merge
|
2016-07-08 17:44:13 +08:00 |
yuanke
|
c2166811eb
|
修改管理课程界面刷新显示问题
|
2016-07-08 17:35:14 +08:00 |
yuanke
|
8d8de084ac
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-08 17:23:44 +08:00 |
yuanke
|
c6099177a4
|
修改微信发送资源平台不显示发送人的问题,删除班级提示文字不居中的问题等
|
2016-07-08 17:22:58 +08:00 |
txz
|
ea5bd94e99
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-08 17:22:50 +08:00 |
txz
|
9ae7461501
|
资源列表学生进入时也显示为课件;课程tab页样式替换
|
2016-07-08 17:22:44 +08:00 |
guange
|
3c36e97ff1
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-08 17:11:41 +08:00 |
guange
|
3c23560d77
|
我的资源搜索无效
|
2016-07-08 17:11:16 +08:00 |
guange
|
068c8967e1
|
新增班级时名称为1个字符时报错
|
2016-07-08 17:04:17 +08:00 |
Tim
|
03bb862e18
|
代码查重页面消息弹框显示样式丢失
|
2016-07-08 16:55:48 +08:00 |
yuanke
|
3a2e2c1174
|
未命名课程暂不允许进行课程管理
|
2016-07-08 16:40:24 +08:00 |
yuanke
|
d38ce793bd
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-08 16:23:29 +08:00 |
yuanke
|
bb62ba40b7
|
修改微信权限问题、管理课程界面等
|
2016-07-08 16:23:07 +08:00 |
Tim
|
fec1015604
|
在线测验结果列表超出bug修改
|
2016-07-08 15:44:14 +08:00 |
cxt
|
cc4b24cdb9
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-07-08 13:18:46 +08:00 |
cxt
|
13bae8f8a5
|
线下作业
|
2016-07-08 13:17:14 +08:00 |
huang
|
ef8b127225
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
public/javascripts/application.js
|
2016-07-08 11:33:51 +08:00 |
huang
|
e588321ada
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-08 11:31:02 +08:00 |
huang
|
61e2e427fd
|
Merge branch 'rep_quality' into develop
|
2016-07-08 11:30:53 +08:00 |
txz
|
ed39b4b4f1
|
动态:创建班级;学生进入资源也显示课件;已有班级和新增班级颜色区分
|
2016-07-08 11:29:33 +08:00 |
yuanke
|
06f7594680
|
Merge branch 'yuanke' into develop
|
2016-07-08 09:15:55 +08:00 |
Tim
|
d7fb0d4bca
|
添加关注,取消关注图标更新
|
2016-07-08 09:10:03 +08:00 |
Tim
|
fbedaea768
|
图标显示css修改
|
2016-07-08 09:00:54 +08:00 |
Tim
|
65cbf14d72
|
提交与取消按钮间添加间距;图标不显示等
|
2016-07-07 17:06:31 +08:00 |
cxt
|
3b418bc44c
|
如果未登陆,在资源列表最上面增加一个提示句(必须全局统一:您尚未登录,登录后可浏览更多信息),“登录”可做成链接。
|
2016-07-07 16:46:41 +08:00 |
cxt
|
37dd447fcb
|
Merge branch 'daiao_dev' into cxt_course
Conflicts:
app/views/admin/courses.html.erb
public/stylesheets/new_user.css
|
2016-07-07 15:14:11 +08:00 |
Tim
|
b02c1b5995
|
提交与取消按钮之间增加间距;新建问卷"选项D"文字折行;日历图标样式调整,问题跟踪日历前input宽度缩减;
|
2016-07-07 15:08:34 +08:00 |
cxt
|
da7509f64c
|
课程大纲的优化
|
2016-07-07 15:04:57 +08:00 |
guange
|
a2ba65956c
|
.
|
2016-07-07 15:03:45 +08:00 |
yuanke
|
3a6470b1f3
|
删除班级时增加提示确定信息
|
2016-07-07 14:55:41 +08:00 |
guange
|
7859bf9c32
|
.
|
2016-07-07 14:51:54 +08:00 |
guange
|
a17a6ed596
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-07 14:35:26 +08:00 |
guange
|
10789d2505
|
added alert2
|
2016-07-07 14:35:15 +08:00 |
huang
|
92b6171c36
|
sonar error puts
|
2016-07-07 11:08:29 +08:00 |
Tim
|
421dc636fe
|
作业列表样式更新
|
2016-07-07 10:47:12 +08:00 |
cxt
|
a99b03ff76
|
管理员界面增加配置课程
|
2016-07-07 09:02:41 +08:00 |
yuanke
|
9d46040f7a
|
课程列表 + - 按钮增加效果,资源发送界面课程列表显示和课程列表界面保持一直
|
2016-07-06 17:08:22 +08:00 |
yuanke
|
6fe8d7ddf5
|
点击图片弹框右下角统一用“关闭”
|
2016-07-06 16:03:50 +08:00 |
Tim
|
0b764d0dfc
|
RSide样式处理
|
2016-07-06 15:52:18 +08:00 |
Tim
|
75475b6058
|
个人主页,课程,项目样式更新
|
2016-07-06 15:43:48 +08:00 |
yuanke
|
b994e786ab
|
我的动态中三类动态之间切换的效果
|
2016-07-06 11:06:32 +08:00 |
Tim
|
d2d2222ea2
|
组织成员列表样式调整
|
2016-07-06 10:00:28 +08:00 |
Tim
|
4136aa9291
|
二级回复,上传附件后删除图标,文件图标显示,
|
2016-07-06 09:07:48 +08:00 |
Tim
|
d9fc479607
|
消息弹框显示css调整
|
2016-07-05 16:51:55 +08:00 |
cxt
|
c5840d75da
|
Merge branch 'daiao_dev' into cxt_course
Conflicts:
db/schema.rb
|
2016-07-05 16:49:50 +08:00 |
Tim
|
253933c85a
|
消息通知图标显示
|
2016-07-05 16:46:52 +08:00 |
Tim
|
b91d6a3273
|
班级动态筛选框样式调整
|
2016-07-05 16:31:36 +08:00 |
Tim
|
c3bc901925
|
对#Rside样式处理
|
2016-07-05 16:16:12 +08:00 |
Tim
|
fae2dc324c
|
登录注册页面图标显示
|
2016-07-05 16:03:39 +08:00 |
Tim
|
1658f78a7b
|
Merge branch 'develop' into cs_optimize_txz
Conflicts:
app/views/layouts/new_base.html.erb
app/views/layouts/new_base_user.html.erb
app/views/users/_user_resource_info.html.erb
|
2016-07-05 15:38:56 +08:00 |
Tim
|
4cbae10934
|
同步devlope分支css
|
2016-07-05 15:01:02 +08:00 |
yuanke
|
d49bc8b114
|
发送课程的时候提示语修改
|
2016-07-05 14:44:50 +08:00 |
txz
|
7a9665bbee
|
微信详情页面样式调整
|
2016-07-05 11:18:58 +08:00 |
cxt
|
4a5bdc5e48
|
课程列表中的班级显示适当缩进
|
2016-07-05 11:01:50 +08:00 |
cxt
|
f83bd3cf63
|
课程英文名称输入框去掉拉动图标
|
2016-07-05 10:52:26 +08:00 |
txz
|
8a59623a73
|
项目问题,项目讨论区,博客,留言详情页面样式更新
|
2016-07-05 10:15:32 +08:00 |
yuanke
|
da19bbd3a0
|
优化了下修改资料界面的代码
|
2016-07-05 09:02:34 +08:00 |
txz
|
64a1d197ee
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-04 17:06:47 +08:00 |
txz
|
3066a564bd
|
课程作业详情页面样式更新
|
2016-07-04 17:06:43 +08:00 |
guange
|
373e3d3422
|
merge
|
2016-07-04 17:06:26 +08:00 |
guange
|
48fb02a2d6
|
管理课程
|
2016-07-04 17:04:06 +08:00 |
yuanke
|
08f263128c
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-04 16:53:10 +08:00 |
yuanke
|
9d0b5789d9
|
1.修改我的动态博客详情页面显示不了的BUG 2.资源界面切换是暂无XX先隐藏 3. 发送资源不选择班级的提示修改
|
2016-07-04 16:50:49 +08:00 |
txz
|
45b824938e
|
课程讨论区与课程通知详情页面样式更新
|
2016-07-04 16:41:41 +08:00 |
guange
|
60367415fa
|
新建课程功能完成
|
2016-07-04 16:19:05 +08:00 |
txz
|
bd1aae07fd
|
微信动态页面样式更新
|
2016-07-04 14:43:51 +08:00 |
cxt
|
599cedaa18
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/courses.css
public/stylesheets/public.css
|
2016-07-04 14:15:56 +08:00 |
cxt
|
cc649ae64b
|
课程讨论区、项目讨论区、帖子详情页面的二级回复
|
2016-07-04 14:14:51 +08:00 |
guange
|
3c295ba5a1
|
merge
|
2016-07-04 10:54:03 +08:00 |
guange
|
201abd6358
|
assets
|
2016-07-03 00:08:51 +08:00 |
guange
|
b010ce2e61
|
发送课程完成
|
2016-07-02 23:46:45 +08:00 |
huang
|
3737ef40d0
|
Merge branch 'cxt_course' into develop
Conflicts:
public/stylesheets/courses.css
|
2016-07-01 21:39:29 +08:00 |
yuanke
|
1bfb2918f0
|
KE间距改回原来的,修改课程大纲附件删除下载问题,修改博客标题与置顶样式问题
|
2016-07-01 20:06:12 +08:00 |
Tim
|
28c20c966e
|
查看标签页面显示bug
|
2016-07-01 19:28:55 +08:00 |
cxt
|
e834d09469
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-07-01 17:52:29 +08:00 |
cxt
|
5a1090c0e1
|
bug修复
|
2016-07-01 17:27:34 +08:00 |
cxt
|
6867a88a94
|
课程大纲样式调整
|
2016-07-01 16:41:13 +08:00 |
cxt
|
0ff8f0a774
|
课程大纲的删除和课程大纲描述的删除
|
2016-07-01 16:25:52 +08:00 |
Tim
|
9cb0160930
|
课程资源,学生,教师列表css调整
|
2016-07-01 15:15:53 +08:00 |
cxt
|
18d677c5eb
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/courses.css
|
2016-07-01 11:31:51 +08:00 |
cxt
|
bdaa9983e3
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-07-01 11:30:24 +08:00 |
cxt
|
a50e15b2ab
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/users/_user_syllabus_list.html.erb
db/schema.rb
|
2016-07-01 11:15:03 +08:00 |
cxt
|
2c1e0f534c
|
课程大纲
|
2016-07-01 11:11:53 +08:00 |
yuanke
|
dfd381fc99
|
Merge branch 'yuanke_org' into develop
Conflicts:
db/schema.rb
|
2016-07-01 09:31:19 +08:00 |
yuanke
|
5cc40408ee
|
修改KE单倍行距显示的时候不一致的BUG
|
2016-06-30 16:30:02 +08:00 |
Tim
|
10f52f110f
|
课程大纲列表点击展开收起,配置按钮链接跳转实现
|
2016-06-30 16:12:25 +08:00 |
yuanke
|
397c4cc2a5
|
1.重新发送注册邮件修改2.个人资料修改页面修改3.问题反馈处增加直接加入QQ群的按钮
|
2016-06-30 16:08:36 +08:00 |
Tim
|
ba1db91a1e
|
css优化调整
|
2016-06-30 15:38:00 +08:00 |
cxt
|
4314f6e36a
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
db/schema.rb
|
2016-06-30 15:37:16 +08:00 |
cxt
|
ac4218bfb0
|
课程大纲列表
|
2016-06-30 15:36:46 +08:00 |
cxt
|
ebb697a49f
|
班级列表、课程大纲的编辑、回复、课程列表
|
2016-06-30 10:44:11 +08:00 |