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

4802 Commits

Author SHA1 Message Date
huang 77bf3be20d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/layouts/base_users.html.erb
 2015-03-12 16:49:42 +08:00
huang b809e8844c 修改项目中添加标签按钮显示异常 2015-03-12 16:42:18 +08:00
z9hang 2d05c3273f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-12 16:33:43 +08:00
z9hang 8190403380 app添加忘记密码接口，课程动态接口代码优化（去掉其中的中文） 2015-03-12 16:33:31 +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
huang 4bfc72dc28 用新表统计动态 
修改关注样式
 2015-03-12 15:56:03 +08:00
sw 2ee04d55f2 修改项目邀请用户的界面 2015-03-12 15:46:24 +08:00
huang 6fa5863665 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-12 15:14:16 +08:00
huang 0ba7ef0560 修改邮箱邀请时，邮件为空时提示错误 2015-03-12 15:13:41 +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 717be2b045 修改部分用户的用户首页报错 2015-03-12 10:29:19 +08:00
sw 5340ad7fc1 修改组织首页不显示私有项目 2015-03-12 10:20:28 +08:00
sw 69eecf49d1 还原冲突 2015-03-12 09:52:57 +08:00
sw 2ac2c1848c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/layouts/base_projects.html.erb
 2015-03-12 09:52:50 +08:00
whimlex 6f4ef81eb9 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-12 09:48:09 +08:00
whimlex 65ee3fdc74 项目主页国际化，项目主页JS冲突解决 2015-03-12 09:47:42 +08:00
sw 5258b7585b 处理冲突还原代码 2015-03-12 09:36:03 +08:00
huang 64bbbff879 添加里程碑 2015-03-12 09:03:25 +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 c773e0fd39 JS冲突，去掉多余标点 2015-03-12 08:42:39 +08:00
huang 29655838f0 项目超过的部分用“展示更多信息”拉开 2015-03-11 23:50:37 +08:00
huang c36db9fd63 项目左侧按钮实现配置-模块进行显示/隐藏管理 2015-03-11 22:42:42 +08:00
whimlex 11da65c9ad Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/layouts/base_projects.html.erb
	config/locales/en.yml
	config/locales/zh.yml
 2015-03-11 17:27:02 +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
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
sw 04e5aee3c2 版本库和新建版本库两个不同的权限 2015-03-11 16:07:42 +08:00
lizanle d7c550b15b 给projects项目新建的时候添加创建人 2015-03-11 15:51:25 +08:00
sw 4d58116da5 #1997 项目--工具集中的“创建版本库”和配置中“新建版本库”打开的窗口不一样 2015-03-11 15:44:22 +08:00
sw 1e262ec731 修改项目上传资源链接 2015-03-11 15:32:50 +08:00
lizanle 88ee202a4c issue2012,分页显示方式修改 2015-03-11 15:30:36 +08:00
lizanle 8f3f9ea2ed Merge remote-tracking branch 'origin/szzh' into szzh 2015-03-11 15:30:17 +08:00
lizanle a8a62ab750 issue2012,分页显示方式修改 2015-03-11 15:30:00 +08:00
sw 52dfb0b0ed Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-11 15:16:43 +08:00
sw 27e72c1f39 #2000 增加项目每个模块的访问控制 2015-03-11 15:14:23 +08:00
huang 078d2fa488 解决项目中文档为空情况显示异常 
新建文件文件术语改变
 2015-03-11 15:14:13 +08:00
z9hang ec455de3d4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-11 15:14:04 +08:00
z9hang 11c8c0510a app版本管理报错问题 2015-03-11 15:13:41 +08:00
z9hang c552a22fb2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-11 14:52:36 +08:00
z9hang 14fe487835 将app个人课程动态接口中作业留言归类到更新了作业中 2015-03-11 14:52:07 +08:00
huang cbfb72bd5b 修改新建资源库显示 2015-03-11 14:32:29 +08:00
huang aa2a41d368 修改文档 从项目动态点入后导航栏显示错误 2015-03-11 11:55:55 +08:00
whimlex 93df92e660 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-11 11:55:42 +08:00
whimlex 540ddd4a1b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	config/locales/zh.yml
 2015-03-11 11:55:13 +08:00
