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

39698 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thibaut Girka
2df72d0697 Fix building assets in test environment 
Webpacker (Ruby wrapper to webpack) uses RAILS_ENV-based environments while
the javascript configuration for webpack re-reads this configuration file using
the NODE_ENV environment variable. This means that when RAILS_ENV=test, running
“assets:precompile” compiled the production packs in “public/packs” while
webpacker expects them in “public/packs-test”. This causes Ruby to recompile
them on-the-fly, possibly leading to race conditions in parallel_tests.

This changes:
- Disables on-the-fly compilation in test environment
- Changes the javascript part to read the correct environment
 2018-09-13 15:32:02 +02:00
ThibG
51dc5ed529 Autofocus comment textarea in report modal (#8689) 2018-09-13 15:27:29 +02:00
ThibG
661a89ea74 Autofocus comment textarea in report modal (#8689) 2018-09-13 15:27:29 +02:00
ThibG
28abd3f699 Fix building assets in test environment (#8691) 
Webpacker (Ruby wrapper to webpack) uses RAILS_ENV-based environments while
the javascript configuration for webpack re-reads this configuration file using
the NODE_ENV environment variable. This means that when RAILS_ENV=test, running
“assets:precompile” compiled the production packs in “public/packs” while
webpacker expects them in “public/packs-test”. This causes Ruby to recompile
them on-the-fly, possibly leading to race conditions in parallel_tests.

This changes:
- Disables on-the-fly compilation in test environment
- Changes the javascript part to read the correct environment
 2018-09-13 15:18:47 +02:00
ThibG
7fa4144d48 Fix building assets in test environment (#8691) 
Webpacker (Ruby wrapper to webpack) uses RAILS_ENV-based environments while
the javascript configuration for webpack re-reads this configuration file using
the NODE_ENV environment variable. This means that when RAILS_ENV=test, running
“assets:precompile” compiled the production packs in “public/packs” while
webpacker expects them in “public/packs-test”. This causes Ruby to recompile
them on-the-fly, possibly leading to race conditions in parallel_tests.

This changes:
- Disables on-the-fly compilation in test environment
- Changes the javascript part to read the correct environment
 2018-09-13 15:18:47 +02:00
Eugen Rochko
50978383f9 Group reports by target account (#8674) 
* Group reports by target account

* Improve CSS
 2018-09-13 03:44:08 +02:00
Eugen Rochko
011437dcb5
Group reports by target account (#8674) 
* Group reports by target account

* Improve CSS
 2018-09-13 03:44:08 +02:00
rhoio
c2c352f511 Highlight active tab in action bar (#8673) 
* NavLinks with activeclass instead of Link in actionbar to highlight active tab

* highlight border-bottom in action bar consistent to public view
 2018-09-13 01:50:41 +02:00
rhoio
7b7c26063e Highlight active tab in action bar (#8673) 
* NavLinks with activeclass instead of Link in actionbar to highlight active tab

* highlight border-bottom in action bar consistent to public view
 2018-09-13 01:50:41 +02:00
Thibaut Girka
22a48adabc Fix composer actions modal 2018-09-11 22:04:06 +02:00
Thibaut Girka
307fb338ee Fix composer actions modal 2018-09-11 22:04:06 +02:00
Thibaut Girka
ad5aaf60c6 Fix action modal links 2018-09-11 22:04:06 +02:00
Thibaut Girka
49734c03fd Fix action modal links 2018-09-11 22:04:06 +02:00
ThibG
8bf74adabd Merge pull request #724 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-09-11 20:09:00 +02:00
ThibG
82b521b4c3
Merge pull request #724 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-09-11 20:09:00 +02:00
Thibaut Girka
12abb0f530 Fix media description in various media modals 2018-09-11 18:29:19 +02:00
Thibaut Girka
59de2868c1 Fix media description in various media modals 2018-09-11 18:29:19 +02:00
Thibaut Girka
5b7d0fcdb9 Fix incorrect disabled boost button color when reduce-motion is set 2018-09-11 18:03:48 +02:00
Thibaut Girka
ac6fb758b9 Fix incorrect disabled boost button color when reduce-motion is set 2018-09-11 18:03:48 +02:00
Thibaut Girka
19de7be7e6 Do not clear local storage on log out 2018-09-11 17:00:22 +02:00
Thibaut Girka
f1214f00d9 Do not clear local storage on log out 2018-09-11 17:00:22 +02:00
Thibaut Girka
4dd208f482 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/controllers/oauth/authorizations_controller.rb

Just two changes being too close to one another.
Took both.
 2018-09-11 16:51:26 +02:00
Thibaut Girka
cd99255698 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/controllers/oauth/authorizations_controller.rb

Just two changes being too close to one another.
Took both.
 2018-09-11 16:51:26 +02:00
Thibaut Girka
22de1c6c17 [Glitch] Hide floating action button on thread views 
Port 692d03239b to glitch-soc
 2018-09-11 16:29:46 +02:00
Thibaut Girka
65f625cf23 [Glitch] Hide floating action button on thread views 
Port f66a786029 to glitch-soc
 2018-09-11 16:29:46 +02:00
Thibaut Girka
7dd2c28836 Fix status embed card links color 2018-09-10 19:53:55 +02:00
Thibaut Girka
e36f6f48e5 Fix status embed card links color 2018-09-10 19:53:55 +02:00
Thibaut Girka
e6aa730195 [Glitch] After click to embed video, autoplay it 
Port 1cf9467613 to glitch-soc
 2018-09-10 19:53:55 +02:00
Thibaut Girka
d9a92d5040 [Glitch] After click to embed video, autoplay it 
Port 478ca39e5e to glitch-soc
 2018-09-10 19:53:55 +02:00
Thibaut Girka
ddbf9887cd [Glitch] Click card to embed external content 
Port front-end changes from 0357e93a91 to glitch-soc
 2018-09-10 19:53:55 +02:00
Thibaut Girka
bc5009cd45 [Glitch] Click card to embed external content 
Port front-end changes from f7765acf9d to glitch-soc
 2018-09-10 19:53:55 +02:00
Thibaut Girka
6e3625c5bc [Glitch] Fix oEmbed image_modal src. 
Port 7da34ff0a3 to glitch-soc
 2018-09-10 19:53:55 +02:00
Thibaut Girka
dfa6fb4927 [Glitch] Fix oEmbed image_modal src. 
Port 25b0d7538e to glitch-soc
 2018-09-10 19:53:55 +02:00
Thibaut Girka
c48345969f [Glitch] Ensure link thumbnails are not stretched to super low quality 
Port front-end changes from 46cce9ee4b to glitch-soc
 2018-09-10 19:53:55 +02:00
Thibaut Girka
cc58265216 [Glitch] Ensure link thumbnails are not stretched to super low quality 
Port front-end changes from c36b9cc5a6 to glitch-soc
 2018-09-10 19:53:55 +02:00
Thibaut Girka
9b7139099f [Glitch] Add embed_url to preview cards 
Port front-end changes from ce3989fc6a to glitch-soc
 2018-09-10 19:53:55 +02:00
Thibaut Girka
49eaf72faf [Glitch] Add embed_url to preview cards 
Port front-end changes from c083816c24 to glitch-soc
 2018-09-10 19:53:55 +02:00
ThibG
f555f38ea6 Add a few black emojis that are to have a white outline (#8597) 2018-09-10 18:26:47 +02:00
ThibG
bda0f7ac73 Add a few black emojis that are to have a white outline (#8597) 2018-09-10 18:26:47 +02:00
ThibG
441238b938 Handle relative URLs when fetching OEmbed/OpenGraph cards (#8669) 2018-09-10 18:26:28 +02:00
ThibG
bd9e47e9be Handle relative URLs when fetching OEmbed/OpenGraph cards (#8669) 2018-09-10 18:26:28 +02:00
rinsuki
14604c384f using mailto scheme in AUTHORS.md (#8663) 2018-09-10 02:01:03 +02:00
rinsuki
25dd523887 using mailto scheme in AUTHORS.md (#8663) 2018-09-10 02:01:03 +02:00
nightpool
b778e40d7d Add rake task for generating AUTHORS.md (#8661) 
* add rake task for generating AUTHORS.md

* update AUTHORS.md

* rubocop
 2018-09-10 01:31:42 +02:00
nightpool
b0b484ba18 Add rake task for generating AUTHORS.md (#8661) 
* add rake task for generating AUTHORS.md

* update AUTHORS.md

* rubocop
 2018-09-10 01:31:42 +02:00
Eugen Rochko
2aee3c9f23 tootctl accounts [add|del|cull] (#8642) 
* CLI interface for creating/deleting local users

- tootctl accounts add USERNAME
- tootctl accounts del USERNAME

* Add CLI interface for culling remote users that no longer exist

- tootctl accounts cull
 2018-09-09 13:33:36 +02:00
Eugen Rochko
47ea318479
tootctl accounts [add|del|cull] (#8642) 
* CLI interface for creating/deleting local users

- tootctl accounts add USERNAME
- tootctl accounts del USERNAME

* Add CLI interface for culling remote users that no longer exist

- tootctl accounts cull
 2018-09-09 13:33:36 +02:00
Eugen Rochko
72a8ca84e0 Add force_login option to OAuth authorize page (#8655) 
* Add force_login option to OAuth authorize page

For when a user needs to sign into an app from multiple accounts
on the same server

* When logging out from modal header, redirect back after re-login
 2018-09-09 04:10:44 +02:00
Eugen Rochko
2288d50a7b
Add force_login option to OAuth authorize page (#8655) 
* Add force_login option to OAuth authorize page

For when a user needs to sign into an app from multiple accounts
on the same server

* When logging out from modal header, redirect back after re-login
 2018-09-09 04:10:44 +02:00
Evgeny Petrov
87f294a33c RU: Translation fixes (#8652) 
* RU: Fixed typos and wrong translations

* RU: Added missing "chosen_languages" string

* RU: Fixed translation for "Features" tab in Admin Dashboard

* Shortened "Mobile apps" string, lowercased "following" string (it needs plurals btw), fixed typo at "copy" string.

* Fixed "media only" string, shortened "Content warning" placeholder, edited "mute thread" translation

* RU: Fixed "Reply to all" translation, Re-worded "short description" translation
 2018-09-09 10:38:13 +09:00