 Tim
|
1a4865be09
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-06-21 15:03:51 +08:00 |
 cxt
|
c4cea93a44
|
消息列表的“展开更多”指针手势修改
|
2016-06-21 13:58:17 +08:00 |
|
cxt
|
4f80e259e8
|
消息弹窗的延时显示
|
2016-06-21 11:16:45 +08:00 |
|
cxt
|
dc70b40309
|
kindeditor中的a标签属性编辑
|
2016-06-21 11:04:35 +08:00 |
|
cxt
|
860068f7ed
|
新注册用户的留言
|
2016-06-21 11:03:50 +08:00 |
|
cxt
|
f4d67bc027
|
未读消息弹窗“点击展开”显示10条未读消息
|
2016-06-20 16:03:57 +08:00 |
|
Tim
|
3548c23aad
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-06-20 15:43:15 +08:00 |
|
cxt
|
048bb7fed5
|
头像下拉菜单、未读消息的延时
|
2016-06-20 15:38:43 +08:00 |
|
cxt
|
b26a6b5195
|
消息弹窗的链接无效
|
2016-06-20 11:24:34 +08:00 |
|
Tim
|
4b62a39b15
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-06-17 16:49:57 +08:00 |
|
cxt
|
2685e263d0
|
Merge branch 'develop' into cxt_course
|
2016-06-17 15:11:30 +08:00 |
|
cxt
|
7b1efe193d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-17 14:45:16 +08:00 |
|
cxt
|
eb3694dbe6
|
消息报500
|
2016-06-17 14:45:07 +08:00 |
 yuanke
|
811afbdf33
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-17 14:43:25 +08:00 |
 huang
|
7d68df79a0
|
组织合并凌彬代码500问题
|
2016-06-17 14:44:12 +08:00 |
|
yuanke
|
b942be7162
|
Merge branch 'yuanke' into develop
|
2016-06-17 14:42:49 +08:00 |
|
yuanke
|
fde3fd0d94
|
新建贴吧跳入该贴吧帖子列表，组织栏目配置默认选择第一个栏目类型
|
2016-06-17 14:40:00 +08:00 |
|
yuanke
|
d6d9a366f2
|
Merge branch 'develop' into yuanke
Conflicts:
public/stylesheets/new_user.css
|
2016-06-17 14:36:12 +08:00 |
|
huang
|
0f17ac0e9e
|
Merge branch 'lingbing' into develop
Conflicts:
app/views/organizations/_org_custom_header.html.erb
|
2016-06-17 14:33:31 +08:00 |
|
huang
|
8741917823
|
访问统计 （自2016年5月）
|
2016-06-17 14:31:42 +08:00 |
|
yuanke
|
c51c73f225
|
所有回复添加未登录提示
|
2016-06-17 14:31:14 +08:00 |
|
cxt
|
a105f4eaf0
|
课程动态中：课程讨论区、课程通知
项目动态中：项目issue、项目新闻、项目讨论区
个人动态：如上动态
未登录时不显示齿轮
|
2016-06-17 14:09:43 +08:00 |
|
yuanke
|
747b2007cd
|
项目中未登录提示按钮样式问题
|
2016-06-17 13:44:11 +08:00 |
|
huang
|
88b838a89a
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-06-17 11:33:48 +08:00 |
|
huang
|
35ee17c4ca
|
Merge branch 'yuanke' into develop
|
2016-06-17 11:32:50 +08:00 |
|
cxt
|
1dac05c6d1
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-17 11:26:58 +08:00 |
|
yuanke
|
3ae26a6530
|
组织配置页面 名师列表 热门项目 学霸 精品课程的右上角字样只对超级管理员显示,图片显示时如果已经带了链接则不增加点击弹框效果。
|
2016-06-17 11:23:49 +08:00 |
|
huang
|
d127c6e12c
|
访问添加自某年某月
|
2016-06-17 09:45:10 +08:00 |
|
cxt
|
795917688c
|
留言内容无法展开、收起
|
2016-06-17 09:34:48 +08:00 |
|
huang
|
227f2343a4
|
登录注册背景图片替换
|
2016-06-16 17:14:13 +08:00 |
|
huang
|
260bef0ebb
|
登录祖册鼠标经过颜色
|
2016-06-16 17:01:51 +08:00 |
|
cxt
|
28ee609eed
|
学生查看测验的统计结果
|
2016-06-16 16:58:59 +08:00 |
|
yuanke
|
70a762220a
|
组织、项目的资源文件增加描述修改及上传文件时候添加描述，并且所有操作对超级管理员开放
|
2016-06-16 16:55:25 +08:00 |
|
huang
|
006965df50
|
导航背景颜色还原
|
2016-06-16 16:46:44 +08:00 |
|
cxt
|
439841fbd7
|
从课程动态页面打开的匿评设置日期选择界面显示为英文，从作业页面打开的匿评设置日期选择界面为中文，应该统一为中文
|
2016-06-16 16:10:42 +08:00 |
|
huang
|
3f697355d2
|
chorm浏览器兼容问题
|
2016-06-16 16:01:56 +08:00 |
|
cxt
|
30db43eb13
|
作业开启匿评之后，如果是普通作业，会提示学生提交的作业不会进入匿评，也不能对其他人进行匿评，如果是编程作业，在打开作业时则无此提示，应该统一，均进行提示
|
2016-06-16 15:58:34 +08:00 |
|
huang
|
312fa61489
|
输入框线条
|
2016-06-16 15:57:30 +08:00 |
|
huang
|
6707868915
|
登录页面新样式
|
2016-06-16 15:52:54 +08:00 |
|
cxt
|
e3ee99b486
|
消息通知中过滤掉已删除的课程消息、
at消息不显示
|
2016-06-16 15:46:16 +08:00 |
|
huang
|
d2d15710b5
|
解决chrome浏览器背景黄色问题
|
2016-06-16 15:25:43 +08:00 |
|
huang
|
a63dffd9d3
|
资源库导航颜色一致
|
2016-06-16 14:54:27 +08:00 |
|
huang
|
d157155cba
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-16 14:43:35 +08:00 |
|
huang
|
d4760bcd6d
|
一个像素问题
|
2016-06-16 14:43:19 +08:00 |
|
yuanke
|
f9f66bac7b
|
修改课程资源描述为空时提示
|
2016-06-16 14:15:46 +08:00 |
|
yuanke
|
7df91ebf70
|
修改课程资源描述空白的提示语
|
2016-06-16 14:14:54 +08:00 |
|
yuanke
|
4cd321f363
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-16 14:11:17 +08:00 |
|
yuanke
|
049a21c7d0
|
不上线的先还原
|
2016-06-16 14:08:54 +08:00 |
|
huang
|
072807fe37
|
1、登录下划线去掉2、登录改成注册3、默认的改成勾选协议
|
2016-06-16 14:07:37 +08:00 |
|
yuanke
|
82ebd1e4c9
|
Merge branch 'yuanke' into develop
|
2016-06-16 14:04:53 +08:00 |