Commit Graph

13466 Commits

Author SHA1 Message Date
cxt c3ee4dadfb 作品提交确认框的高度添加限制 2016-04-05 11:24:13 +08:00
cxt 6a8a82e85a 删除周海芳老师2882作业的学生匿评 2016-04-05 11:23:50 +08:00
txz 48e26fce62 冲突解决 2016-04-05 10:43:51 +08:00
txz 8c7de04dbf 项目问答详情页面 2016-04-05 10:30:25 +08:00
guange 36f3e3a46c 改为angularjs实现 2016-04-04 22:24:13 +08:00
guange 58c1b27600 加入openid传参 2016-04-02 08:13:52 +08:00
guange a6a0681b78 openid参数 2016-04-02 08:08:03 +08:00
guange e1f1c6fbc0 openid参数 2016-04-02 08:05:49 +08:00
guange ff93e9f79b 修改返回为json 2016-04-02 07:56:12 +08:00
guange 1926f0ba53 修改openid路由 2016-04-02 07:49:36 +08:00
guange a25fe6cef8 修改openid路由 2016-04-02 07:47:34 +08:00
guange 9c93b3f9a6 修改openid调用位置 2016-04-02 07:43:55 +08:00
guange 7d4de36521 修改openid调用位置 2016-04-02 07:39:46 +08:00
guange 5839959f0a 修改openid调用位置 2016-04-02 07:32:40 +08:00
cxt 07c95ecacf Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-02 00:37:37 +08:00
cxt 9da89ef5e2 课程通知的回复 2016-04-02 00:37:24 +08:00
huang 73297230d1 权限控制 2016-04-02 00:31:36 +08:00
huang 7d07989939 Merge branch 'hjq_beidou' into develop 2016-04-02 00:15:22 +08:00
huang e4b5a4df05 500wenti 2016-04-02 00:14:48 +08:00
huang 1e2d151152 Merge branch 'hjq_beidou' into develop 2016-04-02 00:02:21 +08:00
huang 0bcd2ddcf8 0 2016-04-02 00:02:09 +08:00
huang 0dc7b1f621 上传图片 2016-04-02 00:00:36 +08:00
huang 86aecd21b9 上传图片 2016-04-01 23:56:05 +08:00
txz 4dbc619fc5 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-01 23:51:17 +08:00
txz 34feff25a6 项目详情配置 2016-04-01 23:51:11 +08:00
cxt d47f887fd1 issue回复的修改 2016-04-01 23:48:29 +08:00
cxt bc5e455f0f 解决冲突 2016-04-01 23:25:19 +08:00
cxt 790b452a9b issue回复 2016-04-01 23:22:39 +08:00
txz d45604c4a0 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-01 23:21:25 +08:00
txz 3b70970651 问题跟踪详情页面修改 2016-04-01 23:21:18 +08:00
cxt cc2fe6108a Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-01 22:38:57 +08:00
cxt 5e697e5367 作业的回复 2016-04-01 22:38:45 +08:00
txz 0d24de7198 详情页面回复 2016-04-01 22:35:44 +08:00
cxt 7dccb0d963 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-01 21:32:56 +08:00
cxt 88c39512b9 journal的修改 2016-04-01 21:32:33 +08:00
huang 0459856a2c 上线logo更换 2016-04-01 21:30:32 +08:00
txz 58e5fe85c3 issue 详情页面 2016-04-01 21:28:25 +08:00
txz 4902361b3f 冲突解决 2016-04-01 20:56:50 +08:00
txz 596bf641ac 最新动态各详情页面 2016-04-01 20:53:21 +08:00
cxt b3b0488bf5 动态点击更多 2016-04-01 20:46:38 +08:00
huang ac1b3338c5 logo图标替换 2016-04-01 20:10:28 +08:00
huang 218a6b9358 Merge branch 'hjq_beidou' of http://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-04-01 19:25:01 +08:00
huang c00c674c34 Merge branch 'develop' into hjq_beidou
Conflicts:
	app/controllers/organizations_controller.rb
2016-04-01 19:24:41 +08:00
cxt 66e80d034f issue只取回复 2016-04-01 18:46:00 +08:00
huang 007419f9cc 精华样式问题 2016-04-01 18:38:05 +08:00
Yiang Gan 869810b3a0 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-01 18:23:21 +08:00
Yiang Gan af2bd66847 回复api 2016-04-01 18:23:12 +08:00
huang 94478829b6 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-01 17:23:37 +08:00
huang 9e7c595e55 组织发送动态的显示 2016-04-01 17:23:15 +08:00
linchun 02ebaf23d1 修改管理员界面组织列表总组织的链接 2016-04-01 16:17:26 +08:00