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

820 Commits

Author SHA1 Message Date
dingxu 440855c0e6 修改项目tag样式 2015-03-19 16:25:18 +08:00
z9hang 2a3a70b7d5 app接口部分信息国际化 2015-03-19 14:41:31 +08:00
huang 1cdf397bc0 修改关注、申请方法中样式 2015-03-18 20:04:59 +08:00
sw d92ac2d909 1、课程跳到其他页面后没有分块 
2、修改course_show界面
 2015-03-18 18:03:17 +08:00
sw 423849ca84 加入课程、退出课程、配置、关闭、复制等按钮 2015-03-18 17:14:26 +08:00
sw 1c30b8c81c 1、增加获取某个课程动态数的方法 
2、修改首页配置、关闭、复制课程等按钮的样式
 2015-03-18 16:34:25 +08:00
sw 8f5d8c86a3 新版样式header调整 2015-03-18 16:16:18 +08:00
sw 64b0646281 base_course基本完成 2015-03-18 15:18:06 +08:00
sw e4c0c840bf 1、完成课程模块导航栏样式调整 
2、修改意见反馈默认在右下角位置
3、调整我的课程、我的项目js
4、ruby生成的菜单栏添加样式及部分方法重写
5、封装部分页面的ruby代码到helper
 2015-03-17 15:30:15 +08:00
whimlex e8da6ef871 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-17 15:07:51 +08:00
whimlex 50fe8f2bb7 项目配置模块 2015-03-17 15:06:15 +08:00
lizanle 86020804c9 ok 2015-03-17 09:42:04 +08:00
lizanle 33669017bf controller 2015-03-17 09:40:31 +08:00
lizanle 0c86ba210d Merge remote-tracking branch 'origin/szzh' into szzh 
Conflicts:
	db/schema.rb
 2015-03-17 09:38:24 +08:00
lizanle 5c4a62dcc4 DiscussDemo代码 2015-03-16 15:29:13 +08:00
guange bcb162c600 #1968 解决IE8不能上传的问题， 只是解决，体验还是没有chrome,firefox的好 2015-03-14 12:01:08 +08:00
sw d18e9ff66b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-12 16:32:31 +08:00
sw 2ee04d55f2 修改项目邀请用户的界面 2015-03-12 15:46:24 +08:00
z9hang 7e7da7e445 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-12 11:18:00 +08:00
z9hang a05061af73 #1859 课程--资源库：全站搜索中“选入我的其他课程”弹出的课程列表中包括当前课程 2015-03-12 11:17:36 +08:00
sw b27bb34662 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/layouts/base_projects.html.erb
 2015-03-12 09:00:12 +08:00
whimlex 57c8575470 新版项目模块国际化，目前完成各项目主页，项目动态，项目评分 2015-03-11 17:23:38 +08:00
sw 4b831c9e65 #2001 项目--工具集中wiki-“查看差别”中有html标签 2015-03-11 17:22:23 +08:00
whimlex 4b19463db7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/layouts/base_projects.html.erb
	app/views/users/show.html.erb
	config/locales/zh.yml
 2015-03-10 10:08:18 +08:00
whimlex 115eb38a02 完善用户资料模块，用户主页课程栏、留言栏、项目栏和标签模块国际化；对一些存储在数据表中的固定的中文属性，比如学期，职称，在helper和model中定义方法封装；平台导航模块，包括各模块内部导航的国际化；课程平台模块国际化整理和修改，去除重复功能标签 2015-03-10 09:45:36 +08:00
huang ce792f6ce8 修改邮件发送界面 2015-03-07 09:32:27 +08:00
huang b2b978d540 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-06 15:27:32 +08:00
huang c159bb2c48 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/controllers/projects_controller.rb
	app/views/issues/show.html.erb
	app/views/layouts/base_projects.html.erb
	app/views/projects/_form.html.erb
	app/views/projects/new.html.erb
	app/views/projects/show.html.erb
 2015-03-06 15:23:42 +08:00
huang beac15475d 新项目及用户反馈框的修改！！ 2015-03-06 14:55:21 +08:00
sw 5692cbf202 #1965 公共贴吧取消软件创客入口 2015-03-06 09:50:17 +08:00
sw 26081c6120 新建项目时增加不选择所属组织 2015-03-06 09:27:43 +08:00
sw 1f2b5eedb8 Merge branch 'dev_zanle' into szzh 
Conflicts:
	app/views/projects/show.html.erb
	db/schema.rb
 2015-03-06 08:59:29 +08:00
