mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-13 06:35:08 +01:00
Code Issues Projects Releases Wiki Activity
4,498 Commits 139 Branches 269 Tags 897 MiB
7cc0da756d
Commit Graph

3027 Commits

Author SHA1 Message Date
beatrix
7cc0da756d Merge pull request #161 from DJSundog/audio-uploads-feature 
Audio uploads feature
 2017-10-07 20:13:53 -04:00
DJ Sundog
979b0d66a7 update indentation 2017-10-07 13:53:46 -07:00
DJ Sundog
6ca03a7f58 add faststart to audio transcoding 2017-10-07 19:59:22 +00:00
DJ Sundog
96ba3482b9 adding support for audio uploads, transcoded to mp4 videos 2017-10-07 19:54:10 +00:00
kibigo!
6610d57f91 Basic static metadata styling 2017-10-06 22:22:34 -07:00
Ondřej Hruška
37e141bccb
comment out unused stuff with Video 2017-10-06 09:23:28 +02:00
Ondřej Hruška
f82e90bf11
workaround for notif clearing 2017-10-05 21:55:02 +02:00
beatrix
b1217242fc Merge pull request #125 from glitch-soc/data-column 
Add data-column="..." to all columns
 2017-09-30 15:02:21 -04:00
Ondřej Hruška
ce3e0faf4d
add login form to landing page if regs are closed 2017-09-29 16:41:18 +02:00
kibigo!
53f829dfa8 HAML fix 2017-09-28 18:16:04 -07:00
kibigo!
cf1f83ca2a Fixed lingering upstream Theme code 2017-09-28 17:45:16 -07:00
kibigo!
1522795853 new HAML for statuses 2017-09-28 17:18:12 -07:00
Ondřej Hruška
e9f9e3cc89
unbreak onboarding modal 2017-09-28 11:13:37 +02:00
Ondřej Hruška
cf24ce7e03
remove wrong emojify usage in old glitch components 2017-09-28 11:03:23 +02:00
Ondřej Hruška
74e4fc8f8a
fix custom emoji not shown in statuses 2017-09-28 10:13:16 +02:00
Ondřej Hruška
9a5418942c
fix some js errors due to number->string change of status ID 2017-09-28 10:04:20 +02:00
Ondřej Hruška
daad07b1d5
Merge remote-tracking branch 'origin/better-themeing' into merging-upstream 2017-09-28 09:20:59 +02:00
Ondřej Hruška
83bda6c1a8
Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream 2017-09-28 09:18:35 +02:00
Ondřej Hruška
9330ea1f4d
Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream 2017-09-28 09:12:17 +02:00
Ondřej Hruška
06e299cef5
Revert "autoscroll emoji suggestions box" 
This reverts commit c89cce0219.
 2017-09-28 08:56:32 +02:00
Ondřej Hruška
8a24ad5828
Revert "Merge pull request #149 from glitch-soc/mojon-suggest" 
This reverts commit fa3587645d, reversing
changes made to 15c9c2fd7e.
 2017-09-28 08:55:53 +02:00
