 yanxd
|
2b57e170ef
|
want that image popup in html when user click on thumbnail.
|
11 years ago |
 nwb
|
31e338f1e5
|
修正http://127.0.0.1:3000/?course.trustie.net链接跳转问题
|
11 years ago |
 sw
|
ed9b97f987
|
增加访问作业显示列表的权限
|
11 years ago |
|
nwb
|
0736dd1254
|
课程讨论区回复权限和界面BUG修正
|
11 years ago |
|
nwb
|
099e8a0912
|
Merge branch 'szzh' into CourseModify
Conflicts:
app/controllers/application_controller.rb
app/views/attachments/upload.js.erb
app/views/courses/_homework_form.html.erb
app/views/layouts/base_courses.html.erb
app/views/users/_my_joinedcourse.html.erb
db/schema.rb
lib/redmine.rb
lib/redmine/access_control.rb
|
11 years ago |
|
nwb
|
2a4486bf0d
|
修改迁移文件
|
11 years ago |
|
yanxd
|
93d13c8867
|
system bin, 坑
|
11 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
|
11 years ago |
 wanglinchun
|
0255a61d2f
|
dfg
|
11 years ago |
|
nwb
|
4404222437
|
0604
|
11 years ago |
|
nwb
|
7d3d406c00
|
新增部分课程所需的解析函数
|
11 years ago |
|
yanxd
|
b33ee17343
|
Merge remote-tracking branch 'remotes/origin/develop' into szzh
Conflicts:
Gemfile
app/controllers/users_controller.rb
db/schema.rb
|
11 years ago |
xianbo
|
7d1327ad2a
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
nwb
|
f936c30ec9
|
添加与course.index相关的control、view、help等实现
|
11 years ago |
 z9hang
|
bf12692de4
|
登录名==》账号/邮箱
老师在课程动态中看到学生真名
|
11 years ago |
|
wanglinchun
|
a1083fe900
|
修改了原有参赛作品显示报500；
修改了作品删除功能报错
|
11 years ago |
|
yanxd
|
654cb404e2
|
bootstrap test
|
11 years ago |
|
yanxd
|
12b1553a33
|
Merge branch 'develop' into szzh
|
11 years ago |
|
yanxd
|
7a4e5afba0
|
test
|
11 years ago |
|
t430
|
fd0a504d84
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
|
11 years ago |
|
yanxd
|
5364687160
|
bootstrap & tag bug
|
11 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
|
11 years ago |
|
xianbo
|
cda9942723
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
yanxd
|
f44b930037
|
233
|
11 years ago |
|
wanglinchun
|
2f709c92ba
|
重构bid_helper，contest_helper以及application_helper中共同用到的方法
|
11 years ago |
|
yanxd
|
34aa8433de
|
import hubspot
|
11 years ago |
 fanqiang
|
10aa8eee81
|
显示帖子的发布者和时间
|
11 years ago |
|
xianbo
|
4b063a2c69
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
11 years ago |
|
fanqiang
|
973a59042c
|
修改帖子显示用户名与链接问题
|
11 years ago |
|
nwb
|
4156983494
|
缺陷添加缩略图显示
|
11 years ago |
|
nwb
|
6f0e621f3c
|
添加项目成员界面，显示用户的account
|
11 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
|
11 years ago |
|
fanqiang
|
07b75924d8
|
修改tag搜索，使得tag搜索能够搜索开源项目
在帖子展示页面添加时间，并添加标签
|
11 years ago |
yanxd
|
f4595dfcd2
|
修改部分拍段project、course方式
projectlist 报错
|
11 years ago |
Wen
|
473a44d11a
|
学校-课程模式！
|
11 years ago |
|
wanglinchun
|
94a7bacdd2
|
首页：当无应用时，提示暂无应用
|
11 years ago |
|
wanglinchun
|
76ccfe8ac4
|
fix
|
11 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
|
11 years ago |
|
wanglinchun
|
8f6d9fc6a5
|
0418
|
11 years ago |
|
wanglinchun
|
733497fef8
|
调整竞赛列表页面中部分统计数字的超链接
|
11 years ago |
|
wanglinchun
|
64895a75ed
|
显示上传截图+应用显示
|
11 years ago |
|
wanglinchun
|
b97cdd6b0d
|
修改参赛应用中应用和竞赛的关联前，目前部分代码由于数据表及关联没考虑清楚，导致无法关联，下一步修改代码，重新建表，完成关联功能及应用的正常显示
|
11 years ago |
|
yanxd
|
1b6cdeac05
|
列表上提交作业，大概好了吧
|
11 years ago |
|
yanxd
|
045b55236f
|
作业提交临时解决方案
|
11 years ago |
|
yanxd
|
7e130ee89e
|
去掉login_flag
|
11 years ago |
|
wanglinchun
|
120e84cfc7
|
新竞赛代码移植
|
11 years ago |
|
yanxd
|
a1a58ee26c
|
加注释
|
11 years ago |
|
yanxd
|
4f5216e632
|
merge
|
11 years ago |
|
yanxd
|
84c5032eb2
|
整理下，加个推荐tag
|
11 years ago |
|
xianbo
|
5c63ea2378
|
add contest and fix url
|
11 years ago |
|
xianbo
|
2bba27e7a1
|
evils uri
|
11 years ago |
|
xianbo
|
3d2516f53c
|
fix navigation
|
11 years ago |
|
yanxd
|
8c251da25d
|
Bug：新建作业时菜单栏第一个显示蓝色，应该是第二个显示蓝色
|
11 years ago |
|
xianbo
|
6e065361b3
|
fix main page navigation
|
11 years ago |
|
xianbo
|
34fd8a933a
|
fix the show of domain and project page
|
11 years ago |
|
xianbo
|
20cd5941a8
|
modify project main page
|
11 years ago |
|
yanxd
|
c905ded3b5
|
擦屁股
|
11 years ago |
|
yanxd
|
52fe99d71c
|
fixed 谭 domain bug in development environment.
|
11 years ago |
|
xianbo
|
3f55e78f49
|
add diff url in navigation
|
11 years ago |
|
yanxd
|
daed8a1164
|
暂且提交，增加活动失败。
|
11 years ago |
|
yanxd
|
7deeab62bc
|
course.trustie.net
|
11 years ago |
|
yanxd
|
ecec98aac9
|
菜单栏调整
|
12 years ago |
|
wanglinchun
|
42a1a9e0b9
|
重复提交问题
|
12 years ago |
 nieguanghui