sw dead08a0d6 添加、修改项目增加所属组织的选择 2015-03-05 11:53:28 +08:00
lizanle 7ee58d1d44 项目动态重写，并去掉首页缓存 2015-03-04 15:32:00 +08:00
sw 73d2e2e5e2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-02-10 09:07:04 +08:00
whimlex 22aae1910b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/welcome/_search_project.html.erb
	config/locales/en.yml
	config/locales/zh.yml
 2015-02-09 22:14:16 +08:00
whimlex 59a2c8283a 国际化结构调整 2015-02-09 22:07:21 +08:00
sw 2ceb21b83b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-02-09 09:16:01 +08:00
z9hang d913f89a82 添加课程动态接口 2015-02-06 15:52:34 +08:00
sw 859889b750 简化查询匿评数量的代码 2015-02-06 11:27:37 +08:00
sw 4cdb3c83dd 增加获取用户在指定课程内作业数量的接口 2015-02-06 11:22:29 +08:00
huang 523af8b2a9 修改企业版结构及列表页面 2015-01-31 15:43:35 +08:00
huang 768e06ea8a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-30 17:58:58 +08:00
huang be9ff9b4bb 修改控制器名 
解决列表中企业重名的bug
 2015-01-30 17:58:41 +08:00
z9hang d8571ac931 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-30 16:58:18 +08:00
z9hang 6bd202e80a 课程作业列表当当前用户为课程学生时，输出分配给改学生匿评的作业集合 2015-01-30 16:58:05 +08:00
sw 0d6261dfa7 Merge branch 'dev_zanle' into szzh 
Conflicts:
	app/controllers/projects_controller.rb
	app/helpers/projects_helper.rb
 2015-01-30 14:38:54 +08:00
huang 29df528af1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/welcome/index.html.erb
	config/locales/zh.yml
	config/routes.rb
 2015-01-30 14:27:56 +08:00
huang d0a675f2b8 企业版模块 2015-01-30 14:11:35 +08:00
lizanle b453d16228 将controller里的两个方法挪到helper 2015-01-30 13:30:06 +08:00
lizanle 0232826a6e 上次修改引入bug:关键字查询不到任何东西 2015-01-30 12:04:33 +08:00
lizanle e761cd5f22 关键字查询会丢失样式 2015-01-30 11:52:37 +08:00
lizanle 852bb940a2 过滤掉日志中日志分析的请求 2015-01-30 11:31:41 +08:00
whimlex 617107f0cb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/welcome/index.html.erb
	config/locales/zh.yml
 2015-01-30 10:34:47 +08:00
whimlex f05e046751 首页国际化 2015-01-30 10:26:26 +08:00
sw ce526fde77 Merge branch 'dev_zanle' into szzh 
Conflicts:
	config/routes.rb
 2015-01-30 09:05:47 +08:00
sw b71d714103 #1887 用户职称显示问题 2015-01-29 16:39:25 +08:00
lizanle 3637d1906d Merge branch 'szzh' into dev_zanle 
Conflicts:
	Gemfile
	config/routes.rb
 2015-01-28 12:38:32 +08:00
lizanle 87b230623b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-28 12:32:16 +08:00
sw 950d831108 Merge branch 'api' into szzh 2015-01-27 14:51:15 +08:00
lizanle ff23ecb9a8 Merge branch 'szzh' into dev_zanle 2015-01-27 14:46:04 +08:00
lizanle fd42af1ac4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-27 14:32:54 +08:00
lizanle d8b5252279 调整了注释 2015-01-27 14:21:51 +08:00
sw 5950f0404b #1832 不显示无数据的字段，字段名 2015-01-27 11:35:19 +08:00
sw 649c65fbe2 国际化部分代码 2015-01-27 10:14:05 +08:00
z9hang db1cd8851c Merge branch 'szzh' into api 
Conflicts:
	Gemfile
	db/schema.rb
 2015-01-23 16:51:40 +08:00
