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

1921 Commits

Author SHA1 Message Date
cxt 02bee33ad2 身份切换加提示 2016-07-29 20:33:35 +08:00
huang 0bf9b5c6e6 消息红点记录 个人主页添加加入项目入口 2016-07-29 20:31:24 +08:00
huang 153efb7eda 局部刷新 2016-07-29 19:42:21 +08:00
cxt e3d538c3fa Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/layouts/_course_base_info.html.erb
	db/schema.rb
 2016-07-29 19:39:42 +08:00
cxt 72977886c7 Merge branch 'cs_optimize_txz' into cxt_course 
Conflicts:
	app/views/layouts/_course_base_info.html.erb
 2016-07-29 19:37:15 +08:00
cxt 5a8d2407e2 放开新建课程、新建班级的权限 2016-07-29 19:28:50 +08:00
cxt 335b82c046 加入班级的弹框 2016-07-29 19:19:58 +08:00
cxt a1a2b3dd33 Merge branch 'rep_quality' into cxt_course 
Conflicts:
	db/schema.rb
 2016-07-29 14:36:18 +08:00
cxt 848c56d54e 班级主页身份切换、成员管理页面的多重身份 2016-07-29 14:34:42 +08:00
huang a8fa4a55e3 项目申请消息发送 2016-07-28 16:22:33 +08:00
cxt e275cd9aa0 邀请码 2016-07-27 17:18:26 +08:00
cxt e2546cdcb7 邀请码的提示 2016-07-27 17:14:06 +08:00
cxt 2fea69359d 非本课程成员无法看到邀请码 2016-07-27 16:47:47 +08:00
Tim 52475099dc 博客设为主页后，文字整个容器宽度显示；班级配置图标菜单css冲突处理；大纲样式冲突处理 2016-07-27 14:36:46 +08:00
cxt a1149c1104 班级列表的公开私有 2016-07-27 14:07:16 +08:00
cxt aafe0aa4ae 删除班级留言时左侧导航栏的样式问题 2016-07-27 10:20:27 +08:00
cxt 04207609cb 未配置课程的班级打开报500 2016-07-26 16:54:34 +08:00
huang 774650c819 项目邀请码直接数据库读取，权限修改 2016-07-25 15:22:34 +08:00
cxt 812481d5fa 非班级成员邀请码显示为***** 2016-07-25 14:49:08 +08:00
huang 84d1adbf25 生成邀请码 2016-07-25 14:36:52 +08:00
cxt 0564ddb6ea 课程大纲的回复 2016-07-25 13:56:26 +08:00
cxt 6c7925a7b4 样式调整 2016-07-22 18:20:11 +08:00
cxt 45fb2d0a3e Merge branch 'develop' into cxt_course 2016-07-22 17:14:28 +08:00
cxt 6d4835c6cc 样式调整 2016-07-22 17:13:40 +08:00
huang 0e1a52726f Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/layouts/base_syllabus.html.erb
 2016-07-22 16:46:01 +08:00
cxt 27afee03b2 编辑课程的英文名称时输入框不清空 2016-07-22 16:38:09 +08:00
cxt 6b1116dfd1 课程的回复和名称的编辑 2016-07-22 16:00:56 +08:00
cxt 9422e2886c 新版班级主页 2016-07-22 15:32:37 +08:00
cxt 1e28ff880d 新版课程大纲 2016-07-22 10:20:28 +08:00
Tim 53c515b8d1 课程大纲侧导航js控制 2016-07-21 10:28:50 +08:00
Tim 78e4d37d8b 大纲base页引入弹框样式；作业列表调整 2016-07-20 15:09:01 +08:00
Tim e966972750 Merge branch 'develop' into cs_optimize_txz 
Conflicts:
	app/views/versions/index.html.erb
 2016-07-18 14:32:17 +08:00
