 alan
|
8c19ec8aa0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/helpers/projects_helper.rb
app/views/contest_notification/show.html.erb
Signed-off-by: alan <547533434@qq.com>
|
2014-09-15 10:58:14 +08:00 |
 z9hang
|
c9f6259587
|
空数据库时部分数据没有，添加非空判断
|
2014-09-09 11:58:35 +08:00 |
 sw
|
b49e76bf79
|
Merge branch 'xiaoguang-contest' into szzh
Conflicts:
app/views/softapplications/show.html.erb
app/views/welcome/contest.html.erb
|
2014-09-02 09:28:51 +08:00 |
|
z9hang
|
d16b54a1ea
|
域名跳转问题、提交代码后版本库不能访问问题
|
2014-08-25 09:15:38 +08:00 |
 hhuai
|
8b121c3e50
|
fixed issue #998, 主页的通知公告区域显示优化
|
2014-08-17 20:56:58 +08:00 |
|
z9hang
|
2b6a376d31
|
修复数据库为初始状态时会出现的部分bug、去除部分连接的域名
|
2014-08-15 14:30:01 +08:00 |
|
z9hang
|
caed78327a
|
积分计算修改
|
2014-08-13 11:17:22 +08:00 |
|
z9hang
|
7907edf168
|
更新项目得分规则
调整项目列表显示样式
|
2014-08-05 16:39:33 +08:00 |
|
z9hang
|
03b212e363
|
首页定制，是否显示课程，竞赛
|
2014-07-30 15:26:55 +08:00 |
|
z9hang
|
8871652e01
|
添加首页定制，设置是否显示"我的课程"功能
|
2014-07-28 10:37:22 +08:00 |
|
z9hang
|
5a0d76c1e0
|
竞赛通知发布完成
|
2014-07-25 11:51:52 +08:00 |
|
z9hang
|
f83336aed0
|
修改首页定制中热门项目排序方式的实现
|
2014-07-25 09:19:29 +08:00 |
 yanxd
|
edee2b2327
|
删掉welcome没用的方法
|
2014-07-22 09:17:21 +08:00 |
 nwb
|
27fda1f938
|
竞赛首页修改
|
2014-07-21 16:19:45 +08:00 |
|
nwb
|
aea41ba997
|
修改竞赛首页搜索功能
|
2014-07-21 15:45:00 +08:00 |
|
z9hang
|
2cab9f7895
|
热门项目排序添加空值判断，默认按活跃度排序
|
2014-07-16 15:24:56 +08:00 |
|
z9hang
|
cc4bf3b328
|
添加超级管理员控制首页热门项目排序问题
|
2014-07-16 14:22:12 +08:00 |
|
z9hang
|
3dfcc90574
|
课程、竞赛首页定制
超级管理员账户中首页定制界面优化
|
2014-07-11 11:41:54 +08:00 |
|
z9hang
|
b4dd8409eb
|
添加项目托管平台首页定制功能
|
2014-07-10 17:38:04 +08:00 |
xianbo
|
25ee1d8672
|
for adjust test domain and give a setting reposwq
|
2014-07-08 10:59:20 +08:00 |
|
z9hang
|
f5b69be967
|
新建贴吧描述为空不能新建、搜索空内容添加提示
|
2014-07-05 14:43:15 +08:00 |
|
yanxd
|
36c90f1dfd
|
取不到学校，再拿id直接空指针
|
2014-07-04 11:30:41 +08:00 |
|
nwb
|
d001b4416a
|
1.优化课程首页
2.优化课程首页搜索逻辑
|
2014-07-04 09:10:17 +08:00 |
|
nwb
|
4d25ec1623
|
1.添加课程垃圾数据清理迁移文件
2.课程首页逻辑更改
|
2014-07-03 17:28:13 +08:00 |
|
nwb
|
2a6cbe28f0
|
修正课程首页错误
|
2014-07-03 15:24:06 +08:00 |
|
yanxd
|
b356145d71
|
course logo
|
2014-06-13 16:46:57 +08:00 |
|
yanxd
|
7456e37e8a
|
home
|
2014-06-13 12:04:15 +08:00 |
|
yanxd
|
789a8d1392
|
tag_name从ProjectInfo取用户抛错的问题
不查询网站信息（删东西
gemfile加pry判定
|
2014-06-03 11:19:20 +08:00 |
Wen
|
50745d5d21
|
course首页布局上的小调整
|
2014-04-29 09:49:51 +08:00 |
|
Wen
|
03d58b962a
|
封装了一下取得logo的方法
|
2014-04-28 10:48:09 +08:00 |
yanxd
|
8f5958abc1
|
mao
|
2014-04-25 16:08:00 +08:00 |
 kg
|
158c950b78
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-04-18 17:57:58 +08:00 |
|
kg
|
bdefa322cc
|
modify foot
|
2014-04-18 17:57:11 +08:00 |
 wanglinchun
|
9ac0cbe6a3
|
Merge branch 'competition' into develop
Conflicts:
Gemfile
app/controllers/tags_controller.rb
app/views/layouts/_base_header.html.erb
config/routes.rb
db/schema.rb
|
2014-04-18 16:03:52 +08:00 |
|
yanxd
|
045b55236f
|
作业提交临时解决方案
|
2014-04-08 14:53:11 +08:00 |
|
yanxd
|
d83ea7ecd8
|
fake Count count student project, lol.
|
2014-04-04 21:30:40 +08:00 |
|
xianbo
|
b1fc33a697
|
add by nyan
|
2014-04-04 16:59:50 +08:00 |
|
xianbo
|
2a72f7aac8
|
evils fix
|
2014-04-04 15:25:21 +08:00 |
|
wanglinchun
|
1e7e0a1bb5
|
修改加入竞赛和退出竞赛不能刷新的问题；新建项目后不能刷新的问题；竞赛列表和竞赛页面搜索问题
|
2014-04-03 22:15:19 +08:00 |
|
wanglinchun
|
120e84cfc7
|
新竞赛代码移植
|
2014-04-03 17:26:56 +08:00 |
|
xianbo
|
5d77381bb9
|
fix the user.trustie.net
|
2014-04-01 16:40:55 +08:00 |
|
xianbo
|
06b2c25f3d
|
fix
|
2014-03-31 19:26:07 +08:00 |
|
xianbo
|
5c63ea2378
|
add contest and fix url
|
2014-03-31 10:56:29 +08:00 |
|
yanxd
|
575fc48ff0
|
首页搜索分类
|
2014-03-25 16:53:11 +08:00 |
|
yanxd
|
21e55492fa
|
小改怡情 大改伤身 强改灰飞烟灭
|
2014-03-01 10:14:01 +08:00 |
|
yanxd
|
bc7471bcb7
|
course real server host.
|
2014-02-24 15:00:03 +08:00 |
|
yanxd
|
7deeab62bc
|
course.trustie.net
|
2014-02-24 10:40:45 +08:00 |
|
yanxd
|
cf2689917b
|
三天两头反复改 不如自挂东南枝
|
2014-02-22 09:47:59 +08:00 |
|
yanxd
|
5d77f2031e
|
主页去除影响性能的代码
|
2013-11-28 16:14:23 +08:00 |
 huangjingquan
|
b19ed67d79
|
新的课程
修改了一些bug
|
2013-09-29 19:46:59 +08:00 |