Commit Graph

76 Commits

Author SHA1 Message Date
lovelyzhang 6904dce21e zy: finish 2017-01-14 16:24:53 +08:00
lovelyzhang dc6569c4dd zy: activity show people name 2017-01-14 16:23:53 +08:00
lovelyzhang 790ac40def zy:check for finish 2017-01-14 16:13:23 +08:00
lovelyzhang 49138c748b zy:add sendgird send mail 2017-01-14 15:43:34 +08:00
lovelyzhang 9dad27c6da zy:view routes profile 2017-01-07 12:33:43 +08:00
lovelyzhang c29cd77767 zy: fix add user chat bug 2017-01-07 11:18:42 +08:00
lovelyzhang a4b1ac9448 zy: fix micro_post view activity view bug 2017-01-06 21:15:51 +08:00
lovelyzhang 45c05a4881 zy: fix micro_post view activity view bug 2017-01-06 21:13:28 +08:00
lovelyzhang b601bcf6f1 zy: fix micro_post comments bugs 2017-01-06 21:09:03 +08:00
lovelyzhang 143e384838 zy:change gitignore 2017-01-05 22:15:34 +08:00
lovelyzhang 9bf238a96e merge mail 2017-01-05 22:13:58 +08:00
lovelyzhang d20cb8ec83 zy: add mail send code to change password 2017-01-05 22:07:22 +08:00
lovelyzhang 1746c9dde7 zy:test pic 2017-01-02 23:31:07 +08:00
lovelyzhang 92821cfd87 zy: add verify code 2017-01-02 22:57:19 +08:00
lovelyzhang 2c21dc9142 zy:reset db 2016-12-27 22:39:43 +08:00
lovelyzhang b18ed5c4e0 zy:fix joinactivity 2016-12-27 22:33:37 +08:00
lovelyzhang 40f8bfc049 zy: user only comments and activity finished 2016-12-27 22:21:50 +08:00
lovelyzhang face9b417f zy: delete post 2016-12-27 17:45:57 +08:00
lovelyzhang af26c41a7d zy:modify activity signup and quit 2016-12-27 16:49:34 +08:00
lovelyzhang 4a24c82a0e zy: db migrate 2016-12-27 11:53:07 +08:00
lovelyzhang 11410f9b86 zy: add new column to micro_posts 2016-12-27 11:51:36 +08:00
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