奧莉薇張雅婷 Rossi - #397

Open

Melodystart wants to merge 319 commits into

ALPHACamp:masterfrom

Melodystart:master

This pull request is big! We're only showing the most recent 250 commits

Commits on Aug 26, 2023

Merge branch 'master' into feature/adminUsers
chiangjou
authored
12c3afe
Merge pull request #17 from Melodystart/feature/adminUsers
chiangjou
authored
3ab0fb3
add likeCounts
Melodystart
committed
375537e
Merge branch 'master' of https://github.com/Melodystart/twitter-fullstack-2020 into feature/like
Melodystart
committed
7e0a3f9
merge conflict
Melodystart
committed
3d2621c
feat: basic style setting
chiangjou
committed
ea7d03b
Merge pull request #19 from Melodystart/feature/like
chiangjou
authored
2c42b83
merge conflict
chiangjou
committed
d2dd079
feat: initialize api server
Melodystart
committed
ff6c59d
feat: modify user signin page UI
chiangjou
committed
b763022
Merge branch 'master' of https://github.com/Melodystart/twitter-fullstack-2020
chiangjou
committed
803b268
Merge pull request #20 from Melodystart/feature/style
chiangjou
authored
93d75c6
Merge branch 'master' of https://github.com/Melodystart/twitter-fullstack-2020 into feature/reply
Melodystart
committed
172e948

Commits on Aug 27, 2023

Merge branch 'master' into feature/userSignin
chiangjou
authored
ed60821
Merge pull request #21 from Melodystart/feature/userSignin
chiangjou
authored
219af8e
feat:reply modal
Melodystart
committed
a1433ac

Commits on Aug 28, 2023

feat: modify basic style
chiangjou
committed
6564ca2
feat: add font-family
chiangjou
committed
905b270
feat: modify form-input css
chiangjou
committed
7f03ed5
feat: modify admin/signin.hbs
chiangjou
committed
0d7a24f
feat: modify admin signin UI
chiangjou
committed
6ec043e
feat: mosify user signin css
chiangjou
committed
485e464
Merge branch 'master' into feature/style
chiangjou
authored
8069aed
Merge branch 'master' into feature/adminSignin
chiangjou
authored
6dfdef5
Merge branch 'master' into feature/userSignup
chiangjou
authored
cfca250
Merge pull request #23 from Melodystart/feature/style
Melodystart
authored
43c78a4
Merge branch 'master' into feature/adminSignin
chiangjou
authored
95c8cd6
Merge pull request #24 from Melodystart/feature/adminSignin
chiangjou
authored
f00fde2
Merge branch 'master' into feature/userSignup
chiangjou
authored
c7e235e
Merge pull request #25 from Melodystart/feature/userSignup
chiangjou
authored
8edf7a9
feat: modify admin-navbar
chiangjou
committed
77c4df3

Commits on Aug 29, 2023

Commits on Aug 30, 2023

