| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2019-06-24 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| Conflicts: - app/models/media_attachment.rb Upstream added audio attachment support - app/serializers/initial_state_serializer.rb Upstream added audio attachment support and how mimetypes are returned - app/serializers/rest/instance_serializer.rb Upstream added a few fields - config/application.rb Upstream added a different paperclip transcoder | |||
| 2019-06-21 | Change audio format from ogg to mp3 for wider compatibility (#11141) | Eugen Rochko | |
| * Change audio format from ogg to mp3 for wider compatibility * Add media description as title to links of unknown media attachments | |||
| 2019-06-13 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| 2019-06-13 | Fix ordering of keyboard access between CW field, textarea and emoji picker ↵ | ThibG | |
| (#11066) | |||
| 2019-06-13 | Fix border-bottom of active tab bars (#11068) | ThibG | |
| 2019-06-11 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| 2019-06-11 | Fix list not being automatically unpinned when it returns 404 in web UI (#11045) | Eugen Rochko | |
| 2019-06-10 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| Conflicts: - app/controllers/settings/notifications_controller.rb - app/javascript/packs/public.js - app/views/settings/preferences/show.html.haml - app/views/stream_entries/_simple_status.html.haml - config/locales/simple_form.en.yml - config/locales/simple_form.pl.yml - config/navigation.rb - config/routes.rb | |||
| 2019-06-09 | Fix position of search icon (#11003) | Eugen Rochko | |
| 2019-06-08 | Fix more issues in the light theme (#10996) | Eugen Rochko | |
| * Fix tabs bar in light theme * Fix borders on small screens in light theme | |||
| 2019-06-08 | Change full logo to use primary text color of the given theme (#10994) | Eugen Rochko | |
| * Change full logo to use primary text color of the given theme * Fix colors of public layout header in light theme | |||
| 2019-06-08 | Improve light theme (#10992) | Eugen Rochko | |
| 2019-06-07 | Fix RTL layout not being RTL within the columns area (#10990) | Eugen Rochko | |
| 2019-06-07 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| Conflicts: - app/controllers/statuses_controller.rb - app/controllers/stream_entries_controller.rb | |||
| 2019-06-07 | Fix display of alt-text when a media attachment is not available (#10981) | ThibG | |
| 2019-06-07 | Change preferences page into appearance, notifications, and other (#10977) | Eugen Rochko | |
| 2019-06-06 | Fix sass-lint config (#10982) | Yamagishi Kazutoshi | |
| 2019-06-06 | Fix emoji picker being always displayed (#10979) | Takeshi Umeda | |
| * Fix emoji picker being always displayed * Remove duplicate content with other pull-requests | |||
| 2019-06-04 | Fix margins on profile metadata in single column mode (#10961) | Eugen Rochko | |
| 2019-06-03 | Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream | Thibaut Girka | |
| Conflicts: - Gemfile.lock - config/webpack/rules/css.js - package.json - yarn.lock | |||
| 2019-06-02 | Fix profile picture preview (#10931) | Jeong Arm | |
| 2019-06-02 | Improvement variable height in single column layout (#10917) | Takeshi Umeda | |
| * Improvement variable height of compose and navigation panel in single column layout * Fix wrong quotes and missing commas | |||
| 2019-06-01 | Center 2-columns layout without side effect (#10915) | Hanage999 | |
| 2019-05-30 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| 2019-05-29 | Fix safari post field display issue in single column layout (#10883) | Takeshi Umeda | |
| 2019-05-28 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| 2019-05-27 | Use `<use />` to render transparent SVG logo instead of inserting it (#10845) | Eugen Rochko | |
| 2019-05-26 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb Conflicts due to the addition of a new preference upstream, “advanced layout”. | |||
| 2019-05-25 | Avoid cutting bottom of letters of last paragraph of statuses (#10821) | Mélanie Chauvel (ariasuni) | |
| 2019-05-25 | Add responsive panels to the single-column layout (#10820) | Eugen Rochko | |
| * Add responsive panels to the single-column layout * Fixes * Fix not being able to save the preference * Fix code style issues * Set max-height on the compose textarea and add a link to relationship manager | |||
| 2019-05-24 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| Conflicts: - streaming/index.js | |||
| 2019-05-23 | Various improvements to single column layout (#10809) | Eugen Rochko | |
| - Add potential side panels to single column layout - Hide FAB on large screens | |||
| 2019-05-23 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| Conflicts: - app/models/account.rb - app/views/settings/profiles/show.html.haml - spec/controllers/api/v1/accounts/credentials_controller_spec.rb Conflicts were due to an increase in account bio length upstream, which is already covered in glitch-soc through `MAX_BIO_CHARS`. | |||
| 2019-05-23 | Add `forceSingleColumn` prop to `<UI />` (#10807) | Eugen Rochko | |
| * Move TabsBar rendering logic from CSS to the ColumnsArea component * Add forceSingleColumn mode * Add unread notifications counter to tabs bar * Add toggle to control `forceSingleColumn` * Increase paddings in mobile layout responsively at large sizes | |||
| 2019-05-22 | Fix stacking order of emoji picker (#10801) | nzws | |
| 2019-05-15 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| 2019-05-15 | Adds click-able div that expands status (#10733) (#10766) | Neil Moore | |
| The clickable div is positioned under the account avatar and covers all empty space below it to the end of the status. | |||
| 2019-05-12 | Fix some colors in light theme (#10754) | nzws | |
| * Fix typo in light theme * Fix background color of empty column | |||
| 2019-05-11 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| 2019-05-10 | Change icon and label depending on whether media is marked as sensitive (#10748) | ThibG | |
| * Change icon and label depending on whether media is marked as sensitive * WiP use a checkbox | |||
| 2019-05-10 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| Conflicts: - app/controllers/statuses_controller.rb minor conflict because of glitch-soc's theming system - app/controllers/stream_entries_controller.rb minor conflict because of glitch-soc's theming system | |||
| 2019-05-09 | Add emoji suggestions to CW and poll option fields (#10555) | ThibG | |
| * Refactor selectComposeSuggestion so that different paths can be updated * Add suggestions in CW field * Add emoji suggestion to poll options * Attempt to fix CSS * Hide suggestions by default They will be enabled if the input has focus | |||
| 2019-05-09 | Improve poll link accessibility (#10720) | Maciek Baron | |
| * Add distinction between hover and active/focus states * Resolves #10198 | |||
| 2019-05-08 | Bring back crossed eye icon on gallery (#10715) | Jeong Arm | |
| 2019-05-07 | Fix some colors of high contrast theme (#10711) | nzws | |
| * Fix "nothing here" text color of high contrast * Fix counter border color of high contrast | |||
| 2019-05-05 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| 2019-05-05 | Make sure the instance banner is never cropped (#10702) | Baptiste Gelez | |
| 2019-05-04 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| 2019-05-04 | Fix transition: all (#10699) | ThibG | |
| 2019-05-04 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| Conflicts: - app/models/media_attachment.rb | |||
 |
index : mastodon | |
| Plural Café fork of Mastodon/Glitch Social |
| about summary refs log tree commit diff |