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

4627 Commits

Author SHA1 Message Date
alan 44c783a61b 帖子的邮件通知改成只有版主收到 
Signed-off-by: alan <547533434@qq.com>
 2015-02-02 17:31:27 +08:00
sw 93410e0d57 #1919 取消作业留言的动态显示 2015-02-02 17:23:32 +08:00
alan 646678c9db 修改《课程--学生列表：输入有效条件获得搜索结果，对搜索结果按积分排序，却自动返回对所有学生排序》bug 
Signed-off-by: alan <547533434@qq.com>
 2015-02-02 17:01:07 +08:00
alan 858b5ea97c 修改《讨论吧发帖发送邮件错误问题》 
Signed-off-by: alan <547533434@qq.com>
 2015-02-02 11:00:23 +08:00
lizanle fa8475387a Merge branch 'szzh' into dev_zanle 2015-02-02 10:06:53 +08:00
lizanle 8f5e613477 添加一些对代码理解的注释 2015-02-02 09:53:14 +08:00
sw a29887cfed 关闭问卷后，发布问卷和其他的发布问卷框框未对齐 2015-02-02 09:43:35 +08:00
sw 78d8a0a1c6 修改意见反馈折叠后背景为透明 2015-02-02 09:09:45 +08:00
sw 6261d95eba 首页显示异常 2015-01-31 17:27:52 +08:00
z9hang 944dc33212 注释掉API文档 2015-01-31 17:14:47 +08:00
z9hang 836be8c75e 添加企业首页配置功能 2015-01-31 17:14:01 +08:00
alan 9681e08600 Merge branch 'szzh' into email_verify 
Conflicts:
	Gemfile.lock
 2015-01-31 16:43:46 +08:00
sw 79d1a069c2 修改公司名字过长首页显示有问题 2015-01-31 16:19:13 +08:00
huang 2a65ba3af8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-31 16:10:33 +08:00
huang 1dd8724656 修改样式 2015-01-31 16:10:20 +08:00
alan 1010003737 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 
Conflicts:
	config/locales/zh.yml
 2015-01-31 15:55:17 +08:00
alan 134f0d5557 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 
Conflicts:
	config/locales/zh.yml
 2015-01-31 15:49:00 +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
alan 9e36f9264c 修改《竞赛作业评分》 
Signed-off-by: alan <547533434@qq.com>
 2015-01-31 15:46:10 +08:00
huang 523af8b2a9 修改企业版结构及列表页面 2015-01-31 15:43:35 +08:00
alan 48cb0e0450 email verify 2015-01-31 15:04:48 +08:00
sw 2cc31e5c72 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-31 14:48:08 +08:00
whimlex c413ce1405 项目企业模块国际化修改 2015-01-31 14:44:16 +08:00
sw f3b99ec045 修改项目首页搜索按钮移位 2015-01-31 14:37:24 +08:00
sw 9b854f4264 修改编辑作业列表显示异常 2015-01-31 14:29:11 +08:00
sw d76c0a5365 修改新建作业界面显示异常 2015-01-31 14:28:02 +08:00
sw 8289ca6c89 11111 2015-01-31 11:14:55 +08:00
whimlex 6a22e47b0a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-31 10:55:31 +08:00
whimlex 57237c76d8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	config/locales/zh.yml
 2015-01-31 10:55:08 +08:00
whimlex 3e1d90630e 找回密码，邮件激活国际化 2015-01-31 10:48:09 +08:00
alan 3484fd34bb merge dev_zanle branch 
Signed-off-by: alan <547533434@qq.com>
 2015-01-31 10:47:09 +08:00
alan 7710af316d Merge remote-tracking branch 'remotes/origin/dev_zanle' into szzh 2015-01-31 10:46:29 +08:00
alan b5e49e2e1c Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-01-31 10:10:28 +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
alan e34e87bb82 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-01-30 17:48:18 +08:00
alan 2f168dd4d7 修改《课程动态》样式 
Signed-off-by: alan <547533434@qq.com>
 2015-01-30 17:47:57 +08:00
lizanle 999b395763 添加Kaminari分页样式文件， 
_paginator.html.erb 这是总的入口文件，可以通过修改它来调整显示的整体结构
比如我不需要“首页”，”末页“这两个链接，那么我就在这个文件里面将对应的代码删除
_page.html.erb 对应页码链接
_first_page.html.erb / _last_page.html.erb 对应“首页”和“末页”的链接
_prev_page.html.erb / _next_page.html.erb 对应“上一页”和“下一页”的链接
_gap.html.erb 空隙的显示，默认是中间的省略号(...)
 2015-01-30 17:26:23 +08:00
