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

4083 Commits

Author SHA1 Message Date
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
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
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
huang 4d0a9bd35c 部分描述增加强制换行 2015-04-15 15:30:33 +08:00
huang 0023d0610b 缺陷主题、描述强制换行 
跟踪按钮样式
引用样式修改
 2015-04-15 15:15:51 +08:00
sw 1dc8190aa0 1、修改无跳转的href链接为javascript:void(0) 
2、增加课程资源库的界面
 2015-04-15 14:53:07 +08:00
sw e579157604 更新public.css 
课程讨论区文件按钮和editor靠的太近
 2015-04-15 14:29:35 +08:00
huang c607bd5cbf 定义缺陷中样式 2015-04-15 12:50:27 +08:00
huang afa5c3a4f9 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-15 11:15:44 +08:00
huang bfe0176b74 修改附件显示样式 2015-04-15 11:15:25 +08:00
sw 61df6e144d 修复学生作业列表QQ浏览器显示超出边框 2015-04-15 10:06:52 +08:00
huang 4acad8088e 缺陷最新显示最上面 
代码优化
 2015-04-15 00:40:25 +08:00
huang e0695fa51d 讨论区。描述、主题换行 2015-04-15 00:30:33 +08:00
huang b7537ad518 修改新闻中测出的bug， 
讨论区中附件显示形式
 2015-04-14 23:58:27 +08:00
whimlex b3b9688072 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-14 19:56:19 +08:00
whimlex cdf1ce1c17 缺陷页面 2015-04-14 19:56:03 +08:00
huang b8058c3e12 用户邀请加入的时候增加拒绝功能 
删除提示星系修改
申请加入模块样式调整
 2015-04-14 19:34:01 +08:00
sw c60515ac50 学生作业增加按学生真实姓名、昵称、学号搜索功能 2015-04-14 19:24:39 +08:00
sw e4b2092c7f 实现项目成员列表增加成员，以及用户/角色留空时的提示信息 2015-04-14 16:56:32 +08:00
sw bb9513b313 课程学生作业列表增加搜索的静态页面 2015-04-14 16:36:03 +08:00
huang 729b28ae43 修改项目创始人不能删除自己 2015-04-14 16:03:47 +08:00
huang 5ae5cfda03 项目配置添加申请加入 
删除成员局部刷新
编辑成员局部刷新
项目动态国际化错误
 2015-04-14 15:34:04 +08:00
huang b3689377a3 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-14 11:48:15 +08:00
huang b98a67f50d 完成项目配置-成员模块 2015-04-14 11:47:47 +08:00
sw 679620fa51 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-14 10:46:52 +08:00
sw 8c122a35f7 项目类型切换到其他类型后，再切回开发组，更多按钮不可用 2015-04-14 10:46:31 +08:00
huang b3c3693d72 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-14 10:24:07 +08:00
huang 845794675a 配置-成员界面休整 2015-04-14 10:23:49 +08:00
sw aee81e8e44 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 
Conflicts:
	app/views/layouts/base_projects.html.erb
 2015-04-14 10:19:17 +08:00
sw fadca9128f 完成项目朋友圈、开发组、科研组直接的切换功能 2015-04-14 10:17:42 +08:00
huang 6b8022cb23 清除不需要的子模块 2015-04-14 09:10:14 +08:00
huang f3ba393bd4 去掉代码审查 
修改配置-“版本库”样式
 2015-04-13 23:39:56 +08:00
huang 48f096178c 修改配置modoule模块 2015-04-13 21:53:52 +08:00
huang 2b063db0cc 修改版本界面 
未完成部分，隔行换色
 2015-04-13 21:08:26 +08:00
whimlex cf4451e998 pre标签换行；contest主页样式调整 2015-04-13 18:34:44 +08:00
huang 6ce998bb54 去掉新版本库中冗余代码 2015-04-13 18:30:20 +08:00
huang 5d249823df 修改配置版本库页面 2015-04-13 18:27:05 +08:00
sw 39579331e7 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-13 10:51:33 +08:00
sw 01f56a761f 完成配置---模块 2015-04-11 17:28:18 +08:00
whimlex 5c96a5322a Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-11 17:11:25 +08:00
whimlex 1d8c2d2a3a commit 2015-04-11 17:10:26 +08:00
sw fb935f124c 完成修改项目界面 2015-04-11 17:04:48 +08:00
huang 534bd46008 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-11 16:34:17 +08:00
huang 36d76cfa07 缺陷列表代码整理 2015-04-11 16:33:25 +08:00
sw b19bfa5c0a Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-11 16:18:01 +08:00
sw 7ad3c2d578 修改项目配置js 
增加项目配置相关子界面
 2015-04-11 16:17:36 +08:00
huang d2a77b3d41 添加issues回复统计 2015-04-11 15:34:59 +08:00
sw 7b60998952 修改点击课程名称，url连接错误 2015-04-11 15:34:08 +08:00
huang 78868b34f0 修改缺陷中四中颜色按钮会折断换行的bug 
区别新闻和通知
 2015-04-11 15:12:06 +08:00
sw 44cb4a8e56 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-11 14:57:15 +08:00
huang 4adfec5640 解决样式冲突 
添加新闻展示页面
 2015-04-11 14:49:26 +08:00
huang e3d815b51d Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-11 14:26:03 +08:00
huang 0c90f2361d 项目用户反馈页面调整 2015-04-11 14:25:47 +08:00
sw 837fe88545 还原冲突，增加项目配置切换js 2015-04-11 14:19:52 +08:00
whimlex f79132e9be 项目新闻评论不显示无评论的查看 2015-04-11 14:01:51 +08:00
whimlex 7e46885f3d 修改上传附件数目限制 2015-04-11 13:46:49 +08:00
sw db0cc88142 静态页面添加 2015-04-11 13:32:39 +08:00
whimlex 5936d8d8e9 评论显示 2015-04-11 11:52:11 +08:00
huang 8f6b095fdb 新闻页面调整 2015-04-11 11:48:39 +08:00
whimlex 23a6408c9f 评论数为0时不显示“查看所有评论” 2015-04-11 11:19:24 +08:00
sw 1c19114252 去掉发布竞赛的权限判断 2015-04-11 11:15:15 +08:00
huang 7577f4cbbc 项目缺陷显示页面样式调整 2015-04-11 09:45:13 +08:00
whimlex 0427032cbe Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-10 17:59:27 +08:00
whimlex 874dcc2b89 附件上传国际化调整 2015-04-10 17:58:59 +08:00