me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
glitchier-soc/app/javascript/mastodon/features/compose/components
History
Thibaut Girka 1488be7d96 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/home_controller.rb
- app/controllers/shares_controller.rb
- app/javascript/packs/public.js
- app/models/status.rb
- app/serializers/initial_state_serializer.rb
- app/views/home/index.html.haml
- app/views/layouts/public.html.haml
- app/views/public_timelines/show.html.haml
- app/views/shares/show.html.haml
- app/views/tags/show.html.haml
- config/initializers/content_security_policy.rb
- config/locales/en.yml
- config/webpack/shared.js
- package.json
2019-08-19 21:49:35 +02:00
..
action_bar.js Added logout to dropdown menu (#11353) 2019-07-19 03:58:46 +02:00
autosuggest_account.js Display full username in tooltip on search and autosuggest #7478 (#7920) 2018-07-01 04:16:13 +02:00
character_counter.js
compose_form.js Merge commit 'c07cca4727041ea5a5721acbc603d4bfb45a15a6' into glitch-soc/merge-upstream 2019-07-07 13:49:31 +02:00
emoji_picker_dropdown.js Add categories for custom emojis (#11196) 2019-06-28 15:54:10 +02:00
navigation_bar.js Add responsive panels to the single-column layout (#10820) 2019-05-25 21:27:00 +02:00
poll_button.js Add UI for creating polls (#10184) 2019-03-06 04:53:37 +01:00
poll_form.js Add emoji suggestions to CW and poll option fields (#10555) 2019-05-09 22:10:27 +02:00
privacy_dropdown.js Improve keyboard navigation in privacy dropdown (#11492) 2019-08-06 11:59:58 +02:00
reply_indicator.js List attachments in reply indicator and boost modal (#10997) 2019-06-13 17:04:52 +02:00
search.js Fix overlap of emoji button on search popup (#10978) 2019-06-06 13:40:17 +02:00
search_results.js Add search results pagination to web UI (#11409) 2019-07-27 05:49:50 +02:00
text_icon_button.js Change icon button styles to make hover/focus states more obvious (#11474) 2019-08-03 19:10:50 +02:00
upload.js Add media editing modal (#11563) 2019-08-14 04:07:32 +02:00
upload_button.js Change camera icon to paperclip icon in upload form (#11149) 2019-06-22 15:29:25 +02:00
upload_form.js Add OCR tool to media editing modal (#11566) 2019-08-15 15:13:26 +02:00
upload_progress.js Add OCR tool to media editing modal (#11566) 2019-08-15 15:13:26 +02:00
warning.js