cxt b7e6725e1f 管理员界面的课程名称双击可点击 2016-07-15 14:48:39 +08:00
Tim 2d1d3083d0 引入project.css 2016-07-15 09:51:14 +08:00
Tim c41a116378 博客上传附件后，编辑处文件夹图标显示；大纲引用css样式更改 2016-07-14 17:00:38 +08:00
cxt 9bf853d2bb 管理员可修改课程名称和英文名称 2016-07-13 09:49:24 +08:00
cxt 16cf8a56a1 管理员和老师可看到课程下的所有班级 2016-07-13 09:34:36 +08:00
Tim 73b7b00db9 班级学生列表导航栏下拉框错位调整 2016-07-12 16:45:04 +08:00
cxt f0e456729e 过滤掉消息中的html 2016-07-12 16:21:30 +08:00
Tim a0db221ffc Merge branch 'develop' into cs_optimize_txz 2016-07-11 13:57:04 +08:00
cxt c224f97905 样式调整、线下作业的作品评分、导出作业成绩报500 2016-07-08 15:02:50 +08:00
cxt 290abeeaa4 班级名称的显示 2016-07-07 15:36:08 +08:00
cxt 3b91adf689 课程大纲内的编辑图标的显示与隐藏 2016-07-07 15:28:33 +08:00
cxt 37dd447fcb Merge branch 'daiao_dev' into cxt_course 
Conflicts:
	app/views/admin/courses.html.erb
	public/stylesheets/new_user.css
 2016-07-07 15:14:11 +08:00
cxt da7509f64c 课程大纲的优化 2016-07-07 15:04:57 +08:00
daiao c621602050 修复当鼠标移至区域内才会显示icon 2016-07-07 15:02:02 +08:00
cxt a99b03ff76 管理员界面增加配置课程 2016-07-07 09:02:41 +08:00
Tim 75475b6058 个人主页，课程，项目样式更新 2016-07-06 15:43:48 +08:00
daiao ad36a1b29e 修复课程下编辑框英文换行缺陷 2016-07-06 09:07:50 +08:00
Tim 1658f78a7b Merge branch 'develop' into cs_optimize_txz 
Conflicts:
	app/views/layouts/new_base.html.erb
	app/views/layouts/new_base_user.html.erb
	app/views/users/_user_resource_info.html.erb
 2016-07-05 15:38:56 +08:00
cxt 3ccdf7f9ae 课程问答区，项目讨论区的帖子消息通知应直接打开对应的帖子详情界面 2016-07-05 15:00:41 +08:00
cxt 17a2686d42 班级左侧头部信息的样式调整 2016-07-05 11:22:58 +08:00
cxt 23eefc2b7f 班级主页：建议将如图所示适当往上调一点，与左侧头像对齐 2016-07-05 10:15:24 +08:00
yuanke 447e624f36 课程大纲bug修复 2016-07-01 21:38:37 +08:00
cxt e834d09469 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-07-01 17:52:29 +08:00
cxt 5a1090c0e1 bug修复 2016-07-01 17:27:34 +08:00
cxt 6867a88a94 课程大纲样式调整 2016-07-01 16:41:13 +08:00
cxt 0ff8f0a774 课程大纲的删除和课程大纲描述的删除 2016-07-01 16:25:52 +08:00
cxt 25b5d74a42 课程大纲的修改 2016-07-01 15:25:30 +08:00
cxt 18d677c5eb Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/stylesheets/courses.css
 2016-07-01 11:31:51 +08:00
cxt 2c1e0f534c 课程大纲 2016-07-01 11:11:53 +08:00
yuanke 397c4cc2a5 1.重新发送注册邮件修改2.个人资料修改页面修改3.问题反馈处增加直接加入QQ群的按钮 2016-06-30 16:08:36 +08:00
Tim ba1db91a1e css优化调整 2016-06-30 15:38:00 +08:00
cxt ac4218bfb0 课程大纲列表 2016-06-30 15:36:46 +08:00
cxt ebb697a49f 班级列表、课程大纲的编辑、回复、课程列表 2016-06-30 10:44:11 +08:00
cxt e066445036 课程大纲的显示和编辑 2016-06-29 10:45:56 +08:00
cxt 383483de26 课程大纲的左侧栏base，新建课程大纲、新建班级的调整 2016-06-28 15:13:04 +08:00
cxt 76e7c50bf4 Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/users/_reply_to.html.erb
 2016-06-24 16:52:00 +08:00
