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

418 Commits

Author SHA1 Message Date
huang eead7962cf 资源申请权限控制 2016-05-21 11:39:50 +08:00
huang b0e4ed5ab3 请求分享如果自己在项目的话则不需要申请 2016-05-20 17:40:18 +08:00
huang 13ac7ef273 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-05-20 15:37:02 +08:00
cxt 6aa20c9edf 消息通知的内容没有过滤用Tab键空格引起的特殊符号 2016-05-20 11:12:37 +08:00
huang 3985c190bf Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-05-19 16:01:07 +08:00
cxt 0f2f4717b6 作业列表增加序号和翻页、按创建时间倒排 2016-05-19 13:50:45 +08:00
huang 11bc6b1e6c 配置500问题 2016-05-17 10:18:24 +08:00
huang 5ee6c9e5d3 子域名添加成员问题 2016-05-16 18:08:05 +08:00
guange f217b3f510 去除用户名域名 2016-05-14 16:00:04 +08:00
huang 33a3b22430 Merge branch 'hjq_beidou' into develop 
Conflicts:
	db/schema.rb
	public/stylesheets/org2.css
 2016-05-13 15:12:26 +08:00
cxt 0f61994252 点击作业动态优秀排行中学生链接，在打开的作品列表中自动定位到该学生作品并默认打开该作品 2016-05-12 17:49:07 +08:00
huang 6474444cc7 用户连接 id变成用户名 2016-05-10 09:00:59 +08:00
huang 00d0bc0ce1 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-05-06 22:02:22 +08:00
cxt b8f7672424 项目动态的更新时间更新到作业动态中 2016-05-06 22:02:45 +08:00
huang 0a989daf31 Merge branch 'cxt_course' into develop 
Conflicts:
	app/helpers/application_helper.rb
	public/stylesheets/courses.css
	public/stylesheets/new_user.css
 2016-05-06 18:12:08 +08:00
cxt 10d26f89d9 作业列表的二级回复 2016-05-06 17:36:28 +08:00
huang 9e0176bc55 Merge branch 'hjq_beidou' into develop 
Conflicts:
	app/controllers/organizations_controller.rb
	app/helpers/organizations_helper.rb
	db/schema.rb
	public/images/homepage_icon.png
	public/stylesheets/new_user.css
 2016-05-06 10:16:56 +08:00
huang 0b43fb5502 隐藏可见及箭头的局部刷新 2016-05-06 09:49:15 +08:00
huang 231f8f3526 二级目录中设置了隐藏，鼠标经过的时候不显示内容及 框框 2016-05-05 21:23:34 +08:00
huang 5e8ff06140 Merge branch 'yuanke' into develop 2016-05-03 17:15:46 +08:00
cxt 1cad1626e0 解决冲突 2016-04-29 20:31:31 +08:00
yuanke b199a6b8b2 列表人气排序修改 2016-04-29 19:24:20 +08:00
yuanke 1353c27f64 Merge branch 'yuanke' into develop 
Conflicts:
	app/helpers/application_helper.rb
 2016-04-29 15:54:37 +08:00
yuanke f8abd46ae9 列表修改 2016-04-29 15:52:44 +08:00
yuanke 1da8288fe7 列表显示修改 2016-04-29 13:42:58 +08:00
yuanke 4258790453 Merge branch 'hjq_beidou' into yuanke_1 
Conflicts:
	db/schema.rb
	public/stylesheets/project.css
 2016-04-27 14:30:28 +08:00
cxt da73d2b004 Merge branch 'cxt_course' into develop 2016-04-22 12:40:20 +08:00
cxt 9b4c275869 作品动态添加追加附件功能 2016-04-22 11:27:30 +08:00
huang cccc2a7eb7 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-21 16:21:49 +08:00
cxt 06f15735fe Merge branch 'weixin_guange' into develop 2016-04-20 15:15:54 +08:00
cxt ef987d6bf7 模板消息中有html标签 2016-04-20 10:44:54 +08:00
huang adc17c5038 代码优化 
文件目录动态获取接口
文件目录显示样式
 2016-04-19 09:34:55 +08:00
huang 8064fe6c46 讨论区新建帖子代码优化 2016-04-18 15:37:32 +08:00
huang acf4e15f09 统计数左侧刷新 2016-04-14 10:26:25 +08:00
huang 2162d7d4b8 组织banner上传功能 2016-04-06 10:40:38 +08:00
alan 46951f7af9 Merge branch 'develop' into alan_develop 
Conflicts:
	app/views/student_work/_student_work_list.html.erb
	app/views/users/_user_activities.html.erb
	app/views/users/_user_message_course.html.erb
 2016-03-25 16:16:55 +08:00
ouyangxuhua b581a13736 Merge branch 'develop' into ouyangxuhua 2016-03-25 15:32:38 +08:00
alan 13e265b7d2 优化 layouts/_user_projects 和 layouts/_user_courses页面 2016-03-23 18:25:50 +08:00
ouyangxuhua 1579a86f9f 老师给学生的作品打分后，学生再次编辑，要给老师和助教发消息提示 2016-03-23 17:19:25 +08:00
ouyangxuhua 84703a3e01 组织配置中的添加成员，链接使用https://www形式 2016-03-18 16:35:36 +08:00
ouyangxuhua b5964fba0b 组织超链接问题 2016-03-18 14:44:39 +08:00
ouyangxuhua 093c777b23 Merge branch 'develop' into ouyangxuhua 
Conflicts:
	app/views/users/_user_message_course.html.erb
 2016-03-17 16:18:30 +08:00
cxt d72aa3a93c Merge branch 'develop' into cxt_course 
Conflicts:
	app/controllers/homework_common_controller.rb
	app/views/student_work/show.js.erb
	public/javascripts/application.js
	public/stylesheets/base.css
	public/stylesheets/public_new.css
 2016-03-17 15:27:52 +08:00
ouyangxuhua baf547417e 组织下的链接用Setting.protocol表示协议 2016-03-16 14:57:32 +08:00
ouyangxuhua ea6de1407e Merge branch 'develop' into ouyangxuhua 
Conflicts:
	app/helpers/application_helper.rb
 2016-03-16 12:36:15 +08:00
ouyangxuhua dcadadae03 退出和用户的链接使用https:// +Setting.host_name 2016-03-16 11:24:55 +08:00
ouyangxuhua da1b27cd38 Merge branch 'ouyang' of https://git.trustie.net/jacknudt/trustieforge into ouyang 2016-03-16 10:01:42 +08:00
cxt 2ce2134f0b 浏览器tab的title，显示用户姓名，不是登录名 2016-03-15 17:25:46 +08:00
ouyangxuhua b716e593b5 组织下的链接问题 2016-03-15 13:49:44 +08:00
ouyangxuhua 098844a910 Merge branch 'develop' into ouyangxuhua 
Conflicts:
	app/helpers/application_helper.rb
	app/views/organizations/_org_course_homework.html.erb
	app/views/organizations/_org_course_news.html.erb
	app/views/organizations/_org_project_issue.html.erb
	app/views/organizations/_project_message.html.erb
	app/views/organizations/_show_org_document.html.erb
	app/views/users/_user_message_course.html.erb
 2016-03-15 13:40:33 +08:00