lizanle a47cb8eb65 去掉原有的样式分页样式 2015-01-30 17:24:56 +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 269f1835b0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-30 16:19:35 +08:00
sw 34c68a59fc 关闭问卷之后老师容许查看统计结果 2015-01-30 16:19:05 +08:00
alan f2a3ce0ece 修改《网页标题显示为“中国高校”不合适》bug 
Signed-off-by: alan <547533434@qq.com>
 2015-01-30 16:05:36 +08:00
alan 661dbe5219 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-01-30 14:52:48 +08:00
alan a467736a5e 修改《多字段唯一性判断》 
Signed-off-by: alan <547533434@qq.com>
 2015-01-30 14:52:36 +08:00
huang 666ebf9b5b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-30 14:45:47 +08:00
huang 9e470fa25c meigia 2015-01-30 14:45:33 +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
sw 31c78279ea 删除多余的一个end 2015-01-30 14:31:15 +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
sw 36c07f9664 修改拒绝项目成员加入后，页面不会刷新的BUG 2015-01-30 14:16:32 +08:00
huang d0a675f2b8 企业版模块 2015-01-30 14:11:35 +08:00
lizanle 22dd4981c0 修改分页函数 2015-01-30 13:35:10 +08:00
lizanle b453d16228 将controller里的两个方法挪到helper 2015-01-30 13:30:06 +08:00
lizanle 90649209ca 封装，简化，重新编排代码格式，并删掉了一些无用的方法代码 2015-01-30 13:29:25 +08:00
lizanle abc5dd1c74 添加表格样式 2015-01-30 12:07:07 +08:00
lizanle 0232826a6e 上次修改引入bug:关键字查询不到任何东西 2015-01-30 12:04:33 +08:00
lizanle e761cd5f22 关键字查询会丢失样式 2015-01-30 11:52:37 +08:00
sw 87fdd840ec 首页加入项目增加已是当前项目的判断 2015-01-30 11:39:19 +08:00
lizanle 852bb940a2 过滤掉日志中日志分析的请求 2015-01-30 11:31:41 +08:00
sw a265556cfe 搜索项目时增加js验证增加 2015-01-30 11:00:18 +08:00
sw 0d5384c6d8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-30 10:37:58 +08:00
sw 97ec208b1a Merge branch 'dev_zanle' into szzh 
Conflicts:
	config/routes.rb
 2015-01-30 10:37:05 +08:00
whimlex deadea81fa Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-30 10:35:23 +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
lizanle f3f590a834 # 这写变量发现没有用而且拖慢速度 
#@teachers= searchTeacherAndAssistant(@course)
    #@canShowRealName = isCourseTeacher(User.current.id,@course)
 2015-01-30 10:27:21 +08:00
whimlex f05e046751 首页国际化 2015-01-30 10:26:26 +08:00
sw 6bca666f08 #1896 课程--问卷调查--新建题目时点击确定按钮无反应 2015-01-30 10:24:06 +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 2978d9020f Merge branch 'develop' into szzh 2015-01-29 17:44:37 +08:00
sw c366cc90e7 修改删除问卷后相关BUG 2015-01-29 17:33:10 +08:00
sw a772ef329d 修改问卷时增加问卷标题不能为空的提示 2015-01-29 17:01:19 +08:00
sw 108435f933 新增题目时，增加标题不能为空的js验证 2015-01-29 16:53:11 +08:00
sw b71d714103 #1887 用户职称显示问题 2015-01-29 16:39:25 +08:00
sw bf75f32903 修改个人留言界面，左侧个人信息样式显示不正确 2015-01-29 16:22:26 +08:00
sw af7e605f76 添加新闻时，“提交”按钮和“取消”按钮之间有一竖 2015-01-29 16:13:36 +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
whimlex b7c7cc4c64 意见反馈栏实现cookie缓存收拉属性，实现页面刷新跳转，意见反馈栏收拉一致 2015-01-28 12:13:17 +08:00
z9hang a6488da7fa 修改ＡＰＩ上线问题 2015-01-28 10:45:20 +08:00
z9hang f7dbb24d35 修改测试版上线问题 2015-01-28 10:31:30 +08:00
z9hang 222e2cc135 修改ErrorHandler未能加载问题 2015-01-28 09:25:58 +08:00
z9hang f793cff398 改为开发模式下才调用api文档 2015-01-27 17:34:02 +08:00
z9hang 91a8078cae Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-27 16:03:53 +08:00
z9hang cf1cd9201c 修改上传资源弹框样式 2015-01-27 16:03:38 +08:00
alan 20f4b5c44b 修改《contest新建的样式》 
Signed-off-by: alan <547533434@qq.com>
 2015-01-27 15:43:06 +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 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