cxt afc8fad7fd 通过邀请码加入课程 2016-06-24 16:12:24 +08:00
cxt ac629440b1 课程邀请码 2016-06-24 15:33:45 +08:00
Tim 8a6bbf50a9 css文件替换 2016-06-24 09:30:46 +08:00
cxt 44334913ee 未读消息弹窗漏了一条消息 2016-06-21 14:28:26 +08:00
cxt c4cea93a44 消息列表的“展开更多”指针手势修改 2016-06-21 13:58:17 +08:00
cxt 4f80e259e8 消息弹窗的延时显示 2016-06-21 11:16:45 +08:00
cxt f4d67bc027 未读消息弹窗“点击展开”显示10条未读消息 2016-06-20 16:03:57 +08:00
cxt 048bb7fed5 头像下拉菜单、未读消息的延时 2016-06-20 15:38:43 +08:00
cxt b26a6b5195 消息弹窗的链接无效 2016-06-20 11:24:34 +08:00
huang 8741917823 访问统计 （自2016年5月） 2016-06-17 14:31:42 +08:00
cxt 1dac05c6d1 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-17 11:26:58 +08:00
huang d127c6e12c 访问添加自某年某月 2016-06-17 09:45:10 +08:00
huang 5e3df51ad9 完成新版登录注册 2016-06-16 10:21:21 +08:00
Tim 9cd1630651 优化css添加，将课程，项目，个人主页，组织首页样式替换，登录与个人主页详细css替换 2016-06-16 08:52:13 +08:00
huang 06f97d5cb7 注册页面（未完） 2016-06-15 17:24:46 +08:00
cxt 03b92f8570 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-15 17:23:23 +08:00
huang a2c5cc6da1 登录界面base及新页面 2016-06-15 15:41:13 +08:00
yuanke 44c9265fee 个人主页个性签名增加自动识别url 2016-06-13 15:29:15 +08:00
cxt 24f5e245df 鼠标经过消息通知时弹窗显示最新的5条未读消息 2016-06-12 14:20:55 +08:00
huang fdb1846f75 Merge branch 'hjq_beidou' into develop 2016-06-07 17:37:38 +08:00
huang 1553eadc58 宽度改成1000二级目录模式二样式调整 2016-06-07 10:17:16 +08:00
cxt 0bf46f2ecd 帮助中心的弹框 2016-06-06 15:03:21 +08:00
cxt ee12b3540b 消息弹窗的还原、微信配置修改 2016-06-06 11:05:25 +08:00
cxt ffe447e5bc Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-03 16:28:23 +08:00
cxt d27a050ffa 消息弹窗的显示 2016-06-03 16:28:11 +08:00
huang b128ba5257 Merge branch 'hjq_beidou' into develop 
Conflicts:
	app/views/layouts/base_org2.html.erb
 2016-06-03 14:58:37 +08:00
huang 3af115ee54 组织新版样式，及方法优化 2016-06-03 12:42:02 +08:00
cxt b833c1f0a4 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-03 09:13:19 +08:00
cxt 1396cae14c 消息弹框 2016-06-03 08:59:17 +08:00
huang 0eb6dbe48a Merge branch 'huang_temp2' into develop 
Conflicts:
	app/views/layouts/base_org2.html.erb
 2016-06-03 08:30:31 +08:00
huang d047409d31 项目动态 2016-06-02 16:01:58 +08:00
huang ba344a86b5 颜色 2016-06-02 14:59:32 +08:00
huang d532cd3c6c 权限 2016-06-02 14:58:13 +08:00
huang 135e50b2e7 链接 2016-06-02 14:54:04 +08:00
huang 1f073c19ae 域名问题 2016-06-02 13:57:07 +08:00
huang 22cafdbd05 二级目录弹出 2016-06-02 13:43:30 +08:00
huang eecf12eda6 添加链接 2016-06-02 13:32:50 +08:00
huang 91ae3d8b39 Merge branch 'develop' into hjq_beidou 
Conflicts:
	db/schema.rb
 2016-05-31 18:38:05 +08:00
huang c57c575c84 新版组织静态页面模板 2016-05-30 16:24:51 +08:00
cxt d4c0e9754a 课程描述展开后应显示“收起描述信息” 2016-05-30 14:51:54 +08:00
huang 81ab73e286 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 
Conflicts:
	app/views/organizations/_org_custom_header.html.erb
 2016-05-30 14:48:12 +08:00
