Commit Graph

55 Commits

Author SHA1 Message Date
lovelyzhang b42036399e zy:modify time zone 2016-12-27 11:24:34 +08:00
lovelyzhang 910246f78d zy: new dev feacture 2016-12-27 11:09:27 +08:00
lovelyzhang 25c738414d zy:rm .idead/ sqlite3 2016-12-27 10:54:31 +08:00
lovelyzhang 962900f274 zy:timestamp for pic 2016-12-27 10:46:28 +08:00
lovelyzhang 0b5691a99b zy: change todolist 2016-12-27 10:24:57 +08:00
lovelyzhang 701a151602 Merge branch 'dev' of https://git.trustie.net/zhujingqiao/guoren into dev 2016-12-26 16:33:10 +08:00
lovelyzhang d35c37f7dd zy:modify gitignore 2016-12-26 16:32:37 +08:00
lovelyzhang 5d2d576cdf zy: change gemfile to delete bcrypt-ruby 2016-12-26 16:25:00 +08:00
lovelyzhang 52d6b1bf8f zy heroku deploy 2016-12-26 16:08:03 +08:00
lovelyzhang 0c0f725ec6 zy: heroku deploy 2016-12-26 15:57:40 +08:00
lovelyzhang 9b4215db04 zy: deploy to heroku 2016-12-26 15:55:36 +08:00
lovelyzhang a18ac0c3d8 Merge branch 'dev' of https://git.trustie.net/zhujingqiao/guoren into dev 2016-12-26 15:36:05 +08:00
lovelyzhang b8a5cea995 paginate finished 2016-12-26 15:36:00 +08:00
BaiFangzhou 98ee5aea5a bfz:Secondtest 2016-12-26 06:46:43 +00:00
lovelyzhang a7cae21e7c zy:tolist changed. 2016-12-26 14:40:34 +08:00
lovelyzhang b599305816 zy: modify gitignore 2016-12-26 14:26:42 +08:00
lovelyzhang 80a4d13dbb zy add picture function 2016-12-26 14:24:20 +08:00
lovelyzhang 7e0c882bb7 zy: rectify user_helper 2016-12-26 11:03:30 +08:00
lovelyzhang 3fe03812e9 zy: change utc time 2016-12-26 11:00:51 +08:00
lovelyzhang dcdd5a225a zy:start upload file 2016-12-25 22:18:43 +08:00
lovelyzhang c0ba62107f zy: sign up activity 2016-12-25 19:33:15 +08:00
lovelyzhang 79a3b58382 zy: add gitingore 2016-12-25 18:04:20 +08:00
lovelyzhang ac33a06e92 zy:fix merge 2016-12-25 18:01:31 +08:00
lovelyzhang 19fc06d990 zy:delete .idea 2016-12-25 17:57:05 +08:00
lovelyzhang 38c737b360 zy: modify gitingore file 2016-12-25 17:45:46 +08:00
yjx 2a644cb60b yjx:add profil path 2016-12-25 16:44:43 +08:00
yjx c317cfa851 yjx:test 2016-12-25 16:38:07 +08:00
lovelyzhang be63444463 Merge branch 'dev' of https://git.trustie.net/zhujingqiao/guoren into dev 2016-12-25 15:10:13 +08:00
lovelyzhang e934a901ee zjq:modify mutipy picture 2016-12-25 15:10:05 +08:00
lovelyzhang 775a8b2f6f zy: to zjq to modify multi-picture 2016-12-25 14:50:37 +08:00
BaiFangzhou 91357e6026 bfz:Fisttest 2016-12-25 06:49:04 +00:00
lovelyzhang 3da3d00232 zy:add TODO List 2016-12-25 14:18:04 +08:00
lovelyzhang 346ddd1e06 zy:add gitignore 2016-12-25 14:10:11 +08:00
lovelyzhang 759bd82ad7 zy:add profile page for yjx 2016-12-25 14:03:11 +08:00
lovelyzhang 3416ad6bb6 zy:add test case 2016-12-25 14:02:06 +08:00
lovelyzhang df353360f5 zy:add profile page 2016-12-25 13:59:01 +08:00
lovelyzhang 6c7c4483f0 bfz:add a test case 2016-12-25 13:47:43 +08:00
lovelyzhang 6fc7ec9d88 fix comments bugs and modify some style css 2016-12-22 23:23:22 +08:00
lovelyzhang ff5f2f6ea3 git rm test.txt 2016-12-22 22:04:09 +08:00
lovelyzhang 2a0f6ec167 delete test.txt 2016-12-22 22:00:20 +08:00
Lieber2016 5241346ad5 nilingbin test 2016-12-22 13:22:05 +00:00
lovelyzhang c5cbe7128f push to heroku: 2016-12-22 20:10:31 +08:00
lovelyzhang 9a221afbb0 new project 2016-12-22 20:05:38 +08:00
lovelyzhang a7c044c53c new guoren project 2016-12-22 20:00:08 +08:00
lovelyzhang bf07e74ece test.txt 2016-12-22 19:58:26 +08:00
lovelyzhang 402725a795 delete all files 2016-12-22 19:56:55 +08:00
joe 2428b90a23 Merge branch 'test' into 'master'
合并测试分支



See merge request !1
2016-12-18 13:05:59 +08:00
Joe f75b5dc59a branch-test 2016-12-01 17:33:59 +08:00
Joe 877fe577f0 third version 2016-11-29 00:10:16 +08:00
Joe a6b184fef4 gather 2016-11-28 23:58:14 +08:00