jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
15,266 Commits 98 Branches 0 Tags 0 B
Commit Graph

3303 Commits

Author SHA1 Message Date
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