Commit Graph

4964 Commits

Author SHA1 Message Date
sw b71d714103 #1887 用户职称显示问题 2015-01-29 16:39:25 +08:00
sw bf75f32903 修改个人留言界面,左侧个人信息样式显示不正确 2015-01-29 16:22:26 +08:00
sw af7e605f76 添加新闻时,“提交”按钮和“取消”按钮之间有一竖 2015-01-29 16:13:36 +08:00
sw 740033c447 Merge branch 'szzh' into develop 2015-01-28 10:48:18 +08:00
z9hang a6488da7fa 修改API上线问题 2015-01-28 10:45:20 +08:00
sw aac53cad48 Merge branch 'szzh' into develop 2015-01-28 10:33:21 +08:00
z9hang f7dbb24d35 修改测试版上线问题 2015-01-28 10:31:30 +08:00
sw 74a8d9ecb9 Merge branch 'szzh' into develop 2015-01-28 09:28:30 +08:00
z9hang 222e2cc135 修改ErrorHandler未能加载问题 2015-01-28 09:25:58 +08:00
z9hang f29427a2fc Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	app/api/mobile/api.rb
2015-01-27 17:35:37 +08:00
z9hang f793cff398 改为开发模式下才调用api文档 2015-01-27 17:34:02 +08:00
zhuhao 7daf01f8e1 测试键包 2015-01-27 17:18:31 +08:00
zhuhao e1e0849735 解决测试冲突 2015-01-27 17:18:01 +08:00
sw aa3856b2e9 Merge branch 'szzh' into develop 2015-01-27 16:06:34 +08:00
z9hang 91a8078cae Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-27 16:03:53 +08:00
z9hang cf1cd9201c 修改上传资源弹框样式 2015-01-27 16:03:38 +08:00
zhuhao 2acca17e27 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	Gemfile
2015-01-27 15:48:25 +08:00
alan 20f4b5c44b 修改《contest新建的样式》
Signed-off-by: alan <547533434@qq.com>
2015-01-27 15:43:06 +08:00
zhuhao 6a49d7a04f 返回匿名和用户全名方法测试 2015-01-27 15:38:32 +08:00
zhuhao d32c4c8e86 预制件gem 2015-01-27 15:32:12 +08:00
alan 5434a5b087 修改《admin可以访问courses和users列表》
Signed-off-by: alan <547533434@qq.com>
2015-01-27 15:29:09 +08:00
alan 36dfd7c77c Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-01-27 15:12:56 +08:00
alan 00c0ddc600 admin查看course和user列表
Signed-off-by: alan <547533434@qq.com>
2015-01-27 15:11:24 +08:00
sw 950d831108 Merge branch 'api' into szzh 2015-01-27 14:51:15 +08:00
sw 5950f0404b #1832 不显示无数据的字段,字段名 2015-01-27 11:35:19 +08:00
sw 56700f4d62 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-27 11:06:42 +08:00
sw 649c65fbe2 国际化部分代码 2015-01-27 10:14:05 +08:00
sw fe06ca503a 增加poll colsed_at的赋值 2015-01-27 09:55:02 +08:00
sw 97c7ccac16 增加关闭问卷功能 2015-01-27 09:45:15 +08:00
z9hang 4b3621905e 修正课程成员搜索bug 2015-01-27 09:06:00 +08:00
whimlex 0ff22b1ac0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-26 17:47:47 +08:00
whimlex e5e24c1163 resolve conflict 2015-01-26 17:47:33 +08:00
whimlex 64cbeddd13 项目“缺陷”修改为“问题跟踪”,sidebar栏“缺陷”修改为“问题”;项目新建新闻按钮样式统一;新建课程样式统一;课程重开和关闭国际化;竞赛导航锁定;翻译缺失修正 2015-01-26 17:37:05 +08:00
alan 36ec204f40 修改《公共贴吧中,回复了帖子后,重新编辑的话能编辑标题》
Signed-off-by: alan <547533434@qq.com>
2015-01-26 16:54:46 +08:00
alan f1495686e9 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-01-26 15:54:38 +08:00
alan 0944cc4ca8 < 邮件格式调整>
Signed-off-by: alan <547533434@qq.com>
2015-01-26 15:54:23 +08:00
sw d135274281 修改重复加入项目提示语 2015-01-26 15:41:10 +08:00
sw 9f6ff04e65 #1866 新建帖子时当鼠标移至“提交”按钮时,光标应变成手型的图标 2015-01-26 15:31:36 +08:00
sw 87f19f7a8b #1873 加入”==》“申请加入” 2015-01-26 14:25:39 +08:00
sw a04bd5d826 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-26 14:11:06 +08:00
sw 554cbf55bb Merge branch 'develop' into szzh 2015-01-26 14:10:38 +08:00
sw 2f8d57797c 增加弹出框的宽度 2015-01-26 14:09:56 +08:00
zhuhao a38b3c89fe 添加预构件生产测试数据 2015-01-24 10:36:19 +08:00
zhuhao ca17058750 添加预构件 2015-01-24 10:35:46 +08:00
zhuhao 167abcd6b4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-24 10:20:01 +08:00
zhuhao 230b98d704 注册测试 2015-01-24 10:18:32 +08:00
sw 0f7c52e279 Merge branch 'szzh' into develop 2015-01-23 17:10:46 +08:00
sw 02f01c1aba 修改首页加入项目 2015-01-23 17:10:21 +08:00
z9hang db1cd8851c Merge branch 'szzh' into api
Conflicts:
	Gemfile
	db/schema.rb
2015-01-23 16:51:40 +08:00
z9hang b2396df68c 优化下代码 2015-01-23 16:31:41 +08:00