me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
9952 commits 2 branches 0 tags 429 MiB
Commit graph

729 commits

Author SHA1 Message Date
Thibaut Girka
579ccb0bb9 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/application_controller.rb
- app/controllers/auth/confirmations_controller.rb
- app/controllers/auth/sessions_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
 2019-07-23 10:51:07 +02:00
ThibG
99b3dd5b00 Play animated custom emoji on hover () 
* Play animated custom emoji on hover in status

* Play animated custom emoji on hover in display names

* Play animated custom emoji on hover in bios/bio fields

* Add support for animation on hover on public pages emojis too

* Fix tests

* Code style cleanup
 2019-07-21 18:10:40 +02:00
Thibaut Girka
eecce7e59b Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- Gemfile.lock
- app/controllers/accounts_controller.rb
- app/controllers/admin/dashboard_controller.rb
- app/controllers/follower_accounts_controller.rb
- app/controllers/following_accounts_controller.rb
- app/controllers/remote_follow_controller.rb
- app/controllers/stream_entries_controller.rb
- app/controllers/tags_controller.rb
- app/javascript/packs/public.js
- app/lib/sanitize_config.rb
- app/models/account.rb
- app/models/form/admin_settings.rb
- app/models/media_attachment.rb
- app/models/stream_entry.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/services/batched_remove_status_service.rb
- app/services/post_status_service.rb
- app/services/process_mentions_service.rb
- app/services/reblog_service.rb
- app/services/remove_status_service.rb
- app/views/admin/settings/edit.html.haml
- config/locales/simple_form.pl.yml
- config/settings.yml
- docker-compose.yml
 2019-07-19 18:26:49 +02:00
Eugen Rochko
de4ead8fc6 Change single-column mode to scroll the whole page () 
Fix
2019-07-19 09:25:22 +02:00
koyu
ee3ab5a51d Added logout to dropdown menu () 
* Added logout to dropdown menu

* Triggering build-and-test with empty commit as it seems it failed due to some internal failure

* Looks fine, ready to review

* Added changes from review

* method can be null without any problems

* Also target can be null
 2019-07-19 03:58:46 +02:00
Eugen Rochko
c56e6fd7a1 Add option to disable real-time updates in web UI () 
Fix 
Fix
2019-07-16 16:11:50 +02:00
Eugen Rochko
9dead08055 Add option to disable real-time updates in web UI () 
Fix 
Fix
2019-07-16 06:30:47 +02:00
Thibaut Girka
d7a7f21646 Merge commit '64909cf0d988fb09917c41cfbc81b1e9a5132aca' into glitch-soc/merge-upstream 
Unlike upstream, kept the direct timeline endpoint, as it is still of use in
glitch-soc.
 2019-07-07 13:49:31 +02:00
ThibG
64909cf0d9 Only scroll to the compose form if it's not horizontally in the viewport () 
Avoids jumping the scroll around vertically when giving it focus and
editing long toots.
 2019-07-06 18:18:08 +02:00
Thibaut Girka
9866c2bfff Merge branch 'master' into glitch-soc/merge-upstream 2019-07-04 16:21:39 +02:00
ThibG
eda4094171 Memoize ancestorIds and descendantIds in detailed status view () 2019-07-02 16:03:54 +02:00
Thibaut Girka
6739c423ff Merge branch 'master' into glitch-soc/merge-upstream 2019-06-28 21:36:50 +02:00
ThibG
72dc1b3e60 Display FTS warning based on actual search term, not the one being typed () 
Follow-up to
2019-06-28 19:29:11 +02:00
Eugen Rochko
1c612f24e4 Add categories for custom emojis () 
Fix
2019-06-28 15:54:10 +02:00
ThibG
9668e42afd Fix swiping columns on mobile sometimes failing () 
Fixes
2019-06-28 13:52:15 +02:00
Thibaut Girka
8176d21824 Merge branch 'master' into glitch-soc/merge-upstream 2019-06-28 12:11:45 +02:00
ThibG
0943e994dd Add message telling FTS is disabled when no toot can be found because of this () 
* Add message telling FTS is disabled when no toot can be found because of this

Fixes 

* Remove info icon and reword message
 2019-06-27 21:12:26 +02:00
Thibaut Girka
acbed64f3d Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb
- config/locales/simple_form.en.yml
 2019-06-26 23:19:22 +02:00
ThibG
4b3d91dc2c Add option to disable blurhash previews () 
* Add option to disable blurhash previews

* Update option text

* Change options order
 2019-06-26 19:33:04 +02:00
ThibG
1af85ca177 Scroll to compose form rather than reply indicator on focus () 2019-06-26 14:28:36 +02:00
PatOnTheBack
9a216634a1 Removed extra pipes from regex. () 2019-06-26 02:16:24 +02:00
Thibaut Girka
1177694c3e Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/media_attachment.rb
  Upstream added audio attachment support
- app/serializers/initial_state_serializer.rb
  Upstream added audio attachment support and how mimetypes are returned
- app/serializers/rest/instance_serializer.rb
  Upstream added a few fields
