 sw
|
b84ec1360a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-25 16:58:57 +08:00 |
|
sw
|
fd4a2b19c8
|
课程界面老师数量
|
2015-09-25 16:11:59 +08:00 |
 lizanle
|
926bdd81e8
|
论坛名换行问题
|
2015-09-25 15:52:28 +08:00 |
|
lizanle
|
66ea9e3052
|
删除贴吧 取消也会被删除
|
2015-09-25 15:23:12 +08:00 |
|
lizanle
|
924183b1cc
|
js合并错误
|
2015-09-25 10:04:56 +08:00 |
|
lizanle
|
6b98b2a273
|
暂时不可点击的链接 不用手型光标
|
2015-09-24 16:17:50 +08:00 |
|
lizanle
|
531b264a8f
|
Merge branch 'dev_zanle' into szzh
|
2015-09-24 13:44:37 +08:00 |
 huang
|
99473c6880
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/issues/show.html.erb
|
2015-09-24 11:46:33 +08:00 |
|
sw
|
f9f51557dd
|
增加关闭反馈功能
|
2015-09-24 11:31:07 +08:00 |
|
huang
|
6449b2563b
|
1、去掉项目隐藏代码库的功能
2、同步圈子的描述
3、圈子JS实现
|
2015-09-24 11:19:07 +08:00 |
|
lizanle
|
d512c25c03
|
Merge branch 'szzh' into dev_zanle
Conflicts:
public/javascripts/new_user.js
public/stylesheets/header.css
public/stylesheets/new_user.css
|
2015-09-24 10:15:23 +08:00 |
|
lizanle
|
44b93af307
|
tag浮动
|
2015-09-24 09:52:57 +08:00 |
|
lizanle
|
7383ac7aa9
|
删除贴吧功能
|
2015-09-23 16:36:11 +08:00 |
|
lizanle
|
6ac5b738e3
|
论坛编辑功能
|
2015-09-23 16:27:13 +08:00 |
|
lizanle
|
eed530db2b
|
添加 上传附件的 文字
|
2015-09-23 15:14:37 +08:00 |
|
lizanle
|
272d9fa527
|
论坛的标签可修改
|
2015-09-23 11:02:22 +08:00 |
|
lizanle
|
1d84064221
|
论坛描述长度过长不会换行显示
|
2015-09-23 09:45:24 +08:00 |
|
lizanle
|
c05b1f5959
|
论坛帖子 和回复 计算错误
|
2015-09-23 09:26:16 +08:00 |
|
lizanle
|
7624b917f0
|
添加标签 要限制长度
|
2015-09-21 17:04:41 +08:00 |
|
lizanle
|
27a4954612
|
添加标签 要限制长度
|
2015-09-21 16:08:05 +08:00 |
|
lizanle
|
e81d8f83a5
|
添加标签 要限制长度
|
2015-09-21 16:01:32 +08:00 |
|
lizanle
|
a24ca05157
|
贴吧的描述修改的图标 和 删除标签的图片的显示隐藏问题
|
2015-09-21 10:31:15 +08:00 |
|
lizanle
|
46c806900e
|
贴吧列表和主题列表 按不同的规则排序的时候，如果翻页了，又回到了综合排序的问题
|
2015-09-19 12:32:11 +08:00 |
|
lizanle
|
7b24f9590d
|
编辑贴吧tag的权限问题
|
2015-09-19 10:28:30 +08:00 |
|
lizanle
|
ba240c72b7
|
编辑贴吧tag的权限问题
|
2015-09-19 10:27:39 +08:00 |
|
lizanle
|
fa41c03a82
|
编辑贴吧描述权限问题
|
2015-09-19 10:25:02 +08:00 |
|
lizanle
|
9443c139f0
|
update forum
|
2015-09-18 17:44:16 +08:00 |
|
huang
|
850a7c937f
|
Merge branch 'szzh' into dev_hjq
|
2015-09-18 17:39:37 +08:00 |
|
huang
|
c8f7655d1e
|
系统消息样式
|
2015-09-18 17:01:30 +08:00 |
 cxt
|
20ea692260
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-18 14:31:33 +08:00 |
|
cxt
|
154cd7de6f
|
子域名的更改
|
2015-09-18 14:31:19 +08:00 |
|
huang
|
f041c80d0a
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/users/user_messages.html.erb
db/schema.rb
public/stylesheets/new_user.css
解决冲突
|
2015-09-18 13:08:12 +08:00 |
|
sw
|
f04e0c5f84
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2015-09-18 11:34:29 +08:00 |
 Tim
|
062a9ff231
|
上传头像确定，取消按钮字号大小统一
|
2015-09-17 16:12:31 +08:00 |
|
huang
|
67f7fc7de3
|
注释掉“邀请系统注册用户”，因为邀请用户中已经包含该功能
|
2015-09-16 17:35:26 +08:00 |
|
sw
|
939a010adb
|
静态页面添加
|
2015-09-16 15:51:35 +08:00 |
|
sw
|
9ee82c57be
|
去掉课程模块的导航栏
|
2015-09-15 17:01:39 +08:00 |
|
sw
|
fff9c44271
|
学生没有课程和项目时，课程和项目导航有2条线
|
2015-09-15 15:16:49 +08:00 |
|
cxt
|
d0c19124b7
|
将课程的“私有”标志改成不可点击
|
2015-09-14 17:29:00 +08:00 |
|
sw
|
ecf2ac5e19
|
课程内发布作业增加提示
|
2015-09-11 16:57:49 +08:00 |
|
cxt
|
dbdd68f45d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2015-09-11 16:43:59 +08:00 |
|
huang
|
4d4b48ef99
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
|
2015-09-11 15:50:10 +08:00 |
|
cxt
|
7d6b9005a4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-11 11:41:45 +08:00 |
|
cxt
|
2da3454bc5
|
暂时屏蔽课程复制功能
|
2015-09-11 11:41:31 +08:00 |
|
sw
|
948a6c9138
|
隐藏教师节相关信息
|
2015-09-11 09:20:43 +08:00 |
|
sw
|
f0bd113a5e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-10 17:11:38 +08:00 |
|
lizanle
|
80e38287dd
|
所有baselayout都引入prttefy.css .js
调整资源库宽度
|
2015-09-10 16:38:45 +08:00 |
|
lizanle
|
cc6fe754d4
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-10 15:45:46 +08:00 |
|
lizanle
|
756aae0cf2
|
发布issue编辑器可以上传代码并高亮显示了
|
2015-09-10 15:45:08 +08:00 |
|
sw
|
97f9d4fa60
|
增加教师节祝福语
|
2015-09-10 10:26:16 +08:00 |