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

204 Commits

Author SHA1 Message Date
yutao 49c5f3879b ... 2015-05-26 17:01:25 +08:00
yutao 8d82ecc89c ... 2015-05-26 15:01:11 +08:00
yutao 4244c69b46 ... 2015-05-26 14:18:42 +08:00
yutao 69affa8a2e ... 2015-05-25 15:19:42 +08:00
yutao fe404f8cb1 ... 2015-05-23 16:35:57 +08:00
yutao 6fcdae517a Merge branch 'memcached_alan' of http://repository.trustie.net/xianbo/trustie2 into memcached_alan 2015-05-23 16:02:55 +08:00
yutao 72b93fa8f0 ... 2015-05-23 16:02:41 +08:00
sw 161edea879 修复课程讨论区无法新建帖子 2015-05-23 14:46:30 +08:00
alan 1c9b9dff79 修改《编辑器还原》《提示信息的添加》 
Signed-off-by: alan <547533434@qq.com>
 2015-05-22 13:57:07 +08:00
alan c18d1d9585 修改《匿名发布新帖》《编辑时出现跳转错误》 
Signed-off-by: alan <547533434@qq.com>
 2015-05-22 11:09:43 +08:00
alan a0ca31780e 修改《帖子排序》《资源区链接错误》《增加回帖回复》《添加编辑器》 
《展开，收起，展开回复，收起回复 的样式问题》
Signed-off-by: alan <547533434@qq.com>
 2015-05-21 16:35:53 +08:00
alan 4a588506a4 增加编辑器 
Signed-off-by: alan <547533434@qq.com>
 2015-05-20 17:38:40 +08:00
alan 052868a6b4 Signed-off-by: alan <547533434@qq.com> 2015-05-19 14:26:42 +08:00
alan 34893db465 Signed-off-by: alan <547533434@qq.com> 2015-05-18 14:53:01 +08:00
alan cc5738c12f 课程讨论区回复样式错误 
Signed-off-by: alan <547533434@qq.com>
 2015-05-15 10:07:52 +08:00
alan e3d277163f 修改个人主页的链接 
Signed-off-by: alan <547533434@qq.com>
 2015-05-14 16:59:43 +08:00
alan 0708279c5e Signed-off-by: alan <547533434@qq.com> 2015-05-14 15:42:20 +08:00
alan 72ef4e1db4 修改讨论区编辑是主题，内容为空时报错以及动态页面跳转问题 
Signed-off-by: alan <547533434@qq.com>
 2015-05-14 15:11:20 +08:00
alan bd77ad9ac1 展开。收起 
Signed-off-by: alan <547533434@qq.com>
 2015-05-13 17:25:31 +08:00
alan fe2f6a0d9d 修改样式以及添加回复取消功能 
Signed-off-by: alan <547533434@qq.com>
 2015-05-13 14:31:54 +08:00
alan fe92b05026 讨论区编辑添加附件 
Signed-off-by: alan <547533434@qq.com>
 2015-05-12 17:14:07 +08:00
alan 29114e19f3 Signed-off-by: alan <547533434@qq.com> 2015-05-12 15:15:04 +08:00
alan 8e61136d7f Signed-off-by: alan <547533434@qq.com> 2015-05-11 17:23:53 +08:00
alan 79c0c6f551 修改路由跳转 
Signed-off-by: alan <547533434@qq.com>
 2015-05-11 16:45:03 +08:00
alan 25bcc676b9 增加附件功能以及修改路由跳转 
Signed-off-by: alan <547533434@qq.com>
 2015-05-11 16:23:15 +08:00
alan c21f2c3927 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-08 14:02:46 +08:00
alan 2d93cd4bdc Signed-off-by: alan <547533434@qq.com> 2015-05-08 13:33:18 +08:00
alan 23ef975c23 讨论区修改bug 
Signed-off-by: alan <547533434@qq.com>
 2015-05-08 13:04:25 +08:00
huang 30c6a71cbc 修正新建课程讨论区跳转 2015-05-08 11:25:25 +08:00
alan 07ca42b24d Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-05-08 10:59:30 +08:00
alan 63351fc049 Signed-off-by: alan <547533434@qq.com> 2015-05-08 10:59:11 +08:00
huang e6fe010bd7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-08 10:56:33 +08:00
huang 5167cf374c 项目讨论区左侧新建按钮跳转页面修改 
通过传参跳入（JS实现）
 2015-05-08 10:56:02 +08:00
alanlong9278 087f46bf64 Signed-off-by: alanlong9278 <547533434@qq.com> 2015-05-08 10:24:26 +08:00
huang 39fe748da7 处理项目讨论区主题、描述内容过长 2015-05-08 10:10:35 +08:00
alanlong9278 358c9aa019 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-05-08 10:09:17 +08:00
alanlong9278 65c2c43dcb 展开收起回复 
Signed-off-by: alanlong9278 <547533434@qq.com>
 2015-05-08 10:09:01 +08:00
