 alan snape
|
ffe9ad4ed3
|
add create_at and update_at to temp commits
|
2016-12-30 07:20:15 +00:00 |
chenyi
|
17c2072661
|
进入项目按钮更改
|
2016-12-29 16:23:12 +00:00 |
|
chenyi
|
d20da2964f
|
创建项目按钮
|
2016-12-29 14:04:00 +00:00 |
|
Yang Zhao
|
8af2993f25
|
添加index.html和alter_info.html更新LoginUserInfo，和其他页面对main.js的引入
|
2016-12-29 13:06:16 +00:00 |
|
Yang Zhao
|
2a90c817b6
|
解决全局共享值的问题
|
2016-12-29 12:57:49 +00:00 |
|
Yang Zhao
|
6c67b0ca34
|
注册功能增加邮箱验证功能；项目详情前端页面完成
|
2016-12-29 12:31:43 +00:00 |
|
alan snape
|
3885ad5b36
|
modify note.type to note.category
|
2016-12-29 12:19:55 +00:00 |
|
HuJiaxuan
|
51e155dafa
|
model层测试完成
|
2016-12-29 11:20:27 +00:00 |
|
HuJiaxuan
|
18ae34e73f
|
model 层测试完成
|
2016-12-29 09:33:25 +00:00 |
|
alan snape
|
5afd109e77
|
merge conflicts
|
2016-12-29 09:01:13 +00:00 |
|
alan snape
|
ea0870a9ea
|
temp commit
|
2016-12-29 08:59:26 +00:00 |
|
chenyi
|
addf740d3d
|
展示项目列表接口
|
2016-12-29 08:11:27 +00:00 |
|
alan snape
|
572dcffcfa
|
add project_id to notes
|
2016-12-29 08:02:23 +00:00 |
|
Yang Zhao
|
4fbac0332c
|
注册功能完成
|
2016-12-28 15:21:43 +00:00 |
|
Yang Zhao
|
694e9f2c97
|
routes修改
|
2016-12-28 14:36:04 +00:00 |
|
alan snape
|
ff7959fdc9
|
temp commit project controller
|
2016-12-28 08:50:19 +00:00 |
|
alan snape
|
c946352470
|
temp commit share controller
|
2016-12-28 07:26:25 +00:00 |
|
alan snape
|
7d3b4fae28
|
add user_id to share
|
2016-12-28 07:16:32 +00:00 |
|
alan snape
|
9cbabcce84
|
add project_id to share
|
2016-12-28 07:13:36 +00:00 |
|
alan snape
|
9ef1bca10b
|
temp commit for mission controller
|
2016-12-28 07:06:19 +00:00 |
|
alan snape
|
6dc13784af
|
Merge branch 'with_test_code' of https://git.trustie.net/snape3058/ambition into with_test_code
|
2016-12-28 06:23:04 +00:00 |
|
alan snape
|
e2bf712558
|
add user_id to comments
|
2016-12-28 06:22:55 +00:00 |
|
Yang Zhao
|
af98434c29
|
用户修改信息功能完成
|
2016-12-28 05:34:43 +00:00 |
|
alan snape
|
fd9f43d7d9
|
modify mission status from string to int
|
2016-12-28 05:22:43 +00:00 |
|
alan snape
|
7d09de6613
|
add project_id to missions
|
2016-12-28 05:01:50 +00:00 |
|
Yang Zhao
|
7f03659a30
|
登录登出功能完成，前后流程走通
|
2016-12-27 14:44:50 +00:00 |
|
HuJiaxuan
|
4748bd0d92
|
controllers
|
2016-12-27 12:15:05 +00:00 |
|
HuJiaxuan
|
1b15e08a97
|
define controllers
|
2016-12-27 11:11:44 +00:00 |
|
HuJiaxuan
|
ffa2fb56e1
|
Merge branch 'master' into with_test_code
merge respec tests of mission and comment to with_test_code
|
2016-12-26 04:36:50 +00:00 |
|
HuJiaxuan
|
2a4729e48c
|
mission comment
|
2016-12-26 04:13:59 +00:00 |
 ccx1024cc
|
f8ad241319
|
addPhoneToUser, addcontentToMission, addTest
|
2016-12-26 10:57:25 +08:00 |
|
HuJiaxuan
|
9c09939939
|
base version
|
2016-12-26 02:19:56 +00:00 |
|
HuJiaxuan
|
1e860fa797
|
Merge remote-tracking branch 'upstream/with_test_code'
|
2016-12-18 05:44:03 +00:00 |
|
ccx1024cc
|
ba794c7657
|
添加日期格式初始化文件
|
2016-12-16 14:14:50 +08:00 |
|
ccx1024cc
|
ff0324ef24
|
用户部分完成
|
2016-12-16 13:55:32 +08:00 |
|
ccx1024cc
|
50f0fd776c
|
添加user和session controller，部分接口 完成
|
2016-12-15 18:07:51 +08:00 |
|
ccx1024cc
|
86bebaf71c
|
删除随机生成字符串函数
|
2016-12-15 09:56:40 +08:00 |
|
ccx1024cc
|
0a65ac2a35
|
添加对user和project的model测试
|
2016-12-11 17:40:47 +08:00 |
 杨诏
|
7bbbeae634
|
Merge branch 'front_end' into 'master'
前端原型完成
前端原型完成，请求合并
See merge request !4
|
2016-12-11 16:08:25 +08:00 |
|
ccx1024cc
|
dbeccff926
|
修改评论长度
|
2016-12-11 16:08:23 +08:00 |
|
ccx1024cc
|
38a754ee3c
|
添加关于User model的测试
|
2016-12-11 15:56:58 +08:00 |
|
ccx1024cc
|
83343b9eb1
|
删除rails自带测试需要的文件夹
|
2016-12-11 12:34:36 +08:00 |
|
ccx1024cc
|
3962970154
|
解决冲突config/application.rb
|
2016-12-11 11:01:55 +08:00 |
|
ccx1024cc
|
b4f528efbd
|
表结构基本修改完成，后续表建立格式参照本次提交内容。
|
2016-12-10 14:01:34 +08:00 |
|
ccx1024cc
|
1862d28e9e
|
不再跟踪Gemfile.lock文件和rubymine相关文件
|
2016-12-10 11:11:50 +08:00 |
|
崔承旭
|
198061b227
|
Merge branch 'could_test' into 'master'
测试部分搭建完成，可以写测试
rspec+capybara+factory_girl+fake
spec测试目录
controllers,models测试文件目录（use rspec）
factories预构件目录（factory_girl+fake）
features验收或集成测试目录（capybara）
supports公共宏定义目录
matchers自定义匹配器目录
注：原来rails的测试工具已经不生效了，完全被替换以上框架。
See merge request !2
|
2016-12-09 11:43:48 +08:00 |
|
ccccx
|
5dc88d5ccb
|
包含所有文件夹
|
2016-12-08 16:06:42 +00:00 |
|
ccccx
|
f6fb16a8bc
|
添加所有可能的空文件夹
|
2016-12-08 16:01:40 +00:00 |
|
ccccx
|
30a6bde5f2
|
可以进行单元测试，功能测试，集成测试
|
2016-12-08 15:39:40 +00:00 |
|
chenyi
|
27594369f9
|
上传部分原型代码
|
2016-12-08 02:10:37 +00:00 |