Commit Graph

11139 Commits

Author SHA1 Message Date
guange 91b245ad2c lastname为空时也可以加,可以省掉查询extensions的语句 2015-12-12 18:06:59 +08:00
guange 3476731b83 将at js data整合到文件中 2015-12-09 09:59:13 +08:00
guange 57d05d147e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-12-07 15:06:15 +08:00
guange 71a5504017 去除at功能,合并 2015-12-07 15:05:51 +08:00
guange 1a2aff99be 调整显示的格式 2015-12-07 14:18:01 +08:00
guange 0c7db76371 tag没闭合的错误 2015-12-07 13:54:52 +08:00
Tim 75d79c6c47 问题跟踪样式调整 2015-12-07 10:14:39 +08:00
guange 7e5a7fce29 加入atwho 2015-12-06 15:04:07 +08:00
guange 3d2ac4b59f KE引用统一使用import_ke 2015-12-06 15:03:36 +08:00
guange af31946586 issue列表开启AT功能 2015-12-06 15:03:12 +08:00
guange 55bb9f68e0 gemfile处理 2015-12-06 10:48:05 +08:00
huang c72cf55564 Merge branch 'develop' into szzh 2015-12-04 16:43:48 +08:00
huang 61d76e6744 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-12-04 16:42:55 +08:00
lizanle 4c00312f45 Merge branch 'szzh' into dev_zanle 2015-12-04 16:42:02 +08:00
huang a5c7cecc2e Merge branch 'gitlab_guange' into szzh 2015-12-04 16:36:13 +08:00
lizanle 0a5a33c2de schema 2015-12-04 16:36:03 +08:00
huang 9716e99533 课程成员提交“修改角色” 2015-12-04 16:33:56 +08:00
huang 7daaa59010 Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange 2015-12-04 16:22:02 +08:00
huang b6edabed9c 修改角色 2015-12-04 16:21:48 +08:00
cxt 8fe53468e1 作品追加附件 2015-12-04 16:21:11 +08:00
Tim dfa9b4cf74 学生列表调整 2015-12-04 16:13:55 +08:00
huang 4a41039fa6 课程英雄榜改成课程活跃度 2015-12-04 15:58:56 +08:00
huang 4d0956dff1 Merge branch 'develop' into gitlab_guange 2015-12-04 15:54:56 +08:00
huang 9f73807e05 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
Conflicts:
	db/schema.rb
处理冲突
2015-12-04 15:54:18 +08:00
huang c1747ab217 fork重名,提交 2015-12-04 15:49:05 +08:00
lizanle dbfc4969e0 测验消息bug 2015-12-04 15:36:19 +08:00
lizanle e2f5dcc3f9 当天截止的测验需要发布截止消息 2015-12-04 13:39:17 +08:00
lizanle 06122dab1d 当天截止的测验需要发布截止消息 2015-12-04 11:24:24 +08:00
lizanle 03588ca88d 发布测验的时候发布消息 2015-12-04 11:21:41 +08:00
lizanle e3c594a7ca Merge branch 'develop' into dev_zanle 2015-12-04 10:59:14 +08:00
lizanle 6553559929 发送消息 2015-12-04 10:56:16 +08:00
huang 1c08c79e8e Merge branch 'develop' into gitlab_guange 2015-12-04 09:12:40 +08:00
huang 8f024bdf4d Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
Conflicts:
	db/schema.rb
2015-12-04 09:12:24 +08:00
huang 7fe3a02d81 Merge branch 'gitlab_guange' into develop 2015-12-04 09:11:22 +08:00
huang 89b8f7783d 添加forked_form的id 2015-12-04 08:57:29 +08:00
cxt 4e9e7543ba chrome浏览器点击保存测验头部信息无反应 2015-12-03 19:21:35 +08:00
cxt 838140ada8 在线测验的自动发布和截止 2015-12-03 19:08:15 +08:00
cxt fd51b02e16 添加修订附件 2015-12-03 18:33:08 +08:00
cxt 8d505b85bf Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-12-03 10:41:39 +08:00
cxt 77e96af78f 还原分组作业 2015-12-03 10:41:27 +08:00
lizanle adb246f9ad 注释标记 错误
<!-- -->
2015-12-02 15:30:07 +08:00
lizanle 9fe5cfbf76 资源发送课程发送项目自动搜索 2015-12-02 14:38:41 +08:00
lizanle 2f0895c2c2 发送资源成功给出提示
发送资源默认为发送课程
2015-12-02 13:40:53 +08:00
lizanle 7af82aac98 base_forums要加ajax-indicator ajax-model 2015-12-02 09:28:01 +08:00
lizanle 46ad5f45c1 搜索结果下一页样式不对 2015-12-02 09:23:12 +08:00
lizanle 8f4c915c57 博客的非空验证bug 2015-12-01 17:33:18 +08:00
lizanle 35b543cd22 论坛发帖 采用ajax提交。这样子网络不好的情况就不会丢失数据了。 2015-12-01 17:23:14 +08:00
lizanle d4823e7c8b 贴吧更新时间 2015-12-01 15:48:25 +08:00
huang f1d38003c4 Merge branch 'szzh' into develop 2015-12-01 15:35:13 +08:00
huang 68f363e4a0 Merge branch 'develop' into szzh 2015-12-01 15:34:42 +08:00