alanlong9278 3995c68b96 Signed-off-by: alanlong9278 <547533434@qq.com> 2015-05-08 09:50:58 +08:00
alanlong9278 3d74734607 Signed-off-by: alanlong9278 <547533434@qq.com> 2015-05-08 09:48:43 +08:00
alanlong9278 49fe15a666 论坛js冲突 
Signed-off-by: alanlong9278 <547533434@qq.com>
 2015-05-08 09:37:52 +08:00
alan 3b58810528 修改课程讨论区的js 
Signed-off-by: alan <547533434@qq.com>
 2015-05-07 17:38:08 +08:00
alan 08f1c39033 修改课程讨论区界面 
Signed-off-by: alan <547533434@qq.com>
 2015-05-07 16:10:07 +08:00
alan eee0df8d22 修改课程，项目的讨论区界面 
Signed-off-by: alan <547533434@qq.com>
 2015-05-07 09:53:34 +08:00
alan d73ed9e467 项目讨论区改版 
Signed-off-by: alan <547533434@qq.com>
 2015-05-05 14:32:40 +08:00
alan a5760afa68 项目讨论区界面更改 
Signed-off-by: alan <547533434@qq.com>
 2015-05-04 17:44:03 +08:00
huang 135c3d9b19 课程讨论区代码重构 
解决路由匹配和JS显示冲突
 2015-04-29 14:29:03 +08:00
huang 9cfcbc5584 项目讨论区--未登录情况下提示界面 2015-04-22 13:56:36 +08:00
huang 861469e39f 1、修改回复帖子和新建帖子标题冲突 
2、对齐新建框
3、版本库新建按钮样式
 2015-04-21 16:11:25 +08:00
huang ce5b2d9996 项目讨论区回复按钮 2015-04-16 17:29:04 +08:00
huang e34a00f66e 讨论区列表样式冲突 2015-04-16 11:17:44 +08:00
huang dc81db1d8b 处理讨论区、缺陷列表样式显示异常 2015-04-16 11:07:37 +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 e0695fa51d 讨论区。描述、主题换行 2015-04-15 00:30:33 +08:00
whimlex 2a35e771c2 项目界面国际化及样式调整；标签模块国际化及样式调整 2015-04-10 12:48:02 +08:00
sw c5b55042d4 1、修复课程讨论区引用功能 
2、回复时回复框自动获得焦点
3、引用样式
4、修改提交回复时下面出现的提示信息
 2015-04-08 17:25:52 +08:00
huang 8b379711d9 1、修改附件列表排列和样式 
2、谈论区样式显示
3、讨论区：“编辑” “引用”， “回复”
4、讨论区与课程分离
 2015-04-07 17:45:00 +08:00
huang 12eaac5683 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/boards/_project_show.html.erb
	public/javascripts/course.js

处理冲突
修改项目动态分页
项目到航天中添加“新建项目”
 2015-04-07 13:47:39 +08:00
huang df43274565 新版项目界面（部分未完成，先合并） 
1、项目框架整理
2、各页面样式
 2015-04-07 12:48:47 +08:00
whimlex 6e0de61458 项目讨论区回复修改 2015-04-03 16:13:31 +08:00
lizanle ceb6af7365 课程相关模块添加编辑器 2015-04-03 11:19:15 +08:00
z9hang 1c8b4c5bdd 去除导出ATOM 2015-03-27 16:59:52 +08:00
z9hang 5ec28d8fc3 置顶贴子显示 2015-03-27 15:39:59 +08:00
sw b9031095d4 Merge branch 'szzh' into sw_new_course 
Conflicts:
	Gemfile
	app/controllers/courses_controller.rb
	app/views/attachments/_form.html.erb
	app/views/attachments/_form_course.html.erb
	app/views/files/_attachement_list.html.erb
	app/views/layouts/base.html.erb
	app/views/layouts/base_projects.html.erb
	config/locales/zh.yml
	public/javascripts/attachments.js
 2015-03-27 14:13:49 +08:00
z9hang 8ef9779b46 修正课程讨论区样式。修正项目讨论区被影响的样式 2015-03-26 15:55:07 +08:00
z9hang 19eaa012b7 讨论区样式调整 2015-03-24 17:12:51 +08:00
huang 1cdf397bc0 修改关注、申请方法中样式 2015-03-18 20:04:59 +08:00
huang 4111e2a940 1、讨论区新子界面 
2、项目右侧优化
 2015-03-17 17:02:32 +08:00
