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

1099 Commits

Author SHA1 Message Date
lizanle f4b6b795e3 kindeditor增加代码编辑功能 2015-04-24 09:07:12 +08:00
whimlex 1f83950b50 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-23 18:18:50 +08:00
whimlex b61d76d94e 意见反馈 2015-04-23 18:18:07 +08:00
lizanle cf9cc0af82 Merge remote-tracking branch 'origin/szzh' into szzh 2015-04-23 18:08:10 +08:00
lizanle 681f7b75d6 kindeditor图片上传改为一次弹框 2015-04-23 18:07:51 +08:00
whimlex e61822d74a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-23 17:56:11 +08:00
whimlex b3e0490b90 意见反馈 2015-04-23 17:55:48 +08:00
sw e21dfe28fd Merge branch 'szzh' into guange_dev 2015-04-23 17:45:22 +08:00
lizanle f7dd4924c1 Merge remote-tracking branch 'origin/szzh' into szzh 
Conflicts:
	public/assets/kindeditor/kindeditor.js
 2015-04-23 17:44:42 +08:00
lizanle 3b99c97617 kindeditor图片上传改为一次弹框 2015-04-23 17:43:34 +08:00
guange 5c0d0230fc 去掉首页底部留白和不对齐 2015-04-23 17:43:10 +08:00
whimlex b5781ac22b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-23 16:13:19 +08:00
whimlex 5d0d9de6e8 意见反馈各主页内保持一致 2015-04-23 16:13:01 +08:00
huang 4da77d8a71 wiki页面显示 2015-04-23 16:02:18 +08:00
huang c9bfe00a4f 修改成员列表的排列 
版本库页面色系
 2015-04-23 15:31:14 +08:00
sw cfe0635804 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-23 14:31:01 +08:00
huang de23c3c2a8 配置中子页面调整 
隔行换色显示
显示页面左对齐
 2015-04-23 14:04:22 +08:00
sw 5b5423b8c5 修改贴吧新建帖子、回复显示样式的问题 2015-04-23 10:47:54 +08:00
huang ee1c53bacc Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-23 10:20:15 +08:00
whimlex 2070d69d44 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-23 10:20:01 +08:00
huang 348eae5c45 修改项目模式提示样式 
版本库
版本
 2015-04-23 10:19:59 +08:00
whimlex 19fe973b5b 上传头像 2015-04-23 10:19:43 +08:00
whimlex d66af82478 新建竞赛页面日历插件显示错误 2015-04-23 01:00:17 +08:00
sw 9a07989917 调整header的login的样式 2015-04-22 17:01:36 +08:00
sw 427f26b058 header的login显示 2015-04-22 16:37:24 +08:00
whimlex 36f2643ad8 上传logo 2015-04-22 16:33:12 +08:00
whimlex 86bd708c5d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-22 14:35:25 +08:00
whimlex 21f08830df 意见反馈功能修改 2015-04-22 14:35:04 +08:00
sw 2f2d4257c2 调整提交作业按钮样式 2015-04-22 14:10:45 +08:00
sw d279881daf Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 
Conflicts:
	app/views/courses/settings.html.erb
 2015-04-22 11:14:12 +08:00
sw 7b3edb59b0 Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/views/courses/_course_members.html.erb
	app/views/courses/settings.html.erb
	app/views/members/create.js.erb
	app/views/members/destroy.js.erb
	app/views/members/update.js.erb
	public/javascripts/course.js
 2015-04-22 11:11:51 +08:00
sw 3d8ec17bb1 修改学生作业得分列表弹出框样式 2015-04-22 11:07:39 +08:00
whimlex 0f037e78fa Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 
Conflicts:
	public/stylesheets/public.css
 2015-04-22 10:18:49 +08:00
whimlex 5123ca1047 版本库样式调整 2015-04-22 10:16:14 +08:00
huang ca26b0d819 Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/views/courses/_course_members.html.erb
	app/views/courses/settings.html.erb
	app/views/members/create.js.erb
	app/views/members/destroy.js.erb
	app/views/members/update.js.erb
	app/views/users/show.html.erb
	public/javascripts/course.js
 2015-04-22 09:31:13 +08:00
huang 8b77079f44 公开。私有标识强制不换行 2015-04-22 00:55:40 +08:00
sw 57193b077e 作品列表取消分页显示 2015-04-21 20:44:27 +08:00
whimlex b99f8d8056 上传头像，上传课程项目logo提示 2015-04-21 17:56:01 +08:00
huang 5bfef259de 去掉缺陷列表空白处的链接 2015-04-21 15:22:27 +08:00
huang dd25cdc065 1、修改项目三种类型术语 
2、未登录情况下缺陷提交bug
3、width果断空白处点击进入
 2015-04-21 14:19:50 +08:00
huang 692500af2e Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-20 14:54:27 +08:00
huang 93e3247685 项目名称不能为空提示 2015-04-20 14:54:04 +08:00
whimlex 86ef3e680a 项目简介展开更多信息不超过一定内容不显示 2015-04-20 14:45:46 +08:00
whimlex 05712c4c06 学生作业改为作品 2015-04-17 17:48:25 +08:00
whimlex 11d83a863a Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 
Conflicts:
	app/views/projects/show.html.erb
 2015-04-17 17:08:21 +08:00
