Commit Graph

70 Commits

Author SHA1 Message Date
Tim 9ec6074260 将头部帮助中心改为贴吧交流 2016-09-05 13:18:35 +08:00
huang 936198a8bd 隐藏非项目信息 2016-08-31 10:30:23 +08:00
cxt e7e873e0df Merge branch 'dev_shcool' into develop
Conflicts:
	app/helpers/users_helper.rb
2016-08-05 16:32:10 +08:00
daiao 7fbca5f260 单位审查消息及其BUG修复 2016-08-05 16:14:26 +08:00
cxt acc3ba121f 测试集的显示、新版分页 2016-08-03 13:46:59 +08:00
Tim 73b7b00db9 班级学生列表导航栏下拉框错位调整 2016-07-12 16:45:04 +08:00
cxt 2c1e0f534c 课程大纲 2016-07-01 11:11:53 +08:00
cxt 4f80e259e8 消息弹窗的延时显示 2016-06-21 11:16:45 +08:00
cxt 048bb7fed5 头像下拉菜单、未读消息的延时 2016-06-20 15:38:43 +08:00
cxt 24f5e245df 鼠标经过消息通知时弹窗显示最新的5条未读消息 2016-06-12 14:20:55 +08:00
cxt ee12b3540b 消息弹窗的还原、微信配置修改 2016-06-06 11:05:25 +08:00
cxt d27a050ffa 消息弹窗的显示 2016-06-03 16:28:11 +08:00
cxt 1396cae14c 消息弹框 2016-06-03 08:59:17 +08:00
huang 5b763927cc 顶部用户路由 2016-04-25 14:14:26 +08:00
huang 9ce39d2f4a Issue模块动态优化 2016-03-25 15:46:40 +08:00
huang 5681d329d6 Merge branch 'develop' into hjq_new_course
Conflicts:
	app/controllers/news_controller.rb
	app/views/users/_user_message_userfeedaback.html.erb
2016-03-15 11:12:24 +08:00
ouyangxuhua a2e6f0ee5f 1.登陆退出使用www;2.对于有多个标签的组织资源,过滤条件中的“其他”应该显示 2016-03-14 15:39:45 +08:00
huang c947121e2b 消息不显示问题(未完) 2016-03-10 14:52:49 +08:00
huang bafa151c0d 0 2016-03-05 03:16:04 +08:00
huang 3f56fa3405 0 2016-03-05 03:14:57 +08:00
huang 97e6299a2b Merge branch 'hjq_new_course' into develop
Conflicts:
	app/views/layouts/_logined_header.html.erb
2016-03-04 09:33:38 +08:00
huang 95346bb419 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	app/views/layouts/_logined_header.html.erb
	public/stylesheets/public.css
2016-03-04 09:32:49 +08:00
cxt f0d7542ac6 个人题库和公共题库 2016-03-03 17:04:38 +08:00
huang 3368680e49 课程、项目、组织添加导入资源功能 2016-03-03 10:38:37 +08:00
huang 8edaa9d2bd 资源库 2016-03-01 17:33:44 +08:00
ouyangxuhua 38a87a04ba 1.为首页、铃铛增加tips;2.为组织、项目下的资源库的tag,增加“双击可编辑”的tips 2016-01-27 15:50:31 +08:00
huang 81b32ea643 点击铃铛弹出新tab页 2016-01-15 12:39:38 +08:00
cxt 0ed58d4898 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-17 19:07:17 +08:00
lizanle f3013ca3e7 修改了搜索的提示描述 2015-12-14 11:22:36 +08:00
huang 5ca8d4cd66 修改http链接自动换域名 2015-12-14 10:54:37 +08:00
lizanle 8bd9c0c7af tip 2015-11-30 14:59:51 +08:00
lizanle 29a8d1b9f5 tip 2015-11-30 13:22:01 +08:00
lizanle 4efb660214 全站搜索 2015-11-26 09:57:53 +08:00
ouyangxuhua 3451ced888 添加我的组织页面及修改bug 2015-11-13 16:34:00 +08:00
ouyangxuhua 6ec27761fb 组织功能实现及缺陷修改 2015-11-12 20:57:41 +08:00
Tim 0d85fb3c5f 导航栏链接在变色范围内都可点击 2015-10-10 11:07:29 +08:00
lizanle dc3cb3a26b _logined_header.html头像 鼠标移入就要有效果 2015-10-09 13:38:35 +08:00
huang edf6f8e1f0 消息提示,显示新消息数目 2015-09-30 10:31:47 +08:00
cxt 6ed0a151dc 头像下拉框的样式修改 2015-09-09 17:45:39 +08:00
cxt 040f3f588d 鼠标移到头像上方,才显示账户下拉菜单 2015-09-09 11:23:23 +08:00
sw f81bab6319 课程回复 2015-08-29 17:19:03 +08:00
sw 1e9f5cebd2 首页查询问题 2015-08-29 17:04:44 +08:00
sw 6d768100f8 输入为空不提交表单 2015-08-29 16:14:02 +08:00
sw 4ade77f3d0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-29 12:04:57 +08:00
suntao 977f81e031 关注和取消关注,导航圆角 2015-08-29 11:41:12 +08:00
sw e5bf355a17 导航栏搜索支持enter键 2015-08-29 11:28:02 +08:00
suntao 02120c778f 样式修改 2015-08-28 12:09:31 +08:00
suntao b6d58b1b58 样式调整 2015-08-28 11:55:34 +08:00
huang bc563119d6 Merge branch 'sw_new_course' into dev_hjq
Conflicts:
	app/controllers/users_controller.rb
	public/stylesheets/new_user.css
2015-08-26 15:04:44 +08:00
lizanle 70e9d75cc6 登陆后的搜索 2015-08-25 18:59:45 +08:00