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

14956 Commits

Author SHA1 Message Date
huang ef931d1491 编辑issue，与回复issue冲突问题（局部刷新） 2016-07-13 12:07:27 +08:00
huang 845f36c4f3 解决z注册时候邮箱不能是大写加下划线的形式 2016-07-13 10:00:04 +08:00
huang 191261d3b8 each time to 10s 2016-07-12 17:30:29 +08:00
huang e766adf087 add delete to qa 2016-07-12 16:23:30 +08:00
huang 8b5a2ac1cb message 500 2016-07-11 16:59:37 +08:00
huang 0a001b4f76 message 500 for boliang 2016-07-11 11:29:15 +08:00
huang 93e79d9419 add hidden to css 2016-07-11 11:23:59 +08:00
huang bac3e433aa sqlate index nil 2016-07-11 11:07:04 +08:00
huang 831006f3c6 css for sqale_index 2016-07-11 10:57:46 +08:00
huang cb148c3b9c fixed 500 2016-07-11 10:48:44 +08:00
huang 62cb7d4568 add css 2016-07-08 20:35:21 +08:00
huang 6b8b20e127 logger to puts 2016-07-08 19:45:15 +08:00
huang 23ba289adf Merge branch 'develop' into rep_quality 2016-07-08 19:02:38 +08:00
cxt 6115b7fa4d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-08 18:23:05 +08:00
cxt 3362ebe321 线下作业 2016-07-08 18:22:59 +08:00
huang 011b7ef4d4 Merge branch 'rep_quality' into develop 2016-07-08 16:59:05 +08:00
huang 5a40174910 change show data's method 2016-07-08 16:19:33 +08:00
cxt 5a22e9a147 作业启动匿评 2016-07-08 15:44:03 +08:00
cxt c224f97905 样式调整、线下作业的作品评分、导出作业成绩报500 2016-07-08 15:02:50 +08:00
huang b0aa3c18c3 Merge branch 'rep_quality' into develop 2016-07-08 14:43:29 +08:00
huang 8916cc7730 update homeworkcommon time 2016-07-08 14:40:21 +08:00
huang 040b6d4b9d Merge branch 'rep_quality' into develop 2016-07-08 14:26:40 +08:00
huang b22882aead some data for css 2016-07-08 14:22:20 +08:00
huang fcf32474b6 modified days and hours for nil data 2016-07-08 13:53:54 +08:00
cxt cc4b24cdb9 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-07-08 13:18:46 +08:00
cxt 13bae8f8a5 线下作业 2016-07-08 13:17:14 +08:00
huang ef8b127225 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
	public/javascripts/application.js
 2016-07-08 11:33:51 +08:00
huang e588321ada Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-08 11:31:02 +08:00
huang 61e2e427fd Merge branch 'rep_quality' into develop 2016-07-08 11:30:53 +08:00
huang 406d636aac add error system 2016-07-08 11:27:03 +08:00
yuanke 06f7594680 Merge branch 'yuanke' into develop 2016-07-08 09:15:55 +08:00
cxt 3b418bc44c 如果未登陆，在资源列表最上面增加一个提示句（必须全局统一：您尚未登录，登录后可浏览更多信息），“登录”可做成链接。 2016-07-07 16:46:41 +08:00
huang ec32204809 sql_index --to chinese 2016-07-07 15:53:07 +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
daiao 87d99a1908 数据迁移 2016-07-07 15:10:08 +08:00
cxt da7509f64c 课程大纲的优化 2016-07-07 15:04:57 +08:00
daiao c621602050 修复当鼠标移至区域内才会显示icon 2016-07-07 15:02:02 +08:00
huang b90c90bc60 add model error_list 2016-07-07 14:22:48 +08:00
huang 92b6171c36 sonar error puts 2016-07-07 11:08:29 +08:00
yuanke a732efa6c6 1.组织动态中去掉设为首页的文章动态 2.个人主页动态中去掉设为首页的博客动态并将 最上面的博客显示回复内容及可回复 2016-07-07 10:42:51 +08:00
cxt a99b03ff76 管理员界面增加配置课程 2016-07-07 09:02:41 +08:00
huang 88f8752490 添加权限 2016-07-06 16:37:19 +08:00
huang 2f8079e85c 版本 库存 2016-07-06 16:07:17 +08:00
yuanke 6fe8d7ddf5 点击图片弹框右下角统一用“关闭” 2016-07-06 16:03:50 +08:00
daiao db3056f1b1 隐藏班级列别的创建时间和创建名称！ 2016-07-06 09:22:20 +08:00
daiao ad36a1b29e 修复课程下编辑框英文换行缺陷 2016-07-06 09:07:50 +08:00
huang f50c4a879b modified total commits 2016-07-05 17:35:56 +08:00
cxt c5840d75da Merge branch 'daiao_dev' into cxt_course 
Conflicts:
	db/schema.rb
 2016-07-05 16:49:50 +08:00