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

4244 Commits

Author SHA1 Message Date
whimlex 9fa3d25e3f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-21 17:57:39 +08:00
whimlex b99f8d8056 上传头像，上传课程项目logo提示 2015-04-21 17:56:01 +08:00
lizanle d6527f1f7e 去掉学生列表分页 2015-04-21 17:54:49 +08:00
whimlex 0d26f64afd 搜索课程——授课时间”与“课程简介”显示异常 2015-04-21 16:49:13 +08:00
huang 2043b963c8 添加意见反馈 
项目配置权限
 2015-04-21 16:35:51 +08:00
whimlex ab93d19b56 动态中显示更新项目缺陷样式异常 2015-04-21 16:17:51 +08:00
huang 861469e39f 1、修改回复帖子和新建帖子标题冲突 
2、对齐新建框
3、版本库新建按钮样式
 2015-04-21 16:11:25 +08:00
huang 5bfef259de 去掉缺陷列表空白处的链接 2015-04-21 15:22:27 +08:00
huang c510f14edb 流程碑添加新建版本 2015-04-21 15:10:05 +08:00
huang 2521e802bf 缺陷统计添加冒号 2015-04-21 14:48:49 +08:00
huang 5c2fdf7aee Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-21 14:20:13 +08:00
huang dd25cdc065 1、修改项目三种类型术语 
2、未登录情况下缺陷提交bug
3、width果断空白处点击进入
 2015-04-21 14:19:50 +08:00
lizanle 457b86a861 版本配置 2015-04-21 10:14:46 +08:00
lizanle 2987253303 Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq 2015-04-21 09:53:22 +08:00
lizanle 3b70ab964d issue过滤 2015-04-21 09:53:09 +08:00
huang 3bd4f2d0f6 修改资源库样式 2015-04-20 17:55:07 +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
huang 8dd0e985a0 完成 2015-04-20 10:48:36 +08:00
whimlex 05712c4c06 学生作业改为作品 2015-04-17 17:48:25 +08:00
whimlex ab39d54b45 版本库文件列表样式 2015-04-17 17:07:23 +08:00
sw 6df1f55ac4 添加课程成员后不自动刷新 2015-04-17 16:53:04 +08:00
sw d5e71e9803 增加课程成员收索功能后、添加课程成员，成员列表不自动刷新 2015-04-17 16:38:25 +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 af28461cf0 动态中创建项目样式调整 2015-04-17 14:51:10 +08:00
lizanle 0ca96a5500 Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq 2015-04-17 14:27:30 +08:00
lizanle ade32aae02 列宽修改 2015-04-17 14:27:26 +08:00
sw 3a8bfbf880 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-17 14:22:19 +08:00
lizanle 3c17492901 列宽 2015-04-17 14:22:08 +08:00
sw 7239f6a641 1、成员列表分页空间翻页不可用 
2、当五输入时显示，无用户显示
 2015-04-17 14:21:44 +08:00
lizanle 17f9ed52ce Wiki列宽度 2015-04-17 14:21:43 +08:00
lizanle b6db00643e Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq 2015-04-17 14:20:58 +08:00
lizanle 532a8cb5c3 返回的时候展开输入框 2015-04-17 14:20:53 +08:00
whimlex 1382f9a0cd Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-17 14:14:35 +08:00
whimlex dc955c7e2d 编辑问题时，编辑问题状态，开始时间、计划完成时间右侧的时间选择器不见了 2015-04-17 14:14:13 +08:00
sw 9814a859c3 项目添加TAG页面不刷新 2015-04-17 14:09:58 +08:00
huang 14a0d885f0 settings 2015-04-17 13:49:40 +08:00
huang 04af919c77 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-17 12:57:48 +08:00
huang fc8dacbd5f 引入资源列表界面调整 2015-04-17 12:56:54 +08:00
lizanle f8951c0044 国际化 2015-04-17 12:55:07 +08:00
lizanle 5e8848f962 国际化 2015-04-17 12:44:27 +08:00
sw cdbe95f6ec 修改老师配置界面成员搜索 2015-04-17 11:48:47 +08:00
huang 0607cf326c 版本库里面页面验证 2015-04-17 11:42:23 +08:00
whimlex 7e0120e029 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-17 11:15:41 +08:00
huang 917701f09d Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-17 11:15:43 +08:00
huang c2c9660a46 项目得分界面调整 2015-04-17 11:15:27 +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
lizanle 8290741746 Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq 2015-04-17 11:13:40 +08:00
lizanle d2b0eae119 格式修改 2015-04-17 11:13:36 +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 1ffa447767 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-17 10:58:54 +08:00
huang 640f6a1ca7 邮件发送框距离 
去掉讨论区不必要的*
 2015-04-17 10:58:40 +08:00
lizanle 1902d557c0 有日期label 2015-04-17 10:48:40 +08:00
lizanle 8cee159cb7 Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq 2015-04-17 10:38:54 +08:00
lizanle e4abc86093 版本和版本库bug修改 2015-04-17 10:38:39 +08:00
huang 1961768031 新建问题前去掉不必要的* 
去掉跟踪功能
 2015-04-17 10:37:40 +08:00
sw a8b1ca10b3 1、学生作业 --> 作品 
2、学生交了作品之后显示修改作品
 2015-04-17 10:36:32 +08:00