whimlex ab39d54b45 版本库文件列表样式 2015-04-17 17:07:23 +08:00
huang 7340ef793c 修改新建项目的显示样式 2015-04-17 16:26:05 +08:00
whimlex 65e6b41d91 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-17 16:06:40 +08:00
whimlex 22a4bf9216 查看修订样式 2015-04-17 16:06:24 +08:00
huang 7d87915413 Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/helpers/application_helper.rb
	app/helpers/files_helper.rb
	app/views/courses/_course_members.html.erb
	app/views/courses/settings.html.erb
	app/views/homework_attach/_homework.html.erb
	public/javascripts/course.js
	public/stylesheets/courses.css
	public/stylesheets/public.css
 2015-04-17 15:07:01 +08:00
whimlex 0a97bbba9d 项目问题跟踪图片点击空白处关闭 2015-04-17 14:29:16 +08:00
whimlex dc955c7e2d 编辑问题时，编辑问题状态，开始时间、计划完成时间右侧的时间选择器不见了 2015-04-17 14:14:13 +08:00
sw cdbe95f6ec 修改老师配置界面成员搜索 2015-04-17 11:48:47 +08:00
whimlex 51e0217eb8 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-17 11:15:15 +08:00
whimlex eb1f8acbd3 版本库样式修改 2015-04-17 11:14:55 +08:00
sw 9f862ad7a7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-17 11:11:03 +08:00
huang 640f6a1ca7 邮件发送框距离 
去掉讨论区不必要的*
 2015-04-17 10:58:40 +08:00
whimlex 54e63cf4d9 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 
Conflicts:
	app/views/issues/_history.html.erb
	public/stylesheets/project.css
 2015-04-17 08:48:17 +08:00
huang fbcd9f9a96 wiki页面调整 2015-04-17 08:28:07 +08:00
whimlex 8babe384fd 缺陷历史记录调整 2015-04-16 20:11:33 +08:00
whimlex e9cf61e0f4 缺陷状态根据完成度调整 2015-04-16 17:56:19 +08:00
z9hang 47e6d5c909 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-16 17:28:36 +08:00
z9hang 8a26fd4343 课程配置：成员配置处添加搜素成员功能 2015-04-16 17:28:08 +08:00
sw b040981c22 调整course.css 2015-04-16 17:07:43 +08:00
sw 11a4febecb 调整course.css 2015-04-16 17:01:47 +08:00
sw daef2c455a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-16 16:55:44 +08:00
whimlex 8b89110e41 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-16 16:40:11 +08:00
sw 65bcaef911 修改TAG云样式 2015-04-16 16:39:58 +08:00
whimlex ca1e902a8f #2279 搜索课程进入结果页面，如图，建议将“授课时间”与“课程简介”与上面的“课程名称”等信息对齐 2015-04-16 16:39:52 +08:00
sw 332a9b45fb 修改项目上传资源弹框样式 2015-04-16 16:10:24 +08:00
huang bfc83d1a8c 解决项目图片不能上传 2015-04-16 15:48:13 +08:00
sw 6983764c44 修改课程名称过长时的样式 2015-04-16 15:41:50 +08:00
sw 4202ec4bad 个人主页样式 2015-04-16 15:27:49 +08:00
huang b92767bbb5 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-16 15:16:54 +08:00
huang b80251a247 链接空白处改成不能点击 
修复项目标题过长，布局变形
 2015-04-16 15:16:15 +08:00
lizanle 10bd7c2855 Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq 2015-04-16 14:59:11 +08:00
lizanle 17f495e77b 项目 版本 和 版本库 标签改动 2015-04-16 14:59:05 +08:00
whimlex 19dd5a9879 项目邀请功能和项目更多功能点击事件 2015-04-16 14:25:02 +08:00
huang 4afd9afd08 解决冲突。修改版本页面 
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq

Conflicts:
	public/stylesheets/project.css
 2015-04-16 13:42:45 +08:00
huang 08fb04aff4 修改版本库样式 2015-04-16 13:40:46 +08:00
whimlex 20b17f5503 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-16 12:15:55 +08:00
whimlex 301e44c695 修改附件上传功能无效 2015-04-16 12:15:36 +08:00
huang dc81db1d8b 处理讨论区、缺陷列表样式显示异常 2015-04-16 11:07:37 +08:00
sw 2db3ab9d13 修改课程时增加密码与课时的验证 2015-04-16 10:56:48 +08:00
sw 94ca6cd2f9 新建课程时增加密码与课时的验证 2015-04-16 10:49:58 +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
sw 9905f91228 修改TAG云的显示样式 2015-04-16 09:46:22 +08:00
huang 61ce44af76 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-16 05:01:58 +08:00
huang c11fdc7273 版本库调整：未完成 2015-04-16 05:01:09 +08:00
whimlex 1d8dee15f4 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-16 04:59:18 +08:00
whimlex 04698c3e53 项目描述展开信息和收起信息 2015-04-16 04:53:09 +08:00
whimlex d23ac832ca 项目页面搜索按钮功能实现；问题跟踪页面编辑按钮功能实现；问题跟踪页面样式调整 2015-04-16 04:12:26 +08:00
huang fec751608a 完成里程碑界面 2015-04-16 03:54:07 +08:00
huang 8e7b4868ca wiki页面调整 2015-04-16 00:30:23 +08:00
huang 6229acac71 完成wiki新建界面 2015-04-15 21:44:19 +08:00
whimlex d79de0a354 课程日期控件样式冲突 2015-04-15 20:27:09 +08:00
sw 0cc809c3e0 实现课程资源TAG云功能 2015-04-15 19:57:16 +08:00
whimlex 7fa2338ce6 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-15 16:34:52 +08:00
whimlex ba0535e127 完成新建缺陷页面 2015-04-15 16:34:34 +08:00