Commit Graph

1435 Commits (7a4e5afba0fdf28904f5cee20612c72f4f454d19)

Author SHA1 Message Date
nwb b94bd99311 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 268dc1acce 主页讨论吧动态前显示吧名
11 years ago
wanglinchun d686e105a5 调整关联作品框显示宽度
11 years ago
ganyiang 2048ce3c10 修复高校列表在firefox下显示不正常问题
11 years ago
wanglinchun 538f8516b0 目前已经通过判断将属于竞赛的项目或是应用显示到我要参赛的作品列表中
11 years ago
z9hang 3caedbdb85 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
yanxd cc2f359e8c 1. Three expressions syntax
11 years ago
wanglinchun f2dbbc48fc 发布作品和关联作品都可以用了,参赛应用也可以取出来了,接下来通过判断来去参赛项目和参赛应用
11 years ago
kg 57e5cda513 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
11 years ago
kg db2ab5b945 modify issue filter and base_footer
11 years ago
wanglinchun fb3c513da2 给“我要参赛”应用了base——newcontest的整体样式
11 years ago
ganyiang 786481e144 新建问题-主题-autocomplete-选中跳转
11 years ago
nwb faab40456a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang a5f7a19f48 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
wanglinchun 1471d78e63 修改应用列表页面中每个应用右边三行的行间距
11 years ago
yanxd 05baffe4f3 issue导航,首页贴吧动态html,加入了最后回复
11 years ago
wanglinchun bb3c7f2432 修改了应用列表页面所属竞赛的显示长度
11 years ago
Wen e8247b6edd Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
11 years ago
Wen d94e15cd94 用户打分
11 years ago
z9hang f8c61ac69b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
yanxd f8746d6812 access control:关闭课程in view
11 years ago
yanxd d257f4e853 随便关闭课程禁止//临时
11 years ago
wanglinchun 31dff76b3a 修改了首页竞赛中包含的app的字体的大小
11 years ago
z9hang 0af034eac6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
fanqiang 547a268af8 修改合并之后的一些小问题
11 years ago
huangjingquan dc4e928741 修改tag显示异常
11 years ago
wanglinchun 4188c046c7 Merge branch 'develop'
11 years ago
Wen 501b491363 =.=
11 years ago
wanglinchun c6576c71bf 增加了每个app打分的总人数
11 years ago
fanqiang d50b2a9cfe Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
11 years ago
fanqiang 2c8580a4e8 Merge branch 'crawl' into develop
11 years ago
wanglinchun 0634f36c10 "打分后不要显示英文,而且还要提示:您可以重新打分"问题解决
11 years ago
wanglinchun ac644beb72 添加竞赛首页中参与竞赛的app个数
11 years ago
wanglinchun 374b183c0f 修改应用列表显示问题
11 years ago
kg 881c91fafd Merge branch 'develop'
11 years ago
kg 776a9d1e35 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
11 years ago
Wen e6288627ad 中国高校页面,下拉框修改
11 years ago
Wen c893227609 个人资料页面学校选择框更改
11 years ago
wanglinchun 688438241e 调整应用列表页面中的bug
11 years ago
wanglinchun 35c424814e 竞赛模块首页应用添加更多链接到应用列表页面
11 years ago
Wen 90b53a7efb 打分的调整
11 years ago
wanglinchun 37304c1232 添加应用页面中的打分详情
11 years ago
wanglinchun 74256d5150 调整应用页面中的距离格式
11 years ago
Wen 040e4b2740 用户打分.
11 years ago
yanxd 0cfd5929d8 Revert "tag todo"
11 years ago
wanglinchun e48edac988 增加参赛应用页面的打分细节--初级版
11 years ago
wanglinchun 3da6d5cd37 应用页面列表排序(按时间排序已好,另一种排序暂未定)
11 years ago
wanglinchun 0eb81a24af 跳转
11 years ago
wanglinchun db2d2e9b24 删掉没用的分页代码
11 years ago
wanglinchun 0403666cea 增加应用列表页面的分页功能
11 years ago
wanglinchun 12ad20cf3b 修改应用列表页面的显示标题为:应用列表-Trustie——为大学生技术创新筑巢
11 years ago
wanglinchun b424e9148e Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
11 years ago
Wen 50745d5d21 course首页布局上的小调整
11 years ago
wanglinchun 6ab0eb4477 修改后发现错误
11 years ago
wanglinchun 7cc4a9f3a6 调整字数限制
11 years ago
wanglinchun c40bc242cd 调整了应用列表页面中的搜索显示格式;
11 years ago
t430 6b526ee438 fix
11 years ago
wanglinchun d073074737 修改应用列表页面格式
11 years ago
wanglinchun bdb1c3f74e 实现应用列表页面
11 years ago
xianbo 6f2b23ce37 Merge branch 'develop'
11 years ago
yan a191b634c5 forum memocount error, footer margin
11 years ago
Wen 10fdcbb050 一个简单的后台上传学校logo的页面.
11 years ago
fanqiang 6ba53f534a 添加回复帖子功能
11 years ago
Wen 03d58b962a 封装了一下取得logo的方法
11 years ago
kg e9bd8a8f3e revise project index,course,search
11 years ago
Wen a8e029da58 数据库迁移:更改了默认的学校logo
11 years ago
fanqiang 87c70909be 可以在开源社区添加帖子,并且添加了帖子的URL,即帖子来源
11 years ago
yanxd be6ae6ef34 d
11 years ago
fanqiang 07b75924d8 修改tag搜索,使得tag搜索能够搜索开源项目
11 years ago
wanglinchun 3a9c7a036f 修改竞赛列表中的奖励方式的显示
11 years ago
yanxd 939e4cc100 footer 下方距离
11 years ago
yanxd 08892d1cf7 s
11 years ago
wanglinchun c16933120d 修改竞赛子站首页显示
11 years ago
wanglinchun 9f75bf179a Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
11 years ago
yanxd 8f5958abc1 mao
11 years ago
yanxd 230b377cad oRevert "leanmodal"
11 years ago
yanxd 12c19e2bfe Revert "jquery 点击省份出学校"
11 years ago
yanxd 891fa65c16 jquery 点击省份出学校
11 years ago
yanxd edce128e6b leanmodal
11 years ago
wanglinchun 189b935d5b Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
11 years ago
wanglinchun ed71a3faa1 调整删除竞赛的显示样式及位置
11 years ago
Wen bac261047f logo
11 years ago
Wen d237a5b824 transparent_logo
11 years ago
Wen ba80593ab0 别忘了改数据库!= =
11 years ago
wanglinchun 1ca0113204 Merge branch 'competition' into develop
11 years ago
wanglinchun 9038f2758c 根据将旧的竞赛信息和参与竞赛的项目信息迁移到新的竞赛相关数据表后重新调整竞赛子站首页最新热门竞赛的显示
11 years ago
Wen 02295e5ca9 给严总调试用
11 years ago
Wen cc738edf2f 学校列表添加了搜索功能
11 years ago
wanglinchun 9baa07b9a3 调整参赛应用页面中两列的显示,主要是防止应用下载和开发人员字数太长显示的问题,使其可以自动换行
11 years ago
yanxd 08b27f38a7 tag todo
11 years ago
kg 14511c079a Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
11 years ago
kg 77ea0092b7 add course homepage activity
11 years ago
yanxd cee205a568 issues#377 074e8adf 引入的issue页面权限问题,除了控制器还修改过views判断语句 keyworks: @edit_allowed
11 years ago
yanxd 2052d36abe issue:socialForge#381
11 years ago
kg daa19de51d Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
11 years ago
kg 709629bcdf add course activity
11 years ago
kg 271427d29e homepage status
11 years ago
Wen 6a2626c90e Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
11 years ago
Wen cf762e6aa3 bug fix~
11 years ago
Wen 08e40c4a4e bug fix
11 years ago
Wen 473a44d11a 学校-课程模式!
11 years ago
wanglinchun 9af6c03547 Merge branch 'competition' into develop
11 years ago
wanglinchun 6b5452f3e2 增加修改应用时提示语
11 years ago
yanxd e2a5e2f730 footer
11 years ago
Wen 735f920e9d 注册页面学校显示方式修改为文本框
11 years ago
wanglinchun a90804b312 修改上传应用软件包和截图的说明文字
11 years ago
wanglinchun 5d752f785f 竞赛页面中应用列表题目增加:点击后弹出新页面
11 years ago
Wen f8c6d7d77e 注册时学校选择的小调整
11 years ago
Wen 7be7fd3d9b 学校选择形式改为弹窗
11 years ago
wanglinchun b318166c15 给参与竞赛的应用页面增加导航条
11 years ago
wanglinchun 0bdb3eb118 应用页面添加所属竞赛及相应链接
11 years ago
wanglinchun 05c0d2a5ac 替换竞赛模块首页中竞赛和应用的图标并调整相应的格式
11 years ago
Wen 3dbe7c5896 课程的学校ID自动设置为开课教师的学校ID
11 years ago
Wen 00e62ec8f7 用户评分理论上完成版.
11 years ago
wanglinchun bc068eb12b 添加参赛应用的删除和修改功能以及添加相应的删除和修改权限
11 years ago
fanqiang 91d5959016 添加了对管理员申请的接受与拒绝
11 years ago
Wen ded3da6670 用户评分理论上完成了
11 years ago
wanglinchun cc5b55ec9c 调整应用页面中简介显示上下边距以及简介限定字数显示格式
11 years ago
fanqiang 28b10ed3fd 修改了搜索功能,并能对搜索进行过滤
11 years ago
Wen 3ba524668f 用户评分未完成版本= =
11 years ago
wanglinchun 7758e9bbf1 df
11 years ago
wanglinchun 66c4d870a4 评分样式
11 years ago
wanglinchun 8a429ec669 首页提示语
11 years ago
wanglinchun 94a7bacdd2 首页:当无应用时,提示暂无应用
11 years ago
alan 87fdecdabd 创新竞赛添加删除功能
11 years ago
yanxd b4209b7cc5 jrating
11 years ago
alan 9a580655ab 在project的项目动态的最后一页显示项目创建信息
11 years ago
xianbo 0d055fd807 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
11 years ago
fanqiang 8600265f00 修改查询条件样式
11 years ago
xianbo bb4d141b0e erge branch 'competition' into develop
11 years ago
yanxd 9034dd09e7 开启重启课程在课程列表里
11 years ago
wanglinchun edb5dac785 添加竞赛列表页面中的超链接
11 years ago
wanglinchun 43064c4bc2 调整竞赛模块首页中显示的竞赛:既有旧的竞赛又有新的竞赛
11 years ago
yanxd a4ab29f49d footer logo modify
11 years ago
fanqiang a611ed4848 修改了按标签搜索,并改了一些样式
11 years ago
wanglinchun 3d02cb7ce0 修改首页显示部分数据
11 years ago
xianbo 2c7615b545 fix robots rule
11 years ago
yanxd 369c015097 board show
11 years ago
kg 158c950b78 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
11 years ago
kg bdefa322cc modify foot
11 years ago
wanglinchun 25bbf791f9 dsfsd
11 years ago
wanglinchun 651710929a 修改弹出新页面
11 years ago
wanglinchun 76ccfe8ac4 fix
11 years ago
wanglinchun 9ac0cbe6a3 Merge branch 'competition' into develop
11 years ago
Wen 775774ad63 临时措施:即使用户没有填写单位,页面也可以正常打开,而不是报错
11 years ago
wanglinchun 8f6d9fc6a5 0418
11 years ago
wanglinchun e136254c8d 回复了项目页面中的头像
11 years ago
Wen 4e567afd0a Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
11 years ago
yanxd 5ee1c8e2f2 refactory zip
11 years ago
Wen 5699a947ec 建立了学校与用户的关联
11 years ago
alan 7c8ecd1944 项目中添加动态后依然能显示项目创建的动态
11 years ago
alan 9206a30bd4 将提交和返回按钮放到文件上传的框内
11 years ago
kg 4d727d8049 revert the mistaken move:base_courses and base_project footer
11 years ago
kg d450da9df8 footer , footer of base_course,upload files count and delete all upload
11 years ago
kg c9b92b4197 modify status color
11 years ago
kg 3013930f28 modify footer
11 years ago
kg 3f096f9167 add pdl logo
11 years ago
kg 69dbd5a85e add logos and modify footer;footer position problem of some projects and courses
11 years ago
kg 2cec3b0490 modify footer
11 years ago
wanglinchun 7adb1f8a60 添加侧面短线
11 years ago
wanglinchun 28ffd44e55 调整竞赛页面加入竞赛,关注以及配置竞赛的显示样式
11 years ago
wanglinchun 1a6a20e761 竞赛模块首页布局和显示效果调整好
11 years ago
wanglinchun 3a5b5bc0ce 设计并调整竞赛模块的首页显示样式
11 years ago
yanxd 61c285ff10 page access controll with homework.zip
11 years ago
yanxd cabceb0064 test zip down
11 years ago
yanxd 84d3e40c41 zip down controller created
11 years ago
Wen d43bf49f4c Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
11 years ago
Wen 56eefe42eb 项目作业处迟交标记添加
11 years ago
yanxd 6f5fcd0dee 测试作业下载
11 years ago
Wen 9fd7f11a47 附件形式提交的作业处,迟交标记添加
11 years ago
wanglinchun 945ca3787a 调整个人主页中top-menu跳转菜单:增加跳转到竞赛模块首页
11 years ago
wanglinchun 6421f02ac8 调整了参赛应用列表布局显示样式
11 years ago
Wen 5e03e71bbe 用户注册页面,学校选择加个星号= =
11 years ago
Wen c34f2da385 课程注册与用户注册页面的学校选择全部搞定!
11 years ago
Wen 37bb5341e4 省份与学校的级联完成!
11 years ago
wanglinchun 484d334c3c 添加竞赛模块中参赛项目的分页功能
11 years ago
Wen 44560a679f 工作单位更改为下拉框选择
11 years ago
wanglinchun c964cf9d9d 调整了发布应用页面星星的颜色
11 years ago
yanxd 31ce41a2d7 testcontroller
11 years ago
wanglinchun b4b61a3422 修改小bug;设计打分和评论唯一性前提交版
11 years ago
yanxd 41f315aac0 压缩文件
11 years ago
wanglinchun f2ed529b92 df
11 years ago
wanglinchun 733497fef8 调整竞赛列表页面中部分统计数字的超链接
11 years ago
wanglinchun 589a21204c 应用下载功能实现
11 years ago
xianbo 7ae55c1ec8 fix
11 years ago
xianbo 762386b56d 修改版本库的提示
11 years ago
yanxd 4f5eff09c8 发帖内容验证不通过不会丢失信息了,加上了所有验证
11 years ago
wanglinchun 98b6493b91 给应用添加开发人员字段及显示
11 years ago
yanxd 00ded2bc38 作业列表格式化输出,memo发帖人的名字清除浮动,防止换行
11 years ago
yanxd 634dd15be3 project html
11 years ago
wanglinchun f9e5dd47f6 修改了竞赛列表的排序问题
11 years ago
wanglinchun 4ccc4548a1 xiug
11 years ago
wanglinchun 64895a75ed 显示上传截图+应用显示
11 years ago
yanxd 28a5eff048 topics未登录footer飞出去的问题,擦屁股+10086,dom结构还有错,找不到崩溃
11 years ago
wanglinchun a4df4cf893 修改竞赛和参与竞赛的新建应用之间的关联关系
11 years ago
yanxd 3e1a674ed9 fix 3
11 years ago
nieguanghui 6baa87a8ea 修复项目列表分数显示不一致的问题,修改用户列表显示不一致的问题,修改作业中项目显示分数和项目内部分数不一致的问题
11 years ago
wanglinchun b97cdd6b0d 修改参赛应用中应用和竞赛的关联前,目前部分代码由于数据表及关联没考虑清楚,导致无法关联,下一步修改代码,重新建表,完成关联功能及应用的正常显示
11 years ago
xianbo 1c69e80745 keep same between take project and watch project
11 years ago
yanxd bfa6f800d9 提交作业 确认在本人属于项目成员的时候才可以
11 years ago
yanxd c21cb264a9 评论显示格式
11 years ago
xianbo f823a81a37 date time error in news `
11 years ago
kg b1705ddf7d Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
11 years ago
kg 9ab5db8ee3 remove tags
11 years ago
yanxd ac4e74af91 作业layout显示提交作业的类型
11 years ago
wanglinchun be61b9d1ac 调整了具体应用页面评价应用的功能
11 years ago
yanxd d3f886d992 不能新建项目 在项目列表
11 years ago
xianbo 20bf1dadc0 fix
11 years ago
xianbo b2896c1645 fix
11 years ago
yanxd 383d62a353 修改错误处理文字显示
11 years ago
wanglinchun dfad0448e1 单个应用显示页面
11 years ago
yanxd 1b6cdeac05 列表上提交作业,大概好了吧
11 years ago
wanglinchun 92078e6ac8 调整首页布局
11 years ago
nieguanghui bad170fdb2 应用上传附件功能
11 years ago
fanqiang a426cf46de 添加浏览次数
11 years ago
yanxd 3fad5abb5c modal init
11 years ago
yanxd 045b55236f 作业提交临时解决方案
11 years ago
nieguanghui cf0604bd84 os project style change
11 years ago
fanqiang 6fdb037b6b 开源项目基本框架完成
11 years ago
fanqiang d381423c0e 添加了版主功能
11 years ago
fanqiang 89b668be82 添加申请版主功能,目前已经可以写入数据库
11 years ago
yanxd 743fee80e3 网站状态css
11 years ago
yanxd d83ea7ecd8 fake Count count student project, lol.
11 years ago
wanglinchun a9e9171441 通过脚手架新建了一套应用的东西,包括数据库的相应表,新建了发布应用的页面,上传图片功能未实现,界面格式还需调整
11 years ago
yanxd 24dd71e6b3 关注项目
11 years ago
yanxd 64e68ff8a0 关注项目无法显示的问题
11 years ago
xianbo 45c6c0b9f3 fix
11 years ago
xianbo b1fc33a697 add by nyan
11 years ago
xianbo 2a72f7aac8 evils fix
11 years ago
wanglinchun c86af5f483 与show_application相关的所有内容改为show_softapplication,以防和系统中的application冲突
11 years ago
wanglinchun 8fb185681a 修改应用列表页面说法
11 years ago
yanxd 976ecc8c89 open_source projects top box
11 years ago
wanglinchun 2a278e0a2d all
11 years ago
wanglinchun 1e7e0a1bb5 修改加入竞赛和退出竞赛不能刷新的问题;新建项目后不能刷新的问题;竞赛列表和竞赛页面搜索问题
11 years ago
fanqiang 9af808821d 修改框架,添加"没有帮助"和"申请成为版主"功能
11 years ago
wanglinchun 120e84cfc7 新竞赛代码移植
11 years ago
yanxd a272be1686 注册页面的姓氏添加回去
11 years ago
fanqiang e8de48dd24 修改osp的show界面,建立框架
11 years ago
Wen 992d2be6e4 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
11 years ago
xianbo 104eaf8c00 fix student can create course in teacher maiun course page
11 years ago
Wen 4448fdfaca Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
11 years ago
xianbo 6888e2bf01 fix
11 years ago
xianbo 90dcf36257 left italic in email
11 years ago
xianbo 02925fbb99 fix
11 years ago
yanxd 5ed40da76f course页面,xx份资料上加链接
11 years ago
xianbo b43a899a18 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
11 years ago
xianbo 5d77381bb9 fix the user.trustie.net
11 years ago
fanqiang cfa5532598 建立了open source project部分的框架,并且建立了相应的帖子
11 years ago
yanxd 4f5216e632 merge
11 years ago
yanxd 930bc4083e forge 软件
11 years ago