 yuanke
|
ec4273fc49
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-15 17:08:24 +08:00 |
|
yuanke
|
a17fb86a17
|
组织回复点登录直接跳入登录页面
|
2016-06-15 17:07:29 +08:00 |
 cxt
|
43192b8648
|
分组作业的弹框增加人数的验证、点击关闭弹框时还原弹框中的值
|
2016-06-15 17:04:53 +08:00 |
|
yuanke
|
a2d1b6d646
|
组织回复点登录直接跳入登录界面
|
2016-06-15 17:01:53 +08:00 |
 huang
|
9b6f40bb02
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-15 15:43:42 +08:00 |
|
huang
|
a2c5cc6da1
|
登录界面base及新页面
|
2016-06-15 15:41:13 +08:00 |
|
yuanke
|
5a7f7da1f7
|
新建贴吧和组织配置默认选项暂时还原。
|
2016-06-15 15:34:13 +08:00 |
|
huang
|
d75a8bc35a
|
Merge branch 'hjq_beidou' into develop
|
2016-06-15 14:49:10 +08:00 |
|
yuanke
|
fd337913ee
|
Merge branch 'develop' into yuanke
|
2016-06-15 14:44:38 +08:00 |
|
yuanke
|
b08f6e307a
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/org_subfields_controller.rb
|
2016-06-15 14:44:02 +08:00 |
|
huang
|
45f185bf9b
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-06-15 14:38:16 +08:00 |
|
huang
|
c15ef27fc0
|
管理员能看到组织资源
|
2016-06-15 14:36:38 +08:00 |
|
yuanke
|
7b6e8fbc53
|
修改组织点击登录后可回复报500的BUG
|
2016-06-15 14:33:25 +08:00 |
|
cxt
|
caa966c85a
|
分组作业的作品列表提示的修改
分组作业提交作品时的最小人数限制不起作用
|
2016-06-15 14:12:42 +08:00 |
 Tim
|
f7832b00c9
|
更新历史版本时描述位置调整
|
2016-06-15 14:02:09 +08:00 |
 guange
|
8fd4d518b2
|
添加邀请码
|
2016-06-15 13:44:28 +08:00 |
|
huang
|
e7c856be0b
|
组织域名500问题
|
2016-06-15 09:30:36 +08:00 |
|
cxt
|
c50d307e89
|
分组作业添加成员后再次打开，数据未保存
|
2016-06-14 17:36:12 +08:00 |
|
guange
|
ada15b4212
|
格式上的调整, 现在可以分开写,但发布时打成一个js提高性能
|
2016-06-14 16:03:10 +08:00 |
|
cxt
|
254e1f44f6
|
评分设置提示的修改与提交时的判断
|
2016-06-14 15:44:03 +08:00 |
 Linda
|
01bd394a59
|
门户首页按照祎欣0613版本设计修改
|
2016-06-14 15:08:13 +08:00 |
|
huang
|
5515fb660f
|
完成资源更新的时候 描述继承问题，并且可以修改描述
|
2016-06-14 14:47:02 +08:00 |
|
guange
|
b1791f4531
|
wechat结构分离
|
2016-06-14 14:24:39 +08:00 |
|
huang
|
d21df48961
|
代码质量分析弹框及参数传入
|
2016-06-14 14:10:33 +08:00 |
|
cxt
|
e7499c95c5
|
点击打开测验作品列表中某作品，在作品详情页面增加返回统计列表的快捷操作
|
2016-06-14 14:08:54 +08:00 |
|
txz
|
270399c5da
|
点赞时图标移动修复
|
2016-06-14 14:04:39 +08:00 |
|
cxt
|
6100abe0da
|
课程大纲
|
2016-06-14 10:38:11 +08:00 |
|
huang
|
c6bd5e6d31
|
饼状图
|
2016-06-14 09:57:53 +08:00 |
|
huang
|
9029fd91e0
|
rails 代码中调用shell命令调用
|
2016-06-14 09:57:29 +08:00 |
|
txz
|
a2450defc6
|
微信作业详情类别文字处理
|
2016-06-13 17:32:51 +08:00 |
|
txz
|
962470c582
|
微信文字显示不全bug
|
2016-06-13 17:23:35 +08:00 |
|
yuanke
|
44c9265fee
|
个人主页个性签名增加自动识别url
|
2016-06-13 15:29:15 +08:00 |
|
txz
|
8bbdf3688c
|
微信加入班级css新增
|
2016-06-13 15:25:26 +08:00 |
|
huang
|
0c25e3b13d
|
版本库质量分析 ssh链接
|
2016-06-13 15:21:29 +08:00 |
|
cxt
|
6c7237509d
|
“当前作品未进行评分，是否确定提交”改为“您当次评阅未对作品进行评分，分数将取上次的评分结果，若没有评分记录则不评分，是否确定提交？”
|
2016-06-13 14:08:30 +08:00 |
|
yuanke
|
e86419c28b
|
组织配置里面栏目类型默认为帖子
|
2016-06-13 13:35:01 +08:00 |
|
cxt
|
3a8a61e404
|
在精品课程列表增加“取消精品”列、在全部课程列表增加“开课学期”列，并支持排序
|
2016-06-13 11:10:28 +08:00 |
|
yuanke
|
3a46a409a9
|
Merge branch 'develop' into yuanke
|
2016-06-13 09:46:17 +08:00 |
|
yuanke
|
f2903ae903
|
新建贴吧后自动跳入该贴吧
|
2016-06-13 09:45:11 +08:00 |
|
guange
|
0a82de1cf4
|
中文问题
|
2016-06-12 17:25:47 +08:00 |
|
guange
|
d3d31ca3a2
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
2016-06-12 17:18:34 +08:00 |
|
guange
|
637411f258
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-06-12 17:18:19 +08:00 |
|
guange
|
1cb63055cb
|
api可以通过openid来认证
|
2016-06-12 17:18:05 +08:00 |
|
cxt
|
02e2831980
|
管理员界面的留言列表优化
|
2016-06-12 17:17:37 +08:00 |
|
huang
|
d4d4e38c41
|
门户模式中含有三级域名的用户图像https问题
|
2016-06-12 16:48:35 +08:00 |
|
huang
|
9d3bb44682
|
简洁模式
|
2016-06-12 16:04:26 +08:00 |
|
txz
|
0e63a3a24c
|
指派文字显示不全
|
2016-06-12 15:37:52 +08:00 |
|
cxt
|
be47331213
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-12 15:08:43 +08:00 |
|
guange
|
15e074417c
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-06-12 15:06:41 +08:00 |
|
guange
|
cbc4f2f6fd
|
菜单更新
|
2016-06-12 15:05:45 +08:00 |