Commit Graph

  • fe1c20cfb9 Fix tabs-vs-spaces issue pointed out by eslint. David Yip 2017-10-12 09:23:06 -05:00
  • cb7ba23cd8 Update oc.json (#5343) JeanGauthier 2017-10-12 15:40:45 +02:00
  • 691e9112f3 Update fr.yml (#5330) JohnD28 2017-10-12 15:25:34 +02:00
  • 385df2c5a0 + me for Dutch (#5349) Jeroen 2017-10-12 12:07:35 +02:00
  • 35ec1c91e3 Fix some failure cases on FetchLinkCardService (#5347) unarist 2017-10-12 19:01:32 +09:00
  • edd1a00faf Restore variable assignment in MuteService#call. David Yip 2017-10-12 04:27:45 -05:00
  • 13e05fece2 Merge tag 'v2.0.0rc2' into gs-master David Yip 2017-10-12 04:22:59 -05:00
  • 9d84b6e606 i18n: Update Polish translation (#5346) Marcin Mikołajczak 2017-10-12 09:56:03 +02:00
  • bf0f7e8846 Moderation notes (#5344) JeanGauthier 2017-10-12 08:28:15 +02:00
  • 4817744b87 Update ja.yml (#5342) nullkal 2017-10-12 12:18:13 +09:00
  • 8e9911962d Change Android icon padding again to half of previous (#5339) Eugen Rochko 2017-10-12 00:58:14 +02:00
  • 3ebe03b729 Fixes and updates for the French translation (#5340) Sylvhem 2017-10-12 00:58:01 +02:00
  • eeaa8fba43 Fix our media gallery not having alt text and tooltips Ondřej Hruška 2017-10-11 22:02:24 +02:00
  • b0b5ff1b0f workaround for scrollIntoView bug ??? Ondřej Hruška 2017-10-11 21:49:22 +02:00
  • bd51a16150 add duck beaks in haml Ondřej Hruška 2017-10-11 21:34:00 +02:00
  • 0bf9261e65 Merge remote-tracking branch 'upstream/master' Ondřej Hruška 2017-10-11 21:27:17 +02:00
  • 6bc07d3de3 Updating Dutch strings for 2.0 (#5334) Jeroen 2017-10-11 21:21:22 +02:00
  • fbc6375fde Add myself as codeowner of the translation files. (#5333) Alda Marteau-Hardi 2017-10-11 21:21:13 +02:00
  • 0352c40e99 Use gender neutral language as in the rest of the french translation (#5331) Alda Marteau-Hardi 2017-10-11 21:20:56 +02:00
  • e5d8166a12 Fix #5329 (#5332) aschmitz 2017-10-11 14:20:39 -05:00
  • 07ea625cb2 Fix styles of error pages (#5335) Lynx Kotoura 2017-10-12 04:18:46 +09:00
  • 3cc6255a7e Removed length check which now happens in reducer kibigo! 2017-10-11 11:50:11 -07:00
  • 35e2cad4eb Fixed header emojification kibigo! 2017-10-11 11:00:28 -07:00
  • 8d6b9ba494 Merge upstream 2.0ish #165 kibigo! 2017-10-11 10:43:10 -07:00
  • 27101f1beb fix presented og:url is incorrect (#5320) takayamaki 2017-10-12 02:22:21 +09:00
  • 1823cf435a In thread view, only scroll first update, scroll to replied-to post (#5322) Eugen Rochko 2017-10-11 19:21:44 +02:00
  • 6a50329a9c Only preload JS in /web pages (#5325) Nolan Lawson 2017-10-11 10:20:55 -07:00
  • b17e571bc2 Add padding to Android icon, change Apple and MS icons (#5321) Eugen Rochko 2017-10-11 19:11:15 +02:00
  • 476e79b8e3 Fully disable hotkeys when input element is focused (#5324) Eugen Rochko 2017-10-11 16:31:07 +02:00
  • 19d3317a69 Update french translation : mastodon/locales/fr.json (#5318) JohnD28 2017-10-11 15:07:09 +02:00
  • fe6941e28e Update doorkeeper.fr.yml (#5317) JohnD28 2017-10-11 15:04:36 +02:00
  • 38600b2792 Update ar.json (#5316) ButterflyOfFire 2017-10-11 13:19:04 +01:00
  • b0407ece42 Fix an error when ancestors get loaded before the status itself (#5312) unarist 2017-10-11 18:25:15 +09:00
  • 9b3d8ee346 Fix #5281 - Fix tooltip/custom emoji/search interaction (#5310) Eugen Rochko 2017-10-11 01:33:29 +02:00
  • b3d7ad958f Fix #5306: Stop hotkeys in input fields even when shift is pressed (#5309) Eugen Rochko 2017-10-11 01:01:17 +02:00
  • 552d22bec9 sign_in and sign_up views present og meta infos (#5308) takayamaki 2017-10-11 07:52:25 +09:00
  • 7c33da45f0 Bump version to 2.0.0rc2 Eugen Rochko 2017-10-10 20:48:26 +02:00
  • 9815be2a44 Fix #5293 - Pre-fill frequently used emojis to avoid bugs (#5305) Eugen Rochko 2017-10-10 20:47:14 +02:00
  • bebaa6eced Remove prop types from external libraries (#5304) Nolan Lawson 2017-10-10 09:44:51 -07:00
  • 616f53eea8 Update German translation (#5302) Jakob Kramer 2017-10-10 16:12:18 +02:00
  • 61d3ecc805 Fix custom emoji copy not copying file (#5298) Eugen Rochko 2017-10-10 15:18:27 +02:00
  • 4bb3e4eeba Fix #5295 - Order custom emoji lexicographically (#5297) Eugen Rochko 2017-10-10 15:18:12 +02:00
  • 784c7510d7 Fix an error when video playback buffer is empty (#5300) unarist 2017-10-10 22:17:53 +09:00
  • 6c54d2e583 foreign_key, non-nullable, dependent: destroy in account_moderation_notes (#5294) nullkal 2017-10-10 20:12:17 +09:00
  • 96c942e8ab Fix wrong dimensions on Android icon (#5296) Eugen Rochko 2017-10-10 12:41:30 +02:00
  • aafe55af81 Material app icon for Chrome (#5291) Eugen Rochko 2017-10-09 21:27:16 +02:00
  • fd49d5603a Fix #5278 - Update emoji-mart so invalid emoji IDs don't crash it (#5290) Eugen Rochko 2017-10-09 20:52:40 +02:00
  • 1c6fc0e4ce Center error layout (#5289) Eugen Rochko 2017-10-09 20:51:36 +02:00
  • 92e7815d1d Fix #5274 - Create symlink from public/500.html to public/assets/500.html (#5288) Eugen Rochko 2017-10-09 20:51:24 +02:00
  • 9d97054fe6 Remove timestamps on any option (#5282) Jeong Arm 2017-10-10 00:52:02 +09:00
  • cc796298c9 Fix pagination in Api::V1::BlocksController (#5285) Akihiko Odaki 2017-10-10 00:30:31 +09:00
  • f0a2a6c875 try to tighten up local only toot stuff, like... properly (#163) beatrix 2017-10-09 09:56:17 -04:00
  • 7fd66cf2fe Fix migration failure due to StrongMigrations on production env (#5283) unarist 2017-10-09 17:05:35 +09:00
  • 6e9e0c14e6 Fix dependency of error page generation on database (#5280) Eugen Rochko 2017-10-09 10:05:10 +02:00
  • 0aa810f9c8 Bump version to 2.0.0rc1 (#5209) Eugen Rochko 2017-10-08 22:03:44 +02:00
  • 3888a12c79 Fix #5272 - Order of checks in ActivityPub handler (#5276) Eugen Rochko 2017-10-08 22:03:34 +02:00
  • cfa68907ae Fix #5271 - Fix missing attribute in remove_from_feed (#5277) Eugen Rochko 2017-10-08 21:55:34 +02:00
  • 488584bfc1 Track frequently used emojis in web UI (#5275) Eugen Rochko 2017-10-08 21:47:15 +02:00
  • 0717d9b3e6 Set snowflake IDs for backdated statuses (#5260) Eugen Rochko 2017-10-08 17:34:34 +02:00
  • 6e4046fc3f Fix #5178 - Use object URI only in Announce, instead of embedding (#5266) Eugen Rochko 2017-10-08 14:41:59 +02:00
  • 92a3181dc6 improve static page metadata look Ondřej Hruška 2017-10-08 10:46:59 +02:00
  • f0c939c431 i18n: Update Polish translation (#5270) m4sk1n 2017-10-08 09:00:55 +02:00
  • ebadfe0ab7 Translate some Esperanto (#5252) Jeong Arm 2017-10-08 14:30:14 +09:00
  • 94f15338c3 i18n update Occitan (#5263) JeanGauthier 2017-10-08 07:18:27 +02:00
  • db33a53ee8 Video preload should be a string (#5267) Nolan Lawson 2017-10-07 18:06:43 -07:00
  • 7de6d269d2 Use ES module build of react-router-dom (#5264) Nolan Lawson 2017-10-07 17:55:58 -07:00
  • 684001d729 Dynamically calculate card height for embeds instead of padding (#5265) Eugen Rochko 2017-10-08 02:34:49 +02:00
  • 292f3cd7e0 Show buffering in video player (#5261) Eugen Rochko 2017-10-08 02:33:08 +02:00
  • 7cc0da756d Merge pull request #161 from DJSundog/audio-uploads-feature beatrix 2017-10-07 20:13:53 -04:00
  • 85d5da86df raise Mastodon::ValidationError if audio file duration is over 60 secs DJ Sundog 2017-10-07 16:14:34 -07:00
  • e10cff8226 update indentation DJ Sundog 2017-10-07 13:55:11 -07:00
  • 979b0d66a7 update indentation DJ Sundog 2017-10-07 13:53:46 -07:00
  • 6ca03a7f58 add faststart to audio transcoding DJ Sundog 2017-10-07 19:59:22 +00:00
  • 96ba3482b9 adding support for audio uploads, transcoded to mp4 videos DJ Sundog 2017-10-07 19:54:10 +00:00
  • a3d4f1bd93 Update outdated README (#5262) Eugen Rochko 2017-10-07 21:20:59 +02:00
  • 633426b261 Add moderation note (#5240) nullkal 2017-10-08 03:26:43 +09:00
  • f486ef2666 Redesign public hashtag pages (#5237) Eugen Rochko 2017-10-07 20:00:35 +02:00
  • d2dee6ea43 Fix custom emoji in emoji picker, persist skin tone (#5258) Eugen Rochko 2017-10-07 19:02:30 +02:00
  • 967e70663f In REST API, when URL can be missing, cast it to nil (#5259) Eugen Rochko 2017-10-07 18:55:48 +02:00
  • b7e65a004f Japanese translation (relative time) (#5251) MitarashiDango 2017-10-08 01:32:03 +09:00
  • 3a3475450e Encode custom emojis as resolveable objects in ActivityPub (#5243) Eugen Rochko 2017-10-07 17:43:42 +02:00
  • 057db0ecd0 Update emoji-mart to v2.1.1 (#5256) Nolan Lawson 2017-10-07 03:17:02 -07:00
  • 11436358b4 Fix regression from #5206 - deduplicate descendants (#5253) Eugen Rochko 2017-10-07 12:16:39 +02:00
  • 6610d57f91 Basic static metadata styling kibigo! 2017-10-06 22:22:34 -07:00
  • 0e0a9e716c Korean translation (#5244) Jeong Arm 2017-10-07 14:16:59 +09:00
  • 45682f876d Make auto-play GIFs preference affect custom emojis in web UI (#5254) Eugen Rochko 2017-10-07 02:38:52 +02:00
  • 4413d81d7f i18n: Update Polish translation (#5255) m4sk1n 2017-10-06 22:43:32 +02:00
  • 5a2c7bd4ce Fix overflowing in web UI (#5246) Lynx Kotoura 2017-10-07 03:40:17 +09:00
  • 5c8ca024ef Improve error handling on LinkCrawlWorker (#5250) unarist 2017-10-07 03:39:08 +09:00
  • d8b2f89d33 Fix remote profile being displayed in HTML on remote_follow (#5249) unarist 2017-10-07 03:38:29 +09:00
  • d5f490b1a2 Fix error on reloading status detail column (#5248) K.SHIRAKASHI 2017-10-07 03:37:56 +09:00
  • c75ca0525b Specify middleware versions in docker-compose.yml (#5247) unarist 2017-10-07 03:37:17 +09:00
  • 6f2d88dd28 Fix error at emoji_compressed in Firefox ESR (#5241) MIYAGI Hikaru 2017-10-06 14:40:41 +00:00
  • daa59dd454 Fix theme settings (#5242) Lynx Kotoura 2017-10-06 20:29:53 +09:00
  • 72d939b69f Fix thinking_face emoji autocomplete (#5238) Nolan Lawson 2017-10-06 03:03:13 -07:00
  • 1a8011648f Merge pull request #160 from glitch-soc/ugly-fix-notif-clearing Ondřej Hruška 2017-10-06 09:34:12 +02:00
  • 37e141bccb comment out unused stuff with Video Ondřej Hruška 2017-10-06 09:23:28 +02:00
  • dcd8ff5308 fix haml quotes in a bid to make travis less grumpy Ondřej Hruška 2017-10-06 09:07:04 +02:00
  • 97b3d0cd56 Import only Spring/Motion from react-motion (#5236) Nolan Lawson 2017-10-05 18:46:15 -07:00
  • fd7f0732fe Compress and combine emoji data (#5229) Nolan Lawson 2017-10-05 18:42:34 -07:00