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

1914 Commits

Author SHA1 Message Date
guange e798b7242b Merge remote branch 'remotes/origin/szzh' into guange_dev 2015-03-15 23:10:48 +08:00
guange f3d6d7c384 #2037 issue列表默认显示顺序改为最后更新的倒序 2015-03-15 16:02:49 +08:00
sw e4895731ae Merge branch 'develop' into szzh 2015-03-13 17:48:12 +08:00
sw e4e56e01b1 修改项目邀请用户失败时的提示 2015-03-13 17:46:09 +08:00
z9hang ff65bf4ba5 app自动更新功能功能，无法下载问题修正 2015-03-13 17:10:22 +08:00
guange 08eae0e5eb Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-03-13 11:30:25 +08:00
guange ab6c21314d #1503 老师发布的作业可以在课程动态中显示了 2015-03-12 21:57:35 +08:00
whimlex 28321deeb5 邮件邀请用户 2015-03-12 18:04:12 +08:00
sw fd8edc9a02 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-12 17:34:25 +08:00
huang 96b2627fda 修改邮件居中样式及提示 2015-03-12 17:22:52 +08:00
sw 78039a726e Merge branch 'szzh' into guange_dev 2015-03-12 17:09:20 +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 312d7660b2 增加邀请成功后的提示 
邀请成功后跳转页面修改
调整翻页控件的样式
 2015-03-12 16:32:20 +08:00
sw 2ee04d55f2 修改项目邀请用户的界面 2015-03-12 15:46:24 +08:00
huang 0ba7ef0560 修改邮箱邀请时，邮件为空时提示错误 2015-03-12 15:13:41 +08:00
sw 5340ad7fc1 修改组织首页不显示私有项目 2015-03-12 10:20:28 +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
huang 3ee9ac2b50 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/layouts/base_projects.html.erb
 2015-03-11 16:44:54 +08:00
huang 8f0af4c00d 修改了未登陆情况下通过URL访问不允访问的 2015-03-11 16:42:02 +08:00
lizanle d7c550b15b 给projects项目新建的时候添加创建人 2015-03-11 15:51:25 +08:00
sw 1e262ec731 修改项目上传资源链接 2015-03-11 15:32:50 +08:00
z9hang eec155f077 课程资源页面app自动登陆处理 2015-03-11 11:22:58 +08:00
sw 9060c9acbc #1977 项目发布新贴跳转有问题 2015-03-11 10:16:06 +08:00
guange fd676f13b5 #994 作品下载：资源排序修正 2015-03-10 21:50:47 +08:00
z9hang 57ba46ff00 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	config/locales/zh.yml
 2015-03-10 17:21:59 +08:00
z9hang 43e9a9a495 1、完成手机app版本管理，上传客户端功能。2、手机app检查更新接口完成 2015-03-10 17:20:30 +08:00
sw 138fac9509 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/homework_attach/_jour.html.erb
	app/views/homework_attach/_journal_reply_items.html.erb
	app/views/homework_attach/_showjour.html.erb
	app/views/words/_feedback.html.erb
	app/views/words/_journal_reply_items.html.erb
	app/views/words/_message.html.erb
 2015-03-10 17:11:52 +08:00
z9hang 803f4a3eaf 1、部分页面根据apptoken参数自动登录功能添加token是否过期判断。2、版本管理发布新版本信息功能添加 2015-03-10 14:41:36 +08:00
guange 5d1a5a0b11 #1738 修复图片下载次数不正确问题 2015-03-10 11:50:27 +08:00
sw bdd1980876 修复个人动态首页报错 2015-03-10 11:39:01 +08:00
z9hang 6ca853edc7 1、课程首页2、用户首页3、课程留言页4、发布作业页5、用户的留言页6、为课程作业创建作品页传递apptoken参数时自动登录功能 2015-03-09 17:28:17 +08:00
sw 3af9c63ae0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-07 16:16:06 +08:00
alan 838c39da69 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 
Conflicts:
	app/views/projects/_invite_members_by_mail.html.erb
 2015-03-07 16:08:54 +08:00
alan 48ac3dbea8 修改《测试版--注册时返回500错误》以及项目邀请时邮箱验证功能 
Signed-off-by: alan <547533434@qq.com>
 2015-03-07 16:07:48 +08:00