whimlex 0eafbb92d5 意见反馈模块国际化 2015-03-11 11:53:42 +08:00
huang 49cf6e1319 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-11 11:38:42 +08:00
huang 32a2e7ae1f 修改默认情况下 用户反馈框处于关闭状态 2015-03-11 11:38:09 +08:00
z9hang 743a642cf1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-11 11:23:23 +08:00
z9hang eec155f077 课程资源页面app自动登陆处理 2015-03-11 11:22:58 +08:00
sw b0eba062a8 修复项目、课程留言不正确的BUG 2015-03-11 11:20:43 +08:00
guange 38c3b40ca1 #1701 修复在编辑作业时，删附件会导致名称编辑内容丢失 2015-03-11 10:52:09 +08:00
sw 9060c9acbc #1977 项目发布新贴跳转有问题 2015-03-11 10:16:06 +08:00
sw aa3ab86fb0 #2013 个人主页--留言--留言输入框不见了 2015-03-11 09:48:35 +08:00
guange e5e46819b4 #867 新建缺陷：校验失败也要保存上传文件信息 2015-03-10 22:35:36 +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
lizanle 87394fe4ce issue2626，建议什么时候创建工程的信息也要加进来。 2015-03-10 16:27:32 +08:00
lizanle 58cbfa6af7 Merge remote-tracking branch 'origin/szzh' into szzh 2015-03-10 16:26:50 +08:00
lizanle 383d90bb12 issue2626，建议什么时候创建工程的信息也要加进来。 2015-03-10 16:26:22 +08:00
guange 31351bc9e8 #1095 在issue主题下，输1个字符可以进行搜索，500错误解决 2015-03-10 15:39:14 +08:00
z9hang 87f0d73ac0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-10 14:41:59 +08:00
z9hang 803f4a3eaf 1、部分页面根据apptoken参数自动登录功能添加token是否过期判断。2、版本管理发布新版本信息功能添加 2015-03-10 14:41:36 +08:00
sw 4034e3565a 修改新建项目html代码不争取 
修改新建项目提示信息有两个
 2015-03-10 14:36:49 +08:00
sw 8a7fc85e8b 系统中部分回复的本地化文件缺失 2015-03-10 14:25:17 +08:00
guange 5d1a5a0b11 #1738 修复图片下载次数不正确问题 2015-03-10 11:50:27 +08:00
sw bdd1980876 修复个人动态首页报错 2015-03-10 11:39:01 +08:00
whimlex 57c97f3dc8 层级回复留言标签修改 2015-03-10 11:12:38 +08:00
z9hang 08f625446e app版本管理功能新建版本界面 2015-03-10 10:18:56 +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
sw 61167e55c9 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-09 17:37:49 +08:00
z9hang 052afefa5e 用户课程动态按更新时间倒序排列 2015-03-09 17:32:38 +08:00
z9hang 6ca853edc7 1、课程首页2、用户首页3、课程留言页4、发布作业页5、用户的留言页6、为课程作业创建作品页传递apptoken参数时自动登录功能 2015-03-09 17:28:17 +08:00
z9hang 26adc13ca2 修改用户课程动态接口 2015-03-09 15:45:09 +08:00
sw 81b58e5c87 修改base_project中代码错误 2015-03-09 15:32:55 +08:00
z9hang 83cc1b41f3 修正api配置 2015-03-09 15:27:01 +08:00
z9hang d634532789 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	config/locales/en.yml
	config/locales/zh.yml
 2015-03-09 15:26:02 +08:00