huang 698e4bd7b3 header 2016-05-30 14:41:53 +08:00
Tim 9cc749bd57 门户样式统一，防止冲突 2016-05-30 14:38:57 +08:00
huang 46e4f2c143 组织新base框架 2016-05-30 14:23:52 +08:00
huang 12ac353de9 北斗新base 2016-05-27 17:08:50 +08:00
cxt 5c9ec49457 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-05-25 15:27:00 +08:00
huang 2abb68c00c 组织代码公共部分整理 2016-05-25 10:54:49 +08:00
Tim 65c7719ed2 设置大纲图标在讨论区换行显示问题 2016-05-24 15:18:11 +08:00
huang 0e03798f6e 组织框架结构（yeild）修改 2016-05-23 16:24:32 +08:00
huang e9c35ae20f 组织未登录情况默认图片展示 2016-05-17 10:13:03 +08:00
Tim 15ea9a9659 组织门户自动播放禁用 2016-05-17 10:04:23 +08:00
Tim 1402ae190d 组织头像 2016-05-17 10:03:26 +08:00
Tim 76d1251546 将组织门户登录栏挪到与logo同行 2016-05-17 09:36:55 +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
huang 7bd047f7e4 组织模式二中名师榜样式 2016-05-13 11:25:05 +08:00
cxt d303a06377 首页列表的排序 2016-05-10 11:32:20 +08:00
Tim 2461a5c918 组织门户二级目录位置重新设置 2016-05-09 19:40:53 +08:00
Tim c2e7a77150 组织门户二级菜单延迟隐藏 2016-05-09 19:23:33 +08:00
Tim cf1cf58bab 组织门户二级目录添加分栏"|"以及登录未登录位置控制 2016-05-09 18:44:20 +08:00
huang 967a76af67 图片变大的问题 2016-05-06 20:20:48 +08:00
huang 3469d928d8 图片变的很大问题 2016-05-06 20:17:11 +08:00
huang 23a23fd085 组织logo上传图片 2016-05-06 19:53:13 +08:00
huang 86b0470b76 隐藏掉搜索功能 2016-05-06 19:02:43 +08:00
huang a267c75ec7 首页的隐藏可见 2016-05-06 18:50:57 +08:00
huang d9b0c654aa 组织门户二级目录显隐 2016-05-06 17:14:53 +08:00
huang 5133338923 组织门户二级目录显隐 2016-05-06 17:11:08 +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 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
Tim 4bf1883ba2 组织门户导航栏二级显隐 2016-05-06 10:02:31 +08:00
huang 6057ea15e1 一级目录新界面鼠标经过显示子目录 2016-05-06 09:18:26 +08:00
huang 231f8f3526 二级目录中设置了隐藏，鼠标经过的时候不显示内容及 框框 2016-05-05 21:23:34 +08:00
huang cd6124895d 鼠标经过一级目录的时候显示二级目录 2016-05-05 21:09:02 +08:00
huang aaf97ac81c 新版块3和板块2合并，板块3取前四个 2016-05-05 09:45:34 +08:00
yuanke 9dc92fe817 列表优化 2016-05-04 16:28:40 +08:00
huang 65a907bc99 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 
Conflicts:
	app/views/layouts/base_sub_domain.html.erb
 2016-05-04 15:06:20 +08:00
huang 8a14ce004f 以弹框模式显示二级目录 2016-05-04 15:05:54 +08:00
Linda cbec7cc8f8 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 
Conflicts:
	app/views/layouts/base_sub_domain.html.erb
 2016-05-04 14:41:54 +08:00
Linda 0fc142d822 组织配置logo样式 2016-05-04 14:40:25 +08:00
Tim 80ff421853 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-04 14:09:20 +08:00
Tim 714deebe21 二级导航调整 2016-05-04 14:08:57 +08:00
huang efb91abfb0 分页不跳转问题 2016-05-04 14:03:18 +08:00
huang c0acaab404 首页logo上传图片 2016-05-04 13:55:27 +08:00
huang f8ba77dc20 banner点击添加图片 2016-05-04 11:32:11 +08:00
huang daa154db02 鼠标经过字母录显示结构 2016-05-04 11:16:25 +08:00
yuanke 411ae6f89e 1.修改贴吧分页显示问题2列表优化 2016-05-04 11:03:08 +08:00
yuanke afd176b805 课程项目按更新时间排序 2016-05-03 19:10:04 +08:00
huang 5e8ff06140 Merge branch 'yuanke' into develop 2016-05-03 17:15:46 +08:00
huang 6635ded1e8 组织base中添加二级域名 2016-05-03 14:55:08 +08:00
yuanke 2468010125 课程、项目列表修改 2016-05-03 14:30:35 +08:00
cxt 3f7a391214 课程和项目的排序 2016-04-29 20:45:14 +08:00
huang 0bd34c2099 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 
Conflicts:
	app/views/layouts/base_sub_domain.html.erb
 2016-04-29 16:15:10 +08:00