lizanle 5afbf6dbca 调整了注释 2015-01-27 14:19:46 +08:00
sw 5950f0404b #1832 不显示无数据的字段，字段名 2015-01-27 11:35:19 +08:00
sw 56700f4d62 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-27 11:06:42 +08:00
sw 649c65fbe2 国际化部分代码 2015-01-27 10:14:05 +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
whimlex 0ff22b1ac0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-26 17:47:47 +08:00
whimlex e5e24c1163 resolve conflict 2015-01-26 17:47:33 +08:00
whimlex 64cbeddd13 项目“缺陷”修改为“问题跟踪”，sidebar栏“缺陷”修改为“问题”；项目新建新闻按钮样式统一；新建课程样式统一；课程重开和关闭国际化；竞赛导航锁定；翻译缺失修正 2015-01-26 17:37:05 +08:00
alan 36ec204f40 修改《公共贴吧中，回复了帖子后，重新编辑的话能编辑标题》 
Signed-off-by: alan <547533434@qq.com>
 2015-01-26 16:54:46 +08:00
alan f1495686e9 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-01-26 15:54:38 +08:00
alan 0944cc4ca8 < 邮件格式调整> 
Signed-off-by: alan <547533434@qq.com>
 2015-01-26 15:54:23 +08:00
sw d135274281 修改重复加入项目提示语 2015-01-26 15:41:10 +08:00
sw 87f19f7a8b #1873 加入”==》“申请加入” 2015-01-26 14:25:39 +08:00
sw 2f8d57797c 增加弹出框的宽度 2015-01-26 14:09:56 +08:00
alan 472ccc45bf Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-01-23 23:12:51 +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
z9hang b2396df68c 优化下代码 2015-01-23 16:31:41 +08:00
alan 7ef6f8adfb Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-01-23 15:55:44 +08:00
alan a3cf79db96 修改编码问题 
Signed-off-by: alan <547533434@qq.com>
 2015-01-23 15:55:29 +08:00
sw 5e4279e158 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-23 15:23:31 +08:00
sw 2450bb777d 修改问卷统计界面样式 2015-01-23 15:10:54 +08:00
whimlex 14685f2656 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-23 15:09:03 +08:00
whimlex 38157e560e 课程--资源库--上传资源：当变化屏幕分辨率时，“上传文件”字样显示异常;添加用户或组没有链接;新建课程中，平台按钮样式调整成统一风格;课程主页，竞赛 2015-01-23 15:08:34 +08:00
alan 38da932f4c Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 
Conflicts:
	config/application.rb
 2015-01-23 14:57:09 +08:00
alan 61634585f5 修改《news，forum模块发送邮件的模板》 
Signed-off-by: alan <547533434@qq.com>
 2015-01-23 14:51:11 +08:00
sw 900cff8f8e 1、问卷列表界面发布问卷按钮增加问卷标题不能为空的判断 
2、去掉错误的插件引用
 2015-01-23 14:43: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
lizanle e96302d219 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	Gemfile
 2015-01-23 13:47:38 +08:00
alan b20204fedd 修改《邮件重发一样引发的bug》 
Signed-off-by: alan <547533434@qq.com>
 2015-01-23 13:42:25 +08:00
alan fdba8ca986 修改《邮箱地址真实性验证》《课程分班提示重名出错》《留言模块发送邮件模板功能》 
Signed-off-by: alan <547533434@qq.com>
 2015-01-23 11:46:55 +08:00
z9hang 4a672416e3 匿评作品详情接口添加评论的回复输出 2015-01-23 11:42:35 +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
lizanle 0147b30133 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	Gemfile
 2015-01-23 10:25:28 +08:00
sw bb64dc9452 修改问卷调查按钮的样式 2015-01-23 10:19:23 +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 89ee38481b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/layouts/_base_feedback.html.erb
 2015-01-23 09:56:37 +08:00
lizanle 27fde6c641 添加注释 2015-01-23 09:47:54 +08:00
huang c65bab8c38 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-23 09:47:33 +08:00
lizanle 03ae5fdeac 添加注释 2015-01-23 09:47:22 +08:00
huang c6deffe245 修改首页样式显示异常 2015-01-23 09:47:13 +08:00
sw ae31d0b861 #1851课程作业增加状态显示 2015-01-23 09:42:08 +08:00
sw 249b08392d #1856 修改问卷列表页面，发布问卷、取消发布后弹出界面显示不正确 2015-01-23 09:31:30 +08:00
sw 81f5a5e624 #1854学生点击查看已提交过的问卷时，多行主观题中显示有html元素 2015-01-23 09:28:01 +08:00
sw 2b5928602e 1.修改由于意见悬浮框引起的界面的padding不正确的问题 
2.修改问卷调查左侧会出现滚动条的问题
 2015-01-23 09:17:27 +08:00