feat: modify user model
chiangjou
committed
94cbdf0
feat: modify like model
chiangjou
committed
8cb62ee
feat: modify tweet model
chiangjou
committed
a0777ca
feat: modify created time
chiangjou
committed
fe37fd0
delete commented code
chiangjou
committed
ddea0ee
feat: modify created time
chiangjou
committed
c979261
feat: add reply seeders
chiangjou
committed
bc10487
feat: add semicolon mark
chiangjou
committed
44b3d1a
Merge branch 'master' of https://github.com/Melodystart/twitter-fullstack-2020 into feature/reply
Melodystart
committed
d5f5c4b
feat: modify routes
chiangjou
committed
4700620
Merge branch 'master' into feature/userSignup
chiangjou
authored
87530cd
Merge branch 'master' into feature/modelSetting
chiangjou
authored
87d6dc5
Merge pull request #33 from Melodystart/feature/userSignup
Melodystart
authored
95d84e8
merge conflict
chiangjou
committed
3c32ec5
Merge pull request #28 from Melodystart/feature/tweetSeeder
Melodystart
authored
6ff9ec0
Merge pull request #29 from Melodystart/feature/replySeeder
Melodystart
authored
d0514f4
Merge pull request #30 from Melodystart/feature/userSeeder
Melodystart
authored
67279f8
Merge pull request #31 from Melodystart/feature/modelSetting
Melodystart
authored
2288338
merge conflict
chiangjou
committed
9f59698
Merge branch 'master' into feature/projectSetting
chiangjou
authored
2b946c1
Merge pull request #27 from Melodystart/feature/projectSetting
chiangjou
authored
bd7bef2
feat: delete repeated file
chiangjou
committed
fb81393
feat: delete repeated file
chiangjou
committed
fab1ee9
feat: add user can reply at tweets page
Melodystart
committed
646073d
feat: show user list
chiangjou
committed
6522949
fix typo
chiangjou
committed
6ff96ab
feat: merge cnoflict
Melodystart
committed
5eca453
feat: modify style
chiangjou
committed
1494c94
feat: merge cnoflict
Melodystart
committed
672a502
feat: modify container position
chiangjou
committed
9112e99
feat: modify container position
chiangjou
committed
e3e1ad8
feat: modify style
chiangjou
committed
f30c8a4
Merge pull request #35 from Melodystart/feature/reply
chiangjou
authored
a025cd4
Merge pull request #38 from Melodystart/feature/adminTweets
Melodystart
authored
4318d78
Merge branch 'master' into feature/userSignin
chiangjou
authored
90e3aba
Merge pull request #37 from Melodystart/feature/adminSignin
Melodystart
authored
fc0da5f
Merge branch 'master' into feature/adminUsers
chiangjou
authored
87583bd
Merge pull request #39 from Melodystart/feature/adminUsers
chiangjou
authored
2fc4719
Merge pull request #36 from Melodystart/feature/userSignin
chiangjou
authored
75c0d49
Merge branch 'master' of https://github.com/Melodystart/twitter-fullstack-2020
chiangjou
committed
3a301a0

Commits on Aug 31, 2023

feat: add reply page and user avatar
Melodystart
committed
4d411c6
Merge pull request #40 from Melodystart/feature/replyPage
chiangjou
authored
2322e87
feat: modify admin navbar
chiangjou
committed
c750774
feat: add followerRecommend at tweets page
Melodystart
committed
b370fab
feat: add followerRecommend at tweets page
Melodystart
committed
f7450c3
feat: add followerRecommend at tweets page
Melodystart
committed
22d3df5

Commits on Sep 1, 2023

feat: modify function about 可以瀏覽自己的貼文頁面
 carola1408
committed
d562480
feat: add followerRecommend at tweet page
Melodystart
committed
283dab9
feat: add error msg
Melodystart
committed
20fe3b1
feat: add error msg
Melodystart
committed
f18b3d7
Merge pull request #42 from Melodystart/feature/followerRecommend
chiangjou
authored
f0e5fca
feat modify nave-link color
carola1408
committed
bc8273e
feat:完成可以瀏覽自己的貼文頁面
 carola1408
committed
88ea1d8
feat: modify navbar & main page UI / fix delete tweet function
chiangjou
committed
94629c4
feat: modify admin signin UI
chiangjou
committed
90c6e2a
Merge branch 'master' of https://github.com/Melodystart/twitter-fullstack-2020
chiangjou
committed
9bfbbc0
feat: modify text color
chiangjou
committed
8042e53
Merge pull request #43 from Melodystart/feature/adminTweets
chiangjou
authored
0851e9f
Merge branch 'master' into feature/adminSignin
chiangjou
authored
4a638fc
Merge pull request #44 from Melodystart/feature/adminSignin
Melodystart
authored
dc905ce
feat:切回主幹拉取遠端分支
 carola1408
