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

295 Commits

Author SHA1 Message Date
huang 91ae3d8b39 Merge branch 'develop' into hjq_beidou 
Conflicts:
	db/schema.rb
 2016-05-31 18:38:05 +08:00
huang 471ed7cbd2 组织logo获取，添加样式图片 2016-05-30 14:58:46 +08:00
huang 3ba4d09336 Merge branch 'weixin_guange' into develop 2016-05-27 15:29:25 +08:00
txz 29faa015ab 微信图标替换，增加空值回复赞文字 2016-05-27 14:01:16 +08:00
huang 25aaa4b5bc 铃铛、搜索颜色 2016-05-27 11:07:27 +08:00
cxt 99c1821b4e Merge branch 'weixin_guange' into develop 2016-05-27 08:56:26 +08:00
txz 9134e55606 动态纯文本模式，图标处理 2016-05-26 17:40:22 +08:00
cxt ff974d6901 Merge branch 'weixin_guange' into develop 
Conflicts:
	app/views/wechats/login.html.erb
 2016-05-26 15:32:00 +08:00
cxt 4d5ee5a722 微信的欢迎图片及欢迎词的修改,测试版的配置 2016-05-26 15:27:31 +08:00
txz 1c95e76209 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-05-26 10:55:18 +08:00
txz c73ce61afe 微信动态可点击，icon图片替换 2016-05-26 10:55:00 +08:00
cxt b1a58ecfb8 Merge branch 'weixin_guange' into develop 
Conflicts:
	1234567
 2016-05-24 20:51:24 +08:00
txz 29ceb7b8e9 微信图标清晰问题，回复点赞右对齐 2016-05-24 15:01:26 +08:00
huang c749fe381b Merge branch 'weixin_guange' into develop 2016-05-20 21:02:01 +08:00
txz d329b60a8a 微信加载中去白底，内容去除固定行高 2016-05-20 20:26:04 +08:00
huang 52c8593b09 组织教师列表sql优化 2016-05-11 16:20:55 +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 d0f97275cc 组织二级栏目显隐效果 2016-05-05 16:20:49 +08:00
huang 8a14ce004f 以弹框模式显示二级目录 2016-05-04 15:05:54 +08:00
Tim ebe6004833 组织二级目录添加列表 2016-04-29 10:53:04 +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 b596c0d66f 二级目录的创建等 2016-04-28 10:25:26 +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 d8f71da1fb 完成模块8配置 2016-04-26 11:01:12 +08:00
huang 81210fd475 顶部导航及样式 2016-04-25 15:35:32 +08:00
huang c1437bb75b 北斗界面 2016-04-24 14:39:33 +08:00
txz 0bab42256c 微信loading弹框改 2016-04-21 11:21:29 +08:00
yuanke 29115bca3a 博客列表修改 2016-04-20 16:12:20 +08:00
txz d0331da0c2 微信最新动态样式调整 2016-04-19 16:26:05 +08:00
huang 7d8715e82b Merge branch 'hjq_beidou' into develop 2016-04-14 13:43:58 +08:00
huang 04849659de 版本库统计 2016-04-12 16:00:54 +08:00
huang cd9ad535f5 1、修改默认图片 
2、作品弹框问题
 2016-04-08 20:44:09 +08:00
huang 3501d6f1d6 完成组织模块的开发 2016-04-07 17:05:22 +08:00
huang 86aecd21b9 上传图片 2016-04-01 23:56:05 +08:00
huang 7c55356ace 组织新界面修改 2016-03-30 17:22:23 +08:00
huang 65e80b1978 用户图像样式 2016-03-29 18:25:16 +08:00
huang 4b6b5504ca 北斗框架（未完） 2016-03-28 14:11:40 +08:00
luoquan ec4b7e3744 视频默认图标 2016-03-11 11:24:10 +08:00
luoquan 62f91865e0 kindeditor视频添加默认图片 2016-03-11 10:21:16 +08:00
huang aef2dd8d1a 版本库通过修订好，导出对应的文件，导出对应内容 
高亮显示内容
内容修订对比 功能
 2016-02-25 11:06:10 +08:00
cxt 265359cd74 发布作业时作业类型的切换 2016-01-29 18:17:27 +08:00
cxt 1ff244ad98 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-01-20 18:38:00 +08:00
cxt 3b180aca90 用户个人留言页面的改版 2016-01-20 18:37:47 +08:00
Tim ffba281de5 弹框蓝色边框与关闭键替换 2016-01-20 16:03:28 +08:00
Tim 50849baade 侧导航“+”号图标调小 2016-01-15 15:27:03 +08:00
Tim f0347c9166 精品课程图标 2016-01-13 18:16:19 +08:00
ouyangxuhua d574521b48 样式更新 2016-01-08 18:03:12 +08:00
ouyangxuhua 7d4e3cdd5c 1.增加项目/课程快捷功能； 
2.增加私信功能
 2016-01-06 16:22:13 +08:00
ouyangxuhua 33ea55ecca 项目/课程帖子发送弹窗样式修改 2015-12-28 17:03:13 +08:00
Tim 1a24505eac footer新增图片，样式修改 2015-12-25 15:27:45 +08:00
cxt f880ccd749 分组作业 2015-12-11 14:57:09 +08:00
huang 9d7bc17115 Merge branch 'develop' into dev_hjq 2015-12-05 11:39:40 +08:00
ouyangxuhua 01b82e59d8 实现组织首页功能 2015-12-05 11:30:05 +08:00
cxt 77e96af78f 还原分组作业 2015-12-03 10:41:27 +08:00
lizanle 582cd6f5d4 Merge branch 'szzh' into dev_zanle 
Conflicts:
	app/models/attachment.rb
	db/schema.rb
 2015-11-27 18:47:02 +08:00
