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

5940 Commits

Author SHA1 Message Date
lizanle c3ea741404 Merge remote-tracking branch 'origin/szzh' into szzh 2015-03-17 10:09:01 +08:00
lizanle bfc9cdb3a4 资源表 2015-03-17 10:08:55 +08:00
z9hang 56b331219d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-17 09:54:44 +08:00
z9hang ffb3e81b99 #2048 公共贴吧--贴吧创建人等信息以下拉框显示不合适 2015-03-17 09:53:35 +08:00
lizanle 86020804c9 ok 2015-03-17 09:42:04 +08:00
lizanle 926283398b 路由修改 2015-03-17 09:41:30 +08:00
lizanle c77c1a81a4 html 2015-03-17 09:41:10 +08:00
lizanle f94222cac7 html 2015-03-17 09:40:45 +08:00
lizanle 33669017bf controller 2015-03-17 09:40:31 +08:00
lizanle 39cbeced87 model类 2015-03-17 09:39:12 +08:00
lizanle 0c86ba210d Merge remote-tracking branch 'origin/szzh' into szzh 
Conflicts:
	db/schema.rb
 2015-03-17 09:38:24 +08:00
lizanle 4817b3106e kindeditor资源类 2015-03-17 09:36:20 +08:00
lizanle a0e8abb5ea kindeditor配置文件 2015-03-16 15:31:11 +08:00
lizanle 5c4a62dcc4 DiscussDemo代码 2015-03-16 15:29:13 +08:00
lizanle 8ad4dba8c2 kindeditor资源文件 2015-03-16 15:27:37 +08:00
lizanle 48b08a20ee 增加gem包 2015-03-16 15:26:24 +08:00
lizanle 6bafec03e9 添加路由 2015-03-16 15:25:41 +08:00
lizanle a9cafb2241 新建DiscussDemo表 2015-03-16 15:25:22 +08:00
sw 747a109638 1、添加CSS文件 
2、调整首页HTML
3、去掉base_header中没用的erb语句
 2015-03-16 11:51:12 +08:00
sw 0a19f65611 Merge branch 'szzh' into sw_new_course 2015-03-16 11:00:48 +08:00
sw 3b1ea392af 去掉无法安装的gem 2015-03-16 11:00:31 +08:00
sw 88d6b25ace 1、修改意见反馈图片 
2、去掉个人首页权限判断
 2015-03-16 09:28:18 +08:00
sw 1535c41907 Merge branch 'szzh' into sw_new_course 2015-03-16 09:00:20 +08:00
guange e798b7242b Merge remote branch 'remotes/origin/szzh' into guange_dev 2015-03-15 23:10:48 +08:00
guange 39f1fb879f 对Gemfile作了一些优化 
1.  源可以从taobao源安装
2. 所有放在lib下的gem删除，从网上下载
 2015-03-15 23:09:44 +08:00
guange f3d6d7c384 #2037 issue列表默认显示顺序改为最后更新的倒序 2015-03-15 16:02:49 +08:00
guange 366fbcd4d4 #2105 fixed ie8下新建帖子时上传附件导致不能发表问题 2015-03-14 12:29:09 +08:00
guange bcb162c600 #1968 解决IE8不能上传的问题， 只是解决，体验还是没有chrome,firefox的好 2015-03-14 12:01:08 +08:00
sw 2c51d6e802 Merge branch 'szzh' into develop 2015-03-13 18:02:53 +08:00
sw 3b0a229c43 1.修改意见反馈框默认关闭 
2、FIle--->资源库
 2015-03-13 18:01:16 +08:00
sw 00725aae93 Merge branch 'szzh' into develop 2015-03-13 17:48:42 +08:00
sw e4895731ae Merge branch 'develop' into szzh 2015-03-13 17:48:12 +08:00
whimlex aee987d634 邀请Trustie用户 2015-03-13 17:47:58 +08:00
sw e4e56e01b1 修改项目邀请用户失败时的提示 2015-03-13 17:46:09 +08:00
sw ca7c970094 修改意见反馈框位置 2015-03-13 17:27:24 +08:00
z9hang da23b4fd21 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-13 17:10:43 +08:00
z9hang ff65bf4ba5 app自动更新功能功能，无法下载问题修正 2015-03-13 17:10:22 +08:00
huang cc5a22f2c6 修改新建按钮样式 2015-03-13 16:16:38 +08:00
sw aa8d1741f9 修改项目发送邮箱时的正则验证 2015-03-13 15:46:00 +08:00
huang da02f3fbb4 去掉项目标签为空提示 2015-03-13 15:45:10 +08:00
sw 368a3ce1fa 修改项目创建时间显示不正确 2015-03-13 15:40:19 +08:00
huang 1ed542af09 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	config/locales/zh.yml
 2015-03-13 15:40:06 +08:00
huang a010c800d6 修改权限库为空情况下403问题 
修改项目标题样式
确认发送国际化
添加小图标
 2015-03-13 15:37:54 +08:00
sw 7894ceb50e Merge branch 'szzh' into develop 2015-03-13 13:45:11 +08:00
z9hang e165dd6572 修改编码 2015-03-13 13:41:26 +08:00
z9hang 2ccb7ff387 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-13 11:56:13 +08:00
z9hang ed674d960c 课程动态国际化问题 2015-03-13 11:55:57 +08:00
whimlex be75bcef47 项目得分国际化 2015-03-13 11:51:53 +08:00
guange 08eae0e5eb Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-03-13 11:30:25 +08:00
whimlex baa854c5a9 公共标签 2015-03-13 10:26:10 +08:00