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

428 Commits

Author SHA1 Message Date
huang b645a1aa1e 私有项目成员列表非项目成员不能通过URL访问 2015-05-19 14:25:10 +08:00
guange 907d89e1cc merge 2015-05-15 13:39:26 +08:00
guange 39308dacfd 将setting中的domain合并到host配置中 2015-05-14 21:40:34 +08:00
guange bb506b2ab4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
# Conflicts:
#	db/schema.rb
 2015-05-13 16:22:44 +08:00
lizanle 3fae37fa90 课程学生列表下啦刷新显示，查看历次作业成绩的下啦刷新显示api改动 2015-05-13 09:56:34 +08:00
guange 461d9cc183 将autologin默认过期时间改为两个月 2015-05-10 18:06:45 +08:00
sw 6a31a99c93 编辑课程讨论区回复时的问题 2015-05-08 16:14:46 +08:00
alanlong9278 49fe15a666 论坛js冲突 
Signed-off-by: alanlong9278 <547533434@qq.com>
 2015-05-08 09:37:52 +08:00
alan 08f1c39033 修改课程讨论区界面 
Signed-off-by: alan <547533434@qq.com>
 2015-05-07 16:10:07 +08:00
huang a7b2ac860b 修改索引迁移文件不能执行的问题 2015-05-06 15:40:13 +08:00
sw 2ade53053b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-05 16:33:13 +08:00
sw c60ea1db84 111 2015-05-05 16:33:01 +08:00
lizanle 71004e2f78 课程学生列表显示太慢，需要对表加索引 2015-05-05 10:58:37 +08:00
lizanle 2f4ac77838 schema 2015-04-30 09:25:16 +08:00
guange 38ec84cde9 将删除版本库的操作置入后台 2015-04-28 10:33:15 +08:00
guange 3f9abf170e #2363 按天发送邮件相关标题修改 2015-04-23 17:43:10 +08:00
sw 92eabdbecd 修改作业历史数据的问题 2015-04-22 11:49:48 +08:00
sw 09c51d1a87 修改创建作业未启用匿评时，所有作业列表看不到 2015-04-22 11:44:52 +08:00
lizanle 871623b7c8 commit 2015-04-16 11:14:12 +08:00
huang 95c5e6ac83 Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/helpers/application_helper.rb
	app/helpers/files_helper.rb
	app/helpers/members_helper.rb
	app/models/journals_for_message.rb
	app/models/mailer.rb
	app/models/user.rb
	app/views/attachments/_form.html.erb
	app/views/bids/_new_homework_form.html.erb
	app/views/boards/_project_show.html.erb
	app/views/courses/_courses_jours.html.erb
	app/views/courses/feedback.html.erb
	app/views/courses/new_homework.html.erb
	app/views/courses/settings.html.erb
	app/views/issues/_list.html.erb
	app/views/issues/new.html.erb
	app/views/messages/_project_show.html.erb
	app/views/messages/edit.html.erb
	app/views/news/_project_news.html.erb
	app/views/projects/invite_members.html.erb
	app/views/projects/settings/_modules.html.erb
	app/views/projects/show.html.erb
	config/configuration.yml
	config/locales/zh.yml
	db/schema.rb
	public/assets/kindeditor/kindeditor.js
	public/javascripts/course.js
	public/stylesheets/courses.css
	public/stylesheets/public.css
 2015-04-16 10:26:03 +08:00
huang 115d77dd01 圈子JS和modulesJS 
版本库删除按钮
 2015-04-16 09:49:03 +08:00
guange 11c1bbb525 解决打包时文件过多插库错误 2015-04-15 11:24:15 +08:00
lizanle b13d30bf20 自动更改 2015-04-15 10:52:50 +08:00
huang f528584345 添加迁移--项目类型默认值 2015-04-14 20:04:58 +08:00
huang e907f5e3e4 1.解决缺陷列表图片不显示 
2、项目种类页面局部刷新
3、工具栏调整
4.项目新增字段（判断种类）
 2015-04-09 19:18:04 +08:00
lizanle 590dd0cac5 删除这个demo的数据表创建脚本 2015-04-09 10:09:47 +08:00
huang 12eaac5683 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/boards/_project_show.html.erb
	public/javascripts/course.js

处理冲突
修改项目动态分页
项目到航天中添加“新建项目”
 2015-04-07 13:47:39 +08:00
guange 56df5ce9a7 优化zip重复打包问题 2015-04-02 17:20:52 +08:00
guange 02e83ea776 将邮件发送放到后台进程中 2015-03-31 11:51:34 +08:00
guange c1ed8bd36d #2096 course、forge的邮件通知系统，改为可以每日一报、一事一报、不报 2015-03-29 12:33:33 +08:00
guange f139427f03 Merge remote-tracking branch 'origin/szzh' into guange_dev 
Conflicts:
	app/controllers/zipdown_controller.rb
	app/views/bids/_homework_list.html.erb
	config/routes.rb
	db/schema.rb
	public/javascripts/attachments.js
 2015-03-27 18:17:46 +08:00
lizanle 04c064ddc8 nothing 2015-03-26 16:22:16 +08:00
lizanle f59e9a3f7e 添加owner_type字段 2015-03-26 16:13:19 +08:00
guange 15accd7d9f 下载功能优化, 功能已实现 2015-03-25 10:41:42 +08:00
lizanle bfc9cdb3a4 资源表 2015-03-17 10:08:55 +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 a9cafb2241 新建DiscussDemo表 2015-03-16 15:25:22 +08:00
sw 78039a726e Merge branch 'szzh' into guange_dev 2015-03-12 17:09:20 +08:00
z9hang 8190403380 app添加忘记密码接口，课程动态接口代码优化（去掉其中的中文） 2015-03-12 16:33:31 +08:00
lizanle 437fc243ad 给每个项目添加一条初始创建信息，如果有menber，最早加进来的就算创始人,并给projects表的更新创建人 2015-03-11 15:47:10 +08:00
guange c893a2d99b 迁移优化，原来需要1800秒，现只需800秒 2015-03-09 16:25:41 +08:00
alan 5ff43fdea7 项目添加新用户邮件发送功能 
Signed-off-by: alan <547533434@qq.com>
 2015-03-07 10:52:20 +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
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
z9hang 3334299808 app版本管理功能（表添加，页面部分添加） 2015-03-05 17:37:33 +08:00
sw bcc8abdee9 1、增加组织相关数据表 
2、增加组织和项目的关联关系
 2015-03-05 09:27:13 +08:00
lizanle 7ee58d1d44 项目动态重写，并去掉首页缓存 2015-03-04 15:32:00 +08:00
alan f2a3ce0ece 修改《网页标题显示为“中国高校”不合适》bug 
Signed-off-by: alan <547533434@qq.com>
 2015-01-30 16:05:36 +08:00
huang d0a675f2b8 企业版模块 2015-01-30 14:11:35 +08:00