lizanle 4efb660214 全站搜索 2015-11-26 09:57:53 +08:00
ouyangxuhua b6d785bda0 修改编辑组织文章样式问题 2015-11-13 19:10:44 +08:00
ouyangxuhua 78e1ae4188 Merge branch 'szzh' into dev_hjq 
Conflicts:
	db/schema.rb
 2015-11-13 17:27:33 +08:00
ouyangxuhua 21275e8b7b 组织模块功能缺陷修改 2015-11-12 17:52:47 +08:00
Tim 3b6e3f6ecf 作品列表修改 2015-11-05 17:02:58 +08:00
lizanle 6f002613d0 答疑框 2015-11-03 10:55:35 +08:00
ouyangxuhua c3a67a544b 修改系统消息logo为红色trustie 2015-10-29 09:23:04 +08:00
Tim 1a2edd9103 课程大纲图标等修改 2015-10-28 17:34:41 +08:00
huang 4c61e7490b Merge branch 'develop' into gitlab_guange 
Conflicts:
	db/schema.rb
 2015-10-27 14:42:05 +08:00
huang 34a8d0890c 相政新界面 2015-10-26 17:18:59 +08:00
ouyangxuhua 4a188dc81d 对所有作业消息，统一在内容前加圆点，并且调整颜色 2015-10-23 14:28:24 +08:00
Tim 64ec465126 意见反馈窗口调整 2015-10-14 09:25:54 +08:00
ouyangxuhua 155dff7e27 1.增加消息列表对应的图标； 2015-10-12 15:08:01 +08:00
Tim 2ceba291bf 蓝色箭头替换 2015-10-08 17:27:08 +08:00
Tim 4c5b59ebc8 作业动态图标替换 2015-09-29 17:28:45 +08:00
Tim c675a4c227 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 10:43:42 +08:00
Tim 7e3ae446f5 资源库头像替换 2015-09-25 10:35:04 +08:00
lizanle 531b264a8f Merge branch 'dev_zanle' into szzh 2015-09-24 13:44:37 +08:00
sw f9f51557dd 增加关闭反馈功能 2015-09-24 11:31:07 +08:00
lizanle d512c25c03 Merge branch 'szzh' into dev_zanle 
Conflicts:
	public/javascripts/new_user.js
	public/stylesheets/header.css
	public/stylesheets/new_user.css
 2015-09-24 10:15:23 +08:00
lizanle 9443c139f0 update forum 2015-09-18 17:44:16 +08:00
Tim 3dccf8f77d 动态页面菜单栏图标更改； 
提交作业界面图标宽度更改。
 2015-09-17 16:04:27 +08:00
sw f79b2cda94 提交作品关联项目功能 2015-09-15 15:18:33 +08:00
sw 2ce29b7dcc 删除应该忽略的文件 2015-09-11 18:36:56 +08:00
sw 97f9d4fa60 增加教师节祝福语 2015-09-10 10:26:16 +08:00
sw 2e59584031 作业编辑功能按钮、加入课程、项目等按钮样式 2015-09-08 16:36:50 +08:00
guange 9e9f373a76 发布作业优化 2015-09-07 23:09:19 +08:00
guange 04dffb2f89 模拟回答界面调整 2015-09-07 18:29:25 +08:00
lizanle b2eb846a23 关于我们 
隐藏招聘信息
联系我们改为服务协议
 2015-09-01 15:34:22 +08:00
suntao ae3f56c758 提交作业界面对齐 2015-09-01 14:37:34 +08:00
suntao 5f3532ac14 头像部分修改 2015-08-29 11:25:49 +08:00
suntao ada04e5e63 个人主页头像模块改动 2015-08-29 10:13:32 +08:00
suntao 46ac491b5b 上传图片 2015-08-28 17:29:22 +08:00
suntao b6d58b1b58 样式调整 2015-08-28 11:55:34 +08:00
sw 3ea198dc3d 标题栏作业界面静态页面的添加 2015-08-24 18:15:46 +08:00
lizanle 86d2f5342c 登陆界面 2015-08-24 16:22:22 +08:00
sw b6a2be72e4 调整CSS，修改图片，实现部分功能动态效果 2015-08-19 15:13:30 +08:00
sw d8da74a0d4 更新css，增加个人主页公共部分的动态效果 2015-08-19 14:43:12 +08:00
sw 752fe93d72 已登录用户header完成 2015-08-18 11:47:22 +08:00
sw b27944fad7 增加css文件以及个人主页静态页面、缺失图片 2015-08-18 10:59:31 +08:00
huang 9b98bdcf5c 1、消息看过则不提示（方法实现） 
2、添加消息新按钮
 2015-08-15 15:44:44 +08:00
sw a7666af597 Merge branch 'yutao' into szzh 
Conflicts:
	app/controllers/users_controller.rb
 2015-07-17 17:38:07 +08:00
huang fc61edf1fa 课程讨论区添加真实姓名 
编辑器图片更新
 2015-07-10 10:37:34 +08:00
yutao 5c011fd342 个人主页 2015-07-09 15:27:49 +08:00