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

3516 Commits

Author SHA1 Message Date
lizanle bd9a645c2c project动态分页页码数显示个数减少 2015-03-08 17:36:45 +08:00
lizanle 53d144e8d2 project动态当前页在最后。 2015-03-08 17:33:55 +08:00
sw b0897638d9 修改进入问卷结果页面描述样式显示不正确的BUG 2015-03-07 17:20:33 +08:00
sw 6a7c7a732c 修改首页报500 2015-03-07 17:08:36 +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
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
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
alan 151fc561ac 修改邮件样式，增加相应的提示 
Signed-off-by: alan <547533434@qq.com>
 2015-03-07 11:30:25 +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 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 e58f5d4af5 #1941 问卷描述，当编辑时有输入空格行时，点击确定js不会刷新，而且不会对剪辑的格式进行存储 2015-03-06 14:56:27 +08:00
huang beac15475d 新项目及用户反馈框的修改！！ 2015-03-06 14:55:21 +08:00
sw e326934027 调整组织首页缺少项目时的显示样式 2015-03-06 10:58:12 +08:00
sw 3c1f1d8bad 修改部分浏览器下发布问卷、取消发布问卷样式显示不正确 2015-03-06 09:45:38 +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 e2307366f6 实现组织的增、删、改、查功能及相关界面 2015-03-05 17:42:31 +08:00
z9hang 3334299808 app版本管理功能（表添加，页面部分添加） 2015-03-05 17:37:33 +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
sw 7f249d29f4 修整页面代码 2015-03-05 08:45:32 +08:00
sw a2d986f70c 修改页面代码 2015-03-04 16:55:25 +08:00
lizanle 7ee58d1d44 项目动态重写，并去掉首页缓存 2015-03-04 15:32:00 +08:00
sw 032e28067d #1959 项目评分是0的，就不显示了！ 2015-03-04 11:34:01 +08:00
sw 33e9a3e326 #1958 关注有用户0个后边取消冒号 2015-03-04 10:02:40 +08:00
sw 5bba54432d #1930 项目缺陷显示个数修改 2015-03-04 09:52:01 +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
sw 90d9e77b32 修复课程主页没有2015年课程 2015-03-02 17:31:04 +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