z9hang d96b87cf42 修改用户课程动态接口返回数据 2015-03-09 15:23:24 +08:00
sw d1912865d3 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-09 14:01:46 +08:00
huang 0402fee6de 修改邮件邀请 2015-03-09 11:31:42 +08:00
huang 402f3701da Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-09 10:31:51 +08:00
huang d947ebff0c 添加国际化 2015-03-09 10:31:05 +08:00
sw 8c44d25750 处理资源标签搜索中标签丢失的问题 2015-03-09 10:27:32 +08:00
sw 659a87ef60 修复部分本地化标签丢失 2015-03-09 09:11:57 +08:00
lizanle bd9a645c2c project动态分页页码数显示个数减少 2015-03-08 17:36:45 +08:00
lizanle 53d144e8d2 project动态当前页在最后。 2015-03-08 17:33:55 +08:00
sw 7c03b03fa9 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-07 17:20:50 +08:00
sw b0897638d9 修改进入问卷结果页面描述样式显示不正确的BUG 2015-03-07 17:20:33 +08:00
sw 6a7c7a732c 修改首页报500 2015-03-07 17:08:36 +08:00
z9hang 610746301f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-07 16:20:28 +08:00
z9hang 5a3d324ce4 添加课程留言列表接口 2015-03-07 16:19:55 +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
huang ba09213023 添加新闻模块、部分样式 2015-03-07 15:32:50 +08:00
sw b292df42d7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-07 15:32:16 +08:00
sw c6788e2f40 修复首页报错 2015-03-07 15:30:37 +08:00
huang eb6deed682 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-07 14:47:39 +08:00
huang 749e10592d 修改邮件页面样式 2015-03-07 14:47:12 +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 3f3bb62678 非项目成员添加新闻、添加讨论区按钮不可见 2015-03-07 14:43:54 +08:00
lizanle a701eb91a2 Merge remote-tracking branch 'origin/szzh' into szzh 2015-03-07 12:26:59 +08:00
lizanle e8bdc13f24 缺陷1975，打开project 330的时候报错 2015-03-07 12:25:42 +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
alan 5c1a6f7754 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-03-07 11:35:49 +08:00
sw 3e3cde0805 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-07 11:32:28 +08:00
alan 151fc561ac 修改邮件样式，增加相应的提示 
Signed-off-by: alan <547533434@qq.com>
 2015-03-07 11:30:25 +08:00
sw ff2b4c610c 1、修改用户动态每页显示条目不正确 
2、用户动态增加新闻、留言等权限判断的补全，以及部分权限判断不正确
 2015-03-07 11:30:21 +08:00
huang e22b389971 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-07 11:15:30 +08:00
huang b043d07d61 修改发布新贴显示问题 2015-03-07 11:02:12 +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
huang b3cbfd39ca 修改一些缺陷，删掉多余的文件 2015-03-07 01:07:50 +08:00
huang f898e2aa91 16:22 2015-03-06 16:22:07 +08:00
z9hang 6e7b294452 注释掉不用的ＡＰＩ 2015-03-06 15:37:24 +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
sw e58f5d4af5 #1941 问卷描述，当编辑时有输入空格行时，点击确定js不会刷新，而且不会对剪辑的格式进行存储 2015-03-06 14:56:27 +08:00
huang beac15475d 新项目及用户反馈框的修改！！ 2015-03-06 14:55:21 +08:00
lizanle 10faab0129 新建的项目发布新问题报500 2015-03-06 11:53:16 +08:00
lizanle 140cb81748 测试版发布课程通知和讨论区发布新帖报500 2015-03-06 11:38:32 +08:00
sw e326934027 调整组织首页缺少项目时的显示样式 2015-03-06 10:58:12 +08:00
sw 5692cbf202 #1965 公共贴吧取消软件创客入口 2015-03-06 09:50:17 +08:00
sw 3c1f1d8bad 修改部分浏览器下发布问卷、取消发布问卷样式显示不正确 2015-03-06 09:45:38 +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 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 45fe622f26 1、修改进入系统首页报错 
2、增加组织的默认图片
 2015-03-05 14:42:46 +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
sw a64671f9de Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-05 09:27:26 +08:00
sw bcc8abdee9 1、增加组织相关数据表 
2、增加组织和项目的关联关系
 2015-03-05 09:27:13 +08:00