whimlex e950208e38 sina邮箱IE样式 2015-01-22 22:05:56 +08:00
whimlex 3fcb2f14a5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/mailer/issue_edit.html.erb
 2015-01-22 21:02:53 +08:00
whimlex 1e36ca504a 多种邮箱邮件样式调整，回复内容样式更改 2015-01-22 20:41:42 +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
huang 388ddac96b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-22 17:46:31 +08:00
huang 84bfd30fc5 修改问题反馈弹框！ 2015-01-22 17:46:12 +08:00
alan 8f1249390a 修改《发送多封相同邮件》 
Signed-off-by: alan <547533434@qq.com>
 2015-01-22 17:31:34 +08:00
z9hang f1693e237b 修改匿评作品详情接口，输出匿评作品详情的同时还输出对该作品的评论（包括，教师评分，匿评及留言） 2015-01-22 17:21:15 +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 e72ed1054e 修改问卷调查按钮的样式 2015-01-22 09:39:04 +08:00
z9hang a4d7e5f932 匿评作品详情显示接口 2015-01-22 09:30:29 +08:00
whimlex 0c0160ac2b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-21 18:13:47 +08:00
whimlex 3279928bef 邮件样式调整，国际化；用户资料页面调整 2015-01-21 18:12:04 +08:00
sw 54c8ee9d4d 增加学生答完问卷之后。能看到自己答题结果的功能 2015-01-21 17:51:12 +08:00
lizanle c0b12ac60c 去掉冗余代码 2015-01-21 17:42:48 +08:00
lizanle 7fc2ea0484 修改国际化文件名字 2015-01-22 17:22:29 +08:00
lizanle 566f59c49e 修改只有管理员才能查看 2015-01-22 16:52:09 +08:00
lizanle 0502eb16a6 添加了访问统计页面和耗时分析页面 2015-01-22 16:47:29 +08:00
lizanle 59a47002ae 重构，修正了许多的空指针异常 2015-01-22 16:46:06 +08:00
lizanle 061e4599c3 重构，修正了许多的空指针异常 2015-01-22 16:45:57 +08:00
lizanle c668b72dac 重构 2015-01-22 16:45:18 +08:00
sw d68486669e #1830课程--标签字体压线 2015-01-21 16:07:44 +08:00
z9hang b6207c0a47 关闭匿评 2015-01-21 15:37:59 +08:00
z9hang 89e0f98034 启动匿评接口 2015-01-21 15:29:05 +08:00
sw 520e9c73aa #1836 未登录或者没有权限访问私有项目时，跳转到403页面 2015-01-21 14:30:19 +08:00
alan f01d164295 Signed-off-by: alan <547533434@qq.com> 2015-01-21 12:01:02 +08:00
sw 0b2fa35a42 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-21 11:58:55 +08:00
sw 77b8bf18c8 #1842 修改部分页面描述问题 2015-01-21 11:50:33 +08:00
sw a53831a6b5 修改当问卷标题过长时，学生查看问卷列表省略号过早出现 2015-01-21 11:44:49 +08:00
alan 64c0fc7413 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-01-21 11:33:43 +08:00
alan 6ccb154cc3 课程留言，发邮件给课程所有人 
Signed-off-by: alan <547533434@qq.com>
 2015-01-21 11:33:29 +08:00
z9hang b13f2b2dc8 添加我的作品列表接口 2015-01-21 11:28:09 +08:00
sw 95dcdd7125 修改进入问卷编辑界面报错 2015-01-21 11:18:47 +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
sw f3062da237 修改空数据时，课程首页无法加载(居然是死循环。。。) 2015-01-21 09:18:29 +08:00
z9hang b949f70c64 修改数据格式转换方法 2015-01-20 17:42:18 +08:00
sw 77cb2b0893 1.修改学生已完成的问卷标题过长时显示异常 
2.增加取消发布时的提示
 2015-01-20 16:50:16 +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
z9hang 0a33a716de 添加课程作业列表API接口 
修改作业详情列表API接口
添加课程通知列表API接口
 2015-01-20 15:17:02 +08:00
sw 7b9d88ecfe 问卷调查增加重新发布功能 2015-01-20 11:42:28 +08:00
sw e493ae22cf Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-19 17:08:47 +08:00
sw 14a1f31a12 1、项目动态 -> 近期动态 
2、修复新建修改课程时，描述会有一行空白行
 2015-01-19 16:43:21 +08:00
lizanle 4796524a97 去掉项目动态查询中过大的时间跨度 2015-01-19 15:35:17 +08:00
z9hang abcf06ccc7 课程资源不能引用问题。原因：15年1-3月能属于2014年秋季学期，代码却将其判断为15年秋季学期了 2015-01-19 15:00:46 +08:00