 yuanke
|
647e6a7f92
|
Merge branch 'yuanke' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
config/locales/zh.yml
db/schema.rb
|
2016-04-28 10:45:57 +08:00 |
 huang
|
b8f7a6a300
|
500问题
|
2016-04-28 10:43:42 +08:00 |
|
yuanke
|
22fc31eb82
|
先把隐藏课程信息的功能去掉
|
2016-04-28 10:39:11 +08:00 |
|
yuanke
|
bcca1366e9
|
Merge branch 'yuanke_1' into yuanke
|
2016-04-28 10:32:57 +08:00 |
|
yuanke
|
dd00533084
|
帖子显示三行好点
|
2016-04-28 10:32:32 +08:00 |
|
huang
|
7aaa13ca1a
|
左一只取一个
|
2016-04-28 10:26:41 +08:00 |
|
huang
|
ae8bb8e83b
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-04-28 10:25:42 +08:00 |
|
huang
|
b596c0d66f
|
二级目录的创建等
|
2016-04-28 10:25:26 +08:00 |
|
huang
|
e48189ae97
|
项目获取数
|
2016-04-28 10:24:53 +08:00 |
|
yuanke
|
c729c1252d
|
项目、课程列表显示修改
|
2016-04-28 10:19:59 +08:00 |
 Tim
|
6b02acb329
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-04-28 10:18:22 +08:00 |
|
Tim
|
024667d035
|
title多行实现省略号效果，默认页面不对齐显示问题，高度控制，标题单行省略显示等
|
2016-04-28 10:17:59 +08:00 |
 cxt
|
451b53f3cc
|
qianyi
|
2016-04-28 10:09:45 +08:00 |
|
cxt
|
d244e22066
|
rake
|
2016-04-28 10:08:09 +08:00 |
|
huang
|
002d0c18ba
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-04-27 17:03:25 +08:00 |
|
huang
|
9fbf713709
|
完成组织二级域名
|
2016-04-27 17:02:44 +08:00 |
|
cxt
|
3aa891acf6
|
Merge branch 'cxt_course' into develop
Conflicts:
app/controllers/student_work_controller.rb
app/views/praise_tread/_praise.html.erb
db/schema.rb
|
2016-04-27 16:27:55 +08:00 |
|
cxt
|
698dfdab4a
|
组织点赞不能用
|
2016-04-27 16:25:17 +08:00 |
|
cxt
|
766026e3cf
|
教师评分为最终评分
|
2016-04-27 16:21:35 +08:00 |
|
yuanke
|
c357971e8a
|
课程列表、项目列表等修改
|
2016-04-27 16:02:52 +08:00 |
|
Tim
|
5d7c8c0b61
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
app/views/layouts/base_org2.html.erb
|
2016-04-27 15:18:50 +08:00 |
|
Tim
|
5d44dc5bba
|
滚动栏js效果修改
|
2016-04-27 15:16:23 +08:00 |
|
yuanke
|
4258790453
|
Merge branch 'hjq_beidou' into yuanke_1
Conflicts:
db/schema.rb
public/stylesheets/project.css
|
2016-04-27 14:30:28 +08:00 |
|
yuanke
|
dac717bd97
|
列表左边菜单收缩
|
2016-04-27 14:12:56 +08:00 |
|
huang
|
811c3a065e
|
完成左中一模块定制
|
2016-04-27 14:09:15 +08:00 |
|
huang
|
ddf1e6f2db
|
组织模式3完成
|
2016-04-27 11:29:01 +08:00 |
|
huang
|
70fa3fddfd
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-04-27 10:41:15 +08:00 |
|
huang
|
cded1802cc
|
右上模块定制完成
|
2016-04-27 10:41:05 +08:00 |
|
cxt
|
78c7db1150
|
Merge branch 'weixin_guange' into develop
|
2016-04-27 10:36:24 +08:00 |
|
cxt
|
df0a7bbf34
|
冲突
|
2016-04-27 10:31:09 +08:00 |
|
cxt
|
0222038899
|
缺陷模板消息改为对项目所有人发送、可屏蔽微信模板消息
|
2016-04-27 10:28:36 +08:00 |
|
yuanke
|
aabb969588
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-27 10:03:15 +08:00 |
|
yuanke
|
51245d44fa
|
编程作业未发布是 由于代码查重按钮的原因导致布局问题。
|
2016-04-27 10:02:43 +08:00 |
|
Tim
|
c9cc4739aa
|
北斗组织微信块调整
|
2016-04-27 09:57:41 +08:00 |
|
yuanke
|
23f48b7189
|
项目列表、项目讨论区列表
|
2016-04-27 09:54:49 +08:00 |
|
huang
|
b6f5bfc450
|
右下版本模块定制
|
2016-04-27 09:45:56 +08:00 |
|
Tim
|
c8dde5565e
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
app/views/layouts/base_org2.html.erb
|
2016-04-27 09:38:29 +08:00 |
|
Tim
|
b8d6ca0229
|
北斗组织门户样式更改
|
2016-04-27 09:36:54 +08:00 |
|
huang
|
b589d5b2ff
|
末班六定配完成
|
2016-04-26 18:27:01 +08:00 |
|
huang
|
17b2e82963
|
banner类型
|
2016-04-26 16:23:08 +08:00 |
|
Tim
|
86751e31fb
|
题库加入私有课程题目，可申请使用
|
2016-04-26 15:35:42 +08:00 |
|
yuanke
|
43c1120b19
|
课程问答区 项目讨论区列表
|
2016-04-26 15:10:47 +08:00 |
|
huang
|
32d7927eb9
|
组织新界面
|
2016-04-26 11:06:18 +08:00 |
|
huang
|
76f93a54c6
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
app/helpers/organizations_helper.rb
app/views/layouts/base_org2.html.erb
app/views/organizations/_org_content.html.erb
|
2016-04-26 11:03:21 +08:00 |
|
huang
|
d8f71da1fb
|
完成模块8配置
|
2016-04-26 11:01:12 +08:00 |
 guange
|
cc9825e6a2
|
将wechat放到项目里面
|
2016-04-26 10:50:54 +08:00 |
|
Tim
|
9ba0d50f26
|
拉代码更新
|
2016-04-26 10:16:23 +08:00 |
|
Tim
|
23a6604e47
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
app/views/layouts/base_org2.html.erb
|
2016-04-26 10:07:21 +08:00 |
|
Tim
|
53e6b41d93
|
北斗登录效果调整
|
2016-04-26 10:02:16 +08:00 |
|
cxt
|
49a7e2ce1d
|
关注和绑定登录后发送欢迎消息
|
2016-04-26 09:03:01 +08:00 |