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

13962 Commits

Author SHA1 Message Date
huang 9c18b37349 Merge branch 'hjq_beidou' into develop 2016-05-06 17:05:27 +08:00
huang 3de2b151a3 左三”更多“提供链接 2016-05-06 17:03:54 +08:00
Tim c3aec4d115 组织一级栏目名称过长时溢出 2016-05-06 16:31:40 +08:00
huang 7f9a327166 Merge branch 'hjq_beidou' into develop 
Conflicts:
	app/views/sub_document_comments/show.html.erb
 2016-05-06 16:25:41 +08:00
huang 44c1675ecd To 一级栏目 | 二级栏目 2016-05-06 16:20:47 +08:00
Tim cd95ed0558 二级回复展开更多效果实现 2016-05-06 16:20:39 +08:00
huang 8c9a94f1ac 默认的内容显示问题 2016-05-06 15:36:58 +08:00
huang 9d79fd3777 资源栏目不能添加二级目录 2016-05-06 15:31:45 +08:00
huang 8f492f6108 二级目录自动排序功能 2016-05-06 15:09:08 +08:00
huang 526fe8ff13 帖子详情页面添加删除功能 2016-05-06 15:02:38 +08:00
huang ae298f9b55 帖子详情页面添加编辑功能 2016-05-06 14:57:36 +08:00
huang a5be092c16 二级目录帖子列表中添加编辑功能 2016-05-06 14:42:13 +08:00
yuanke d32e07bda9 项目符号有的地方多余，issue详情里面项目符号显示为数字改为圆点. 2016-05-06 14:22:45 +08:00
huang df1c70880a Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/users/_homework_repository.html.erb
	public/stylesheets/new_user.css
 2016-05-06 12:22:43 +08:00
huang 572a051b04 Merge branch 'yuanke' into develop 
Conflicts:
	app/controllers/users_controller.rb
	app/views/blogs/_article.html.erb
	app/views/layouts/new_base_user.html.erb
 2016-05-06 11:35:27 +08:00
huang 42814feab8 js问题 2016-05-06 11:29:30 +08:00
huang 0bbdf85491 more添加链接 2016-05-06 10:55:24 +08:00
huang c3a016607b 解决冲突 2016-05-06 10:39:37 +08:00
huang aefcb78926 新base 2016-05-06 10:28:21 +08:00
yuanke a863c143f3 收缩箭头修改 2016-05-06 10:22:48 +08:00
huang 6e7d20c410 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-06 10:17:18 +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 17a9de8ec4 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-06 10:12:52 +08:00
huang 885b6f6092 隐藏掉“综合”选项，分页每页显示20个 2016-05-06 10:12:30 +08:00
Tim e2907565bd Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-06 10:02:43 +08:00
Tim 4bf1883ba2 组织门户导航栏二级显隐 2016-05-06 10:02:31 +08:00
huang 0b43fb5502 隐藏可见及箭头的局部刷新 2016-05-06 09:49:15 +08:00
huang 6057ea15e1 一级目录新界面鼠标经过显示子目录 2016-05-06 09:18:26 +08:00
cxt 0fafbffa49 项目的更新加到作业的最后更新时间中 2016-05-06 08:52:54 +08:00
yuanke 283a83013c KE 修改项目符号、表格颜色问题 2016-05-06 08:48:15 +08:00
huang 231f8f3526 二级目录中设置了隐藏，鼠标经过的时候不显示内容及 框框 2016-05-05 21:23:34 +08:00
huang cd6124895d 鼠标经过一级目录的时候显示二级目录 2016-05-05 21:09:02 +08:00
huang 51f3e27a99 模式二详情目录调整 2016-05-05 20:59:02 +08:00
huang e9c3d5cceb 模式二 二级目录调整 2016-05-05 20:54:43 +08:00
huang c400b44230 一级目录列表引起的问题 2016-05-05 20:19:39 +08:00
huang d0db711449 编辑功能 2016-05-05 18:47:32 +08:00
huang 1d2e6327a8 二级域名隐藏可见局部刷新 2016-05-05 18:21:54 +08:00
huang e9f88c5593 链接问题 2016-05-05 17:08:12 +08:00
Tim 24c5cdfdda 二级栏目效果改 2016-05-05 17:02:39 +08:00
huang 3565e0bf6f base左侧链接 2016-05-05 16:59:06 +08:00
huang 62da2928a8 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-05 16:43:36 +08:00
huang 02d6186045 二级域名讨论帖子添加删除链接 2016-05-05 16:43:20 +08:00
Tim c8da24b6bc Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-05 16:21:01 +08:00
Tim d0f97275cc 组织二级栏目显隐效果 2016-05-05 16:20:49 +08:00
huang e0c011948c 二级域名的隐藏和显示 2016-05-05 15:16:14 +08:00
cxt 29c18518e7 教师有权限删除课程内教辅和学生上传的资源的TAG 2016-05-05 15:04:37 +08:00
yuanke b82a1c1162 讨论区计算回复数的一个BUG 2016-05-05 14:52:58 +08:00
guange 72f5f5b795 加入组织 2016-05-05 14:52:10 +08:00
huang 79cd36f297 二级域名排序 2016-05-05 14:39:27 +08:00
guange 17282083a6 merge 2016-05-05 14:07:37 +08:00