committed
d7cdda1
feat: modify admin users page UI
chiangjou
committed
21e691d
Merge branch 'master' into feature/adminUsers
chiangjou
authored
43ed3a1
feat: modify user signin page UI
chiangjou
committed
8d2feb2
Merge branch 'master' into feature/userSignin
chiangjou
authored
6bb8806
feat: modify user signup page UI
chiangjou
committed
92fc5a9
Merge branch 'master' into feature/userSignup
chiangjou
authored
65f8af3
feat: 提交已解決的衝突
 carola1408
committed
3167d3e
feat: delete repeated file
chiangjou
committed
ad163e9
Merge pull request #49 from Melodystart/feature/adminTweets
Melodystart
authored
b9db321
Merge pull request #46 from Melodystart/feature/adminUsers
Melodystart
authored
f6d43a8
Merge branch 'master' into feature/userSignin
chiangjou
authored
594cb9b
Merge pull request #47 from Melodystart/feature/userSignin
chiangjou
authored
0a5b6e6
Merge branch 'master' into feature/userSignup
chiangjou
authored
31f168a
Merge pull request #48 from Melodystart/feature/userSignup
chiangjou
authored
2c4c32b
feat: revise for test failure
Melodystart
committed
8a9861a
feat: modify routes & messages
chiangjou
committed
18d5169

Commits on Sep 2, 2023

feat: add tweet-controller.js
carola1408
committed
15557d2
feat: modify handlebars-helpers.js
carola1408
committed
79fe446
feat: modify files in models
carola1408
committed
40d11a0
feat: modify style.css
carola1408
committed
dc0d1e7
feat: modify time format
chiangjou
committed
dc31fe2
feat: add api file and index.js
carola1408
committed
f08cf01
feat: modify modules file and index.js
carola1408
committed
02618a0
feat: modify controllers file and add pages file
carola1408
committed
6cae931
feat: modify seeders
carola1408
committed
22be510
feat: modify admin file in viewa file
carola1408
committed
1910aee
feat: modify main.hbs in layouts file
carola1408
committed
7d88b94
feat: modify partials file and add admin-user-card.hbs
carola1408
committed
46da673
feat: modify signup.hbs and add tweet.hbs
carola1408
committed
d41b2dd
feat: fix admin signin route
chiangjou
committed
5e1034e
feat: add replies-seed-file
carola1408
committed
8c65f14
feat: modify admin get tweets function
chiangjou
committed
e5f2034
feat: modify tab exchange
chiangjou
committed
4c31fec
Merge pull request #50 from Melodystart/feature/followerRecommend
chiangjou
authored
8da2e4c
Merge branch 'master' into feature/projectSetting
chiangjou
authored
1d2c3bb
feat: modify time format
chiangjou
committed
bd00158
Merge pull request #54 from Melodystart/feature/followerRecommend
Melodystart
authored
bdf513b
Merge pull request #52 from Melodystart/feature/adminTweets
Melodystart
authored
60da7d9
Merge branch 'master' into feature/projectSetting
chiangjou
authored
67f7e91
Merge pull request #51 from Melodystart/feature/projectSetting
chiangjou
authored
ebd94e3
feat: modify likes count
chiangjou
committed
0559504
已經解決
 carola1408
committed
98c1d31
解決合併衝突：修復修改的文件
 carola1408
