 huang
|
a63dffd9d3
|
资源库导航颜色一致
|
2016-06-16 14:54:27 +08:00 |
|
huang
|
d157155cba
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-16 14:43:35 +08:00 |
|
huang
|
d4760bcd6d
|
一个像素问题
|
2016-06-16 14:43:19 +08:00 |
 yuanke
|
f9f66bac7b
|
修改课程资源描述为空时提示
|
2016-06-16 14:15:46 +08:00 |
|
yuanke
|
7df91ebf70
|
修改课程资源描述空白的提示语
|
2016-06-16 14:14:54 +08:00 |
|
yuanke
|
4cd321f363
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-16 14:11:17 +08:00 |
|
yuanke
|
049a21c7d0
|
不上线的先还原
|
2016-06-16 14:08:54 +08:00 |
|
huang
|
072807fe37
|
1、登录下划线去掉2、登录改成注册3、默认的改成勾选协议
|
2016-06-16 14:07:37 +08:00 |
|
yuanke
|
82ebd1e4c9
|
Merge branch 'yuanke' into develop
|
2016-06-16 14:04:53 +08:00 |
|
yuanke
|
2781605670
|
课程资源描述增加可编辑
|
2016-06-16 14:04:12 +08:00 |
 Tim
|
24458ecb48
|
table可拖拽，在线测验表格布局优化
|
2016-06-16 11:31:39 +08:00 |
|
huang
|
24b12513e5
|
铃铛颜色
|
2016-06-16 11:16:41 +08:00 |
|
huang
|
8f73cba44b
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-16 10:36:40 +08:00 |
|
huang
|
41bb68d0e1
|
Merge branch 'hjq_login' into develop
|
2016-06-16 10:36:30 +08:00 |
|
huang
|
474c183050
|
导航颜色一致
|
2016-06-16 10:35:53 +08:00 |
|
huang
|
5e3df51ad9
|
完成新版登录注册
|
2016-06-16 10:21:21 +08:00 |
|
huang
|
aa42044199
|
注册登录
|
2016-06-15 17:58:02 +08:00 |
|
huang
|
06f97d5cb7
|
注册页面（未完）
|
2016-06-15 17:24:46 +08:00 |
 cxt
|
03b92f8570
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-15 17:23:23 +08:00 |
|
yuanke
|
1023b94f0d
|
新建贴吧之后转入这个贴吧界面,组织配置栏目默认选择第一项
|
2016-06-15 17:22:39 +08:00 |
|
yuanke
|
000d33bf0d
|
Merge branch 'develop' into yuanke
|
2016-06-15 17:18:27 +08:00 |
|
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 |