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

464 Commits

Author SHA1 Message Date
cxt 9bc8ccbb9e 教辅可只评语不评分 2016-05-11 09:18:55 +08:00
txz 9b55d8b527 微信版标题显示不完整 2016-05-10 14:06:34 +08:00
huang cabac5914c 学生统计数 2016-05-10 13:41:21 +08:00
huang e99aa2f199 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-10 11:33:19 +08:00
huang 99d9a28828 名师榜sql查询 2016-05-10 11:33:02 +08:00
Tim c8e0ffbdae 左二和右二文字隐藏时的更多显示 2016-05-10 10:30:28 +08:00
huang ccc4ddc325 组织编辑问题 2016-05-10 10:18:47 +08:00
huang 5880a12290 sql查询 2016-05-10 10:00:28 +08:00
huang fc36e4c01e 教师列表 2016-05-09 18:10:22 +08:00
cxt 1eb41478b2 课程动态和首页动态中的作业动态实现二级回复 2016-05-09 17:06:10 +08:00
huang a98678e001 列表中类型显示方法封装 2016-05-09 15:00:50 +08:00
huang 878bcc8cf1 栏目创建类型添加老师、学生类型 2016-05-09 14:43:28 +08:00
huang 7a0d86228a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-06 22:57:29 +08:00
huang 635d49cc25 course->课程动态 
project->项目动态
 2016-05-06 22:57:05 +08:00
cxt e03bc42c53 Merge branch 'cxt_course' into develop 
Conflicts:
	app/controllers/words_controller.rb
 2016-05-06 22:53:16 +08:00
huang 96ce1d8d40 | 及更多问题 2016-05-06 22:35:17 +08:00
huang 6401afb850 二级目录排序同步 2016-05-06 22:30:44 +08:00
huang 9a80ff0597 右一添加“更多”链接 2016-05-06 22:21:52 +08:00
cxt 90809ea350 首页报500 2016-05-06 22:18:31 +08:00
cxt b8f7672424 项目动态的更新时间更新到作业动态中 2016-05-06 22:02:45 +08:00
huang 00d0bc0ce1 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-05-06 22:02:22 +08:00
huang ece84e912d 鼠标经过显示标题 2016-05-06 21:32:37 +08:00
huang 86ad0035b7 样式显示问题 2016-05-06 18:19:00 +08:00
huang 67be99530c 左侧模式三样式修改 2016-05-06 18:06:25 +08:00
huang 97f263e97e 空内容的提示语 2016-05-06 17:34:45 +08:00
huang b40a112015 配置页面一级域名超过的时候显示样式 2016-05-06 17:25:50 +08:00
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 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 0bbdf85491 more添加链接 2016-05-06 10:55:24 +08:00
huang c3a016607b 解决冲突 2016-05-06 10:39:37 +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 1d2e6327a8 二级域名隐藏可见局部刷新 2016-05-05 18:21:54 +08:00
Tim 24c5cdfdda 二级栏目效果改 2016-05-05 17:02:39 +08:00
huang 3565e0bf6f base左侧链接 2016-05-05 16:59:06 +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
huang 79cd36f297 二级域名排序 2016-05-05 14:39:27 +08:00
huang 6d28d0becd 二级域名的删除功能 2016-05-05 12:27:35 +08:00
huang 2920f21c95 二级域名编辑功能自动刷新 2016-05-05 11:28:28 +08:00
huang 5f696fe123 添加二级域名局部刷新 2016-05-05 11:06:11 +08:00
huang 36e6d44ac1 二级目录新建的时候暂时隐藏资源 2016-05-05 11:01:02 +08:00
Tim 71b70cf937 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-05 10:36:30 +08:00
Tim 9536f87c26 标题多行控制 2016-05-05 10:36:18 +08:00
huang 72e19b8b67 完成左中板块内容空白的配置 2016-05-05 10:36:17 +08:00
huang 159728c3ba 模式二为空的时候显示情况 2016-05-05 10:20:31 +08:00
huang a0ea2c7e5d 模式二3在配置整合 2016-05-05 10:05:53 +08:00
huang 18dff4f8a3 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-05 09:45:53 +08:00
huang aaf97ac81c 新版块3和板块2合并，板块3取前四个 2016-05-05 09:45:34 +08:00
Tim c3514f5b6a 二级栏目名长度控制 2016-05-05 09:28:49 +08:00
Tim 787dbaaffc 二维码处文字样式处理 2016-05-05 09:08:01 +08:00
huang 06e90c83e4 二级目录不进行排列定制和域名申请 2016-05-04 20:12:09 +08:00
huang ccea42cc8b 项目和课程的动态只参与五种配置 2016-05-04 19:47:44 +08:00
huang f94a45c398 完成模块8没内容显示 2016-05-04 19:40:48 +08:00
huang d75f39cd81 模式7空白内容显示 2016-05-04 19:36:30 +08:00
huang d86fec6f03 模式6没有内容的显示 2016-05-04 19:30:01 +08:00
huang 33bf4fafa6 模式4没有内容的显示情况 2016-05-04 19:12:53 +08:00
huang 04b2aee166 板块一没有图片的显示情况 2016-05-04 18:50:25 +08:00
Tim 6098e47ffe Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-04 16:54:14 +08:00
Tim abbbe9b7d6 二级子目录样式处理 2016-05-04 16:53:59 +08:00
huang c32479270c Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-04 15:51:07 +08:00
huang 8dfe95dfd1 配置页面新建二级域名样式 2016-05-04 15:50:53 +08:00
Tim c7ea675e7d Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-04 15:44:17 +08:00
Tim 51ff1b0aa6 滚动栏效果调整 2016-05-04 15:43:46 +08:00
huang a691fb7eb7 添加或者取消提交时候弹框自动消失 2016-05-04 15:19:26 +08:00
huang 8a14ce004f 以弹框模式显示二级目录 2016-05-04 15:05:54 +08:00
Tim 399f757811 0 2016-05-04 09:01:51 +08:00
huang 39dd62580a 完成2级目录详情页面 2016-05-03 20:08:40 +08:00
huang d212d4f4c5 Merge branch 'cxt_course' into develop 2016-05-03 18:17:54 +08:00
cxt 407af62654 作业动态的分数显示 2016-05-03 18:06:53 +08:00
huang a602a6aa63 Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/users/_course_message.html.erb
 2016-05-03 17:12:38 +08:00
