 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 |
|
guange
|
5a60702412
|
删除1234567
|
2016-04-25 21:23:52 +08:00 |
|
guange
|
98f84bb0ab
|
Merge remote-tracking branch 'origin/develop' into guange_dev
|
2016-04-25 21:22:28 +08:00 |
|
huang
|
255d7e07bc
|
北斗新界面样式
|
2016-04-25 18:54:21 +08:00 |
|
huang
|
dae6a5ecae
|
配置八种类型更新
|
2016-04-25 16:00:52 +08:00 |
|
huang
|
81210fd475
|
顶部导航及样式
|
2016-04-25 15:35:32 +08:00 |
|
cxt
|
b86669d49c
|
微信模板消息的详情页面
|
2016-04-25 14:57:55 +08:00 |
|
huang
|
5b763927cc
|
顶部用户路由
|
2016-04-25 14:14:26 +08:00 |
|
yuanke
|
bb80cad1e3
|
Merge branch 'yuanke' into yuanke_1
Conflicts:
app/views/layouts/new_base_user.html.erb
|
2016-04-25 14:03:27 +08:00 |
|
cxt
|
3382355086
|
conflicts
|
2016-04-25 11:15:44 +08:00 |
|
cxt
|
9a6ea9757d
|
微信模板消息的颜色、去掉模板消息的最后一行
|
2016-04-25 11:12:34 +08:00 |
|
yuanke
|
639749f02b
|
修改作业未发布时 加了代码查重按钮 显示错乱的问题.
|
2016-04-25 11:00:56 +08:00 |
|
yuanke
|
d34b3780c8
|
课程列表修改
|
2016-04-25 10:44:46 +08:00 |
|
guange
|
050d3c5440
|
Merge remote-tracking branch 'origin/develop' into guange_dev
|
2016-04-24 22:23:14 +08:00 |
|
guange
|
744c04b54a
|
修改gem源
|
2016-04-24 22:20:29 +08:00 |
|
huang
|
c1437bb75b
|
北斗界面
|
2016-04-24 14:39:33 +08:00 |
|
yuanke
|
f6d09e0554
|
配置中增加一个 隐藏课程信息的功能
|
2016-04-24 14:23:08 +08:00 |
|
guange
|
2c23b88998
|
boards#index性能优化
|
2016-04-24 12:48:03 +08:00 |
|
huang
|
5d506458df
|
迁移空数据问题
|
2016-04-24 11:25:29 +08:00 |
|
huang
|
081aea8b02
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-24 10:53:31 +08:00 |
|
huang
|
cc48fb5a98
|
Merge branch 'hjq_beidou' into develop
|
2016-04-24 10:53:23 +08:00 |