committed
499e2bd
merge conflict
chiangjou
committed
4f3d68c
Merge remote-tracking branch 'origin/master' into feature/user
carola1408
committed
e98a960
feat:amend UI
Melodystart
committed
c8f8ff5
feat: 執行 seeder
carola1408
committed
ac3ca72
feat:amend UI
Melodystart
committed
f58c31c
add Procile
Melodystart
committed
674aa95
feat: add messages
chiangjou
committed
698dd06
Merge pull request #57 from Melodystart/feature/amendUI
chiangjou
authored
0c64b26
Merge branch 'master' into feature/adminSignin
chiangjou
authored
62b1053
merge conflict
chiangjou
committed
598f773
feat: delete edit.hbs
carola1408
committed
7faec8e
Merge pull request #58 from Melodystart/feature/adminSignin
chiangjou
authored
20a2387
Merge branch 'master' of https://github.com/Melodystart/twitter-fullstack-2020
chiangjou
committed
cff7f7f
fix typo
chiangjou
committed
fabc1a5
Merge branch 'master' into feature/userSignup
chiangjou
authored
7edc37d
merge conflict
chiangjou
committed
ebac297
Merge pull request #60 from Melodystart/feature/userSignup
Melodystart
authored
63e0275
feat: fix default cover size
chiangjou
committed
76f5c47
Merge branch 'master' into feature/adminUsers
chiangjou
authored
684a028
Merge branch 'master' of https://github.com/Melodystart/twitter-fullstack-2020
chiangjou
committed
8000c2d
feat: modify config for heroku
Melodystart
committed
31cab6a
Merge pull request #62 from Melodystart/feature/setting
chiangjou
authored
7596b02
Merge pull request #61 from Melodystart/feature/adminUsers
Melodystart
authored
2e8285d
Merge branch 'master' of https://github.com/Melodystart/twitter-fullstack-2020
chiangjou
committed
fa5269a
feat: fix tab color
chiangjou
committed
d524de6
Merge branch 'master' into feature/adminTweets
chiangjou
authored
1314b2e
Merge pull request #63 from Melodystart/feature/adminTweets
Melodystart
authored
986d1a9
Merge branch 'master' of https://github.com/Melodystart/twitter-fullstack-2020
chiangjou
committed
24dc64c
close log and add console.log
Melodystart
committed
d8db778
Merge pull request #64 from Melodystart/feature/modal
chiangjou
authored
cedaa65
revise API path
Melodystart
committed
6eca064
feat: add form messages
chiangjou
committed
b33b1b8
Merge pull request #65 from Melodystart/feature/modal
chiangjou
authored
46ccd73
feat: modify form input style
chiangjou
committed
d41ad23
feat: modify 使用者可以連覽自己頁面的功能
 carola1408
committed
e9efe70
Merge pull request #66 from Melodystart/feature/userSignup
Melodystart
authored
2a2a228
Commit message
carola1408
committed
2df46e9
Resolve conflicts in style.css
carola1408
committed
0e33708
Committing local changes before merge
carola1408
committed
e435c91

Commits on Sep 3, 2023

feat: fix routes
chiangjou
committed
7a6a05b
feat: fix user model
chiangjou
committed
b08a3c6
Merge branch 'master' into feature/user
chiangjou
authored
618aa68
Merge pull request #67 from Melodystart/feature/user
Melodystart
authored
2e93c43
feat:6~8 followInfo
Melodystart
committed
9b618af
Revert "Feature/user"
Melodystart
authored
3fe79b4
Merge pull request #68 from Melodystart/revert-67-feature/user
chiangjou
authored
c0f071e
Merge branch 'master' of https://github.com/Melodystart/twitter-fullstack-2020 into feature/followInfo
Melodystart
committed
f47ff9f
Merge pull request #69 from Melodystart/feature/followInfo
chiangjou
authored
9bd4005
revise seed typo
Melodystart
committed
f9d93c5
Merge pull request #70 from Melodystart/feature/seedRevise
chiangjou
authored
413af46
revise Recommend Followings
Melodystart
committed
a944cf4
Merge pull request #71 from Melodystart/feature/reviseRecommendFollowing
chiangjou
authored
e4531c6
提交合併的更改
 carola1408
committed
6c680aa
fead: modify self.hbs
carola1408
committed
73ca294
feat: user pages controllers & routes
chiangjou
committed
29b5bea
Merge pull request #72 from Melodystart/feature/user
chiangjou
authored
857529d
重新合併程式碼
 carola1408
committed
594851c
Merge branch 'master' of https://github.com/Melodystart/twitter-fullstack-2020
chiangjou
committed
07d29de
fix typo
chiangjou
committed
8e55139

Commits on Sep 4, 2023

