feng longyu
|
109231fe3b
|
课程表
|
2017-01-03 17:00:21 +00:00 |
|
stormand
|
4f81cefb40
|
Merge branch 'dev' into master
|
2016-12-10 03:11:31 -06:00 |
|
feng longyu
|
c1da723e3e
|
选课冲突
|
2016-12-10 08:17:57 +00:00 |
|
stormand
|
b2de705b5d
|
t
|
2016-12-07 22:07:49 +08:00 |
|
stormand
|
9158204087
|
t
|
2016-12-07 22:07:14 +08:00 |
|
stormand
|
a1e5cf7a63
|
merge
|
2016-12-07 22:06:14 +08:00 |
|
feng longyu
|
603106a908
|
冯龙宇
|
2016-12-07 13:06:14 +00:00 |
|
feng longyu
|
f7eae2aa2e
|
冯龙宇功能
|
2016-12-01 18:42:23 +00:00 |
|
stormand
|
b2e2f36304
|
de some bug
|
2016-11-23 21:00:59 +08:00 |
|
stormand
|
f7852f3783
|
rm addopento..
|
2016-11-23 20:43:42 +08:00 |
|
stormand
|
4a9bf630d5
|
merge stormand
|
2016-11-23 20:38:11 +08:00 |
|
stormand
|
456395ef10
|
Merge branch 'stormand' into dev
# Conflicts:
# .idea/workspace.xml
|
2016-11-23 20:37:45 +08:00 |
|
stormand
|
91ee579a26
|
修改首页轮播逻辑，完成课程详情页界面
|
2016-11-23 20:34:24 +08:00 |
|
stormand
|
b3f3fff60e
|
Merge branch 'dev' of github.com:stormand/CourseSelect into dev
|
2016-11-20 01:54:21 +08:00 |
|
stormand
|
d3321d1e7c
|
merge stormand
|
2016-11-20 01:53:51 +08:00 |
|
stormand
|
877e90c0de
|
merge stormand
|
2016-11-20 01:43:36 +08:00 |
|
stormand
|
f144a18a85
|
Merge branch 'stormand' into dev
# Conflicts:
# .idea/workspace.xml
# app/controllers/courses_controller.rb
|
2016-11-20 01:42:46 +08:00 |
|
stormand
|
48ae155543
|
something not matter
|
2016-11-20 01:39:16 +08:00 |
|
stormand
|
885098af63
|
some little thing not matter
|
2016-11-20 01:37:12 +08:00 |
|
stormand
|
5fb13b16c4
|
增加搜索后保留搜索项，添加刷新搜索按钮
|
2016-11-20 01:32:19 +08:00 |
|
stormand
|
a3b3fe6325
|
change the default photo
|
2016-11-16 21:31:07 +08:00 |
|
stormand
|
a0390d5ed8
|
merge change of stormand,search function
|
2016-11-16 20:39:29 +08:00 |
|
stormand
|
90daeccc5a
|
desomelittlebug
|
2016-11-16 20:32:57 +08:00 |
|
stormand
|
a2124e046e
|
desomebug
|
2016-11-16 20:25:31 +08:00 |
|
stormand
|
8b3ecdc489
|
添加搜索
|
2016-11-16 20:17:26 +08:00 |
|
stormand
|
81b14e19a5
|
轮播项目为人数前三，没有图片时使用默认
|
2016-11-16 15:25:25 +08:00 |
|
stormand
|
2c620573dd
|
merge stormand
|
2016-11-13 19:12:16 +08:00 |
|
stormand
|
5b1d6ae0f8
|
Merge pull request #1 from flyingwaters/master
test
|
2016-11-13 02:06:35 -06:00 |
|
feng longyu
|
36171eccfb
|
test
|
2016-11-13 08:04:44 +00:00 |
|
feng longyu
|
80b37055e7
|
test
|
2016-11-13 08:02:40 +00:00 |
|
stormand
|
10ca847620
|
添加图片 版本。首页轮播图片用剪裁的大小
|
2016-11-09 18:22:18 +08:00 |
|
stormand
|
26a0bc14eb
|
为每个课程添加 图片 ，并且可上传
|
2016-11-09 01:08:07 +08:00 |
|
stormand
|
29542eb706
|
introduction
|
2016-11-02 14:55:43 +08:00 |
|
stormand
|
6626edb3cb
|
introduction
|
2016-11-02 14:54:21 +08:00 |
|
stormand
|
a414930195
|
增加课程介绍，首页轮播的外观搭建
|
2016-11-02 14:11:40 +08:00 |
|
stormand
|
bd40e23e1b
|
首页轮播
|
2016-11-02 00:58:21 +08:00 |
|
stormand
|
c9d1cd6764
|
使课程名称可以点击，进入课程详细信息界面。具体界面待开发
|
2016-11-01 22:21:35 +08:00 |
|
stormand
|
cf0d5d0da6
|
update readme ,complete heroku
|
2016-10-31 22:54:47 +08:00 |
|
stormand
|
f52fec6a02
|
test
|
2016-10-31 22:29:03 +08:00 |
|
彭兆卿
|
433e295185
|
Update README.md
|
2016-09-28 00:35:19 +08:00 |
|
彭兆卿
|
5549289d30
|
Merge pull request #3 from lioncruise/master
修正删除课程的一个bug ,以下两个写法一样，可能当时写错了
@course=Course.find_by_id(params[:id])
@course=Course.find_by(id: params[:id])
|
2016-09-23 15:10:59 +08:00 |
 Shijun Qin
|
9209d8b94e
|
修正删除课程的一个bug
|
2016-09-23 14:57:25 +08:00 |
|
彭兆卿
|
81aee48cd1
|
Update README.md
|
2016-09-21 20:13:07 +08:00 |
|
彭兆卿
|
6632a7cdd0
|
Update README.md
|
2016-09-18 12:51:01 +08:00 |
|
peng
|
1bac56068a
|
rename pgsql
|
2016-09-11 01:05:07 +08:00 |
|
peng
|
498a51597d
|
remove postgres
|
2016-09-11 00:59:56 +08:00 |
|
peng
|
c7aecf3e24
|
rename postgres
|
2016-09-11 00:50:09 +08:00 |
|
彭兆卿
|
f767caf1bb
|
Update README.md
|
2016-09-11 00:20:08 +08:00 |
|
彭兆卿
|
c368d61024
|
Update README.md
|
2016-09-11 00:18:18 +08:00 |
|
彭兆卿
|
7bb1821072
|
Update README.md
|
2016-09-11 00:07:52 +08:00 |