 yanxd
|
93d13c8867
|
system bin, 坑
|
12 years ago |
|
yanxd
|
70abac4c1e
|
Merge branch 'competition' into develop
Conflicts:
app/controllers/application_controller.rb
config/locales/en.yml
config/locales/zh.yml
db/schema.rb
|
12 years ago |
 wanglinchun
|
0255a61d2f
|
dfg
|
12 years ago |
|
yanxd
|
b33ee17343
|
Merge remote-tracking branch 'remotes/origin/develop' into szzh
Conflicts:
Gemfile
app/controllers/users_controller.rb
db/schema.rb
|
12 years ago |
xianbo
|
7d1327ad2a
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
 z9hang
|
bf12692de4
|
登录名==》账号/邮箱
老师在课程动态中看到学生真名
|
12 years ago |
|
wanglinchun
|
a1083fe900
|
修改了原有参赛作品显示报500；
修改了作品删除功能报错
|
12 years ago |
|
yanxd
|
654cb404e2
|
bootstrap test
|
12 years ago |
|
yanxd
|
12b1553a33
|
Merge branch 'develop' into szzh
|
12 years ago |
|
yanxd
|
7a4e5afba0
|
test
|
12 years ago |
|
t430
|
fd0a504d84
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
|
12 years ago |
|
yanxd
|
5364687160
|
bootstrap & tag bug
|
12 years ago |
|
xianbo
|
e52886cf46
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/softapplications/show.html.erb
db/schema.rb
|
12 years ago |
|
xianbo
|
cda9942723
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
yanxd
|
f44b930037
|
233
|
12 years ago |
|
wanglinchun
|
2f709c92ba
|
重构bid_helper，contest_helper以及application_helper中共同用到的方法
|
12 years ago |
|
yanxd
|
34aa8433de
|
import hubspot
|
12 years ago |
 fanqiang
|
10aa8eee81
|
显示帖子的发布者和时间
|
12 years ago |
|
xianbo
|
4b063a2c69
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
12 years ago |
|
fanqiang
|
973a59042c
|
修改帖子显示用户名与链接问题
|
12 years ago |
 nwb
|
4156983494
|
缺陷添加缩略图显示
|
12 years ago |
|
nwb
|
6f0e621f3c
|
添加项目成员界面，显示用户的account
|
12 years ago |
|
fanqiang
|
2c8580a4e8
|
Merge branch 'crawl' into develop
Conflicts:
app/controllers/tags_controller.rb
app/views/tags/_tag.html.erb
app/views/tags/_tag_search_results.html.erb
app/views/tags/index.html.erb
config/locales/zh.yml
config/routes.rb
db/schema.rb
|
12 years ago |
|
fanqiang
|
07b75924d8
|
修改tag搜索，使得tag搜索能够搜索开源项目
在帖子展示页面添加时间，并添加标签
|
12 years ago |
yanxd
|
f4595dfcd2
|
修改部分拍段project、course方式
projectlist 报错
|
12 years ago |
Wen
|
473a44d11a
|
学校-课程模式！
|
12 years ago |
|
wanglinchun
|
94a7bacdd2
|
首页：当无应用时，提示暂无应用
|
12 years ago |
|
wanglinchun
|
76ccfe8ac4
|
fix
|
12 years ago |
|
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
|
12 years ago |
|
wanglinchun
|
8f6d9fc6a5
|
0418
|
12 years ago |
|
wanglinchun
|
733497fef8
|
调整竞赛列表页面中部分统计数字的超链接
|
12 years ago |
|
wanglinchun
|
64895a75ed
|
显示上传截图+应用显示
|
12 years ago |
|
wanglinchun
|
b97cdd6b0d
|
修改参赛应用中应用和竞赛的关联前，目前部分代码由于数据表及关联没考虑清楚，导致无法关联，下一步修改代码，重新建表，完成关联功能及应用的正常显示
|
12 years ago |
|
yanxd
|
1b6cdeac05
|
列表上提交作业，大概好了吧
|
12 years ago |
|
yanxd
|
045b55236f
|
作业提交临时解决方案
|
12 years ago |
|
yanxd
|
7e130ee89e
|
去掉login_flag
|
12 years ago |
|
wanglinchun
|
120e84cfc7
|
新竞赛代码移植
|
12 years ago |
|
yanxd
|
a1a58ee26c
|
加注释
|
12 years ago |
|
yanxd
|
4f5216e632
|
merge
|
12 years ago |
|
yanxd
|
84c5032eb2
|
整理下，加个推荐tag
|
12 years ago |
|
xianbo
|
5c63ea2378
|
add contest and fix url
|
12 years ago |
|
xianbo
|
2bba27e7a1
|
evils uri
|
12 years ago |
|
xianbo
|
3d2516f53c
|
fix navigation
|
12 years ago |
|
yanxd
|
8c251da25d
|
Bug：新建作业时菜单栏第一个显示蓝色，应该是第二个显示蓝色
|
12 years ago |
|
xianbo
|
6e065361b3
|
fix main page navigation
|
12 years ago |
|
xianbo
|
34fd8a933a
|
fix the show of domain and project page
|
12 years ago |
|
xianbo
|
20cd5941a8
|
modify project main page
|
12 years ago |
|
yanxd
|
c905ded3b5
|
擦屁股
|
12 years ago |
|
yanxd
|
52fe99d71c
|
fixed 谭 domain bug in development environment.
|
12 years ago |
|
xianbo
|
3f55e78f49
|
add diff url in navigation
|
12 years ago |
