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

38492 commits

This branch
This branch
All branches
Author SHA1 Message Date
ThibG
f1528ea3c4 [Glitch] Fix handling of audio files in account media gallery 
Port b48c7ee059 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-20 20:38:42 +02:00
Thibaut Girka
0f22699c02 Merge branch 'master' into glitch-soc/merge-upstream 2019-08-20 20:30:44 +02:00
Thibaut Girka
81d2d71094 Merge branch 'master' into glitch-soc/merge-upstream 2019-08-20 20:30:44 +02:00
ThibG
73b23ef7be Fix handling of audio files in account media gallery (#11629) 
Fixes #11627
 2019-08-20 19:46:41 +02:00
ThibG
b48c7ee059 Fix handling of audio files in account media gallery (#11629) 
Fixes #11627
 2019-08-20 19:46:41 +02:00
ThibG
a8ffa84a40 Merge pull request #1199 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-08-20 12:09:11 +02:00
ThibG
bce46f2057
Merge pull request #1199 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-08-20 12:09:11 +02:00
Thibaut Girka
c2ecfa969b Add button to edit media description from missing description confirmation dialog 2019-08-20 11:33:35 +02:00
Thibaut Girka
fae9e34484 Add button to edit media description from missing description confirmation dialog 2019-08-20 11:33:35 +02:00
Thibaut Girka
cec23a0de6 Remove code for giving focus to first media without description 
Since the textarea is in a modal, now…
 2019-08-20 10:55:03 +02:00
Thibaut Girka
dff4ccd7e9 Remove code for giving focus to first media without description 
Since the textarea is in a modal, now…
 2019-08-20 10:55:03 +02:00
Thibaut Girka
f065048070 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- config/initializers/content_security_policy.rb
  (took our version)
 2019-08-20 10:33:24 +02:00
Thibaut Girka
df150da435 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- config/initializers/content_security_policy.rb
  (took our version)
 2019-08-20 10:33:24 +02:00
ThibG
101b2695c6 Revert "Bump react-redux-loading-bar from 4.0.8 to 4.4.0 (#11609)" (#11625) 
This reverts commit 5c310a43ef.
 2019-08-20 02:19:01 +02:00
ThibG
97af209c31 Revert "Bump react-redux-loading-bar from 4.0.8 to 4.4.0 (#11609)" (#11625) 
This reverts commit 2e44b81166.
 2019-08-20 02:19:01 +02:00
Thibaut Girka
e81a8dcd85 Fix composer options colors in glitch-soc light theme 2019-08-19 22:18:43 +02:00
Thibaut Girka
1d40325e7c Fix composer options colors in glitch-soc light theme 2019-08-19 22:18:43 +02:00
Thibaut Girka
f82b1bb158 Fix connect-src policy for Tesseract 2019-08-19 22:02:35 +02:00
Thibaut Girka
9e17f9e95a Fix connect-src policy for Tesseract 2019-08-19 22:02:35 +02:00
Thibaut Girka
031fe56133 Use public pack in about controller to handle blockpage JS 2019-08-19 21:56:25 +02:00
Thibaut Girka
f00a0f35ee Use public pack in about controller to handle blockpage JS 2019-08-19 21:56:25 +02:00
Thibaut Girka
2d84897916 Move character counter to the options box to match upstream styling 2019-08-19 21:56:25 +02:00
Thibaut Girka
a334cbcb20 Move character counter to the options box to match upstream styling 2019-08-19 21:56:25 +02:00
Thibaut Girka
558aa2bcfd [Glitch] Fix hidden statuses losing focus 
Port d8153b99b3 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-19 21:56:25 +02:00
Thibaut Girka
ed4317b549 [Glitch] Fix hidden statuses losing focus 
Port 0d13a9cd13 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-19 21:56:25 +02:00
ThibG
ec9ae03ad7 [Glitch] Improve focal point modal on mobile 
Port dc83169865 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-19 21:56:25 +02:00
ThibG
ab0961fe9a [Glitch] Improve focal point modal on mobile 
Port 2ca6b2bb6c to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-19 21:56:25 +02:00
ThibG
e27d8efacf [Glitch] Allow clicking behind preview 
Port a886bf3808 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-19 21:56:25 +02:00
ThibG
fcd2244015 [Glitch] Allow clicking behind preview 
Port d37126fd03 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-19 21:56:25 +02:00
Eugen Rochko
6f3f392e8a [Glitch] Fix edit media modal on small screens, touch events 
Port 375f2f3864 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-19 21:56:25 +02:00
Eugen Rochko
91d968bf72 [Glitch] Fix edit media modal on small screens, touch events 
Port 1bea318197 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-19 21:56:25 +02:00
Eugen Rochko
66af3222be [Glitch] Fix tesseract.js being part of the common chunk 
Port fe52fca65c to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-19 21:56:25 +02:00
Eugen Rochko
5c35c9c409 [Glitch] Fix tesseract.js being part of the common chunk 
Port dfe6059889 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-19 21:56:25 +02:00
Eugen Rochko
b3f63b601a [Glitch] Add OCR tool to media editing modal 
Port 41b188dce6  to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-19 21:56:25 +02:00
Eugen Rochko
41c7fec796 [Glitch] Add OCR tool to media editing modal 
Port 28636f43e4  to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-19 21:56:25 +02:00
Thibaut Girka
f20d417448 Refactor character counter to match upstream 2019-08-19 21:56:25 +02:00
Thibaut Girka
066034c62e Refactor character counter to match upstream 2019-08-19 21:56:25 +02:00
Eugen Rochko
4982885bfa [Glitch] Add media editing modal 
Port da208e7d9b to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-19 21:56:25 +02:00
Eugen Rochko
ab019800f8 [Glitch] Add media editing modal 
Port 23f7afa562 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-19 21:56:25 +02:00
Eugen Rochko
199d7ce136 [Glitch] Add explanation to featured hashtags page and profile 
Port SCSS changes from 8e76c759c1 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-19 21:56:25 +02:00
Eugen Rochko
f8e7c69861 [Glitch] Add explanation to featured hashtags page and profile 
Port SCSS changes from b348c9b0db to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-19 21:56:25 +02:00
ThibG
98df5f8fc2 [Glitch] Add public blocks to /about/blocks 
Port SCSS changes from 867b9f3e9c to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-19 21:56:25 +02:00
ThibG
5971ea7466 [Glitch] Add public blocks to /about/blocks 
Port SCSS changes from 9b6a5ed109 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-19 21:56:25 +02:00
ThibG
150d3f7104 [Glitch] Fix client-side resizing of image uploads 
Port 0fd7f8315f to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-19 21:49:39 +02:00
ThibG
4e9794f533 [Glitch] Fix client-side resizing of image uploads 
Port f178a01c11 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-19 21:49:39 +02:00
Eugen Rochko
1d666bf95b [Glitch] Fix short number formatting for numbers above million in web UI 
Port 954840740e to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-19 21:49:39 +02:00
Eugen Rochko
26b249ad2d [Glitch] Fix short number formatting for numbers above million in web UI 
Port 0e9668051e to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-19 21:49:39 +02:00
Thibaut Girka
c060523dc2 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/home_controller.rb
- app/controllers/shares_controller.rb
- app/javascript/packs/public.js
- app/models/status.rb
- app/serializers/initial_state_serializer.rb
- app/views/home/index.html.haml
- app/views/layouts/public.html.haml
- app/views/public_timelines/show.html.haml
- app/views/shares/show.html.haml
- app/views/tags/show.html.haml
- config/initializers/content_security_policy.rb
- config/locales/en.yml
- config/webpack/shared.js
- package.json
 2019-08-19 21:49:35 +02:00
Thibaut Girka
1488be7d96 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/home_controller.rb
- app/controllers/shares_controller.rb
- app/javascript/packs/public.js
- app/models/status.rb
- app/serializers/initial_state_serializer.rb
- app/views/home/index.html.haml
- app/views/layouts/public.html.haml
- app/views/public_timelines/show.html.haml
- app/views/shares/show.html.haml
- app/views/tags/show.html.haml
- config/initializers/content_security_policy.rb
- config/locales/en.yml
- config/webpack/shared.js
- package.json
 2019-08-19 21:49:35 +02:00
ThibG
5a122f1450 Fix CSP needlessly allowing blob URLs in script-src (#11620) 2019-08-19 20:36:58 +02:00