Commit Graph

579 Commits

Author SHA1 Message Date
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
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
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
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
admin
d524741a3a Update header.js s/direct-message/private-message/g 2020-02-08 22:58:41 +00:00
mgabdev
bdb482140b Updates to footer, nav bar 2020-02-05 19:38:02 -05:00
mgabdev
e92a419b2a Added chat button to footer, nav 2020-02-05 19:23:03 -05:00
mgabdev
331ae0ca38 Edits for chat button 2020-02-04 21:25:33 -05:00
mgabdev
9f1643a17d Adding chat buttons 2020-02-04 11:30:26 -05:00
mgabdev
1a6afcdd2b Gifs working on mobile, maybe 2020-01-21 17:06:33 -05:00
mgabdev
1a7c3a9ef9 TESTING gifs 2020-01-21 17:02:34 -05:00
mgabdev
5bbf41a0bc TESTING gifs 2020-01-21 16:57:21 -05:00
mgabdev
10fce962c8 TESTING gifs 2020-01-21 16:44:17 -05:00
mgabdev
c7969ab97d TESTING gifs 2020-01-21 16:34:36 -05:00
mgabdev
9c843d5847 Updated progress panel 2020-01-21 16:13:52 -05:00
mgabdev
05d4c921a8 Added expenses to sidebar in app 2020-01-21 16:07:58 -05:00
mgabdev
5a8d386683 Play gif if no user 2020-01-17 18:24:10 -05:00
mgabdev
755835d2bd Revert tests, update gif loading 2020-01-17 17:55:00 -05:00
mgabdev
9e7b896e9e TESTING gifs 2020-01-17 15:32:37 -05:00
mgabdev
ad906f0b30 TESTING gifs 2020-01-17 15:18:02 -05:00
mgabdev
b8aede03a1 TESTING gifs 2020-01-17 15:07:23 -05:00
mgabdev
7ec113a038 TESTING gifs 2020-01-17 14:13:31 -05:00
mgabdev
432817741a TESTING gifs 2020-01-17 13:53:39 -05:00
mgabdev
6c769caf24 TESTING gifs 2020-01-17 13:31:42 -05:00
mgabdev
f08e1d3c21 TESTS for gifs 2020-01-17 12:49:07 -05:00
mgabdev
f7037644f0 Don't use ForeignKey for User.last_read_notification
dc7bc17267
2020-01-16 18:25:25 -05:00
mgabdev
7fb0b462e2 Fix notifications
https://gitlab.com/soapbox-pub/soapbox/merge_requests/120/diffs#diff-content-917c7fb80cf426cfae1e7baaa21b3d90ccb2b29c
2020-01-16 18:24:10 -05:00
mgabdev
292991bf33 Merge branch 'develop' of https://code.gab.com/gab/social/gab-social into develop 2020-01-16 17:59:31 -05:00
Developer
525937d5b0 Merge branch 'emoji-verify-hide' into 'develop'
Hide "verified" emoji from usernames to avoid confusion, fixes #73

See merge request gab/social/gab-social!31
2020-01-16 22:58:39 +00:00
Developer
9b225dcf36 Merge branch 'develop-noTranscodeGifs' into 'develop'
Update gif_transcoder.rb

See merge request gab/social/gab-social!42
2020-01-16 22:57:34 +00:00
admin
92e53953ce Update gif_transcoder.rb 2020-01-16 22:57:34 +00:00
mgabdev
8322dd3b3e Merge branch 'feature/updating_quote_statuses' of https://code.gab.com/gab/social/gab-social into develop 2020-01-16 17:56:32 -05:00
mgabdev
adde863246 Merge branch 'feature/search_updates_groups' of https://code.gab.com/gab/social/gab-social into develop 2020-01-16 17:56:04 -05:00
mgabdev
4787060608 Updated max lines of status content
Improving visibility
2020-01-15 11:14:44 -05:00
mgabdev
69ea7fcdc6 Updated search UI header and results
Added groups with new items for filtering search results
2020-01-14 18:14:54 -05:00