z9hang 0f2ded4d25 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-07 15:36:16 +08:00
z9hang 782071ab64 显示接口不能用问题，app版本管理部分代码 2015-03-07 15:36:00 +08:00
sw c6788e2f40 修复首页报错 2015-03-07 15:30:37 +08:00
sw fea7bd6ad1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-07 14:44:10 +08:00
sw 945b9ff9cf 修复进入我的动态，关注人没有进行权限过滤的BUG 2015-03-07 11:38:15 +08:00
alan 6cf7e156d1 Signed-off-by: alan <547533434@qq.com> 2015-03-07 11:35:57 +08:00
sw 3e3cde0805 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-07 11:32:28 +08:00
sw ff2b4c610c 1、修改用户动态每页显示条目不正确 
2、用户动态增加新闻、留言等权限判断的补全，以及部分权限判断不正确
 2015-03-07 11:30:21 +08:00
alan 5ff43fdea7 项目添加新用户邮件发送功能 
Signed-off-by: alan <547533434@qq.com>
 2015-03-07 10:52:20 +08:00
huang ce792f6ce8 修改邮件发送界面 2015-03-07 09:32:27 +08:00
z9hang c1c05067e7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/controllers/admin_controller.rb
	db/schema.rb
 2015-03-06 15:36:47 +08:00
z9hang 754acc6945 移动端版本管理 2015-03-06 15:33:59 +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
sw a6b3ddcfcb Merge branch 'szzh' into dev_zanle 2015-03-06 14:58:49 +08:00
huang beac15475d 新项目及用户反馈框的修改！！ 2015-03-06 14:55:21 +08:00
lizanle 10faab0129 新建的项目发布新问题报500 2015-03-06 11:53:16 +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 d947a914cc Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-05 17:43:00 +08:00
sw e2307366f6 实现组织的增、删、改、查功能及相关界面 2015-03-05 17:42:31 +08:00
z9hang 3334299808 app版本管理功能（表添加，页面部分添加） 2015-03-05 17:37:33 +08:00
lizanle 8d322edb90 Merge branch 'szzh' into dev_zanle 
Conflicts:
	app/views/projects/show.html.erb
 2015-03-05 17:24:19 +08:00
sw 3c4b502e97 1、修改进入组织主页项目列表显示不正确的问题 
2、admin页面增加组织列表显示
 2015-03-05 17:03:44 +08:00
sw 5f8595d874 admin页面增加组织列表 2015-03-05 15:27:22 +08:00
sw 3b4bf8b99d 增加组织的index界面，以及index界面到组织首页的跳转 2015-03-05 14:15:07 +08:00
sw dead08a0d6 添加、修改项目增加所属组织的选择 2015-03-05 11:53:28 +08:00
sw d1edd86e11 1、修改组织首页项目获取 
2、修改此组织没有项目时的样式
 2015-03-05 10:40:10 +08:00
z9hang 04dea372c5 添加意见反馈接口 2015-03-05 10:09:19 +08:00
lizanle 7ee58d1d44 项目动态重写，并去掉首页缓存 2015-03-04 15:32:00 +08:00
sw 2c4e864080 #1949 学生可以通过url访问老师并未发布的问卷并进行作答 2015-03-03 17:53:15 +08:00
sw 9233213127 修复未登录时进入指定学校课程列表显示却是国防科大课程列表的BUG 2015-03-03 17:35:46 +08:00
sw bbeaa6e80c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-02 17:43:16 +08:00
alan 22ac578ede Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 
Conflicts:
	config/locales/zh.yml
 2015-03-02 14:50:10 +08:00
alan f374bfd7e2 修复《窗口跳转问题》 
Signed-off-by: alan <547533434@qq.com>
 2015-03-02 14:47:50 +08:00
sw d999a9f4a6 修复新建课程时报错的BUG 2015-03-02 14:33:35 +08:00
z9hang 18271946d7 作业详情，课程作业列表接口返回数据格式修改（增加了作业作者相关信息） 2015-03-01 17:31:38 +08:00
alan aa8f58530c 给黄总提供接口 
Signed-off-by: alan <547533434@qq.com>
 2015-02-11 23:34:10 +08:00