|
2db1067158
|
1、 网站中的搜索几乎都没有搜索后的提示语，这里应该加提示语，提示重新搜索。
2、 竞赛—关注 参与项目 用户反馈 这行应该去掉。
4. 去掉竞赛参与项目页面中”参与了竞赛”的 a 标签。
5．竞赛侧边栏显示方式的统一。
6. 解决竞赛侧边栏关注部分不显示头像的bug.修复侧边栏参与者部分没有参与者也不会显示提示的bug。
7. 增加竞赛中关注一栏的”more”链接。
7. 重构竞赛layouts代码。
|
12 years ago |
|
yanxd
|
cefddb635a
|
e
|
12 years ago |
|
yanxd
|
4eeb7c3ea8
|
look at daily log.
|
12 years ago |
|
yanxd
|
dd1f972edd
|
Revert "move courses mixed To projecthelper From applicantionHelper"
This reverts commit 42332201f2.
|
12 years ago |
|
yanxd
|
42332201f2
|
move courses mixed To projecthelper From applicantionHelper
|
12 years ago |
 baiyu
|
e5baf0959b
|
1、竞赛里的参与者名字显示全称
2、个人主页里的“关注”与“粉丝”列表名字显示全称
3、区别了“关注”里个人参与的项目与课程
4、竞赛里的参与者的项目与课程数量的显示做出了区分
5、竞赛的参与者列表增加了学员学号
|
12 years ago |
|
baiyu
|
2f8ef03d32
|
1、增加了参与竞赛的用户列表
2、区分了个人主页里“粉丝”列表里的项目与课程的计数与显示
3、竞赛发布人的名字改为了全称
|
12 years ago |
|
yanxd
|
3b52936d17
|
roadmap -> milestone
|
12 years ago |
|
yanxd
|
56cbca3ce8
|
fix little words
|
12 years ago |
|
xianbo
|
1cfba644f5
|
fix show of someone who watch and fxi the show of homework exdit
|
12 years ago |
|
xianbo
|
3253f1cf28
|
modify show of some style
|
12 years ago |
|
xianbo
|
5032eaabcb
|
fix the show out of the frame and the location of show
|
12 years ago |
|
xianbo
|
607eb2c2ff
|
modify shoew of project
|
12 years ago |
|
nieguanghui
|
2b10258ae1
|
修改课程列表显示样式
|
12 years ago |
 huangjingquan
|
c93ca4d2ed
|
添加了作业截止时间提醒功能！
|
12 years ago |
|
xianbo
|
003b4704cc
|
fix link to
|
12 years ago |
|
xianbo
|
ca0f63a817
|
del the link of .head portrait
|
12 years ago |
|
yanxd
|
2286fbeff5
|
members split (teacher,student) in course
|
12 years ago |
|
yanxd
|
b617f3d42f
|
fix my welcome#index bug
|
12 years ago |
|
yanxd
|
dd0c087209
|
rest tan backurl
|
12 years ago |
|
xianbo
|
1f419c936d
|
del the back_url to let the different identity change has a correct url
|
12 years ago |
|
xianbo
|
2589d429b0
|
add the project what one watch
|
12 years ago |
|
yanxd
|
e2447b4c88
|
truncate textilizable
|
12 years ago |
|
yanxd
|
332bc0765d
|
240 characters or less limited in activity info. ===> projects#show
|
12 years ago |
|
yanxd
|
ec63fc41bb
|
add link in project/course list page, joinBUtton renamed.
|
12 years ago |
|
baiyu
|
8335c111c7
|
1、修改了“加入课程”位置
2、修改了我的账号里的格式
|
12 years ago |
|
fanqiang
|
9fbccfbb6d
|
改了一些问题
创建课程问题
添加了需求的FORK功能
|
12 years ago |
|
xianbo
|
8ff8d0f4d4
|
modify some little bug && merge handle
|
12 years ago |
 huangjingquan
|
e4cbc7533e
|
tabs显示
|
12 years ago |
|
huangjingquan
|
261c3fc337
|
new version
|
12 years ago |
|
nieguanghui
|
a126083579
|
用户主页头像显示改进
|
12 years ago |
|
nieguanghui
|
647781effa
|
增加粉丝和关注处更多的链接
|
12 years ago |
|
nieguanghui
|
f91cfcdec2
|
再提交一次
|
12 years ago |
|
nieguanghui
|
1dd86b9116
|
修正了UTF-8问题；修正了上传头像显示问题
|
12 years ago |
|
fanqiang
|
75aca1bad4
|
123
|
12 years ago |
 kaizheng
|
8309be475a
|
微小修改国际化
|
12 years ago |
|
fanqiang
|
0c89ef0360
|
修改注册BUG
|
12 years ago |