huang f1e86ace25 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-17 10:14:03 +08:00
huang 54b81bdfb3 项目类型图标 2015-04-17 10:13:47 +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 258a023abd Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-17 08:44:16 +08:00
huang fec0a7472d 新闻换行处理 2015-04-17 08:43:58 +08:00
huang fbcd9f9a96 wiki页面调整 2015-04-17 08:28:07 +08:00
huang 0ea683e1b4 修改issue中图片附件的缩略图显示方式 2015-04-17 07:45:37 +08:00
whimlex 8633ba3325 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-16 20:11:49 +08:00
whimlex 8babe384fd 缺陷历史记录调整 2015-04-16 20:11:33 +08:00
huang d1e7777040 关注列表样式 2015-04-16 20:00:07 +08:00
huang 63a457674a Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-16 19:08:34 +08:00
huang 440eb8dc7f 1、修改项目成员一排显示 
2、项目动态显示强制换行
3、讨论区提示用语
 2015-04-16 19:08:16 +08:00
whimlex fc106fef49 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-16 17:56:52 +08:00
huang fb06571918 项目讨论区引用强制换行 2015-04-16 17:56:45 +08:00
whimlex e9cf61e0f4 缺陷状态根据完成度调整 2015-04-16 17:56:19 +08:00
huang ce5b2d9996 项目讨论区回复按钮 2015-04-16 17:29:04 +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 daef2c455a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-16 16:55:44 +08:00
sw 57a5191fe5 课程资源列表样式调整 2015-04-16 16:55:24 +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
huang c852e72e36 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-16 16:36:51 +08:00
huang 611952eb05 新建项目时候设定默认项目类型 
新建项目样式异常调整
 2015-04-16 16:36:34 +08:00
sw a0c6a09e7d Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-16 16:10:48 +08:00
sw 332a9b45fb 修改项目上传资源弹框样式 2015-04-16 16:10:24 +08:00
huang be97e4732d 目标版本为空的不显示 2015-04-16 15:58:38 +08:00
huang bfc83d1a8c 解决项目图片不能上传 2015-04-16 15:48:13 +08:00
sw 6983764c44 修改课程名称过长时的样式 2015-04-16 15:41:50 +08:00
huang 9fa7b04ce5 组织不需要必填 2015-04-16 15:30:24 +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
sw 05c74960a8 1、增加当前选择的TAG云的样式 
2、当选择TAG云过滤之后，对TAG进行添加、删除操作时继续选中该TAG
 2015-04-16 15:01:37 +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
huang 3c563eaecb Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-16 14:34:21 +08:00
huang bb7904b32f 引入JS文件 2015-04-16 14:34:08 +08:00
whimlex 19cbc34b2b Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-16 14:25:19 +08:00
whimlex 19dd5a9879 项目邀请功能和项目更多功能点击事件 2015-04-16 14:25:02 +08:00
huang 890f36a2d5 优化缺陷 2015-04-16 14:13:12 +08:00
sw a2b529b38b 课程添加TAG后删除TAG按钮消失 2015-04-16 14:12:37 +08:00
sw b7e9442800 添加、删除TAG云时TAG云列表刷新 2015-04-16 14:01:58 +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 8803942a02 项目讨论区，引用样式调整 2015-04-16 11:35:38 +08:00
huang e34a00f66e 讨论区列表样式冲突 2015-04-16 11:17:44 +08:00
huang c1d997379f Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-16 11:08:53 +08:00
lizanle a4d6eaa46c 跳转回来自动选择tab页 2015-04-16 11:08:00 +08:00
huang 284e4938f6 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-16 11:07:55 +08:00
lizanle 38672458b0 新建版本 更改页面 2015-04-16 11:07:38 +08:00
huang dc81db1d8b 处理讨论区、缺陷列表样式显示异常 2015-04-16 11:07:37 +08:00
sw 2db3ab9d13 修改课程时增加密码与课时的验证 2015-04-16 10:56:48 +08:00
lizanle 86b05b8e6a Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq 2015-04-16 10:51:09 +08:00
lizanle fe94efeb39 新建版本更改页面 2015-04-16 10:50:53 +08:00
sw 94ca6cd2f9 新建课程时增加密码与课时的验证 2015-04-16 10:49:58 +08:00
huang e2f7da5b99 修改里程碑代码 2015-04-16 10:31:42 +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
huang bd800a53e4 项目简介显示 2015-04-16 10:00:36 +08:00
whimlex 7ce8ae0261 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-16 09:54:27 +08:00
whimlex 9c07976751 展开和收起更多信息图片样式修改；跟踪者样式修改 2015-04-16 09:54:10 +08:00
huang 115d77dd01 圈子JS和modulesJS 
版本库删除按钮
 2015-04-16 09:49:03 +08:00
huang bc6ff57de2 修改开发组、朋友圈、研发组切换js 2015-04-16 09:30:06 +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
whimlex 596e89a14f 缺陷更新页面 2015-04-15 20:05:21 +08:00
sw 0cc809c3e0 实现课程资源TAG云功能 2015-04-15 19:57:16 +08:00
huang 45c234bf9c Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-15 18:14:10 +08:00
huang aff58dd3a7 添加关注者 2015-04-15 18:13:51 +08:00
whimlex 30dae089c6 新建缺陷页面主题不能为空 2015-04-15 17:28:53 +08:00
whimlex 521e000c74 commmit 2015-04-15 17:17:03 +08:00
sw 2e3294a341 1、增加根据资源列表，获取其TAG与每个TAG数量的hash的方法 
2、增加课程资源列表的TAG云的显示
 2015-04-15 17:16:28 +08:00
whimlex d68b0283eb Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-15 17:06:56 +08:00
whimlex a10ced61ec 缺陷跟踪者 2015-04-15 17:06:40 +08:00
huang 3825252327 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-15 16:38:58 +08:00
huang 104075b3fd 修改缺陷留言方式 2015-04-15 16:38:39 +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
sw 676cf8f180 课程上传资源是根据上传的类型，对资源添加默认的TAG 2015-04-15 16:00:45 +08:00