alan 4bfc4493eb 添加《邮件周日发送》功能，修改《贴吧》邮件发送策略 
Signed-off-by: alan <547533434@qq.com>
 2015-02-11 20:23:50 +08:00
sw f380d781e7 增加根据已有课程复制成新课程的路由以及方法实现 2015-02-09 10:28:33 +08:00
alan 7442cc1ca4 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into email_verify 2015-02-06 18:19:35 +08:00
alan 6f9e2bad63 mail weekly 2015-02-06 18:15:08 +08:00
huang 59e7f2f28b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-02-03 15:23:05 +08:00
huang 8bef9420cf 修改企业版中自己能看到自己的私有项目 2015-02-03 15:22:45 +08:00
sw 6226974f0b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-02-03 11:25:31 +08:00
huang 56fa330fed Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-02-03 11:25:08 +08:00
huang 26b1f9f433 修改企业版中存在的一些bug 
最多只显示十个项目
提示的样式
代码优化
 2015-02-03 11:24:46 +08:00
sw 320ee9289a #1897 修改点击DTS测试之后，TAB页背景色变化 2015-02-03 09:52:35 +08:00
alan 646678c9db 修改《课程--学生列表：输入有效条件获得搜索结果，对搜索结果按积分排序，却自动返回对所有学生排序》bug 
Signed-off-by: alan <547533434@qq.com>
 2015-02-02 17:01:07 +08:00
z9hang 836be8c75e 添加企业首页配置功能 2015-01-31 17:14:01 +08:00
huang 3350bb98b6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	config/locales/zh.yml
 2015-01-31 15:46:30 +08:00
huang 523af8b2a9 修改企业版结构及列表页面 2015-01-31 15:43:35 +08:00
sw 8289ca6c89 11111 2015-01-31 11:14:55 +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 d91c0442d1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-30 14:29:01 +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 90649209ca 封装，简化，重新编排代码格式，并删掉了一些无用的方法代码 2015-01-30 13:29:25 +08:00
sw 87fdd840ec 首页加入项目增加已是当前项目的判断 2015-01-30 11:39:19 +08:00
sw 97ec208b1a Merge branch 'dev_zanle' into szzh 
Conflicts:
	config/routes.rb
 2015-01-30 10:37:05 +08:00
lizanle f3f590a834 # 这写变量发现没有用而且拖慢速度 
#@teachers= searchTeacherAndAssistant(@course)
    #@canShowRealName = isCourseTeacher(User.current.id,@course)
 2015-01-30 10:27:21 +08:00
sw c56f641163 修改首页加入项目按钮没反应 2015-01-30 09:57:43 +08:00
sw ce526fde77 Merge branch 'dev_zanle' into szzh 
Conflicts:
	config/routes.rb
 2015-01-30 09:05:47 +08:00
sw c366cc90e7 修改删除问卷后相关BUG 2015-01-29 17:33:10 +08:00
lizanle 3637d1906d Merge branch 'szzh' into dev_zanle 
Conflicts:
	Gemfile
	config/routes.rb
 2015-01-28 12:38:32 +08:00
alan 5434a5b087 修改《admin可以访问courses和users列表》 
Signed-off-by: alan <547533434@qq.com>
 2015-01-27 15:29:09 +08:00
alan 36dfd7c77c Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-01-27 15:12:56 +08:00
alan 00c0ddc600 admin查看course和user列表 
Signed-off-by: alan <547533434@qq.com>
 2015-01-27 15:11:24 +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 5afbf6dbca 调整了注释 2015-01-27 14:19:46 +08:00
sw fe06ca503a 增加poll colsed_at的赋值 2015-01-27 09:55:02 +08:00
sw 97c7ccac16 增加关闭问卷功能 2015-01-27 09:45:15 +08:00
z9hang 4b3621905e 修正课程成员搜索bug 2015-01-27 09:06:00 +08:00
sw d135274281 修改重复加入项目提示语 2015-01-26 15:41:10 +08:00
sw 02f01c1aba 修改首页加入项目 2015-01-23 17:10:21 +08:00
z9hang db1cd8851c Merge branch 'szzh' into api 
Conflicts:
	Gemfile
	db/schema.rb
 2015-01-23 16:51:40 +08:00
