 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 |
 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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
yuanke
|
639749f02b
|
修改作业未发布时 加了代码查重按钮 显示错乱的问题.
|
2016-04-25 11:00:56 +08:00 |
|
yuanke
|
d34b3780c8
|
课程列表修改
|
2016-04-25 10:44:46 +08:00 |
|
huang
|
c1437bb75b
|
北斗界面
|
2016-04-24 14:39:33 +08:00 |
|
yuanke
|
f6d09e0554
|
配置中增加一个 隐藏课程信息的功能
|
2016-04-24 14:23:08 +08:00 |
|
huang
|
f5a88ef6f9
|
数据库为空的迁移问题
|
2016-04-24 10:52:29 +08:00 |
|
yuanke
|
c8eaf293e7
|
课程列表
|
2016-04-24 10:49:33 +08:00 |
|
yuanke
|
81cd30cbda
|
Merge branch 'cxt_course' into yuanke_1
Conflicts:
db/schema.rb
|
2016-04-23 13:22:28 +08:00 |
|
yuanke
|
a4d250e168
|
博客列表
|
2016-04-23 13:20:49 +08:00 |
 cxt
|
8f6b116c51
|
作品详情打不开
|
2016-04-22 14:46:58 +08:00 |
|
yuanke
|
6191c3636d
|
Merge branch 'yuanke' into yuanke_1
Conflicts:
public/javascripts/homework.js
|
2016-04-22 14:18:30 +08:00 |
|
yuanke
|
f6a5ffc6a5
|
测试代码的时候点击一下然后按钮消失等结果返回才出现
|
2016-04-22 14:13:24 +08:00 |
|
yuanke
|
5c5d212193
|
博客列表
|
2016-04-22 13:52:33 +08:00 |
|
huang
|
c4bd78e442
|
讨论区代码还原及优化
|
2016-04-22 12:44:37 +08:00 |
|
cxt
|
7673fc41fb
|
作品列表页面增加提交作品的入口
|
2016-04-22 12:37:13 +08:00 |
|
cxt
|
9b4c275869
|
作品动态添加追加附件功能
|
2016-04-22 11:27:30 +08:00 |
|
huang
|
aaeec3ab6c
|
版本库show页面代码简化封装
|
2016-04-22 10:58:41 +08:00 |
|
huang
|
e23262225a
|
版本库名不能是全数字
|
2016-04-22 10:34:45 +08:00 |
|
huang
|
cb2033c80f
|
去掉rake中输出
|
2016-04-21 16:20:29 +08:00 |
|
huang
|
81f8559c48
|
gitlab版本库成员同步任务
|
2016-04-21 16:04:00 +08:00 |
|
yuanke
|
eddea2eabd
|
Merge branch 'yuanke' into yuanke_1
|
2016-04-21 14:01:54 +08:00 |
|
huang
|
42076a137d
|
项目统计添加判断
|
2016-04-21 11:19:21 +08:00 |
|
yuanke
|
d538d1967b
|
解决管理员界面代码测试列表404的问题
|
2016-04-21 11:16:32 +08:00 |
|
cxt
|
7a90c0ea10
|
评分设置修改多项时不应发多条模板消息
|
2016-04-21 10:51:43 +08:00 |
|
huang
|
ba171c49cc
|
统计 改成 代码统计
|
2016-04-21 10:42:06 +08:00 |
|
huang
|
e8048f8eb7
|
完成版本库时间UTC与北京时间的转换
时间国际化问题
|
2016-04-21 10:09:52 +08:00 |