about summary refs log tree commit diff
path: root/app
AgeCommit message (Collapse)Author
2018-12-10Add specs for activitypub collections controller (#9484)ysksn
* Add specs for ActivityPub::CollectionsController#show * Raise ActiveRecord::RecordNotFound Raising ActiveRecord::NotFound raises NameError: uninitialized constant ActiveRecord::NotFound.
2018-12-10Remove RemoteAccountControllerConcern never used (#9482)ysksn
2018-12-10Fix Admin::TagsController#unhide (#9481)ysksn
2018-12-09Fix directory controller in glitch-socThibaut Girka
2018-12-09[Glitch] Fix various things in the directoryThibaut Girka
Port ecd303c097bf20aa971628ba8420a9f17f3dd1f7 to glitch-soc
2018-12-09Port directory CSS changes from upstreamThibaut Girka
Port 73be8f38c115c279e3d3961b98bd2b82b9706b05 to glitch-soc
2018-12-09Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/javascript/packs/public.js - app/models/user.rb - config/settings.yml - db/schema.rb Moved public.js changes to settings.js.
2018-12-09Add setting to not aggregate reblogs (#9248)ThibG
* Add setting to not aggregate reblogs Fixes #9222 * Handle cases where user is nil in add_to_home and add_to_list * Add hint for setting_aggregate_reblogs option * Reword setting_aggregate_reblogs label
2018-12-08Cache hashtag sample accounts, and exclude ineligible ones (#9465)Eugen Rochko
2018-12-08Make notification time smaller and reduce contrast (#9464)Eugen Rochko
2018-12-07Escape HTML in profile name preview in profile settings (#9446)Paweł Ngei
* fix non-escaped html in the profile settings * provide a default profile text in case if there's no custom one * update haml syntax * simplify default profile name to username * sanitize user-input html but display emojified icons
2018-12-07Fix various things in the directory (#9449)Eugen Rochko
* Fix missing variable in directory page title * Order hashtags by number of people instead of alphabetically * Add icon to OpenGraph preview of directory page * Prevent line breaks in hashtags and ensure lowercase in the table
2018-12-07Fix tag mb_chars comparison of profile directory (#9448)Takeshi Umeda
2018-12-06Merge pull request #848 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2018-12-06Add profile directory (#9427)Eugen Rochko
Fix #5578
2018-12-06Fix mention links in detailed statuses not opening in the WebUIThibaut Girka
2018-12-06Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-12-05Attempt fixing deadlocks by moving account stats update outside transaction ↵ThibG
(#9437) * Use `update_column` instead of `update_attribute` in callback `update_attribute` would normally cause callbacks to be called. Called from a callback, it seems to stop further callbacks from executing. `update_column` does the same work, but without calling callbacks or preventing other callbacks from executing. * Fix deadlocks by moving account stats update outside transaction
2018-12-05Add visible dates for notifications in Notification column (#9423)Paweł Ngei
* add RelativeTimestamp elements * style the elements properly with CSS
2018-12-05Fix thread depth computation in statuses_controller (#9426)ThibG
* Add test that should currently fail * Fix depth computation (will still fail if statuses have been filtered out) * Fix handling of broken threads
2018-12-03Improve account suspension speed and completeness (#9290)Eugen Rochko
- Some associations were missing from the clean-up - Some attributes were not reset on suspension - Skip federation and streaming deletes when purging a dead domain - Move account association definitions to concern
2018-12-02Merge pull request #838 from ↵David Yip
ThibG/glitch-soc/features/reply-all-streaming-entries Display a double reply arrow on public pages for toots that are replies
2018-12-01Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-12-01Fix since_idThibaut Girka
2018-12-01Fix last_status parameter for notifications and conversations (#9407)ThibG
2018-12-01[i18n] update and corrections for Occitan locale (#9404)Quentí
* Update + correction Colomna and not columna Pòt, verb missing * Correction D’aquí is followed by a time period, and dins by a season. Read : https://github.com/briannesbitt/Carbon/pull/1403 for more details. * Correction admin zone * Correction Reïnicializacion, with the funny ï
2018-12-01Add a tooltip explaining what a locked account is (#9403)Paweł Ngei
* create a title tooltip explaining what a locked account is * improve phrasing * minor phrasing fix to unify default and english
2018-11-30Merge pull request #837 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2018-11-30Scroll to selected toot even if the ancestors happen to be loadedThibaut Girka
2018-11-30Scroll to detailed status when new ancestors get insertedThibaut Girka
2018-11-30[Glitch] Fix bug in order of conversations in web UIThibaut Girka
Port e18390cfe6f5f0eb55abafe072b14b7fa123e808 to glitch-soc
2018-11-30[Glitch] Replace recursion in status mapStateToPropsThibaut Girka
Port dfbadd68374ab5ddcaa75907261bd91da688fc6b to glitch-soc
2018-11-30[Glitch] Fix context building in the reducerThibaut Girka
Port 7706ed038f1a16d232635d564a28e6f90e53e0fd to glitch-soc
2018-11-30[Glitch] Introduce flat layout to contexts reducerThibaut Girka
Port 023fe5181b66ba2cbd20cca4e3bd34f132deba52 to glitch-soc
2018-11-30Display a double reply arrow on public pages for toots that are repliesThibaut Girka
2018-11-30Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-11-30Fix that translation is not applied to "joining hashtags" (#9397)mayaeh
2018-11-30Remove npm-run-all dependency (#9401)Eugen Rochko
Fix #9359
2018-11-29Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-11-29Improve detailed status component lifecycleThibaut Girka
- Move componentWillMount and componentWillReceiveProps logic to getDerivedStateFromProps. - Compute CW auto-unfold status earlier
2018-11-29Swap avatar and header input fields in profile page (#9271)ThibG
Fixes #9211
2018-11-28Do not hardcode preferences link, pleroma doesn't have itThibaut Girka
2018-11-28Add error boundary component to catch Web UI crashesThibaut Girka
2018-11-28Do not crash the whole UI when loading an invalid columnThibaut Girka
2018-11-28Switch “cycling” reply policy link to set of radio inputsThibaut Girka
Fixes #832
2018-11-28Add basic UI to set list replies setting in glitch-socThibaut Girka
2018-11-28Add backend support to read and update list-specific show_replies settingsThibaut Girka
2018-11-28Add database support for list show-reply preferencesThibaut Girka
2018-11-27Merge pull request #829 from ThibG/glitch-soc/features/volume-slidersDavid Yip
[Glitch] Volume sliders for videos
2018-11-27Fix TLS handshake timeout not being enforced (#9381)Eugen Rochko
Follow-up to #9329