Commit Graph

684 Commits

Author SHA1 Message Date
Alex Gleason af1627815c
Merge remote-tracking branch 'origin/develop' into feature/frontend_refactor 2020-03-11 14:52:10 -05:00
Alex Gleason 3d3b51ee1a
Only validate User.unique_email on create 2020-03-10 18:24:02 -05:00
Alex Gleason a34f544ddf Merge branch 'unique-emails' into 'develop'
Unique emails

See merge request gab/social/gab-social!46
2020-03-10 23:13:34 +00:00
Alex Gleason c3bc1c08b9
Set unique_email upon User creation 2020-03-10 18:09:40 -05:00
Alex Gleason 4052329ca4
Add unique_email field 2020-03-10 17:44:32 -05:00
Alex Gleason 316b5c8d0f
Merge remote-tracking branch 'upstream/develop' into feature/frontend_refactor 2020-03-10 16:24:43 -05:00
Alex Gleason bccb9a6f9c
Display favorites count on profile, fixes #126 2020-03-10 15:26:34 -05:00
Alex Gleason 0e17641f12
Implement profile avatar and header, fixes #125 2020-03-10 13:50:31 -05:00
mgabdev 0b94033011 Progress 2020-03-08 19:02:28 -04:00
mgabdev 2f9dbfa91d Progress 2020-03-08 12:46:00 -04:00
mgabdev 557c6470f5 Progress 2020-03-06 23:53:28 -05:00
mgabdev da3d0c3462 Progress 2020-03-06 10:38:22 -05:00
mgabdev 5109276331 Progress 2020-03-05 10:44:17 -05:00
Alex Gleason fadc08fbad Merge branch 'bugfixes' into 'develop'
Use uploaded avatar over legacy avatar when possible

See merge request gab/social/gab-social!45
2020-03-05 04:59:08 +00:00
Alex Gleason e039a535d5
Use uploaded avatar over legacy avatar when possible 2020-03-04 22:42:29 -06:00
mgabdev c7da9da84e Progress 2020-03-04 18:08:08 -05:00
mgabdev d31d5fcd81 Progress 2020-03-04 17:50:15 -05:00
mgabdev 198fe127a0 Progress 2020-03-04 17:32:57 -05:00
mgabdev 567894f614 Progress 2020-03-04 17:26:01 -05:00
mgabdev 143725b5bd Progress 2020-03-03 23:59:11 -05:00
mgabdev 33952e424f Progress 2020-03-03 22:45:16 -05:00
mgabdev 0df3c073a5 Progress 2020-03-02 17:26:25 -05:00
mgabdev c6aa4e08a1 Progress 2020-02-29 10:42:47 -05:00
mgabdev 3ca4ffcc6b Progress 2020-02-28 10:20:47 -05:00
Alex Gleason 3edd573c0c Merge branch 'fix-federation' into 'develop'
Fix federated threads

See merge request gab/social/gab-social!44
2020-02-26 20:01:41 +00:00
Alex Gleason 8a7c7d8364
Let React controller precede Account controller 2020-02-26 13:36:24 -06:00
Alex Gleason 842e5de971 Merge branch 'avatar-fix' into 'develop'
Fix federation of avatars and images with legacy gab:// URLs

See merge request gab/social/gab-social!43
2020-02-26 18:42:59 +00:00
Alex Gleason 28cc38ad6b
Fix federation of avatars and images with legacy gab:// URLs 2020-02-26 12:32:30 -06:00
mgabdev 0bd1eb2c77 Progress 2020-02-25 11:04:44 -05:00
mgabdev 32cd8e622a Progress 2020-02-24 18:25:55 -05:00
mgabdev 7679012e2f Progress 2020-02-24 16:56:07 -05:00
mgabdev d255982ec5 Progress 2020-02-22 18:26:23 -05:00
Alex Gleason a63f3fefc0
Add username regex to routes to allow full handle user@server.tld 2020-02-21 14:35:12 -06:00
Alex Gleason e9fe94b96d
home_controller_spec --> react_controller_spec 2020-02-21 14:26:04 -06:00
Alex Gleason db3269919c
Update AccountsController tests 2020-02-21 14:25:57 -06:00
Alex Gleason 0874251bb3
Update StatusesController tests 2020-02-21 14:25:49 -06:00
Alex Gleason 82d476227c
Return StatusFinder to its original state 2020-02-21 14:25:34 -06:00
Alex Gleason a925509384
Clean up ReactController 2020-02-21 14:23:08 -06:00
Alex Gleason b3bdddf374
Route status URLs back through StatusesController 2020-02-21 14:22:55 -06:00
Alex Gleason d3ee46c328
Route account URLs back through AccountsController 2020-02-21 14:21:00 -06:00
Alex Gleason a7955ad491
Account.find_acct! function 2020-02-21 14:17:39 -06:00
Alex Gleason 0aed68a7e3
Rename home#index to react#react 2020-02-21 14:16:43 -06:00
mgabdev bebc39f150 Progress 2020-02-20 19:57:29 -05:00
mgabdev e37500c0cf Progress 2020-02-19 18:57:07 -05:00
mgabdev be3daea78b Progress 2020-02-17 12:50:29 -05:00
mgabdev cdde454915 Progress 2020-02-13 19:40:04 -05:00
admin d524741a3a Update header.js s/direct-message/private-message/g 2020-02-08 22:58:41 +00:00
mgabdev 389b189d64 Progress 2020-02-08 17:57:09 -05:00
mgabdev 1c98dd283e Progress 2020-02-08 01:12:01 -05:00
mgabdev bdb482140b Updates to footer, nav bar 2020-02-05 19:38:02 -05:00