about summary refs log tree commit diff
path: root/app
AgeCommit message (Collapse)Author
2019-10-11Merge pull request #1233 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-10-10[Glitch] Fix media editing modal changing dimensions when image loadsEugen Rochko
Port 6ebd74f4fa640b9616ebb2730d97722799c6ed56 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-10[Glitch] Remove `lang` attribute from individual statusesEugen Rochko
Port 538db85d3cc6d8fcb3c0a89f7eef069a686c19f4 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-10[Glitch] Add missing back button header for invalid accounttrwnh
Port 95f21ab87f3d459311c411cf429ac051a668218f to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-10[Glitch] Fix performance of home feed regenerationEugen Rochko
Port front-end changes from f665901e3c0930fb8b3741f6bc6f6a15dd0343f6 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-10Increase poll option length limit to 100 chars, number of options to 5Thibaut Girka
2019-10-10Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - README.md - app/javascript/styles/mastodon/components.scss conflicts caused by image URLs being different - app/models/status.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline - app/views/statuses/_simple_status.html.haml - config/locales/en.yml some strings were changed upstream - spec/models/status_spec.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline
2019-10-10Ensure pack is set when rendering OTP promptThibaut Girka
Fixes #1230
2019-10-10Fix media editing modal changing dimensions when image loads (#12131)Eugen Rochko
2019-10-10Fix admin setting to auto-approve hashtags not affecting query (#12130)Eugen Rochko
Follow-up to #12122
2019-10-10Fix not showing if emoji has a local counterpart in admin UI (#12135)Eugen Rochko
Fix #12132
2019-10-09Remove auto-silence behaviour from spam check (#12117)Eugen Rochko
Fix #12113
2019-10-09Fix attachment not being re-downloaded even if file is not stored (#12125)Eugen Rochko
Change the behaviour of remotable concern. Previously, it would skip downloading an attachment if the stored remote URL is identical to the new one. Now it would not be skipped if the attachment is not actually currently stored by Paperclip.
2019-10-09Remove `lang` attribute from individual statuses (#12124)Eugen Rochko
Fix #10930
2019-10-09Add admin setting to auto-approve hashtags (#12122)Eugen Rochko
Change inaccurate labels on other admin settings
2019-10-08Remove fallback to long description on sidebar and meta description (#12119)Eugen Rochko
Fix #12114
2019-10-07Add missing back button header for invalid account (#12094)trwnh
Should fix #6786
2019-10-07Fix hashtag timeline REST API accepting too many hashtags (#12091)Eugen Rochko
2019-10-06Fix `GET /api/v1/instance` REST APIs being unavailable in secure mode (#12089)Eugen Rochko
2019-10-06Fix performance of home feed regeneration (#12084)Eugen Rochko
Fetching statuses from all followed accounts at once takes too long within Postgres. Fetching them one by one and merging in Ruby could be a lot less resource-intensive Because the query for dynamically fetching the home timeline is so heavy, we can no longer offer it when the home timeline is missing
2019-10-06add loglevel fatal to video and audio styles (#12088)Hugo Gameiro
2019-10-06Partially revert scrollbar handling on mobile, since its width-based and wrongThibaut Girka
Have to investigate as to whether it was actually needed on mobile, doesn't seem to be the case from Firefox's Responsive Design Mode
2019-10-06Apply scroll changes to Bookmark columnThibaut Girka
2019-10-06[Glitch] Add refresh button to list of rebloggers/favouriters in web UIEugen Rochko
Port b0323d0888fcb4aa9f85a67422961a85b8ab6069 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-06[Glitch] Do not add margin light when opening modal on mobileYamagishi Kazutoshi
Port 0a49b26793d467589be09305e15ff9cc97cdd200 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-06[Glitch] Fix left side of single column layout being cropped on smaller screensEugen Rochko
Port 37ccafec8fe8bf5588794257744554be61a3f22e to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-06[Glitch] Fix thread column showing pin buttonEugen Rochko
Port 129bc871a0dc9e49900692a0b88d8d5700d9752a to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-06[Glitch] Fix scroll position resetting when opening media modals in web UIEugen Rochko
Port 50755a47b4f0999f8c49501ff4fa4c2ef676fa0e to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-06[Glitch] Fix loading bar being obscured by other elements in web UIEugen Rochko
Port 2b4e2616eab746e4b13f77fef404165b972168ad to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-06[Glitch] Fix scroll to top in single column UIEugen Rochko
Port 2dee293c4c98486d387105224023fad02b8b0d96 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-05[Glitch] Fix column header scrolling with the pageEugen Rochko
Port 706a48ee1f2075ffb35ad4ad9cfc2f23fffbffcb to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-05[Glitch] Fix tabs bar scrolling along with content on mobileEugen Rochko
Port 4cc29eb5ad106c267ff16c9f49f145bc34d1aae0 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-05[Glitch] Fix scrolling in single-column mode on ChromeThibG
Port fb1b710e8ddc800f930f7b2de9a10b716f091abd to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-05[Glitch] Change single-column mode to scroll the whole pageEugen Rochko
Port aa22b38fdbc1842549b6cbc0e0d948f85a71b92a to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-04Fix audio modal closing immediatelyThibaut Girka
2019-10-04Merge tag 'v3.0.0' into glitch-soc/merge-upstreamThibaut Girka
2019-10-04[Glitch] Fix audio attachments opening in video modal from media tab in web UIEugen Rochko
Port c9b8ba50f8ad46e2f7821bb36af0c85e4b9a29df to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-04[Glitch] Scroll into search bar when focusJeong Arm
Port 66fda37fd04de989d12f3f4c565ba5bfc6ee189d to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-04[Glitch] Fix issues in RTL layout in web UIEugen Rochko
Port 9184522cb49d87a58184a0561d46575ea1b5667d to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-04[Glitch] Fix media editing modal and profile directory in light themeEugen Rochko
Port f51f99c3c21e1ef792db91cb90816b6c52727989 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-03New Crowdin translations (#12067)Eugen Rochko
* New translations en.yml (Indonesian) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.json (Turkish) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.json (Arabic) [ci skip] * New translations en.yml (Arabic) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.yml (Arabic) [ci skip] * New translations simple_form.en.yml (Arabic) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.json (French) [ci skip] * New translations simple_form.en.yml (French) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.json (French) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations simple_form.en.yml (Japanese) [ci skip] * New translations simple_form.en.yml (Japanese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.json (Persian) [ci skip] * New translations en.json (Persian) [ci skip] * i18n-tasks normalize * yarn manage:translations
2019-10-03Remove invite comments from UI (#12068)Eugen Rochko
Due to UX confusion and insufficient time to fix it
2019-10-03New Crowdin translations (#12061)Eugen Rochko
* New translations en.json (Armenian) [ci skip] * New translations en.json (Kazakh) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations doorkeeper.en.yml (Hungarian) [ci skip] * New translations en.json (Italian) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations doorkeeper.en.yml (Italian) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations doorkeeper.en.yml (Japanese) [ci skip] * New translations en.yml (Kazakh) [ci skip] * New translations doorkeeper.en.yml (Greek) [ci skip] * New translations doorkeeper.en.yml (Kazakh) [ci skip] * New translations en.json (Korean) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations doorkeeper.en.yml (Korean) [ci skip] * New translations en.yml (Norwegian Nynorsk) [ci skip] * New translations en.json (Occitan) [ci skip] * New translations en.yml (Occitan) [ci skip] * New translations en.json (Hungarian) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations en.json (Persian) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations doorkeeper.en.yml (Dutch) [ci skip] * New translations en.json (Esperanto) [ci skip] * New translations en.yml (Esperanto) [ci skip] * New translations doorkeeper.en.yml (Esperanto) [ci skip] * New translations en.json (Estonian) [ci skip] * New translations en.yml (Estonian) [ci skip] * New translations doorkeeper.en.yml (Estonian) [ci skip] * New translations en.json (Finnish) [ci skip] * New translations doorkeeper.en.yml (Finnish) [ci skip] * New translations en.json (Greek) [ci skip] * New translations en.json (French) [ci skip] * New translations doorkeeper.en.yml (French) [ci skip] * New translations en.json (Galician) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations doorkeeper.en.yml (Galician) [ci skip] * New translations en.json (German) [ci skip] * New translations en.yml (German) [ci skip] * New translations doorkeeper.en.yml (German) [ci skip] * New translations doorkeeper.en.yml (Occitan) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations en.json (Dutch) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.json (Telugu) [ci skip] * New translations en.yml (Telugu) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations doorkeeper.en.yml (Thai) [ci skip] * New translations en.json (Turkish) [ci skip] * New translations doorkeeper.en.yml (Turkish) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations en.json (Welsh) [ci skip] * New translations en.yml (Welsh) [ci skip] * New translations doorkeeper.en.yml (Welsh) [ci skip] * New translations en.json (Spanish, Argentina) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.json (Macedonian) [ci skip] * New translations en.yml (Macedonian) [ci skip] * New translations en.yml (Tamil) [ci skip] * New translations doorkeeper.en.yml (Swedish) [ci skip] * New translations doorkeeper.en.yml (Persian) [ci skip] * New translations doorkeeper.en.yml (Portuguese, Brazilian) [ci skip] * New translations en.json (Polish) [ci skip] * New translations en.yml (Polish) [ci skip] * New translations doorkeeper.en.yml (Polish) [ci skip] * New translations en.json (Portuguese) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations doorkeeper.en.yml (Portuguese) [ci skip] * New translations en.json (Portuguese, Brazilian) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations en.json (Romanian) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations en.yml (Romanian) [ci skip] * New translations en.json (Slovenian) [ci skip] * New translations en.yml (Slovenian) [ci skip] * New translations doorkeeper.en.yml (Slovenian) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations doorkeeper.en.yml (Spanish) [ci skip] * New translations en.json (Swedish) [ci skip] * New translations en.yml (Dutch) [ci skip] * New translations doorkeeper.en.yml (Danish) [ci skip] * New translations en.yml (Armenian) [ci skip] * New translations en.json (Ido) [ci skip] * New translations en.yml (Ido) [ci skip] * New translations doorkeeper.en.yml (Ido) [ci skip] * New translations en.json (Indonesian) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations doorkeeper.en.yml (Indonesian) [ci skip] * New translations en.json (Latvian) [ci skip] * New translations en.yml (Latvian) [ci skip] * New translations en.json (Lithuanian) [ci skip] * New translations en.yml (Hebrew) [ci skip] * New translations en.yml (Lithuanian) [ci skip] * New translations en.json (Malay) [ci skip] * New translations en.yml (Malay) [ci skip] * New translations en.json (Norwegian) [ci skip] * New translations en.yml (Norwegian) [ci skip] * New translations doorkeeper.en.yml (Norwegian) [ci skip] * New translations doorkeeper.en.yml (Hebrew) [ci skip] * New translations en.json (Hebrew) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Bulgarian) [ci skip] * New translations en.json (Asturian) [ci skip] * New translations en.yml (Asturian) [ci skip] * New translations doorkeeper.en.yml (Asturian) [ci skip] * New translations en.json (Breton) [ci skip] * New translations en.yml (Breton) [ci skip] * New translations en.json (Bulgarian) [ci skip] * New translations doorkeeper.en.yml (Bulgarian) [ci skip] * New translations doorkeeper.en.yml (Georgian) [ci skip] * New translations en.json (Chinese Traditional, Hong Kong) [ci skip] * New translations en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations doorkeeper.en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations en.json (Croatian) [ci skip] * New translations en.yml (Croatian) [ci skip] * New translations doorkeeper.en.yml (Croatian) [ci skip] * New translations en.json (Georgian) [ci skip] * New translations en.yml (Georgian) [ci skip] * New translations en.json (Russian) [ci skip] * New translations doorkeeper.en.yml (Russian) [ci skip] * New translations en.yml (Danish) [ci skip] * New translations en.json (Chinese Traditional) [ci skip] * New translations en.yml (Bengali) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations doorkeeper.en.yml (Catalan) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations doorkeeper.en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Traditional) [ci skip] * New translations doorkeeper.en.yml (Basque) [ci skip] * New translations doorkeeper.en.yml (Chinese Traditional) [ci skip] * New translations en.json (Corsican) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations doorkeeper.en.yml (Corsican) [ci skip] * New translations en.json (Czech) [ci skip] * New translations en.yml (Czech) [ci skip] * New translations doorkeeper.en.yml (Czech) [ci skip] * New translations en.json (Danish) [ci skip] * New translations en.json (Bengali) [ci skip] * New translations en.yml (Basque) [ci skip] * New translations en.json (Serbian (Cyrillic)) [ci skip] * New translations en.json (Ukrainian) [ci skip] * New translations en.yml (Serbian (Cyrillic)) [ci skip] * New translations doorkeeper.en.yml (Serbian (Cyrillic)) [ci skip] * New translations en.json (Serbian (Latin)) [ci skip] * New translations en.yml (Serbian (Latin)) [ci skip] * New translations doorkeeper.en.yml (Serbian (Latin)) [ci skip] * New translations en.json (Slovak) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations doorkeeper.en.yml (Slovak) [ci skip] * New translations en.yml (Ukrainian) [ci skip] * New translations en.json (Basque) [ci skip] * New translations doorkeeper.en.yml (Ukrainian) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations en.json (Arabic) [ci skip] * New translations en.yml (Arabic) [ci skip] * New translations en.json (Albanian) [ci skip] * New translations en.yml (Albanian) [ci skip] * New translations doorkeeper.en.yml (Albanian) [ci skip] * New translations doorkeeper.en.yml (Arabic) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations simple_form.en.yml (Indonesian) [ci skip] * New translations simple_form.en.yml (Indonesian) [ci skip] * New translations simple_form.en.yml (Indonesian) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.json (Spanish, Argentina) [ci skip] * New translations devise.en.yml (Spanish, Argentina) [ci skip] * New translations simple_form.en.yml (Indonesian) [ci skip] * New translations devise.en.yml (Spanish, Argentina) [ci skip] * New translations simple_form.en.yml (Indonesian) [ci skip] * New translations devise.en.yml (Spanish, Argentina) [ci skip] * New translations simple_form.en.yml (Indonesian) [ci skip] * New translations devise.en.yml (Spanish, Argentina) [ci skip] * New translations simple_form.en.yml (Indonesian) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations devise.en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations simple_form.en.yml (Indonesian) [ci skip] * New translations simple_form.en.yml (Indonesian) [ci skip] * New translations simple_form.en.yml (Indonesian) [ci skip] * New translations en.json (Corsican) [ci skip] * New translations en.json (Dutch) [ci skip] * New translations en.yml (Dutch) [ci skip] * New translations en.json (Slovak) [ci skip] * New translations en.json (Czech) [ci skip] * New translations en.json (German) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations simple_form.en.yml (Indonesian) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.yml (Japanese) [ci skip] * i18n-tasks normalize * yarn manage:translations
2019-10-03Add `reason` param to `POST /api/v1/accounts` REST API (#12064)Eugen Rochko
For approval-required registrations mode
2019-10-03Fix wrong attribute in MoveWorker (#12066)Eugen Rochko
2019-10-03[Glitch] Fix drag and drop link to composeboxJeong Arm
Port 3abe003f5938fe4194bffa1127d3451eca00e321 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-03[Glitch] Fix bad word breaking on conversationsCutls
Port 733a3d20b089f67ec57b08ddcad19b8de212fd48 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-03[Glitch] Fix typo in mute confirmation dialogThibG
Port 559da46fd48b7442a79de563206fb974f05bd1f4 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-03[Glitch] Fix custom emoji animation on hover in conversations viewThibG
Port 26a8c6fd2dd02426d0353887f0db6eb5b470305a to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-03[Glitch] Fix missing propType for conversation deleteThibG
Port 541269f8bcb575501215b6694924075d696b710b to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
generated by cgit-pink (git 2.37.1) at 2024-11-01 21:43:56 +0000