Commit Graph

  • f72ad67a39 Merge pull request #180 from STJrInuyasha/glitch-soc/avatar-unification David Yip 2017-10-16 00:49:05 -05:00
  • 56094cb4bd 1.6 changed files for unified avatar styling -- updated to restore unity Matthew Walsh 2017-06-18 15:09:03 -07:00
  • 22df18e902 Merge pull request #173 from glitch-soc/zerowidthmoji David Yip 2017-10-15 20:04:19 -05:00
  • 894da3dcca Clear timer when unmounting RelativeTimestamp components (#5408) Eugen Rochko 2017-10-16 03:03:36 +02:00
  • 3e2f793948 Add up-to-date korean translation on serverside (#5400) voidSatisfaction 2017-10-16 06:08:30 +09:00
  • 8eb7d30a6c l10n Occitan: finishing touches (#5404) JeanGauthier 2017-10-15 23:07:32 +02:00
  • 7fe1428cc4 Update French translation (#5401) Yannick A 2017-10-15 14:21:05 +02:00
  • b3b4b5a2eb Adjust public hashtag pages (#5357) Lynx Kotoura 2017-10-14 21:48:12 +09:00
  • 8125fdc19f Use atomUri in Undo activity of Announce (#5376) unarist 2017-10-14 21:42:09 +09:00
  • ae716a12e1 replace newlines in desktop notif with spaces instead of removing them (#5361) Ondřej Hruška 2017-10-14 14:41:12 +02:00
  • f63a40e7c2 Updated Catalan strings (#5323) spla 2017-10-14 14:40:35 +02:00
  • 1bdd694a0a Fix #5351 - Redirection with page params after copy emoji (#5387) KY 2017-10-14 20:40:10 +08:00
  • 2eab41cd1a Close connection when succeeded posting (#5390) abcang 2017-10-14 21:38:57 +09:00
  • c6f76db2e1 Update French translation (#5384) Yannick A 2017-10-14 14:30:19 +02:00
  • 2c704ca9c6 l10n: update Persian translation for 2.0 (#5391) Masoud Abkenar 2017-10-14 14:28:19 +02:00
  • cdc22d23b9 Doodle improvements 2 (#176) Ondřej Hruška 2017-10-14 12:24:35 +02:00
  • eb96aa86a4 Update German translation (#5389) Jakob Kramer 2017-10-14 12:00:23 +02:00
  • c1a2707ecf Correct some misspellings (#5381) Mathias B 2017-10-14 03:34:59 +02:00
  • 531dadad86 Doodle palette, options, fill tool (#172) Ondřej Hruška 2017-10-14 00:58:38 +02:00
  • 723890b6fa use zerowidth spaces for emojis Ondřej Hruška 2017-10-14 00:48:53 +02:00
  • daa04c39b6 Merge pull request #168 from glitch-soc/doodles David Yip 2017-10-13 11:48:53 -05:00
  • 2af964ef20 Fixed a bug where the canvas would get transparent bg upon erase Ondřej Hruška 2017-10-13 18:13:00 +02:00
  • 33e806217f Initial doodle support Ondřej Hruška 2017-10-13 18:01:14 +02:00
  • c35132a738 Dutch strings: small change (#5375) Jeroen 2017-10-13 18:03:56 +02:00
  • a1c54220e8 Optimize Status#permitted_for 500x (account timeline) (#5373) unarist 2017-10-13 23:53:44 +09:00
  • df7dbc41ae Fix NameError: uninitialized constant OStatus::AtomSerializer::TagManager (#5371) Eugen Rochko 2017-10-13 16:44:43 +02:00
  • b8db386e05 Fix UserTrackingConcern firing on every request, optimize some queries (#5368) Eugen Rochko 2017-10-13 16:44:29 +02:00
  • 48f7a58799 Do not try to guess why home timeline is empty in web UI (#5370) Eugen Rochko 2017-10-13 16:44:16 +02:00
  • 388d093beb When unfollowing, remove from home in web UI immediately (#5369) Eugen Rochko 2017-10-13 16:44:02 +02:00
  • 95fe20b78a Fix remote status fetching for “pure” ActivityPub WEB_ACCOUNT users (#5372) ThibG 2017-10-13 12:58:13 +02:00
  • 3283868e28 Improve spec of Feed and UserTrackingConcern (#5367) Eugen Rochko 2017-10-13 11:00:11 +02:00
  • dc91fd482a Set InstancePresenter to Auth::RegistrationsController#create (#5366) Yamagishi Kazutoshi 2017-10-13 16:35:07 +09:00
  • b8bae96647 Retoot count increases without reason (#5363) Lex Alexander 2017-10-12 14:52:09 -10:00
  • d37305c628 Reduce discrepancies between server and client-side character count (#5360) ThibG 2017-10-12 23:26:34 +02:00
  • ad917cda10 l10n: PT-BR translation updated (#5362) Anna e só 2017-10-12 18:16:43 -03:00
  • f398ad1994 Updating more Dutch strings for 2.0 (#5359) Jeroen 2017-10-12 21:33:37 +02:00
  • df626fdd43 Fix the notification bug with newlines Ondřej Hruška 2017-10-12 21:28:17 +02:00
  • 6a2b1ba91e Another tabs-vs-spaces fix, but with ~feeling~ David Yip 2017-10-12 09:36:26 -05:00
  • 3cfcc7a50e Fix some consistance errors in gender neutral formulations. Add some missing ones. (#5350) Alda Marteau-Hardi 2017-10-12 16:31:14 +02:00
  • 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