about summary refs log tree commit diff
path: root/app
AgeCommit message (Collapse)Author
2018-04-14Merge remote-tracking branch 'glitchsoc/master' into gs-masterDavid Yip
Conflicts: db/schema.rb
2018-04-14Add missing Japanese translationimncls
2018-04-13Merge pull request #419 from ThibG/glitch-soc/features/bookmarksDavid Yip
Bookmarks
2018-04-13Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
Conflicts: Gemfile.lock config/application.rb
2018-04-12Upgrade Rails to version 5.2.0 (#5898)Yamagishi Kazutoshi
2018-04-12Merge remote-tracking branch 'tootsuite/master'David Yip
Conflicts: app/controllers/statuses_controller.rb
2018-04-12Merge pull request #418 from ThibG/glitch-soc/fixes/composer-dropdownsDavid Yip
Place composer dropdown menus top if they are closer to the bottom of the viewport
2018-04-12Merge pull request #416 from ThibG/glitch-soc/features/media-modalDavid Yip
Port various media modal improvements to glitch-soc
2018-04-11Add glitch-soc front-end support for bookmarksThibaut Girka
Unlike boosts and like, there is no confirmation dialog as misclicking can be recovered without another user seeing it.
2018-04-11Place privacy dropdown menu top if it is closer to the bottom of the ↵ThibG
viewport (#7106)
2018-04-11Add backend support for bookmarksThibaut Girka
Bookmarks behave like favourites, except they aren't shared with other users and do not have an associated counter.
2018-04-11Update glitch-soc style to match changes to reports UIThibaut Girka
Port style changes from d9b62e34da0c0238176f27557ac7b953da94df7e
2018-04-11Paginate ancestor statuses in public page (#7102)Akihiko Odaki
This also limits the statuses returned by API, but pagination is not implemented in Web API yet. I still expect it brings user experience better than making a user wait to fetch all ancestor statuses and flooding the column with them.
2018-04-11Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-04-10Place composer dropdown menus top if they are closer to the bottom of the ↵Thibaut Girka
viewport
2018-04-10Feature: Improve reports ui (#7032)Emelia Smith
* Further improvements to Reports UI - Clean up notes display - Clean up add new note form - Simplify controller - Allow reopening a report with a note - Show created at date for reports - Fix report details table formatting * Show history of report using Admin::ActionLog beneath the report * Fix incorrect log message when reopening a report * Implement fetching of all ActionLog items that could be related to the report * Ensure adding a report_note updates the report's updated_at * Limit Report History to actions that happened between the report being created and the report being resolved * Fix linting issues * Improve report history builder Thanks @gargron for the improvements
2018-04-10Improve load gap styling in web UI (#7100)Eugen Rochko
2018-04-10Change custom emoji search to `ILIKE` instead of `=` (#7099)Paul Woolcock
2018-04-10Feature: Allow staff to change user emails (#7074)Emelia Smith
* Admin: Show unconfirmed email address on account page * Admin: Allow staff to change user email addresses * ActionLog: On change_email, log current email address and new unconfirmed email address
2018-04-10Fix GIFV encoding params (#7098)MIYAGI Hikaru
- Explicitly specify video codec. When ffmpeg isn't compiled with libx264 but openh264, mpeg4 is selected as video codec. - Swap avarage bitrate and max bitrate.
2018-04-09When creating status, if no sensitive status is given, use default (#7057)Renato "Lond" Cerqueira
Clients using the API that do not provide the sensitive flag are always posting with false sensitive option.
2018-04-09Feature: Direct message from Statuses (#7089)Emelia Smith
* Fix: Switching between composing direct message and mention from menus Previously clicking "direct message" followed by "mention" resulted in the composed status staying as "direct", along with weird spacing of items in the text area. This attempts to fix that. * Fix: Add missing proptype check for onMention in Status component * Add the ability to send a direct message to a user from the menu on Statuses * Add space between "Embed" and "Mention" on expanded statuses menu
2018-04-09i18n: Update Polish translation (#7085)Marcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-04-09Exclude status itself from context query (#7083)Akihiko Odaki
ancestor_statuses and descendant_statuses used to include the root status itself, but the behavior is confusing because the root status is not an ancestor nor descendant.
2018-04-08Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
Conflicts: app/serializers/initial_state_serializer.rb The glitch flavour isn't yet pulling custom emoji data on its own (see https://github.com/tootsuite/mastodon/pull/7047). Once that gets into the glitch flavour, we can eliminate the custom_emojis load.
2018-04-09[Glitch] Fix video player heightThibaut Girka
Port 31e7b7308489ecc8b43f83b78ec0a288c4195d5b to glitch-soc
2018-04-09[Glitch] Refactor scssThibaut Girka
Port f691afaae913fdb3041864b2824ca092e092ba84 to glitch-soc
2018-04-09Fix video modalThibaut Girka
2018-04-08[Glitch] Avoid using JS to set height in MediaModalThibaut Girka
Port fa5c867e0ec426fc01653e9022ba29783b2a826f to glitch-soc
2018-04-08[Glitch] Improved media modalThibaut Girka
Port 4e929b2d173fa22b722c58c0e9f8223eb4f44b0e to glitch-soc
2018-04-08[Glitch] Allow to open a modal for embedded photoThibaut Girka
Port bf7757cbbc7677fb46aee9a0a8d1b8a37ded7bb6 to glitch-soc
2018-04-08Hide search from Compose on mobile devices (#7077)Emelia Smith
* Hide search from Compose on mobile devices We're presently seeing large numbers of users accidentally tooting what they're trying to search for. This PR hides the search form from the Compose view, now that we have a dedicated "search" tab on mobile. * Don't "showSearch" on mobile if we're not currently searching (isSearchPage)
2018-04-08Add search item to tab bar for mobile devices (#7072)Emelia Smith
* Add search item to tab bar for mobile devices * Fix missing prop validation
2018-04-08Enable updating additional account information from user preferences via ↵Levi Bard
rest api (#6789) * Enable updating additional account information from user preferences via rest api Resolves #6553 * Pacify rubocop * Decoerce incoming settings in UserSettingsDecorator * Create user preferences hash directly from incoming credentials instead of going through ActionController::Parameters * Clean up user preferences update * Use ActiveModel::Type::Boolean instead of manually checking stringified number equivalence
2018-04-08Fix follow/unfollow buttons on public profile (fixes #7036) (#7040)ThibG
* Fix follow/unfollow buttons on public profile - Present non-logged users with web+mastodon:// URLs for remote accounts - Present logged-in users with appropriate links (authorize_follows and remote_unfollows) for remote accounts * Do not cache rendered cards if user is logged in
2018-04-08Free stroage if it is exceeding disk quota (#7061)Akihiko Odaki
2018-04-08Fix video playback in glitch-soc detailed statusesThibaut Girka
2018-04-07Add a circuit breaker for ActivityPub deliveries (#7053)Eugen Rochko
2018-04-07i18n: improve "Welcome" translation in Portuguese (#7068)Hisham Muhammad
* i18n: update gender-neutral language for pt and pt-BR Instead of using "bem-vindo(a)" (a masculine form of "Welcome" with a "(a)" in the end to mean "bem-vinda" for the feminine form), use "boas-vindas", which is a gender-neutral form of "Welcome"). There is already precedent for using "boas-vindas" in the Brazilian Portuguese localization, in `config/locales/pt-BR.yml`. European Portuguese dictionary Priberam also registers it as a valid form: https://www.priberam.pt/dlpo/boas-vindas * i18n: pt-BR minor orthography fix The form "a bordo" does not take an accent. http://oredator.com.br/curso-de-redacao/uncategorized/a-bordo-ou-a-bordo
2018-04-07Prevent admins and moderators eavesdropping in private and direct toots (#7067)Alda Marteau-Hardi
Fix #6986
2018-04-07Forward deletes on the same path as reply forwarding (#7058)Eugen Rochko
* Forward deletes on the same path as reply forwarding * Remove trailing whitespace
2018-04-07Remove duplicate frequently used emojis (#7064)Harmon
2018-04-04retrieve custom emoji list via API instead of before page load (#7047)Isatis
2018-04-04Adjust privacy policy (#6666)Eugen Rochko
* Adjust privacy policy to be more specific to Mastodon Fix #6613 * Change data retention of IP addresses from 5 years to 1 year * Add even more information * Remove all (now invalid) translations of the privacy policy * Add information about archive takeout, remove pointless consent section * Emphasis on DM privacy * Improve wording * Add line about data use for moderation purposes
2018-04-04Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
Conflicts: spec/views/about/show.html.haml_spec.rb
2018-04-04Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-masterDavid Yip
2018-04-04Merge pull request #412 from ThibG/glitch-soc/cleanupbeatrix
Remove duplicate message entries (minor code cleanup)
2018-04-04Update accounts SCSS for public pagesThibaut Girka
2018-04-04Remove duplicate message entriesThibaut Girka
2018-04-04Revert "Add double-tap zoom functionary to `ZoomableImage` (#6944)" (#7035)Emelia Smith
Unfortunately the new hammer.js functionality wasn't correctly tested and didn't work across devices and browsers, as such, it's best to revert PR #6944 until we can revisit this functionality and make it work across all devices and browsers that are supported by Mastodon. This reverts commit 5021c4e9ca78881f5379a18185a46e580b8f2c34.
generated by cgit-pink (git 2.37.1) at 2024-11-08 01:22:10 +0000