Commit Graph

183 Commits

Author SHA1 Message Date
ouyangxuhua c3a67a544b 修改系统消息logo为红色trustie 2015-10-29 09:23:04 +08:00
Tim 1a2edd9103 课程大纲图标等修改 2015-10-28 17:34:41 +08:00
huang 4c61e7490b Merge branch 'develop' into gitlab_guange
Conflicts:
	db/schema.rb
2015-10-27 14:42:05 +08:00
huang 34a8d0890c 相政新界面 2015-10-26 17:18:59 +08:00
ouyangxuhua 4a188dc81d 对所有作业消息,统一在内容前加圆点,并且调整颜色 2015-10-23 14:28:24 +08:00
Tim 64ec465126 意见反馈窗口调整 2015-10-14 09:25:54 +08:00
ouyangxuhua 155dff7e27 1.增加消息列表对应的图标; 2015-10-12 15:08:01 +08:00
Tim 2ceba291bf 蓝色箭头替换 2015-10-08 17:27:08 +08:00
Tim 4c5b59ebc8 作业动态图标替换 2015-09-29 17:28:45 +08:00
Tim c675a4c227 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 10:43:42 +08:00
Tim 7e3ae446f5 资源库头像替换 2015-09-25 10:35:04 +08:00
lizanle 531b264a8f Merge branch 'dev_zanle' into szzh 2015-09-24 13:44:37 +08:00
sw f9f51557dd 增加关闭反馈功能 2015-09-24 11:31:07 +08:00
lizanle d512c25c03 Merge branch 'szzh' into dev_zanle
Conflicts:
	public/javascripts/new_user.js
	public/stylesheets/header.css
	public/stylesheets/new_user.css
2015-09-24 10:15:23 +08:00
lizanle 9443c139f0 update forum 2015-09-18 17:44:16 +08:00
Tim 3dccf8f77d 动态页面菜单栏图标更改;
提交作业界面图标宽度更改。
2015-09-17 16:04:27 +08:00
sw f79b2cda94 提交作品关联项目功能 2015-09-15 15:18:33 +08:00
sw 2ce29b7dcc 删除应该忽略的文件 2015-09-11 18:36:56 +08:00
sw 97f9d4fa60 增加教师节祝福语 2015-09-10 10:26:16 +08:00
sw 2e59584031 作业编辑功能按钮、加入课程、项目等按钮样式 2015-09-08 16:36:50 +08:00
guange 9e9f373a76 发布作业优化 2015-09-07 23:09:19 +08:00
guange 04dffb2f89 模拟回答界面调整 2015-09-07 18:29:25 +08:00
lizanle b2eb846a23 关于我们
隐藏招聘信息
联系我们改为服务协议
2015-09-01 15:34:22 +08:00
suntao ae3f56c758 提交作业界面对齐 2015-09-01 14:37:34 +08:00
suntao 5f3532ac14 头像部分修改 2015-08-29 11:25:49 +08:00
suntao ada04e5e63 个人主页头像模块改动 2015-08-29 10:13:32 +08:00
suntao 46ac491b5b 上传图片 2015-08-28 17:29:22 +08:00
suntao b6d58b1b58 样式调整 2015-08-28 11:55:34 +08:00
sw 3ea198dc3d 标题栏作业界面静态页面的添加 2015-08-24 18:15:46 +08:00
lizanle 86d2f5342c 登陆界面 2015-08-24 16:22:22 +08:00
sw b6a2be72e4 调整CSS,修改图片,实现部分功能动态效果 2015-08-19 15:13:30 +08:00
sw d8da74a0d4 更新css,增加个人主页公共部分的动态效果 2015-08-19 14:43:12 +08:00
sw 752fe93d72 已登录用户header完成 2015-08-18 11:47:22 +08:00
sw b27944fad7 增加css文件以及个人主页静态页面、缺失图片 2015-08-18 10:59:31 +08:00
huang 9b98bdcf5c 1、消息看过则不提示(方法实现)
2、添加消息新按钮
2015-08-15 15:44:44 +08:00
sw a7666af597 Merge branch 'yutao' into szzh
Conflicts:
	app/controllers/users_controller.rb
2015-07-17 17:38:07 +08:00
huang fc61edf1fa 课程讨论区添加真实姓名
编辑器图片更新
2015-07-10 10:37:34 +08:00
yutao 5c011fd342 个人主页 2015-07-09 15:27:49 +08:00
huang 7ebdf4a08d issue列表增加优先级
修改issue列表界面
2015-07-07 11:29:40 +08:00
yutao cd0752f5da 课程讨论区动态与我相关 2015-06-04 15:55:41 +08:00
sw cc5171bc1d 解决冲突 2015-06-02 14:48:48 +08:00
yutao 709c026910 ... 2015-05-28 15:48:52 +08:00
sw faeb06aae8 1、更新css文件
2、新建作品功能天津
3、老师新建作业时增加文件的保存
2015-05-21 15:52:27 +08:00
sw 628ffc67dd 课程作品列表界面增加返回顶部功能 2015-05-07 10:43:23 +08:00
huang 95c5e6ac83 Merge branch 'szzh' into dev_hjq
Conflicts:
	app/helpers/application_helper.rb
	app/helpers/files_helper.rb
	app/helpers/members_helper.rb
	app/models/journals_for_message.rb
	app/models/mailer.rb
	app/models/user.rb
	app/views/attachments/_form.html.erb
	app/views/bids/_new_homework_form.html.erb
	app/views/boards/_project_show.html.erb
	app/views/courses/_courses_jours.html.erb
	app/views/courses/feedback.html.erb
	app/views/courses/new_homework.html.erb
	app/views/courses/settings.html.erb
	app/views/issues/_list.html.erb
	app/views/issues/new.html.erb
	app/views/messages/_project_show.html.erb
	app/views/messages/edit.html.erb
	app/views/news/_project_news.html.erb
	app/views/projects/invite_members.html.erb
	app/views/projects/settings/_modules.html.erb
	app/views/projects/show.html.erb
	config/configuration.yml
	config/locales/zh.yml
	db/schema.rb
	public/assets/kindeditor/kindeditor.js
	public/javascripts/course.js
	public/stylesheets/courses.css
	public/stylesheets/public.css
2015-04-16 10:26:03 +08:00
whimlex 9c07976751 展开和收起更多信息图片样式修改;跟踪者样式修改 2015-04-16 09:54:10 +08:00
huang 8e7b4868ca wiki页面调整 2015-04-16 00:30:23 +08:00
sw e579157604 更新public.css
课程讨论区文件按钮和editor靠的太近
2015-04-15 14:29:35 +08:00
sw bb9513b313 课程学生作业列表增加搜索的静态页面 2015-04-14 16:36:03 +08:00
sw 3313bef0b1 路由报错 2015-04-11 11:00:06 +08:00