Eugen Rochko
e648ef0bfb Remove web UI warnings about OStatus privacy (#5102) 
* Remove web UI warnings about OStatus privacy

* yarn run manage:translations
 2017-09-28 00:26:33 +02:00
Eugen Rochko
3caf0ba923 Fix empty query sent to postgres for custom emojis (#5121) 2017-09-27 04:14:03 +02:00
kibigo!
86e617a839 Better themeing support!! 2017-09-25 19:24:32 -07:00
Eugen Rochko
e528114c53 Follow-up to #4582 and #5027, removing dead code (#5101) 2017-09-26 01:06:27 +02:00
Eugen Rochko
cf7fbf2c56 Fix #5059 - Stop processing payload if it's from local account (#5100) 2017-09-26 01:06:13 +02:00
Eugen Rochko
91e5b0dfdb Send streaming API delete to people mentioned in status (#5103) 
- Previously they wouldn't receive it unless they were author's
  followers
- Skip unpush from public/hashtag timelines if status wasn't
  public in the first place
 2017-09-26 00:29:29 +02:00
Eugen Rochko
3b60832214 New error page graphic. Other error page improvements (#5099) 
- 500.html generated with admin-set default locale if set
- Error page `<title>` includes Mastodon site title
- 500 title changed to "This page is not
  correct" (ref: <https://www.youtube.com/watch?v=2VCAP_seh1A>)
- 500 content appended with "on our end" to make clear it's
  not user's fault
 2017-09-25 23:05:54 +02:00
Lynx Kotoura
259181c41a Fix size of single media in media-gallery (#5098) 2017-09-25 20:26:50 +02:00
Eugen Rochko
510df0ac55 Fix emojify() by generating a mapping to existing Twemoji files (#5080) 
A new rake task emojis:generate downloads a full list of valid
unicode sequences from unicode.org and checks it against existing
Twemoji files, finally generating a map from each sequence to the
existing file (e.g. when there's multiple ways an emoji can be
expressed). The map is dumped into app/javascript/mastodon/emoji_map.json

That file is loaded by emojione_light.js (now a misnomer) which
decorates it further with shortcodes taken from emoji-mart's index.
 2017-09-25 18:36:33 +02:00
Akihiko Odaki
98936bfcdf Add missing validations in ActivityPub::Activity::Create (#5096) 2017-09-25 18:33:11 +02:00
unarist
5c82c2b75f Increase max height of preview card image (#5092) 
We added horizontal layout to preview card for wide image. However, max height of the thumbnail is still limited to 120px and it makes nearly square images to too small for that layout.

This PR increases max height as well as max width.
 2017-09-25 17:10:49 +02:00
Eugen Rochko
2c8e3fbbfb Generate 500.html with assets:precompile, remove loading from Google Fonts (#5067) 2017-09-25 04:04:04 +02:00
JeanGauthier
3f3de38075 OC update: different emoji picker (#5046) (#5077) 2017-09-24 12:17:47 +02:00
ThibG
c267acfcf7 Thread toot notification mails by conversation (#5061) 
* Thread toot notification mails by conversation

* Make codeclimate happy and avoid potential mis-threading
 2017-09-24 11:19:42 +02:00
Daigo 3 Dango
ab625c57ce Compact status_ids in StatusRelationshipsPresenter (#5073) 2017-09-24 11:18:32 +02:00
abcang
e756c4f5ec Fix media spoiler of DetailedStatus (#5071) 2017-09-24 11:15:11 +02:00
Daigo 3 Dango
a0bbeafb04 Suppress backtrace when failed to communicate with a remote instance (#5076) 2017-09-24 11:14:06 +02:00
Eugen Rochko
2f079573ed In detail status view, display attachment uncropped if there's only one (#5054) 
* In detail status view, display attachment uncropped if there's only one

* Make media spoiler the size of the media it hides, enable on static
 2017-09-24 05:58:30 +02:00
Eugen Rochko
adc38078dd Make sure nil IDs to not get cast to empty string in REST API (#5068) 2017-09-24 04:09:32 +02:00
Eugen Rochko
dae0af1fd2 Change mobile layout breakpoint from 1024px to 630px (#5063) 
630px = Drawer + 1 Column
 2017-09-24 01:25:07 +02:00
Eugen Rochko
5b8d0ad71b Dropdown triangles a bit nicer, smoother scrolling on touch (#5062) 2017-09-24 00:40:10 +02:00
Eugen Rochko
233258c61b Fix media gallery CSS (#5064) 2017-09-24 00:33:26 +02:00
Eugen Rochko
9c8aad612e Require at least 2 characters before showing autosuggestions (#5065) 2017-09-24 00:33:17 +02:00
Ondřej Hruška
210e6776fc
Fix intl warning with disabled secondary toot btn 
- Moved building the secondary btn text into the if to avoid trying to translate 'none' visibility
 2017-09-23 23:41:25 +02:00
Ondřej Hruška
1924a71b5a
Make secondary toot button work nicer with file attachments & revert to the original behavior if it's disabled 2017-09-23 23:38:24 +02:00
Ondřej Hruška
67f8277526 Add secondary toot button (opt-in) (#153) 
Add secondary toot button + other toot button enhancements. 
Squashing so it's easy to revert if needed.
 2017-09-23 23:11:02 +02:00
Mingye Wang
6dfeb64326 jsx/zh-*: Fix "pin column" for Chinese (#5060) 2017-09-23 22:47:15 +02:00
m4sk1n
427beb4177 i18n: Update Polish translation (#5058) 2017-09-23 22:14:39 +02:00
Lynx Kotoura
838f255fc2 Fix overflowing tabs in account__action-bar (#5056) 
* Fix numbers in accounts columns

* Support edge compact-header
 2017-09-23 21:06:16 +02:00