sw dbdae2ac7e 问卷编辑页面在发布问卷和点击问卷标题确认增加问卷标题不能为空的提示 2015-01-23 14:25:29 +08:00
sw 016f4f9a0d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-23 14:11:02 +08:00
sw 6645648027 学生是否看到问卷结果老师可配置增加数据库 2015-01-23 14:10:38 +08:00
lizanle b26f2029ef Merge branch 'szzh' into dev_zanle 
Conflicts:
	Gemfile
 2015-01-23 13:49:13 +08:00
alan fdba8ca986 修改《邮箱地址真实性验证》《课程分班提示重名出错》《留言模块发送邮件模板功能》 
Signed-off-by: alan <547533434@qq.com>
 2015-01-23 11:46:55 +08:00
lizanle df88cb6eba 管理员才能查看 2015-01-23 11:14:48 +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
alan 942035f698 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-01-23 10:03:45 +08:00
alan 24a8f4fe7d Signed-off-by: alan <547533434@qq.com> 2015-01-23 10:03:00 +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
lizanle 4fe8b23069 去掉不必要的代码，修改注释，格式 2015-01-22 17:50:24 +08:00
lizanle 8b6750c1ed 删除日志修改为只能修改当天的日志：这样子保护原来的日志，又能进行当天的调试 2015-01-22 17:04:12 +08:00
sw 90a81ee1f1 增加网站项目首页加入项目的功能 2015-01-22 17:03:01 +08:00
alan 24dfeb1614 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-01-22 16:32:53 +08:00
alan 432e3a05f2 增加贴吧创建，发帖时发送邮件功能，修改《邮件重发多次》bug 
Signed-off-by: alan <547533434@qq.com>
 2015-01-22 16:30:21 +08:00
sw 683625066e 修改进入未批列表修改排序后，老师进行评分之后排序会回到默认排序额问题 2015-01-22 15:16:15 +08:00
sw 54c8ee9d4d 增加学生答完问卷之后。能看到自己答题结果的功能 2015-01-21 17:51:12 +08:00
lizanle 566f59c49e 修改只有管理员才能查看 2015-01-22 16:52:09 +08:00
lizanle 061e4599c3 重构，修正了许多的空指针异常 2015-01-22 16:45:57 +08:00
sw 520e9c73aa #1836 未登录或者没有权限访问私有项目时，跳转到403页面 2015-01-21 14:30:19 +08:00
sw 3bdaeb20c2 1、修改问卷列表页面样式 
2、问卷列表增加发布问卷功能
3、增加js返回方式
4、去掉无用的js函数
 2015-01-21 11:14:01 +08:00
sw 402dfc788f 修改新建问卷时问卷名称默认为空 2015-01-21 09:55:40 +08:00
sw 4caf6ab5f7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-21 09:19:05 +08:00
z9hang b949f70c64 修改数据格式转换方法 2015-01-20 17:42:18 +08:00
alan 9f36469d39 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-01-20 16:34:30 +08:00
alan 40d6c3b19c 添加《邮箱地址验证是否存在及国际化的编写》功能 
Signed-off-by: alan <547533434@qq.com>
 2015-01-20 16:33:59 +08:00
sw 7b9d88ecfe 问卷调查增加重新发布功能 2015-01-20 11:42:28 +08:00
lizanle 4796524a97 去掉项目动态查询中过大的时间跨度 2015-01-19 15:35:17 +08:00
lizanle 49ff5659d9 系统日志查看相关代码，资源 2015-01-19 14:09:53 +08:00
sw 00633c8331 1 2015-01-17 19:00:32 +08:00
sw 750c8d77aa 11111 2015-01-17 15:21:18 +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
sw 155d48b7cb 问卷列表每页显示20个 2015-01-17 14:41:33 +08:00
alan ade0720331 邮件系统界面重置 
Signed-off-by: alan <547533434@qq.com>
 2015-01-17 14:19:54 +08:00
sw c43c6a8c3f Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 2015-01-17 13:56:11 +08:00
z9hang 05b1b9741b 问卷调查页面修改为每页显示5题 2015-01-17 13:35:15 +08:00