 txz
|
dcb150559e
|
angularjs路径修改
|
2016-04-22 16:37:01 +08:00 |
 yuanke
|
016177a078
|
Merge branch 'yuanke' into develop
|
2016-04-22 14:14:15 +08:00 |
|
yuanke
|
f6a5ffc6a5
|
测试代码的时候点击一下然后按钮消失等结果返回才出现
|
2016-04-22 14:13:24 +08:00 |
 huang
|
cccc2a7eb7
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-21 16:21:49 +08:00 |
|
huang
|
ab8c1a0bad
|
Merge branch 'hjq_beidou' into develop
|
2016-04-21 16:21:39 +08:00 |
|
txz
|
2345eb9d64
|
路径修改
|
2016-04-21 11:22:52 +08:00 |
|
txz
|
0bab42256c
|
微信loading弹框改
|
2016-04-21 11:21:29 +08:00 |
|
txz
|
39c64c9198
|
解决冲突
|
2016-04-21 10:41:54 +08:00 |
|
txz
|
8e254ff722
|
微信loading弹框
|
2016-04-21 10:38:36 +08:00 |
|
txz
|
6e6a29cfa6
|
api路径更改
|
2016-04-20 17:04:59 +08:00 |
|
txz
|
0b82bf50c2
|
微信内容中图片正常显示
|
2016-04-20 15:45:33 +08:00 |
|
txz
|
282e1b41e1
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-20 10:08:16 +08:00 |
|
txz
|
6957c24da5
|
微信最新动态页面调整
|
2016-04-20 10:08:03 +08:00 |
|
yuanke
|
dc3837da76
|
Merge branch 'cxt_course' into yuanke
Conflicts:
db/schema.rb
|
2016-04-20 09:59:37 +08:00 |
|
yuanke
|
bc59ce0b60
|
Merge branch 'yuanke' into develop
Conflicts:
db/schema.rb
|
2016-04-20 09:55:29 +08:00 |
|
yuanke
|
0f5fe51f97
|
1.管理员界面代码测试列表的修改
2.代码查重按钮位置
3.查重结果样式
|
2016-04-20 09:51:51 +08:00 |
|
txz
|
d0331da0c2
|
微信最新动态样式调整
|
2016-04-19 16:26:05 +08:00 |
|
huang
|
4e4cb309a9
|
版本库目录最新动态
|
2016-04-19 15:03:47 +08:00 |
|
huang
|
adc17c5038
|
代码优化
文件目录动态获取接口
文件目录显示样式
|
2016-04-19 09:34:55 +08:00 |
|
txz
|
73b89cdde5
|
微信边框，回复点赞样式更改
|
2016-04-18 11:19:13 +08:00 |
 cxt
|
51478bd232
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-15 17:21:07 +08:00 |
|
cxt
|
b07c3947d6
|
Merge branch 'cxt_course' into develop
|
2016-04-15 17:20:55 +08:00 |
|
cxt
|
8611fbbdec
|
新建课程界面中关于学时的输入提示不合理，提示为只能输入数字，但是输入负数或小数时不能执行提交操作，应该修改为只能输入正整数。
|
2016-04-15 17:10:44 +08:00 |
|
yuanke
|
3dbedcdcbf
|
Merge branch 'yuanke' into develop
Conflicts:
db/schema.rb
|
2016-04-15 17:08:51 +08:00 |
|
yuanke
|
764dffd95e
|
动态里面加上代码查重
|
2016-04-15 17:07:38 +08:00 |
|
huang
|
16bba76f61
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-15 16:52:15 +08:00 |
|
huang
|
6027b6d0f5
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
|
2016-04-15 16:51:37 +08:00 |
|
huang
|
4a8d572cb1
|
项目动态中版本库统计样式
|
2016-04-15 15:38:08 +08:00 |
|
yuanke
|
f1090d45ad
|
Merge branch 'cxt_course' into yuanke
Conflicts:
db/schema.rb
|
2016-04-15 14:13:44 +08:00 |
|
cxt
|
36e8b05f9c
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-15 11:32:38 +08:00 |
|
cxt
|
bca0a4bf39
|
Merge branch 'cxt_course' into develop
|
2016-04-15 11:32:24 +08:00 |
|
yuanke
|
e58f1ab94b
|
Merge branch 'yuanke' into develop
|
2016-04-15 11:29:40 +08:00 |
|
yuanke
|
998106b37b
|
修改代码查重的一些弹框显示效果等问题
|
2016-04-15 11:28:20 +08:00 |
|
Tim
|
f479277a96
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-04-14 14:38:34 +08:00 |
|
cxt
|
d948536a10
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-14 12:33:15 +08:00 |
|
cxt
|
e5b07c6c12
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
|
2016-04-14 12:33:11 +08:00 |
|
yuanke
|
ef4b256313
|
Merge branch 'yuanke' into develop
Conflicts:
app/models/homework_common.rb
config/locales/zh.yml
db/schema.rb
|
2016-04-14 11:32:35 +08:00 |
|
cxt
|
5e1284605f
|
Merge branch 'hjq_beidou' into cxt_course
Conflicts:
app/views/layouts/new_base_user.html.erb
|
2016-04-14 11:29:26 +08:00 |
|
yuanke
|
a8dce5e520
|
代码查重功能增加,管理员界面增加代码测试列表.
|
2016-04-14 11:29:22 +08:00 |
|
txz
|
13576ca477
|
app.js
|
2016-04-14 09:43:43 +08:00 |
|
huang
|
adf6cca435
|
完成代码行数的提交和统计
|
2016-04-13 20:39:20 +08:00 |
|
cxt
|
2befcd6634
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
|
2016-04-13 16:52:52 +08:00 |
|
cxt
|
f5122d7ef0
|
微信url切换到正式版
|
2016-04-13 14:52:18 +08:00 |
|
Tim
|
deda05b048
|
作业下拉选择
|
2016-04-13 14:23:24 +08:00 |
|
cxt
|
fcd1684658
|
作业列表按更新时间排序 作业列表左上角添加作业的下拉列表
|
2016-04-13 11:20:38 +08:00 |
|
cxt
|
a6f4b7f505
|
测试版
|
2016-04-12 16:23:52 +08:00 |
|
huang
|
04849659de
|
版本库统计
|
2016-04-12 16:00:54 +08:00 |
|
cxt
|
e420be8ee9
|
Merge branch 'weixin_guange' into develop
Conflicts:
app/models/blog_comment.rb
|
2016-04-12 15:56:08 +08:00 |
|
txz
|
38c182d76a
|
作业发布者真名为空时，显示昵称
|
2016-04-12 15:51:18 +08:00 |
|
cxt
|
1882cd8f4f
|
用户姓名不显示
|
2016-04-12 15:42:59 +08:00 |