Merge pull request #73 from Melodystart/feature/userSignup
Melodystart
authored
3432c49
add Reply words limit
Melodystart
committed
a6a207d
Merge pull request #74 from Melodystart/amendReply
chiangjou
authored
410958e
Merge branch 'master' of https://github.com/Melodystart/twitter-fullstack-2020
chiangjou
committed
37683e3
feat: user navbar & post modal
chiangjou
committed
eedbb3c
Merge branch 'feature/user'
chiangjou
committed
5ae5b09
Merge pull request #75 from Melodystart/feature/user
Melodystart
authored
5cc10a3
merge conflict
chiangjou
committed
f3b5390
merge conflict
chiangjou
committed
7557de2
Merge pull request #76 from Melodystart/feature/user
Melodystart
authored
f3ce572
Merge branch 'master' of https://github.com/Melodystart/twitter-fullstack-2020
chiangjou
committed
06d626b
delete repeated modal
chiangjou
committed
afdc971
feat: fix typo
chiangjou
committed
a2c7188
Merge pull request #77 from Melodystart/feature/adminTweets
Melodystart
authored
573f09e
Merge branch 'master' of https://github.com/Melodystart/twitter-fullstack-2020
chiangjou
committed
255d0fa
Merge pull request #78 from Melodystart/feature/user
Melodystart
authored
ae0b57c
fix typo & post modal
chiangjou
committed
77b3d79
Merge pull request #79 from Melodystart/feature/user
Melodystart
authored
14f4932
Merge branch 'master' of https://github.com/Melodystart/twitter-fullstack-2020
chiangjou
committed
aae8647

Commits on Sep 5, 2023

code review
chiangjou
committed
e765cd6
Merge branch 'master' into feature/userSignup
chiangjou
authored
c8542eb
feat: modify admin/tweets
chiangjou
committed
e54e4d7
feat: modify admin-navbar UI
chiangjou
committed
b1a9e12
feat: add admin delete tweet
chiangjou
committed
8d779d0
feat: modify admin/tweets UI
chiangjou
committed
6832451
delete repeated file
chiangjou
committed
d6e7f7a
Merge pull request #80 from Melodystart/feature/userSignup
Melodystart
authored
0d3697e
Merge branch 'master' of https://github.com/Melodystart/twitter-fullstack-2020
chiangjou
committed
eec49f3
feat: modify error messages position
chiangjou
committed
3a09c6d
feat: modify messages position & style
chiangjou
committed
c9b558c
add more user seeders
chiangjou
committed
15e711f
Merge branch 'feature/userSeeder'
chiangjou
committed
1cd9d97
feat: modify tweet description length
chiangjou
committed
1730ce8
Merge branch 'feature/tweetSeeder'
chiangjou
committed
739dbdf
feat: modify tweet count
chiangjou
committed
e0cda0a
Merge branch 'feature/tweetSeeder'
chiangjou
committed
d78c339
feat: add tweets based on users length
chiangjou
committed
5aff983
feat: add tweets based on user length
chiangjou
committed
1ba5a79
Merge branch 'feature/tweetSeeder'
chiangjou
committed
1a1387e
feat: defined text length
chiangjou
committed
5e546ba
Merge branch 'master' into feature/userSignup
chiangjou
authored
a7386ef
Merge branch 'master' into feature/userSeeder
chiangjou
authored
415a584
Merge pull request #84 from Melodystart/feature/tweetSeeder
Melodystart
authored
b6ab3bd
Merge pull request #83 from Melodystart/feature/userSeeder
Melodystart
authored
31969b0
Merge branch 'master' into feature/style
chiangjou
authored
38401f2
Merge pull request #81 from Melodystart/feature/style
chiangjou
authored
3f3d2a1
Merge branch 'master' into feature/userSignup
chiangjou
authored
beaa862
Merge pull request #82 from Melodystart/feature/userSignup
chiangjou
authored
021922e
feat: modify user & setting page routes
chiangjou
committed
c96a863
clean code
chiangjou
committed
aad32b6

Commits on Sep 6, 2023

Merge pull request #85 from Melodystart/feature/user
Melodystart
authored
d314561