Commit Graph

10136 Commits

Author SHA1 Message Date
ouyangxuhua 0b932267c7 调整截止日期快到了的宽度 2015-09-25 15:26:40 +08:00
lizanle 66ea9e3052 删除贴吧 取消也会被删除 2015-09-25 15:23:12 +08:00
lizanle f501b24cbd Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-25 15:17:22 +08:00
lizanle 1ee00fcae4 论坛描述自动换行 2015-09-25 15:17:14 +08:00
lizanle fc1ec7135d Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-25 15:12:08 +08:00
lizanle b525f12a32 文件上传问题 2015-09-25 15:12:01 +08:00
huang 3d91786fe2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 15:11:00 +08:00
huang b9c7f7ba5c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 15:10:38 +08:00
huang 61513153ec Merge branch 'dev_hjq' into szzh 2015-09-25 15:10:20 +08:00
sw 4765cef7bf Merge branch 'szzh' into develop 2015-09-25 15:09:59 +08:00
huang d32f92ed1d Merge branch 'szzh' into dev_hjq 2015-09-25 15:09:18 +08:00
huang 44a1518ddd Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 15:08:44 +08:00
huang e15ea06e2a 修改邮件标题 2015-09-25 15:08:31 +08:00
sw 241da3a37b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 15:06:38 +08:00
sw 6c62b44b59 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 15:06:06 +08:00
sw 0b0befa38c Merge branch 'develop' into szzh 2015-09-25 15:05:51 +08:00
lizanle 8f93cdcd80 Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-25 15:05:43 +08:00
lizanle befd8d66f6 编辑名称检查 2015-09-25 15:05:32 +08:00
sw 33924680b2 修改开启匿评提示 2015-09-25 15:02:56 +08:00
sw 4a838611fd 新建作业选择课程下拉框按时间倒排 2015-09-25 15:01:24 +08:00
sw 29fd5b41e2 调整用户搜索界面样式 2015-09-25 14:55:58 +08:00
ouyangxuhua 474779498b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 14:40:22 +08:00
ouyangxuhua 1935a9caaa 调整消息页面的宽度 2015-09-25 14:38:41 +08:00
sw 709e099770 增加部分作业关联表的判断 2015-09-25 14:33:33 +08:00
sw 5f1b4b1b24 导入作业后编辑按钮、弹出框确定按钮不可用 2015-09-25 14:16:12 +08:00
lizanle 35dd56d51c Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-25 12:32:03 +08:00
lizanle 7ef48f3fa3 标签修改的问题 2015-09-25 12:31:52 +08:00
ouyangxuhua b265b20753 1.消息中,回复了项目帖子,显示主题;
2.回复了消息帖子的tips中,“内容”改为“回复内容”,并调整样式
2015-09-25 12:01:21 +08:00
lizanle 9184dddb5e Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-25 11:50:05 +08:00
lizanle 3fe5adcaf8 统一修改tag 会 和边框有边距 2015-09-25 11:49:57 +08:00
huang 82b21fd4ec Merge branch 'dev_hjq' into szzh 2015-09-25 11:47:48 +08:00
huang fa88e50bcd Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-25 11:47:13 +08:00
huang d21ffcf7ff Merge branch 'szzh' into dev_hjq 2015-09-25 11:46:54 +08:00
huang 8886bda790 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 11:46:15 +08:00
huang 44c097dbaf 1、issue回复添加新的编辑器
2、解决issue回复含有html问题
3、解决项目动态中含有html问题
2015-09-25 11:45:57 +08:00
ouyangxuhua 4d1bc90161 匿名用户重新评阅作品,在消息显示中,需要正常显示 2015-09-25 11:40:57 +08:00
ouyangxuhua c466ac876e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 11:22:50 +08:00
ouyangxuhua 123a6c862d 匿名用户评阅,修改样式 2015-09-25 11:22:35 +08:00
lizanle a763fc4860 Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-25 11:17:38 +08:00
lizanle e4e1a0818e 论坛样式问题 2015-09-25 11:17:31 +08:00
ouyangxuhua dd7199623d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 11:13:55 +08:00
ouyangxuhua 3e857ba48f 作业消息:截止日期快到时,给出消息提醒。修改提醒内容及样式 2015-09-25 11:04:46 +08:00
Tim c675a4c227 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 10:43:42 +08:00
Tim e8a7448a7c 资源库用户资源图标位置调整 2015-09-25 10:43:19 +08:00
lizanle 80bf8d83f3 项目资源和课程资源 js需要分开 2015-09-25 10:38:26 +08:00
lizanle 061d41e50a 课程资源 和 项目资源 页面通用,需要对js进行判断 2015-09-25 10:35:43 +08:00
Tim 7e3ae446f5 资源库头像替换 2015-09-25 10:35:04 +08:00
ouyangxuhua c445e933bf 修改作业消息颜色 2015-09-25 10:18:43 +08:00
ouyangxuhua 892aa166ee 增加作业消息的截止日期为24点 2015-09-25 10:16:27 +08:00
sw dfc9d89a3d Merge branch 'szzh' into develop 2015-09-25 10:13:34 +08:00