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

5546 Commits

Author SHA1 Message Date
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
whimlex baa854c5a9 公共标签 2015-03-13 10:26:10 +08:00
whimlex cef923b8a8 邮件邀请用户国际化 2015-03-13 09:46:05 +08:00
huang fb907094f8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-12 19:32:51 +08:00
huang 47e1427ead 左侧工具栏添加功能：左侧统计数目为零的手不显示 2015-03-12 19:29:44 +08:00
whimlex 28321deeb5 邮件邀请用户 2015-03-12 18:04:12 +08:00
sw c52eebe6f4 Merge branch 'szzh' into develop 2015-03-12 18:03:39 +08:00
whimlex 18422ecf6a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/projects/invite_members_by_mail.html.erb
 2015-03-12 17:50:15 +08:00
whimlex 1e5fac32b4 添加邮箱验证 2015-03-12 17:48:31 +08:00
sw fd8edc9a02 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-12 17:34:25 +08:00
sw 2b28448397 Merge branch 'guange_dev' into szzh 2015-03-12 17:33:18 +08:00
huang ab57e7e432 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-12 17:23:28 +08:00
huang 96b2627fda 修改邮件居中样式及提示 2015-03-12 17:22:52 +08:00
sw 3fd94ce243 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/projects/invite_members_by_mail.html.erb
 2015-03-12 17:19:03 +08:00
sw 362bad594f 修改项目发送邮件邀请页面样式，以及提示 2015-03-12 17:18:18 +08:00
whimlex 3a1f0aec55 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-12 17:14:12 +08:00
whimlex 5f88ffc5d0 项目邀请用户国际化，js判断邮件格式 2015-03-12 17:13:46 +08:00
sw 7dc6f76060 Merge branch 'guange_dev' of http://repository.trustie.net/xianbo/trustie2 into guange_dev 2015-03-12 17:09:32 +08:00
sw 78039a726e Merge branch 'szzh' into guange_dev 2015-03-12 17:09:20 +08:00
sw ceb6ccf908 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-12 17:06:04 +08:00
sw 971c278de5 #2026 作业创建时间->截至时间 2015-03-12 17:02:47 +08:00
huang 77bf3be20d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/layouts/base_users.html.erb
 2015-03-12 16:49:42 +08:00
huang b809e8844c 修改项目中添加标签按钮显示异常 2015-03-12 16:42:18 +08:00
z9hang 2d05c3273f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-12 16:33:43 +08:00
z9hang 8190403380 app添加忘记密码接口，课程动态接口代码优化（去掉其中的中文） 2015-03-12 16:33:31 +08:00
sw d18e9ff66b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-12 16:32:31 +08:00
sw 312d7660b2 增加邀请成功后的提示 
邀请成功后跳转页面修改
调整翻页控件的样式
 2015-03-12 16:32:20 +08:00
huang 88449d8a1c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-12 15:56:31 +08:00
huang 4bfc72dc28 用新表统计动态 
修改关注样式
 2015-03-12 15:56:03 +08:00
sw 2ee04d55f2 修改项目邀请用户的界面 2015-03-12 15:46:24 +08:00
whimlex e952490fa0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-12 15:25:45 +08:00
whimlex 458fa5b977 完善代码审查插件、账户、项目部分模块国际化 2015-03-12 15:25:27 +08:00
huang 6fa5863665 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-12 15:14:16 +08:00
huang 0ba7ef0560 修改邮箱邀请时，邮件为空时提示错误 2015-03-12 15:13:41 +08:00
sw 1e23007e5d 资源库中文丢失 2015-03-12 13:58:50 +08:00
z9hang 7e7da7e445 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-12 11:18:00 +08:00
z9hang a05061af73 #1859 课程--资源库：全站搜索中“选入我的其他课程”弹出的课程列表中包括当前课程 2015-03-12 11:17:36 +08:00
sw 717be2b045 修改部分用户的用户首页报错 2015-03-12 10:29:19 +08:00
sw 5340ad7fc1 修改组织首页不显示私有项目 2015-03-12 10:20:28 +08:00
sw 69eecf49d1 还原冲突 2015-03-12 09:52:57 +08:00
sw 2ac2c1848c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/layouts/base_projects.html.erb
 2015-03-12 09:52:50 +08:00
whimlex 6f4ef81eb9 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-12 09:48:09 +08:00
whimlex 65ee3fdc74 项目主页国际化，项目主页JS冲突解决 2015-03-12 09:47:42 +08:00
sw 5258b7585b 处理冲突还原代码 2015-03-12 09:36:03 +08:00