Commit Graph

  • 9201398507 Merge branch 'master' into glitch-soc/merge-upstream Thibaut Girka 2018-11-09 14:56:31 +0100
  • bf92e7aaa6 [Glitch] Implement adding a user to a list from their profile Thibaut Girka 2018-11-06 17:44:28 +0100
  • ed7c5f94f7
    Improve ActiveRecord connection in on_worker_boot (#9238) Eugen Rochko 2018-11-09 09:08:01 +0100
  • 0319361fa3 Bump tty-prompt from 0.17.1 to 0.17.2 (#9243) dependabot[bot] 2018-11-09 09:07:45 +0100
  • 31af76a72c Bump sidekiq from 5.2.2 to 5.2.3 (#9241) dependabot[bot] 2018-11-09 06:56:46 +0100
  • 2cdbe18c22 Bump pry-rails from 0.3.6 to 0.3.7 (#9242) dependabot[bot] 2018-11-09 06:55:41 +0100
  • 12401000d8 Bump hiredis from 0.6.1 to 0.6.3 (#9240) dependabot[bot] 2018-11-09 06:55:19 +0100
  • 16a16f62c7
    Fix nil error regression from #9229 in tootctl media remove (#9239) Eugen Rochko 2018-11-08 21:55:59 +0100
  • 4615512285
    Reduce connect timeout limit and limit signature failures by source IP (#9236) Eugen Rochko 2018-11-08 21:35:58 +0100
  • dd00cd19d2
    Use local instead of global loading indicator for timelines, account timelines (#9224) Eugen Rochko 2018-11-08 21:35:06 +0100
  • f055907857 Bump bullet from 5.7.6 to 5.8.1 (#9156) dependabot[bot] 2018-11-08 21:15:33 +0100
  • 6e44e27e09 Bump parallel_tests from 2.26.0 to 2.26.2 (#9154) dependabot[bot] 2018-11-08 21:15:08 +0100
  • 9d0e61167f Bump aws-sdk-s3 from 1.23.0 to 1.23.1 (#9174) dependabot[bot] 2018-11-08 21:14:25 +0100
  • e50a7cbc69 Bump capybara from 3.10.0 to 3.10.1 (#9216) dependabot[bot] 2018-11-08 21:13:44 +0100
  • a28441144e Bump pkg-config from 1.3.1 to 1.3.2 (#9215) dependabot[bot] 2018-11-08 21:13:27 +0100
  • 5cbf6cf3ec
    Add "Show thread" link to self-replies (#9228) Eugen Rochko 2018-11-08 21:08:57 +0100
  • 3ddb460449
    Display amount of freed disk space in tootctl media remove (#9229) Eugen Rochko 2018-11-08 21:06:26 +0100
  • ccbdf689e8
    Fix form validation flash message color and input borders (#9235) Eugen Rochko 2018-11-08 21:06:14 +0100
  • 7f4adfaf77
    Fix follow limit validator reporting lower number past threshold (#9230) Eugen Rochko 2018-11-08 21:06:01 +0100
  • 6d59dfa15d
    Optimize the process of following someone (#9220) Eugen Rochko 2018-11-08 21:05:42 +0100
  • 9cfd610484 Cancel list scroll reset after mouse move on wheel scroll (#9233) Les Orchard 2018-11-08 12:45:20 -0500
  • b22db8162a
    Increase default column width from 330px to 350px (#9227) Eugen Rochko 2018-11-08 07:42:17 +0100
  • a2a254625b [Glitch] Update reset.scss from upstream Thibaut Girka 2018-11-06 16:03:53 +0100
  • 36dab188fd Merge branch 'master' into glitch-soc/merge-upstream Thibaut Girka 2018-11-06 15:22:44 +0100
  • 7775225d17 [Security] Bump rack from 2.0.5 to 2.0.6 (#9214) dependabot[bot] 2018-11-06 05:36:56 +0100
  • 535ce84896 Bump active_model_serializers from 0.10.7 to 0.10.8 (#9209) dependabot[bot] 2018-11-05 19:01:17 +0100
  • 6a1216d2cd Temporarily hold timeline if mouse moved recently (fixes #8630) (#9200) Les Orchard 2018-11-05 12:59:41 -0500
  • cd41c2c6ad Update resolve_url_service.rb (#9188) m.b 2018-11-05 18:54:07 +0100
  • 4c03e05a4e Allow joining several hashtags in a single column (#8904) James Kiesel 2018-11-06 06:53:25 +1300
  • bb5558de62 Implement adding a user to a list from their profile (#9062) namelessGonbai 2018-11-06 02:52:38 +0900
  • a7e3bd0300 Check for empty "last_status" before sorting DM column (#9207) Steven Tappert 2018-11-05 18:51:43 +0100
  • d6c7b01d08 fix(reset): Property name for styled scrollbars (#9210) Sorin Davidoi 2018-11-05 17:51:26 +0000
  • f5ebb739ec Bump rack-attack from 5.4.1 to 5.4.2 (#9186) dependabot[bot] 2018-11-05 18:50:53 +0100
  • 87ca51878d Bump redis from 4.0.2 to 4.0.3 (#9187) dependabot[bot] 2018-11-03 09:34:43 +0900
  • 34209c0340 Fix timestamp position in public pages with RTL languages Thibaut Girka 2018-10-31 11:10:51 +0100
  • b3c1380980 Fix styling of display names in public pages Thibaut Girka 2018-10-31 11:01:50 +0100
  • a78ec63afa
    Merge pull request #803 from ThibG/glitch-soc/merge-upstream ThibG 2018-10-31 11:15:37 +0100
  • 75b48dc177 Merge branch 'master' into glitch-soc/merge-upstream Thibaut Girka 2018-10-31 10:08:36 +0100
  • 2b2facbbdf [Glitch] Port some of upstream's getting started footer links Thibaut Girka 2018-10-27 23:09:07 +0200
  • ba06a5f485
    Bump version to 2.6.1 (#9172) Eugen Rochko 2018-10-31 01:04:45 +0100
  • b9d0d209cd
    Fix reducer error when conversation has no last status in web UI (#9173) Eugen Rochko 2018-10-31 00:55:20 +0100
  • ce2ee68b64
    Revert "Fix FetchAtomService content type handling (#9132)" (#9171) Eugen Rochko 2018-10-31 00:43:34 +0100
  • 50ce347ef9
    Bump version to 2.6.0 (#9149) Eugen Rochko 2018-10-30 22:06:59 +0100
  • 804586172e [i18n] Update for Occitan (#9169) Quentí 2018-10-30 22:06:31 +0100
  • f2290e311b
    Remove progress estimate from MigrateAccountConversations (#9168) Eugen Rochko 2018-10-30 21:09:33 +0100
  • 08c0f8b67c
    Merge pull request #802 from ThibG/glitch-soc/merge-upstream ThibG 2018-10-30 20:10:09 +0100
  • 7800e1af7e Specify node version to not use node11 (#9166) Jeong Arm 2018-10-31 03:46:20 +0900
  • 0d6b8f36aa [Glitch] Fix empty display name precedence over username in web UI Thibaut Girka 2018-10-30 17:54:50 +0100
  • 1c448d6474 Merge branch 'master' into glitch-soc/merge-upstream Thibaut Girka 2018-10-30 17:52:08 +0100
  • 7e18e95716 Add a local setting for inline preview cards Thibaut Girka 2018-10-30 14:46:48 +0100
  • bdc2338833 Add a “link” status icon for toots with a preview card Thibaut Girka 2018-10-30 14:39:00 +0100
  • b21615e957 [Glitch] Fix dimensions of preview cards, fix crash in web UI, fix warning Thibaut Girka 2018-10-29 14:56:53 +0100
  • ac9780b844 [Glitch] Include preview cards in status entity in REST API Thibaut Girka 2018-10-29 14:44:04 +0100
  • 66019b0ec4
    Bump version to 2.6.0rc4 (#9164) Eugen Rochko 2018-10-30 17:37:49 +0100
  • f59b840549
    Fix empty display name precedence over username in web UI (#9163) Eugen Rochko 2018-10-30 17:06:12 +0100
  • cc45a8f9f7
    Fix td instead of th in sessions table header (#9162) Eugen Rochko 2018-10-30 17:00:34 +0100
  • 5c8e7f0e1d
    Revert "feat(auth/session_controller): Send Clear-Site-Data when logging out (8627)" (#9161) Eugen Rochko 2018-10-30 16:25:54 +0100
  • c36a4a1617 Fix FetchAtomService content type handling (#9132) valerauko 2018-10-30 23:07:57 +0900
  • a3d40ba53b [i18n] Update for Occitan (#9157) Quentí 2018-10-30 15:05:01 +0100
  • be202f9377
    Accept the same payload in multiple inboxes and deliver (#9150) Eugen Rochko 2018-10-30 15:03:55 +0100
  • 47b8d195e6
    Always let through notifications from staff (#9152) Eugen Rochko 2018-10-30 15:02:55 +0100
  • a03d506626 Fix Pleroma mentions being fetched as preview cards (#9158) ThibG 2018-10-30 15:02:24 +0100
  • c1eec9869e [Security] Bump loofah from 2.2.2 to 2.2.3 (#9160) dependabot[bot] 2018-10-30 22:59:11 +0900
  • 7f24242ef6
    Merge pull request #801 from ThibG/glitch-soc/merge-upstream ThibG 2018-10-30 14:20:25 +0100
  • 48be335f4f Remove duplicate and outdated specs Thibaut Girka 2018-10-30 12:46:05 +0100
  • 3aa2418217 [Glitch] RTL: fix toot privacy preferences radio buttonss Masoud Abkenar 2018-10-30 00:49:29 +0100
  • e32a4f55fe [Glitch] RTL: fix preferences page checkbox margins Masoud Abkenar 2018-10-30 00:47:43 +0100
  • 94ad76a5b9 Merge branch 'master' into glitch-soc/merge-upstream Thibaut Girka 2018-10-30 11:22:25 +0100
  • 6771e8c88c Bump oj from 3.6.12 to 3.7.0 (#9155) dependabot[bot] 2018-10-30 06:39:52 +0100
  • 2cc099c70f Make detailed-status__wrapper actually wrap detailed status (#8547) trwnh 2018-10-30 00:33:02 -0500
  • d4415cc316
    Bump i18n-tasks from master to 0.9.28 (#9148) Eugen Rochko 2018-10-30 01:06:47 +0100
  • e961a763a2 RTL: fix toot privacy preferences radio buttonss (#9146) Masoud Abkenar 2018-10-30 00:49:29 +0100
  • 5ee0b51ac8 RTL: fix preferences page checkbox margins (#9145) Masoud Abkenar 2018-10-30 00:47:43 +0100
  • 33a71e8f7c Do not hide boost notifications from followed people with hidden boosts (#9147) ThibG 2018-10-30 00:47:31 +0100
  • 7ec3f6022d move some constants to rails environment ash lea 2018-10-21 20:57:25 -0400
  • 88659eda24
    Merge pull request #798 from ThibG/glitch-soc/merge-upstream ThibG 2018-10-29 21:29:15 +0100
  • ee5132a00e Merge branch 'master' into glitch-soc/merge-upstream Thibaut Girka 2018-10-29 14:16:35 +0100
  • e84da282f6
    Bump version to 2.6.0rc3 (#9142) Eugen Rochko 2018-10-29 14:15:54 +0100
  • f16d66c5c8 Merge branch 'master' into glitch-soc/merge-upstream Thibaut Girka 2018-10-29 14:09:54 +0100
  • 3fd808ab26
    Update AUTHORS.md (#9141) Eugen Rochko 2018-10-29 14:05:53 +0100
  • b40ea6d1d4
    Bump sanitize from 4.6.6 to 5.0.0 (#9140) Eugen Rochko 2018-10-29 14:05:25 +0100
  • a942ad3062 Merge branch 'master' into glitch-soc/merge-upstream Thibaut Girka 2018-10-29 14:00:41 +0100
  • 32f950a7a8
    Update i18n-tasks to master (#9139) Eugen Rochko 2018-10-29 13:46:39 +0100
  • fb2e699eeb Improved grammar in German translation (#9092) Julian 2018-10-29 13:24:15 +0100
  • 2b18f5f85d Add Page AP type support (#9121) m.b 2018-10-29 13:23:29 +0100
  • 9d84d55cf0 Weblate translations (2018-10-26) (#9113) Renato "Lond" Cerqueira 2018-10-29 13:20:29 +0100
  • ce33ce94c9 Bump parallel_tests from 2.25.0 to 2.26.0 (#9137) dependabot[bot] 2018-10-29 12:55:55 +0100
  • 8c944c2f63 Bump tzinfo-data from 1.2018.6 to 1.2018.7 (#9136) dependabot[bot] 2018-10-29 12:55:34 +0100
  • 3b89abc343 Bump rubocop from 0.59.2 to 0.60.0 (#9135) dependabot[bot] 2018-10-29 12:55:16 +0100
  • 5de592bcce Bump doorkeeper from 5.0.1 to 5.0.2 (#9134) dependabot[bot] 2018-10-29 12:54:56 +0100
  • 9c38c5daa3
    Fix dimensions of preview cards, fix crash in web UI, fix warning (#9133) Eugen Rochko 2018-10-29 04:42:07 +0100
  • 7f22ed0fc9
    Merge pull request #794 from ThibG/glitch-soc/merge-upstream ThibG 2018-10-28 20:36:55 +0100
  • b00f60f1d3 Merge branch 'master' into glitch-soc/merge-upstream Thibaut Girka 2018-10-28 08:37:49 +0100
  • 26fe37c414
    Update i18n-tasks and change CircleCI command (#9104) Eugen Rochko 2018-10-28 07:15:20 +0100
  • 11b3ee4f4c
    Reset status cache when status_stat or media_attachment updates (#9119) Eugen Rochko 2018-10-28 06:42:34 +0100
  • 93a1ab9030
    Add progress indicators to MigrateAccountConversations (#9101) Eugen Rochko 2018-10-28 06:40:45 +0100
  • 678f5ed296 Set z-index of dropdown to 9999. (#9126) kedama 2018-10-28 14:39:59 +0900
  • 795f0107d2
    Include preview cards in status entity in REST API (#9120) Eugen Rochko 2018-10-28 06:35:03 +0100
  • 6f78500d4f
    Do not remove "dead" domains in tootctl accounts cull (#9108) Eugen Rochko 2018-10-27 22:56:16 +0200
  • ee1f1a2ec9 When searching for an emoji with multiple separators, consider the full input Thibaut Girka 2018-10-27 18:29:22 +0200