1346 Commits (4f781b17cc0644a1e464dc8fd968d393ccb9b605)

Author SHA1 Message Date
Kurtis Rainbolt-Greene 1e4453405b Merge branch 'master' into patch-2
8 years ago
Chris Heninger 0ad694f96b Add SVG version of logo to repo
8 years ago
Shel R fef478781d Merge branch 'master' into master
8 years ago
Shel R 9f43e3b428 Merge branch 'master' into patch-4
8 years ago
Yann GUERN 485d75a805 #1141 on remote follow
8 years ago
Eugen Rochko 4b621188ad Fix #1165 - before_action was called before protect_from_forgery
8 years ago
Eugen Rochko b2a7218ab7 Fix #801 - Respect webfinger's canonical response of username/domain
8 years ago
Eugen 1961825ff9 Merge pull request #1183 from thoughtbot/cp-post-status-service-specs
8 years ago
Chad Pytel ad5ddd5e95 Use I18n for media attachment validation errors
8 years ago
Joël Quenneville d4c94fa004 DRY up reblog vs original status check
8 years ago
Eugen 4e41cd9ab8 Merge pull request #1146 from tootsuite/fix-object-type-nil-exception
8 years ago
Eugen c9b23a93c7 Merge branch 'master' into fix-object-type-nil-exception
8 years ago
Eugen 0adee18d73 Merge branch 'master' into feature-customized-default-locale
8 years ago
Eugen Rochko 8a6d8de60a Fix nil#object_type error
8 years ago
Jantso Porali 786e6f94b9 Update Finnish translations, add sample Minio config (#954)
8 years ago
Eugen Rochko e3a3422a65 Allow setting of default language through config
8 years ago
Eugen Rochko 624a9a7136 Re-add forgotten <author> element on standalone <entry>
8 years ago
Eugen 1c351709bc Force UTF8 encoding on generated XML (#1140)
8 years ago
Eugen 6d6a429af8 Rewrite Atom generation from stream entries to use Ox instead of Nokogiri (#1124)
8 years ago
Matt Jankowski 97ae53daa8 Reduce size of background-photo.jpeg
8 years ago
Eugen Rochko 51d7caaf19 Fix wrong pubsub channel on public timelines
8 years ago
Eugen a9c0062e80 Merge pull request #1013 from blackle/master
8 years ago
Eugen Rochko dbd529109e Fix notifications delivered to wrong pubsub channel, optimized RemoveStatusService,
8 years ago
blackle 540d6efe88 Catch more errors in process_follows so it doesn't fail
8 years ago
Eugen Rochko 5442083b3c Split SalmonWorker into smaller parts, move profile updating into another job
8 years ago
André Lewin bf7cefa516 Merge branch 'master' into master
8 years ago
Eugen Rochko 5b95be1c42 Replace calls to FeedManager#inline_render and #broadcast
8 years ago
Eugen c9ebd5d19f Fix wrong variable used in publish channel
8 years ago
Eugen 1b8c244dff Add proper message to PushUpdateWorker, use redis directly
8 years ago
Eugen 3d8b80e1cc Merge branch 'master' into broadcast-to-worker
8 years ago
tom 8989569dd4 Update components.scss
8 years ago
Eugen Rochko 220bc48e8e Only render public payload once in FanOutOnWrite
8 years ago
Eugen Rochko 8530f9413b Replace ActionCable broadcast call with simple redis publish
8 years ago
Eugen 1904a1aa14 Merge pull request #919 from JantsoP/master
8 years ago
Eugen 6b566c6b88 Merge pull request #908 from krainboltgreene/application-worker-for-shared-logic
8 years ago
JantsoP 20b53e6add Merge branch 'master' into master
8 years ago
JantsoP b8a867adcc updated translation
8 years ago
Brad Urani 6a1da87cd3 Eliminate unnecessary queries and query clauses with none and all
8 years ago
Kurtis Rainbolt-Greene 22dcadedb4 We're going to want these nice helper methods, lets share them with a parent class that matches Rails 5 practices (application level abstraction)
8 years ago
Kurtis Rainbolt-Greene 7bed4e51db Moved to the worker
8 years ago
Kurtis Rainbolt-Greene 9638894233 Moving in the inline render
8 years ago
Kurtis Rainbolt-Greene 220051b8b2 I don't actually think we need that.
8 years ago
Kurtis Rainbolt-Greene 0069c01285 Moving the queue_at into the worker
8 years ago
Kurtis Rainbolt-Greene dc5704b0b0 This method isn't used anymore
8 years ago
Kurtis Rainbolt-Greene 96ef933820 Replacing the broadcast method with the one defined in the feed manager
8 years ago
Kurtis Rainbolt-Greene 1e96ce378e By pushing this into a worker we can reduce the amount of time the feed manager using workers eat up a connection
8 years ago
Eugen 4c92f15664 Merge branch 'master' into add_more_tests_to_models
8 years ago
Eugen afdcdce551 Merge pull request #839 from SirCmpwn/profile-readability
8 years ago
Drew DeVault c106b6d3e0 Improve readability of text on profiles
8 years ago
Eugen e76dd52b08 Merge pull request #818 from JantsoP/master
8 years ago
Eugen 117b22e905 Merge pull request #852 from peterkeen/email-whitelist-817
8 years ago
Eugen 909d81923e Merge pull request #898 from SirCmpwn/remote-follow-improvements
8 years ago
Eugen 2edeb3fe1c Merge pull request #858 from krainboltgreene/patch-6
8 years ago
Drew DeVault f7e35d90db Remote follow improvements
8 years ago
Eugen Rochko bda37489ac Remove PuSH subscriptions when delivery is answered with a 4xx error
8 years ago
Samy KACIMI 79ef756f64 fix rubocop issues
8 years ago
Samy KACIMI 81c76fe375 add more tests to models
8 years ago
axolotl 8736ef50ad Added Esperanto translation inside the javascripts folder
8 years ago
Eugen Rochko 6fd865c000 Spawn FeedInsertWorker to deliver status into personal feed
8 years ago
Kurtis Rainbolt-Greene 731e650681 Use active record shorthand
8 years ago
Pete Keen e9a6da6bc7 [#817] Add email whitelist
8 years ago
Eugen Rochko 5f54981846 New admin setting: open/close registrations, with custom message, from the admin UI
8 years ago
JantsoP 10a8666e04 updated line 28 about GitHub
8 years ago
Eugen 405c495c23 Merge pull request #804 from fhalna/development
8 years ago
Eugen Rochko 82aaedec46 Reduce number of items in feeds, optimize regeneration worker slightly,
8 years ago
Eugen Rochko b1f3499c38 Optimize FeedManager#unmerge, and slightly optimize FeedManager#merge
8 years ago
Eugen Rochko b21f7c28f6 Move OStatus processing back into default queue
8 years ago
Eugen Rochko ce9df2fa82 Optimize filter methods in FeedManager a bit, use redis pipelining on merge/unmerge feed methods,
8 years ago
halna_Tanaguru 3abb0f7bc7 Merge branch 'master' into development
8 years ago
JantsoP db4a41cf58 Merge branch 'master' into master
8 years ago
JantsoP b8243c1b49 changed line 25 for better translation
8 years ago
Eugen Rochko eb023beb49 Fix #808 - smaller elephant friend PNG for frontpage
8 years ago
Eugen Rochko b510a56c0c Only call regeneration worker after first login after a 14 day break
8 years ago
Eugen Rochko 4c53af64f0 Fix ActionController::Parameters in API issue
8 years ago
Eugen Rochko f722bd2387 Separate background jobs into different queues. ATTENTION: new queue "pull"
8 years ago
Eugen Rochko 8232f76c48 Add check for visibility.nil? even though it can't ever be, to check for race conditions
8 years ago
halna_Tanaguru 3f30ae1f97 accessibility fix
8 years ago
axolotl 0700521ef3 added Esperanto (eo)
8 years ago
Eugen Rochko 68f829e11c Add basic logging of who resolved report
8 years ago
Eugen Rochko 71458dc6df When taking action on a report (silence/suspend), it dismisses all other
8 years ago
Eugen Rochko b7c1b12367 Make default admin UI page reports. Add admin UI for creating a domain block
8 years ago
David Baumgold 5652f00d81 GitHub should be capitalized
8 years ago
JantsoP a229840ffe fixed typo
8 years ago
JantsoP bfa99981e5 Merge branch 'master' into master
8 years ago
JantsoP ae95f35fe6 add finnish translation
8 years ago
JantsoP 22f88b845a add finnish translation
8 years ago
JantsoP eabb86b124 add finnish language
8 years ago
Eugen 5d854f37b4 Merge pull request #764 from ticky/tweak-quick-start-area
8 years ago
JantsoP 69fc95a2f5 Create Finnish translation for Mastodon
8 years ago
Marvin Kopf 1236a12cae add mute option in status dropdown
8 years ago
Jessica Stokes 2d384850cb Fix the position of the Mastodon mascot in the UI
8 years ago
Eugen d2358aefec Merge branch 'master' into master
8 years ago
Eugen 61894582b8 Merge pull request #746 from eramdam/feature/improve-french-locales
8 years ago
Kazhnuz c76d20c2a0 Add forgotten comma
8 years ago
Damien Erambert 4f7cce25ac Add more lcoales in fr.jsx
8 years ago
Kazhnuz 633e5ec6f6 Update French Translation
8 years ago
Eugen 09b4b65fde Merge pull request #740 from 0x70b1a5/master
8 years ago
Eugen 48cb2dccd2 Merge pull request #741 from eramdam/feature/improve-french-locales
8 years ago
Eugen Rochko a23e4380b2 Avoid re-loading already loaded relationships. Also fixes issue where wrong
8 years ago
Eugen Rochko aaa4d1b0fb Keep track of which timelines are connected live to avoid redundant
8 years ago
Eugen Rochko 2d07cb5771 Catching rack timeout from rails doesn't work
8 years ago
Tobias Merkle f25fc04ea1 single-quotes
8 years ago
Tobias Merkle ca21be3e16 remove black border on buttons
8 years ago
Eugen Rochko 5b12624847 Add proper error page for request timeouts
8 years ago
Olivia Mossberg 30da6440d0 Merge branch 'master' of github.com:tootsuite/mastodon
8 years ago
Olivia Mossberg f4b5fe9caf Fix word-break in account profiles
8 years ago
Eugen Rochko 4b7dca4713 Fix wording "show reblogs" -> "show boosts", order reports chronologically in
8 years ago
Eugen Rochko d6b965cf08 Fix issue with feed merge-in code as well
8 years ago
Eugen Rochko e809caa0e1 Fix feed regeneration bug
8 years ago
Eugen Rochko 34aff3e269 Merge branch 'master' of https://github.com/maximeborges/mastodon into maximeborges-master
8 years ago
Damien Erambert 3ed75efc31 Add fr locale for community_timeline in fr.jsx
8 years ago
Eugen Rochko 433cb198fa Fix landing page sign up form ignoring username field
8 years ago
Tobias Merkle ae43978433 improve video button visibililty
8 years ago
Eugen Rochko a8c2e44fee Fix broken reference
8 years ago
Eugen Rochko 808017ff18 Paperclip will complain on its own if this variable is missing
8 years ago
Eugen Rochko 60ebfa182f Made modal system more generic
8 years ago
Maxime BORGES f693ab69f3 Fix word-break in profile's note on profile page and profile component
8 years ago
Eugen Rochko 13dfd8d109 Improve mobile tabs a little
8 years ago
Eugen Rochko d93d6f5124 Fix reworked search
8 years ago
Eugen Rochko b4046c5957 Rework search
8 years ago
shel f20f6b25b9 Merge branch 'master' into patch-2
8 years ago
Eugen Rochko 680f9efe9c Fix web UI profile clickable area overlapping with follow button area
8 years ago
Eugen Rochko bde5c0eaf9 Fix some views still not using counter caches
8 years ago
Eugen Rochko 5e26295e06 Fix #700 - hide spoilers on static pages
8 years ago
Eugen Rochko 3ac4455160 :active and :focus states same as :hover for buttons
8 years ago
Eugen Rochko bf61bc1b96 Fix drag & drop overlay flickering
8 years ago
Eugen Rochko e8875c6046 Import feature for following/blocking lists (addresses #62, #177, #201, #454)
8 years ago
Eugen Rochko de22c202f5 Add counter caches for a large performance increase on API requests
8 years ago
Eugen Rochko 333e44c3fc Improve emojis - use SVGs where possible
8 years ago
Eugen Rochko bb7006bda1 Hide drag & drop area on drop event regardless of success
8 years ago
Eugen Rochko 139fc994e2 Fix #408 - link @ names in bios
8 years ago
Eugen Rochko 1c6b02f936 Fix #690 - Webfinger should handle new shortform profile URLs now (nice)
8 years ago
shel 76188d61f2 Clarify post privacy warning
8 years ago
Eugen Rochko c334541011 Add tooltip to privacy dropdown
8 years ago
Eugen Rochko f864fee116 Fix up some localizations
8 years ago
Eugen Rochko efbbd42216 Fix style issue
8 years ago
Eugen Rochko dddb2eb84f Merge branch 'feature/language_zh-cn' of https://github.com/leopku/mastodon into leopku-feature/language_zh-cn
8 years ago
Eugen Rochko 6ec6fe259a Compose form layout fixes
8 years ago
leopku d5d5afff9c 🌐 add simplified chinese language
8 years ago
shel 5f7c997654 Change to using variables
8 years ago
shel 2b7e3d56c8 Increase color contrast
8 years ago
shel c66dc0d114 Clarify privacy options
8 years ago
Eugen Rochko 1fd88e3bad Fix up visual indicators for compose form privacy
8 years ago
Eugen Rochko b8f9de8636 Improve sign up page on small screens
8 years ago
Eugen Rochko a9303e7062 When replying to status with content warning, prefill content warning
8 years ago
Eugen Rochko ad1af951fb Temporary spacing fix
8 years ago
Eugen Rochko bd1ceb1daa Privacy dropdown i18n
8 years ago
Eugen Rochko 99ca63a543 Fix public profile pagination links
8 years ago
Eugen Rochko d8c5a83827 Redesigned compose form
8 years ago
Eugen Rochko 9bf4c34919 Fix #675 - return created_at in notifications API
8 years ago