whimlex 38157e560e 课程--资源库--上传资源：当变化屏幕分辨率时，“上传文件”字样显示异常;添加用户或组没有链接;新建课程中，平台按钮样式调整成统一风格;课程主页，竞赛 2015-01-23 15:08:34 +08:00
lizanle 90661374a5 Merge branch 'szzh' into dev_zanle 
Conflicts:
	Gemfile
	app/controllers/projects_controller.rb
	config/locales/zh.yml
 2015-01-23 10:33:07 +08:00
lizanle 0147b30133 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	Gemfile
 2015-01-23 10:25:28 +08:00
lizanle 27fde6c641 添加注释 2015-01-23 09:47:54 +08:00
sw a0e6b9c2fe Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	config/locales/zh.yml
 2015-01-22 17:51:11 +08:00
z9hang f1693e237b 修改匿评作品详情接口，输出匿评作品详情的同时还输出对该作品的评论（包括，教师评分，匿评及留言） 2015-01-22 17:21:15 +08:00
sw 54c8ee9d4d 增加学生答完问卷之后。能看到自己答题结果的功能 2015-01-21 17:51:12 +08:00
lizanle 59a47002ae 重构，修正了许多的空指针异常 2015-01-22 16:46:06 +08:00
z9hang 89e0f98034 启动匿评接口 2015-01-21 15:29:05 +08:00
alan f01d164295 Signed-off-by: alan <547533434@qq.com> 2015-01-21 12:01:02 +08:00
alan 6ccb154cc3 课程留言，发邮件给课程所有人 
Signed-off-by: alan <547533434@qq.com>
 2015-01-21 11:33:29 +08:00
z9hang b949f70c64 修改数据格式转换方法 2015-01-20 17:42:18 +08:00
z9hang abcf06ccc7 课程资源不能引用问题。原因：15年1-3月能属于2014年秋季学期，代码却将其判断为15年秋季学期了 2015-01-19 15:00:46 +08:00
lizanle 2431fea63e 日志查看Helper 2015-01-19 14:05:43 +08:00
sw 1e8c6374d7 Merge branch 'szzh' into Poll 
Conflicts:
	app/views/layouts/_base_feedback.html.erb
 2015-01-17 15:03:59 +08:00
huang e8cca08f40 多选查询去重，修改样式 2015-01-17 14:54:19 +08:00
huang 6bba6b2b76 weiwan 2015-01-17 14:04:20 +08:00
huang 6e698d45bb 修改了html边界超出问题 2015-01-17 12:34:57 +08:00
huang 0f5c3c5f4c 添加主观题统计页面及样式 2015-01-17 11:46:34 +08:00
huang 3acec4b7c1 修改了总统计数 2015-01-17 10:14:07 +08:00
huang 59c21d81e9 修改了分母不能为0的bug 
统计结果精确到两位
 2015-01-16 16:48:20 +08:00
huang 7177303eeb 问卷统计最终效果 2015-01-16 15:49:22 +08:00
z9hang dc2c96f59a 提交后的问卷禁止查看与编辑 2015-01-16 10:19:38 +08:00
alan 5191411508 <邮件加密自动登录功能，邮件附件下载功能> 
Signed-off-by: alan <547533434@qq.com>
 2015-01-15 18:48:19 +08:00
z9hang 77dc9607df 简答题答题 2015-01-15 17:36:30 +08:00
z9hang d684acf527 多选题答题功能 2015-01-15 11:54:30 +08:00
z9hang 6d82e79e7f 答题相关方法添加 2015-01-15 09:41:19 +08:00
lizanle aca74bf937 Merge remote-tracking branch 'origin/dev_zanle' into szzh 
Conflicts:
	Gemfile
	app/views/welcome/index.html.erb
 2015-01-14 16:15:09 +08:00
z9hang 0f9915fc2a Merge branch 'szzh' into api 
Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/bids_controller.rb
	app/controllers/users_controller.rb
	db/schema.rb
 2015-01-13 15:12:05 +08:00
huang 293b3a3b42 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-10 15:42:33 +08:00
huang f7c1b76b3d 用户反馈弹框模块！ 2015-01-10 15:39:02 +08:00
alan fb6c297a37 Signed-off-by: alan <547533434@qq.com> 2015-01-10 11:46:39 +08:00
alan 575b641e25 merge dev_chuangbin 
Signed-off-by: alan <547533434@qq.com>
 2015-01-10 11:01:16 +08:00
lizanle 3047b523b0 add expire_helper and change the code way of set cache expire! 2015-01-09 15:28:43 +08:00