huang f6c3e89454 二级目录帖子详细页面 2016-04-29 16:14:08 +08:00
cxt 1dc0f9dd95 主页的项目和课程排序 2016-04-29 15:55:29 +08:00
Tim 5f1b335cfb 北斗二级菜单显隐 2016-04-29 15:38:38 +08:00
huang d8480ea3c6 二级目录内容页面 2016-04-29 11:33:56 +08:00
huang 1685449381 二级目录框架及结构 2016-04-28 17:36:29 +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 e48189ae97 项目获取数 2016-04-28 10:24:53 +08:00
Tim 5d7c8c0b61 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 
Conflicts:
	app/views/layouts/base_org2.html.erb
 2016-04-27 15:18:50 +08:00
Tim 5d44dc5bba 滚动栏js效果修改 2016-04-27 15:16:23 +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
yuanke dac717bd97 列表左边菜单收缩 2016-04-27 14:12:56 +08:00
huang 811c3a065e 完成左中一模块定制 2016-04-27 14:09:15 +08:00
huang ddf1e6f2db 组织模式3完成 2016-04-27 11:29:01 +08:00
huang cded1802cc 右上模块定制完成 2016-04-27 10:41:05 +08:00
cxt 78c7db1150 Merge branch 'weixin_guange' into develop 2016-04-27 10:36:24 +08:00
cxt 0222038899 缺陷模板消息改为对项目所有人发送、可屏蔽微信模板消息 2016-04-27 10:28:36 +08:00
yuanke 23f48b7189 项目列表、项目讨论区列表 2016-04-27 09:54:49 +08:00
huang b6f5bfc450 右下版本模块定制 2016-04-27 09:45:56 +08:00
huang b589d5b2ff 末班六定配完成 2016-04-26 18:27:01 +08:00
huang 17b2e82963 banner类型 2016-04-26 16:23:08 +08:00
yuanke 43c1120b19 课程问答区 项目讨论区列表 2016-04-26 15:10:47 +08:00
huang 32d7927eb9 组织新界面 2016-04-26 11:06:18 +08:00
huang 76f93a54c6 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 
Conflicts:
	app/helpers/organizations_helper.rb
	app/views/layouts/base_org2.html.erb
	app/views/organizations/_org_content.html.erb
 2016-04-26 11:03:21 +08:00
huang d8f71da1fb 完成模块8配置 2016-04-26 11:01:12 +08:00
Tim 53e6b41d93 北斗登录效果调整 2016-04-26 10:02:16 +08:00
huang 255d7e07bc 北斗新界面样式 2016-04-25 18:54:21 +08:00
huang dae6a5ecae 配置八种类型更新 2016-04-25 16:00:52 +08:00
huang 81210fd475 顶部导航及样式 2016-04-25 15:35:32 +08:00
huang 5b763927cc 顶部用户路由 2016-04-25 14:14:26 +08:00
huang c1437bb75b 北斗界面 2016-04-24 14:39:33 +08:00
yuanke f6d09e0554 配置中增加一个 隐藏课程信息的功能 2016-04-24 14:23:08 +08:00
huang cccc2a7eb7 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-21 16:21:49 +08:00
huang ab8c1a0bad Merge branch 'hjq_beidou' into develop 2016-04-21 16:21:39 +08:00
cxt 0cc5eca34b 个人主页的项目列表有重复的项目 2016-04-19 09:58:51 +08:00
huang 200307ec9f 组织模块访问统计修改 2016-04-19 09:18:58 +08:00
cxt 829399b8af 个人主页的课程列表和项目列表排序 2016-04-14 16:59:25 +08:00
cxt e5b07c6c12 Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/layouts/new_base_user.html.erb
 2016-04-14 12:33:11 +08:00
cxt 5e1284605f Merge branch 'hjq_beidou' into cxt_course 
Conflicts:
	app/views/layouts/new_base_user.html.erb
 2016-04-14 11:29:26 +08:00
huang acf4e15f09 统计数左侧刷新 2016-04-14 10:26:25 +08:00
huang 12efc10759 图标曲线 总变更为+ 2016-04-14 10:10:31 +08:00