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 99fc46d023 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Our README.md files are completely different. Discarded upstream changes.
- `app/javascript/core/admin.js`:
  Updating rails-ujs, no real conflict, but a comment to close to changed
  code. Various glitch-soc-only files have been updated to match those changes,
  though.
- `package.json`:
  No real conflict, just an additional dependency in glitch-soc that was too
  close to something updated upstream. Took upstream's changes.
2020-03-22 16:10:44 +01:00
..
action_bar.js Add link to bookmarks in web UI dropdown (#13273) 2020-03-21 03:14:28 +01: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 Count all URLs in text as 23 characters flat, do not count domain part of usernames (#4427) 2017-07-29 00:06:29 +02:00
compose_form.js Merge commit '64909cf0d988fb09917c41cfbc81b1e9a5132aca' into glitch-soc/merge-upstream 2019-07-07 13:49:31 +02:00
emoji_picker_dropdown.js Add announcements (#12662) 2020-01-23 22:00:13 +01:00
navigation_bar.js Add confirmation modal when logging out from the web app (#11671) 2019-08-26 18:24:10 +02:00
poll_button.js Add UI for creating polls (#10184) 2019-03-06 04:53:37 +01:00
poll_form.js Merge branch 'master' into glitch-soc/merge-upstream 2020-03-08 19:38:53 +01:00
privacy_dropdown.js Change description of privacy levels to be more intuitive in web UI (#13197) 2020-03-08 15:59:55 +01:00
reply_indicator.js List attachments in reply indicator and boost modal (#10997) 2019-06-13 17:04:52 +02:00
search.js Scroll into search bar when focus (#12032) 2019-10-01 19:19:10 +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 Add option to reduce motion (#5393) 2017-10-16 09:36:15 +02:00