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

1653 Commits

Author SHA1 Message Date
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 626e3da1e6 Merge branch 'szzh' into dev_hjq 
Conflicts:
	public/stylesheets/new_user.css
	public/stylesheets/public.css
 2016-01-08 18:09:21 +08:00
huang 6a9dc43d03 版权修改、issue编辑 2016-01-08 14:42:28 +08:00
ouyangxuhua 5eceb3d841 解决一些bug; 增加已设为首页标签 2016-01-08 14:42:21 +08:00
ouyangxuhua 66bf50098a 增加组织/个人屏蔽项目/课程动态功能 2016-01-08 14:12:55 +08:00
huang e56382a899 tag云ajax更新后自动刷新 2016-01-07 17:15:19 +08:00
cxt 05f822a5c2 导出在线测验成绩列表 2016-01-07 16:43:03 +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 dab3f0d225 为组织1添加子域名：team 2016-01-05 16:55:21 +08:00
ouyangxuhua d8c6775f42 1.解决“组织动态中的作业动态，评分设置弹框不能关闭 ”的问题； 
2.组织申请子域名功能。
 2016-01-05 16:46:06 +08:00
huang 680e861620 项目资源搜索功能 2016-01-05 11:00:26 +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
cxt 7e76a32480 项目/课程讨论区的动态增加设置菜单 2015-12-31 15:36:42 +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
lizanle b7eda83def 历史资源功能 2015-12-30 17:27:44 +08:00
ouyangxuhua c2c4c032dc Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-30 17:27:22 +08:00
ouyangxuhua dcfe89c544 帖子发送到组织资源栏目，同时增加增删查改功能 2015-12-30 15:46:01 +08:00
guange aa951cd7b9 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-30 13:18:40 +08:00
guange 887d2f9f00 添加micros和nubot的链接 2015-12-30 13:14:32 +08:00
ouyangxuhua 40bf109223 给资源栏目增加board 2015-12-30 10:34:37 +08:00
lizanle abb19422ff 发送资源到组织功能。同时个人资源库也要添加这个功能 2015-12-29 17:13:01 +08:00
cxt c3ddbcfddf Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2015-12-29 16:33:32 +08:00
cxt 6bdd6d3e03 课程添加设置菜单，设置页面的信息更改 2015-12-29 10:15:53 +08:00
ouyangxuhua d77625e4e9 Merge branch 'develop' into dev_hjq 2015-12-28 17:04:12 +08:00
huang 900d7d62cb 邮件按天发送添加提示 2015-12-28 16:14:32 +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 d2f56693b4 课程通知新建报404 2015-12-25 19:02:26 +08:00
cxt 11bf8f77dc Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-25 15:59:33 +08:00
huang a16d6803ae Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-25 15:48:41 +08:00
cxt 3e39eacd19 新建课程通知时通知标题框自动获取焦点 2015-12-24 16:45:45 +08:00
cxt f26f71c07a 课程通知改成动态的模式 2015-12-24 09:57:32 +08:00
huang 00711f1100 issue编辑、添加邮件中去掉token 2015-12-23 16:12:23 +08:00
ouyangxuhua b9ae579622 将课程帖子转发至组织帖子栏目 2015-12-23 15:35:26 +08:00
ouyangxuhua 2220e0b7cc 增加帖子-组织栏目关联表 2015-12-22 15:48:41 +08:00
guange 1724ae430e Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-21 15:15:48 +08:00
guange b235e8de70 改为默认模板 2015-12-21 15:15:39 +08:00
huang 4092401e68 Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-18 21:22:08 +08:00
huang 88cdb5a3ed Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/controllers/repositories_controller.rb
解决冲突
 2015-12-18 17:08:26 +08:00
guange 57b1c0c7d8 at是否开启加入到配置 2015-12-18 17:02:50 +08:00
guange d703f75c98 merge 2015-12-18 09:23:52 +08:00
houxiang 5f2e6284ce 增加了两个template文件，大家下拉代码后将template文件复制去掉后尾的template就行 2015-12-18 09:21:05 +08:00
guange eb97f7dfb2 merge 2015-12-18 09:20:51 +08:00
huang b87943ff1d Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	db/schema.rb
处理冲突
 2015-12-18 09:17:18 +08:00