djsundog
/
tootlab-mastodon
mirror of https://github.com/glitch-soc/mastodon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,524 Commits 69 Branches 20 Tags 356 MiB
Commit Graph

7524 Commits

Author SHA1 Message Date
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 011437dcb5
Group reports by target account (#8674) 
* Group reports by target account

* Improve CSS
 2018-09-13 03:44:08 +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 307fb338ee Fix composer actions modal 2018-09-11 22:04:06 +02:00
Thibaut Girka 49734c03fd Fix action modal links 2018-09-11 22:04:06 +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 59de2868c1 Fix media description in various media modals 2018-09-11 18:29:19 +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 f1214f00d9 Do not clear local storage on log out 2018-09-11 17:00:22 +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 65f625cf23 [Glitch] Hide floating action button on thread views 
Port f66a786029 to glitch-soc
 2018-09-11 16:29:46 +02:00
Thibaut Girka e36f6f48e5 Fix status embed card links color 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 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 dfa6fb4927 [Glitch] Fix oEmbed image_modal src. 
Port 25b0d7538e 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 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 bda0f7ac73 Add a few black emojis that are to have a white outline (#8597) 2018-09-10 18:26:47 +02:00
ThibG bd9e47e9be Handle relative URLs when fetching OEmbed/OpenGraph cards (#8669) 2018-09-10 18:26:28 +02:00
rinsuki 25dd523887 using mailto scheme in AUTHORS.md (#8663) 2018-09-10 02:01:03 +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 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 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 2492c12281 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
Daigo 3 Dango 675f4705c7 Adjust Aptfile for Heroku-18 stack (#8588) 2018-09-09 02:10:58 +02:00
Sorin Davidoi 8fefcb86ea feat(css): Styled scrollbars in Firefox Nightly (#8653) 
You currently need to enable `layout.css.scrollbar-colors.enabled` in `about:config` in Firefox
Nightly.
 2018-09-09 02:08:49 +02:00
Sorin Davidoi 6f3d934bc1 feat(cookies): Use the same-site attribute to lax (#8626) 
CSFR-prevention is already implemented but adding this doesn't hurt.

A brief introduction to Same-Site cookies (and the difference between strict and
lax) can be found at
https://blog.mozilla.org/security/2018/04/24/same-site-cookies-in-firefox-60/

TLDR: We use lax since we want the cookies to be sent when the user navigates
safely from an external site.
 2018-09-08 23:54:28 +02:00
Thibaut Girka 324ce93368 Add preferences for notification badges 2018-09-07 20:37:17 +02:00
Thibaut Girka ba4521b175 Move compose box options to their own page 2018-09-07 20:37:17 +02:00
Thibaut Girka b28cbb8b25 Add unread notifications badge to the mobile navbar 2018-09-07 20:37:17 +02:00
Thibaut Girka 2cdc00bc8b Add unread notifications badge to the navigation bar 2018-09-07 20:37:17 +02:00
Thibaut Girka 0f155af32a Add notification badge to favicon 2018-09-07 20:37:17 +02:00
Thibaut Girka d315f1dc02 Count unread notifications when window loses focus 2018-09-07 20:37:17 +02:00
Thibaut Girka c8875b4d8a Keep track of unread notifications when the notification column isn't mounted 2018-09-07 20:37:17 +02:00
Thibaut Girka 711826cb37 Accurately count deleted unread notifications 2018-09-07 20:37:17 +02:00
Thibaut Girka f4ca3262f2 [Glitch] Audio.prototype.seek is undefined 
Port f08e6e9ab5 to glitch-soc
 2018-09-07 20:37:17 +02:00
Thibaut Girka 8dbbec0939 Fix dropdown arrow position 2018-09-07 09:45:33 +02:00
Renato "Lond" Cerqueira 7607f4778b Use animation config for avatar in profile pages (#8614) 
Fixes #7380.
 2018-09-07 05:43:09 +02:00
abcang 2058af4a26 config/boot is required first (#8619) 2018-09-07 05:42:54 +02:00
Sorin Davidoi 10680f93e7 feat(auth/session_controller): Send Clear-Site-Data when logging out (#8627) 
Will clear the browser's cache, cookies and storage.

https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Clear-Site-Data
https://w3c.github.io/webappsec-clear-site-data/
 2018-09-07 05:42:16 +02:00
ThibG 0c5db3163a Fix dropdown arrow position (#8637) 2018-09-07 01:18:46 +02:00
Thibaut Girka 7f2f59dae6 Fix public profile's “show more” links styling 2018-09-05 13:46:19 +02:00
Thibaut Girka 258e8b7734 Port SCSS changes from 19b07ba260 2018-09-05 13:46:19 +02:00
Thibaut Girka 4b29a41f1d Port SCSS changes from 85bb32c410 2018-09-05 13:46:19 +02:00
Thibaut Girka 77e7da7d0d Port SCSS changes from 78fa926ed5 2018-09-05 13:46:19 +02:00
Thibaut Girka d8b2f15b23 Pause video playback if toot is collapsed or CWs folded (fixes #146) 2018-09-05 11:58:56 +02:00
Thibaut Girka a9ed9d3572 Fix videos being cropped 2018-09-05 11:58:43 +02:00
Aditoo17 8c96fd4967 Add Czech language option and locale data (#8594) 
* Added Czech language option

* Added Czech language option

* Add Czech locale data

* Delete duplicate locale-data/cs.js

Duplicate locale-data is ignored in Mastodon.

see https://github.com/tootsuite/mastodon/blob/v2.5.0/config/webpack/generateLocalePacks.js#L25-L35
 2018-09-05 08:50:06 +09:00
Thibaut Girka c0275cdcb2 Fix interactions between CW and sensitive flag when spoilersAlwaysOn is set 2018-09-04 19:40:57 +02:00
Thibaut Girka 3d5a789bbb Fix “sensitive” media warning and upload form colors in Mastodon-light 2018-09-04 18:50:26 +02:00