cxt ada4407e63 局部刷新后 名片不显示 2016-05-03 17:11:30 +08:00
huang 5fb5a2e8bc 二级域名帖子列表两种形式区分 2016-05-03 16:49:13 +08:00
cxt 55297a9daf 统一作业动态中项目的更新时间与tip中的更新时间 2016-05-03 15:19:22 +08:00
huang 6635ded1e8 组织base中添加二级域名 2016-05-03 14:55:08 +08:00
huang 517db8f105 组织二级域名弹框 2016-05-03 11:24:39 +08:00
huang 90a285b35e base中添加二级目录 2016-04-29 17:13:09 +08:00
Tim ebe6004833 组织二级目录添加列表 2016-04-29 10:53:04 +08:00
yuanke f185c59e90 Merge branch 'yuanke' into develop 2016-04-28 14:33:30 +08:00
yuanke 2cb9f0cd05 组织还原 2016-04-28 14:31:40 +08:00
Tim 5c795b92ee 图片百分百显示； 默认大图尺寸调整 2016-04-28 11:12:44 +08:00
huang 4635c04798 关注添加次数 2016-04-28 10:57:45 +08:00
yuanke 647e6a7f92 Merge branch 'yuanke' into develop 
Conflicts:
	app/views/layouts/new_base_user.html.erb
	config/locales/zh.yml
	db/schema.rb
 2016-04-28 10:45:57 +08:00
huang b8f7a6a300 500问题 2016-04-28 10:43:42 +08:00
huang 7aaa13ca1a 左一只取一个 2016-04-28 10:26:41 +08:00
huang ae8bb8e83b Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-04-28 10:25:42 +08:00
huang b596c0d66f 二级目录的创建等 2016-04-28 10:25:26 +08:00
Tim 6b02acb329 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-04-28 10:18:22 +08:00
Tim 024667d035 title多行实现省略号效果，默认页面不对齐显示问题，高度控制，标题单行省略显示等 2016-04-28 10:17:59 +08:00
huang 002d0c18ba Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-04-27 17:03:25 +08:00
huang 9fbf713709 完成组织二级域名 2016-04-27 17:02:44 +08:00