sw 9060c9acbc #1977 项目发布新贴跳转有问题 2015-03-11 10:16:06 +08:00
sw 3f3bb62678 非项目成员添加新闻、添加讨论区按钮不可见 2015-03-07 14:43:54 +08:00
huang b043d07d61 修改发布新贴显示问题 2015-03-07 11:02:12 +08:00
huang beac15475d 新项目及用户反馈框的修改！！ 2015-03-06 14:55:21 +08:00
sw 0f9a82637e #1716 课程讨论区-发布新贴点2次才能成功 2014-12-18 15:58:33 +08:00
zhuhao a33084545f 课程实践平台按钮样式统一的改动 2014-11-28 09:27:43 +08:00
sw 9a7160178c #1633 课程讨论区：“提交”、“预览”按钮显示问题 2014-11-27 16:33:17 +08:00
sw 23907c5c01 修改课程讨论区按钮样式 2014-11-25 16:02:11 +08:00
alan ace5b514c6 修改bug<测试版--注册登录：成功激活注册的用户后，登录返回资料修改的页面，姓氏、名字还是标识为必填项> 
Signed-off-by: alan <547533434@qq.com>
 2014-11-25 14:17:04 +08:00
zhuhao b222b7a8ed 资源库讨论区发帖按钮样式调整 2014-11-24 09:21:48 +08:00
zhuhao ac6305cddb 课程讨论区发帖按钮样式调整 2014-11-21 15:49:21 +08:00
gonglexin 972d748199 #1434 解决文件重复上传的问题 2014-11-06 19:34:31 +08:00
sw e220f100d6 #1163项目、课程讨论区新建帖子增加js验证 2014-10-27 14:20:59 +08:00
sw 7a710a4a8f 去除掉部分无用预览按钮 2014-10-13 09:40:49 +08:00
alan dea1a299af 修改competition的view文件，将其中不规范的代码进行修改，并将其中所有的link_to 
修改成"link_to ‘welcome’ home_path,  {option}" 的形式；
统一route风格
match 'path', :to => 'controller#action'
如果 path = controller#action 则 match 'path'
Example:
match 'welcome/course', :to => 'welcome#course' 变成 match 'welcome/cource'


Signed-off-by: alan <547533434@qq.com>
 2014-09-12 16:45:03 +08:00
sw fbb19480f5 修复火狐不兼容自动换行的问题 2014-08-28 17:30:08 +08:00
z9hang e1672fd0e0 讨论区帖子数统计错误问题 2014-08-27 10:20:08 +08:00
chenmin 554d744929 修复项目和课程讨论区所有帖子显示页面各帖子内容没对齐的bug； 2014-08-22 09:18:45 +08:00
chenmin e44ece80f6 项目讨论区贴子主题超出边界bug处理 2014-08-15 14:45:04 +08:00
sw 5838b3e47d 不选择新闻时，取消"添加新闻"按钮的显示。不选择问题跟踪时，取消“新建问题”和“自定义查询”按钮的显示,不选择讨论区时，取消“发布新帖”按钮的显示 2014-07-18 10:54:22 +08:00
nwb 863dec03d2 添加课程讨论区show视图 2014-06-12 10:03:01 +08:00
yanxd 369c015097 board show 2014-04-19 09:42:48 +08:00
wanglinchun f0132a0f5f 在“课程实践->讨论区”为匿名用户不能进行评论添加登陆的提示以及登陆的链接 
在“课程实践->留言”中的用户反馈改为用户留言
将“课程实践”中讨论区、资源库、课程通知和留言中提示语格式进行统一
 2014-01-21 17:02:33 +08:00
yanxd 28bc3c1894 图标and页面不换行顶出边界 2014-01-09 16:57:28 +08:00
yanxd 71775000a4 新建新闻css，教师新建课程 2014-01-09 08:34:30 +08:00
yanxd 5e5689d945 闭合素有标签 2013-12-24 11:19:20 +08:00
yanxd 55af88777b issue#426 不是顺序乱，是没显示置顶 2013-12-23 09:30:15 +08:00
huangjingquan 6dc692bb6a 修改了主页、论坛显示 2013-11-27 16:40:47 +08:00
huangjingquan 10ce6a87c2 修改了一些新建、编辑权限 2013-11-26 16:27:56 +08:00
huangjingquan dc00216603 修改了谈论区框架、列表等 2013-11-25 21:42:59 +08:00
huangjingquan 19f183cb2b 讨论区message样式 2013-11-25 15:07:34 +08:00
huangjingquan 9b044f8d13 修改了讨论区显示 2013-11-21 09:38:03 +08:00
huangjingquan bfcb68efab 课程添加了讨论区 
限制学生下作业
讨论区权限设置
 2013-11-14 19:29:42 +08:00
Administrator 1b43ce386c modify 2013-08-22 22:30:24 +08:00
zhangyang 38ed91746f 修正了讨论区部分问题；version部分问题 2013-08-21 16:43:47 +08:00
zhangyang a7871c63b2 修改了项目里各form的显示样式 2013-08-03 22:18:30 +08:00
huangjingquan 70b211e355 first commit 2013-08-01 10:33:49 +08:00