- config/application.rb
  Upstream added a different paperclip transcoder
 2019-06-24 15:02:59 +02:00
koyu
a317acfa72 Change camera icon to paperclip icon in upload form () 2019-06-22 15:29:25 +02:00
Eugen Rochko
d7e2f554fb Add audio uploads () 
* Add audio uploads

Fix 

Accept uploads of OGG, WAV, FLAC, OPUS and MP3 files, and converts
them to OGG. Media attachments get a new `audio` type. In the UI,
audio uploads are displayed identically to video uploads.

* Improve code style
 2019-06-19 23:42:38 +02:00
Thibaut Girka
4356f98a37 Merge branch 'master' into glitch-soc/merge-upstream 2019-06-16 21:09:19 +02:00
ThibG
cdfeb86b7b Do not scroll in the compose panel on single-column () 2019-06-16 18:46:55 +02:00
Thibaut Girka
4741ea0029 Merge branch 'master' into glitch-soc/merge-upstream 2019-06-13 22:23:20 +02:00
ThibG
770515a629 Fix ordering of keyboard access between CW field, textarea and emoji picker () 2019-06-13 17:07:43 +02:00
ThibG
92ec50ad4b List attachments in reply indicator and boost modal () 
* Add media attachments list to boost modal

* Add attachment list to reply indicator
 2019-06-13 17:04:52 +02:00
ThibG
b988634e4e Only show profile directory link when it's enabled () 2019-06-13 00:16:27 +02:00
Thibaut Girka
5a158899bc Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/settings/notifications_controller.rb
- app/javascript/packs/public.js
- app/views/settings/preferences/show.html.haml
- app/views/stream_entries/_simple_status.html.haml
- config/locales/simple_form.en.yml
- config/locales/simple_form.pl.yml
- config/navigation.rb
- config/routes.rb
 2019-06-10 18:59:53 +02:00
mayaeh
42a53e57d7 Fix emoji-button appearing above privacy-dropdown () 2019-06-10 12:27:17 +02:00
ThibG
21acf681d2 Put poll options behind content warnings () 
* Put poll options behind CWs in WebUI

* Put polls behind CWs on public pages

* Add poll icon to public pages CWs

* Revert to not showing an icon in the CW button
 2019-06-08 17:40:59 +02:00
Eugen Rochko
c7feecc715 Improve light theme () 2019-06-08 10:23:41 +02:00
Eugen Rochko
5c1a46bdcf Fix some React warnings () 2019-06-07 17:15:18 +02:00
Thibaut Girka
00552d2f79 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/statuses_controller.rb
- app/controllers/stream_entries_controller.rb
 2019-06-07 17:00:36 +02:00
Wenceslao Páez Chávez
796b8e8d34 Fix overlap of emoji button on search popup () 2019-06-06 13:40:17 +02:00
Eugen Rochko
a36e4db82f Fix not being able to directly switch between list timelines in web UI () 2019-06-06 13:04:49 +02:00
Takeshi Umeda
88a04bf6c4 Fix emoji picker being always displayed () 
* Fix emoji picker being always displayed

* Remove duplicate content with other pull-requests
 2019-06-06 12:30:14 +02:00
Jeong Arm
91ae2d1275 Scroll to compose form when focus () 
* Scroll to compose form when focus

* Get rid of constructor
 2019-06-05 15:29:45 +02:00
Thibaut Girka
a76c660645 Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream 2019-06-04 20:40:19 +02:00
Eugen Rochko
4331f4948e Add profile directory link to single column navigation panel () 2019-06-04 19:50:38 +02:00
Thibaut Girka
a4e0071538 Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream 
Conflicts:
- Gemfile.lock
- config/webpack/rules/css.js
- package.json
- yarn.lock
 2019-06-03 14:54:30 +02:00
Takeshi Umeda
96ac52dabd Improvement variable height in single column layout () 
* Improvement variable height of compose and navigation panel in single column layout

* Fix wrong quotes and missing commas
 2019-06-02 10:05:54 +02:00
Thibaut Girka
206d0ea6a2 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-30 13:31:01 +02:00
Eugen Rochko
233a60f6a2 Change links in right panel to open in the same tab () 
For Rambox compatibility
 2019-05-29 17:33:35 +03:00
ThibG
0162dc0c9c Fix React warning about legacy lifecycle calls and sensitive status resetting () 2019-05-29 17:33:15 +03:00
Thibaut Girka
b9c5aed987 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-28 17:45:06 +02:00
Eugen Rochko
7d2b4e9277 Refactor footers in web UI into a single component () 2019-05-27 21:58:41 +02:00
Takeshi Umeda
03054b27e1 Fix poll visibility on public pages () 
* Fix poll visibility on public pages

* Revert "Fix poll visibility on public pages"

This reverts commit 54a9608add6f855bc6337fe3c65eaee7ba13db49.

* Revert "Change poll options to alphabetic letters when status text is hidden"

This reverts commit c53d67326201b2061990b1874a3547c3647f50d2.
 2019-05-26 23:13:29 +02:00