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

507 Commits

Author SHA1 Message Date
Tim 88895ff262 英文文本强制折行修复 2016-01-13 16:36:34 +08:00
huang 580e4d7327 迁移问题 2016-01-08 18:55:17 +08:00
huang 5b9be0bb11 Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	db/schema.rb
	public/stylesheets/public.css
 2016-01-08 18:11:54 +08:00
ouyangxuhua 66bf50098a 增加组织/个人屏蔽项目/课程动态功能 2016-01-08 14:12:55 +08:00
huang fd2197a73d 项目资源库历史数据迁移 
搜索功能添加Version类型判断
 2016-01-08 11:01:29 +08:00
ouyangxuhua e90a237a8a 2.1博客增加“设为主页”的功能 2016-01-07 15:09:09 +08:00
ouyangxuhua eacf89100d Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/controllers/organizations_controller.rb
	config/routes.rb
	db/schema.rb
	public/images/hwork_icon.png
	public/stylesheets/new_user.css
	public/stylesheets/public.css
 2016-01-06 16:27:42 +08:00
ouyangxuhua 7d4e3cdd5c 1.增加项目/课程快捷功能； 
2.增加私信功能
 2016-01-06 16:22:13 +08:00
huang 0a1aa9e569 Merge branch 'develop' into hjq_new_course 
Conflicts:
	db/schema.rb
	public/stylesheets/public.css
 2016-01-06 09:27:00 +08:00
ouyangxuhua d8c6775f42 1.解决“组织动态中的作业动态，评分设置弹框不能关闭 ”的问题； 
2.组织申请子域名功能。
 2016-01-05 16:46:06 +08:00
huang be218baa52 添加迁移：项目讨论区数据重复问题 2016-01-05 15:59:13 +08:00
huang 470f45becd 课程讨论区（未完） 2016-01-04 17:05:32 +08:00
lizanle d26b51c982 Merge branch 'szzh' into dev_zanle 
Conflicts:
	app/controllers/organizations_controller.rb
	db/schema.rb
 2015-12-31 15:44:57 +08:00
cxt 9b974b6170 Merge branch 'cxt_course' into szzh 
Conflicts:
	db/schema.rb
 2015-12-31 15:39:07 +08:00
ouyangxuhua 806e4caf5a 1.增加隐藏组织栏目功能；2.未登录情况，隐藏部分内容。 2015-12-31 13:26:28 +08:00
cxt ec631691e3 新建课程和课程配置页面增加结束学期 2015-12-31 11:12:09 +08:00
lizanle be146a9421 Merge branch 'szzh' into dev_zanle 
Conflicts:
	app/controllers/organizations_controller.rb
	db/schema.rb
	public/stylesheets/courses.css
	public/stylesheets/public.css
 2015-12-31 11:11:38 +08:00
ouyangxuhua e9cedf0eb9 删除冗余的迁移文件 2015-12-30 17:14:48 +08:00
ouyangxuhua d1ebc35e43 Merge branch 'develop' into dev_hjq 
Conflicts:
	db/schema.rb
 2015-12-30 10:37:28 +08:00
ouyangxuhua 40bf109223 给资源栏目增加board 2015-12-30 10:34:37 +08:00
lizanle 90c63192e6 历史资源模型修改 2015-12-30 10:32:32 +08:00
lizanle abb19422ff 发送资源到组织功能。同时个人资源库也要添加这个功能 2015-12-29 17:13:01 +08:00
ouyangxuhua 77e0f0cd08 转发帖子新建帖子，并更新相关表 2015-12-29 15:49:24 +08:00
ouyangxuhua 2076c9b449 Merge branch 'develop' into dev_hjq 
Conflicts:
	app/controllers/organizations_controller.rb
	app/views/layouts/_footer.html.erb
	app/views/layouts/base_org.html.erb
	app/views/organizations/_org_activities.html.erb
	db/schema.rb
	public/stylesheets/new_user.css
	public/stylesheets/org.css
	public/stylesheets/public.css
 2015-12-28 15:32:03 +08:00
cxt e86778a9c7 删除不存在的留言动态 2015-12-25 10:13:29 +08:00
Tim b0b4527ea1 Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq 
Conflicts:
	public/stylesheets/org.css
 2015-12-24 10:40:00 +08:00
ouyangxuhua 73d377d06d 组织资源栏目显示转发的帖子 2015-12-23 16:49:05 +08:00
ouyangxuhua b9ae579622 将课程帖子转发至组织帖子栏目 2015-12-23 15:35:26 +08:00
ouyangxuhua 2220e0b7cc 增加帖子-组织栏目关联表 2015-12-22 15:48:41 +08:00
huang 747493993b 上线测试 2015-12-18 19:57:08 +08:00
lizanle 793a98ade1 forge_activities那个运行批量删除回复动态脚本改动 2015-12-18 15:51:41 +08:00
lizanle bba40de36d journal不应该算入ForgeActivity，历史数据应该删除 2015-12-18 10:48:13 +08:00
guange d703f75c98 merge 2015-12-18 09:23:52 +08:00
guange eb97f7dfb2 merge 2015-12-18 09:20:51 +08:00
guange fc63dfcb7b 消息通知 2015-12-17 15:14:52 +08:00
huang 721a007779 删除 由于course、project一张表而引起的历史数据异常问题 2015-12-17 13:22:41 +08:00
huang 41bb37d6d4 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb

解决冲突
 2015-12-16 10:02:08 +08:00
huang 06e5784436 解决英雄榜两个用户同时存在的but 2015-12-16 10:00:10 +08:00
cxt 699d0e22dd 删除多余学生的测验数据 2015-12-15 19:05:19 +08:00
cxt bb2f49439e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2015-12-11 15:00:35 +08:00
huang be940ee3aa Merge branch 'develop' into hjq_new_course 2015-12-10 16:09:36 +08:00
ouyangxuhua 2f7260cba2 1.在栏目表中增加field_type(类型)字段； 
2.在组织配置-》栏目，增加栏目类型。
 2015-12-09 17:24:59 +08:00
ouyangxuhua 09f0d0201e 组织增加栏目发帖功能 2015-12-09 09:23:22 +08:00
cxt a9f6e817b4 分组作业关联项目 2015-12-08 17:37:15 +08:00
huang 916d99be82 课程删除功能 2015-12-08 16:45:26 +08:00
huang 42f5b86d95 添加字段删除课程 2015-12-08 10:32:10 +08:00
cxt b61a0a98e5 Merge branch 'develop' into cxt_course 
Conflicts:
	app/views/student_work/new.html.erb
	app/views/users/_user_homework_form.html.erb
	db/schema.rb
	public/stylesheets/courses.css
 2015-12-07 09:47:18 +08:00
huang 9d7bc17115 Merge branch 'develop' into dev_hjq 2015-12-05 11:39:40 +08:00
ouyangxuhua ab4d0e4678 组织界面增加分栏 2015-12-04 17:34:48 +08:00
huang 4d0956dff1 Merge branch 'develop' into gitlab_guange 2015-12-04 15:54:56 +08:00