phnt/pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • 026b245dbc Merge branch 'develop' into feature/polls-2-electric-boogalo rinpatch 2019-06-03 11:14:52 +03:00
  • 5bd41fef8b Change query order in fetch_activities_for_context_query to make poll vote exclusion work rinpatch 2019-06-03 10:58:37 +03:00
  • baefb97dc4 Add a changelog entry for polls rinpatch 2019-06-03 10:55:16 +03:00
  • 1fd8e19d76 Remove a TODO comment as the tests for poll view were written rinpatch 2019-06-02 23:46:17 +03:00
  • 2fe3a20638 Make error message about author's inability to vote more sensible rinpatch 2019-06-02 23:30:36 +03:00
  • c47da0e65d Add tests for poll view rinpatch 2019-06-02 23:25:33 +03:00
  • e3c460353d Refresh the object in CommonAPI.vote instead of MastoAPI controller rinpatch 2019-06-02 23:24:48 +03:00
  • 83663caa81 Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification. Ivan Tashkinov 2019-06-02 17:45:32 +03:00
  • 561a21986d formatting William Pitcock 2019-06-02 10:29:15 +00:00
  • c724d8df98 docs: document mrf_subchain William Pitcock 2019-06-02 10:14:56 +00:00
  • 38a275b31f test: add tests for subchain policy William Pitcock 2019-06-02 10:08:51 +00:00
  • 4087ccdab8 mrf: add subchain policy William Pitcock 2019-06-02 09:50:16 +00:00
  • edf772d41e mrf: allow a policy chain to be specified when filtering William Pitcock 2019-06-02 09:44:42 +00:00
  • 1236c5dbf5 Merge branch 'bugfix/reverse-proxy-hackney-wtf' into 'develop' kaniini 2019-06-02 09:19:15 +00:00
  • 52e09807d4 reverse proxy: clean up some @hackney leftovers William Pitcock 2019-06-02 09:09:58 +00:00
  • 5402d04e3c Merge branch 'feature/notification-control-part-2' into 'develop' kaniini 2019-06-02 08:25:37 +00:00
  • e394fc2eef fix the flaky test for users creation by admin Sachin Joshi 2019-06-02 09:48:45 +05:45
  • 67bcc3ccc4 Remove index on object name used for excluding poll votes (replaced by just rewriting Note to Answer) rinpatch 2019-06-01 21:49:18 +03:00
  • cfa588e357 Fix Credo issues rinpatch 2019-06-01 21:42:29 +03:00
  • 6bc9e5c020 Mastodon API: Refresh the object before rendering it after voting rinpatch 2019-06-01 21:41:49 +03:00
  • 444406167b Mastodon API: actually check for poll votes rinpatch 2019-06-01 21:41:23 +03:00
  • 65db5e9f52 Resolve merge conflicts rinpatch 2019-06-01 16:29:58 +03:00
  • 300d94c628 Add poll votes rinpatch 2019-06-01 16:07:01 +03:00
  • ad5263c647 Merge remote-tracking branch 'upstream/develop' into admin-create-users Sachin Joshi 2019-06-01 11:42:37 +05:45
  • 5534d4c676 make bulk user creation from admin works as a transaction Sachin Joshi 2019-06-01 11:17:53 +05:45
  • e706b42f51 Merge branch 'bugfix/visibility-indicator-litepub-dm' into 'develop' kaniini 2019-06-01 03:39:13 +00:00
  • 14ef35f402 Merge branch 'bugfix/remove-others-follower-collections' into 'develop' kaniini 2019-06-01 03:26:46 +00:00
  • 2bbc2a801f Remove all follower collections but actor's from "cc" Sergey Suprunenko 2019-06-01 03:26:45 +00:00
  • d46cc7896e Merge branch 'bugfix/remove-vanilla-flavour' into 'develop' kaniini 2019-06-01 03:26:05 +00:00
  • 88df629689 Merge branch 'add-missing-mock' into 'develop' kaniini 2019-06-01 03:25:33 +00:00
  • f2efe24cf8 visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility William Pitcock 2019-06-01 03:23:21 +00:00
  • d4304a3945 add the missing mock file Sachin Joshi 2019-06-01 08:37:10 +05:45
  • 5d3ece2861
         Remove now useless flavours switching Haelwenn (lanodan) Monnier 2019-06-01 01:42:46 +02:00
  • aa9f52edd2
         mastodon_api_controller.ex: Remove vanilla from supported_flavours Haelwenn (lanodan) Monnier 2019-06-01 01:37:11 +02:00
  • f1890d2cac Merge branch 'dokku' into 'develop' Haelwenn 2019-05-31 23:09:06 +00:00
  • f8d4c02431 Merge branch 'doc/mongoose-im-config' into 'develop' feld 2019-05-31 20:36:33 +00:00
  • abedcca349 Sample Mongoose IM config. feld 2019-05-31 20:36:33 +00:00
  • 3415962d60 Merge branch 'fix/mastodon-user-search' into 'develop' lambda 2019-05-31 18:46:57 +00:00
  • 6872c5f88f Mastodon API search default value for "resolve" is false feld 2019-05-31 18:46:57 +00:00
  • 7591a8928d Setting Store: Document in changelog. lain 2019-05-31 19:15:44 +02:00
  • e2c72e5390 Merge branch 'hotfix-0.9.99999' v0.9.99999 lain 2019-05-31 19:08:14 +02:00
  • f061d551a9 Bump version. lain 2019-05-31 18:49:39 +02:00
  • 1f4c6c32f1 html: lock down allowed class attributes to only those related to microformats William Pitcock 2019-04-23 22:55:21 +00:00
  • d9b9b12005 Transmogrifier: Fix user fetching. lain 2019-05-31 18:45:33 +02:00
  • f5851ff645 Mastodon API: Fix lists leaking private posts rinpatch 2019-05-31 15:25:17 +03:00
  • d760df475a Fix fix_explicit_addressing moving follower collection to cc and add tests for it rinpatch 2019-05-31 14:17:05 +03:00
  • 2993361075 Merge branch 'hotfix/leaking-lists' into 'develop' lambda 2019-05-31 13:26:48 +00:00
  • 10fe02acef Documentation: Document Settings store mechanism. lain 2019-05-31 14:58:28 +02:00
  • 7861974ab2 MastodonAPI: Add extension to set and get pleroma_settings_store. lain 2019-05-31 14:50:18 +02:00
  • aaad85c4d9 AccountView: settings -> settings_store lain 2019-05-31 14:49:46 +02:00
  • eb2963bc43 User: Add settings store to Info, AccountView lain 2019-05-31 14:27:15 +02:00
  • d9c0650ff9 Mastodon API: Fix lists leaking private posts rinpatch 2019-05-31 15:25:17 +03:00
  • a9eaa55885 Fix fix_explicit_addressing moving follower collection to cc and add tests for it rinpatch 2019-05-31 14:17:05 +03:00
  • 97fb50d9fa Mastodon Conversation API: Don't return own account in 'accounts'. lain 2019-05-31 11:27:14 +02:00
  • 4e45f7bc87 CI: Add auto-deployment via dokku. lain 2019-05-31 10:55:35 +02:00
  • 5241c2a163 . lain 2019-05-31 10:37:52 +02:00
  • 5b048df7db . lain 2019-05-31 10:15:58 +02:00
  • d888ab8add . lain 2019-05-31 10:14:00 +02:00
  • 3cc00fd2e9 Merge branch 'fix/install-guide' into 'develop' feld 2019-05-30 21:35:31 +00:00
  • 88414151b4 Formatting feld 2019-05-30 21:35:31 +00:00
  • 3c1c478125 Merge branch 'fix/install-guide' into 'develop' feld 2019-05-30 21:30:42 +00:00
  • 75a37a68d4 Install docs should clone from master branch feld 2019-05-30 21:30:42 +00:00
  • 73a7420c23 Merge branch 'fix/ogp-missing-data' into 'develop' feld 2019-05-30 21:03:31 +00:00
  • 1690be991e Replace missing non-nullable Card attributes with empty strings Sergey Suprunenko 2019-05-30 21:03:31 +00:00
  • 8328698154 . lain 2019-05-30 20:45:26 +02:00
  • dadcb2bcf6 . lain 2019-05-30 20:40:20 +02:00
  • 3c30d58e4f . lain 2019-05-30 20:25:48 +02:00
  • 4bf0c72918 . lain 2019-05-30 20:25:48 +02:00
  • 1816917539 ... lain 2019-05-30 20:07:22 +02:00
  • 6080058b74 .. lain 2019-05-30 19:55:35 +02:00
  • 93b328a3c1 . lain 2019-05-30 19:50:50 +02:00
  • 10e718487a . lain 2019-05-30 19:41:55 +02:00
  • b74f115902 . lain 2019-05-30 19:40:03 +02:00
  • b3df8f7a15 . lain 2019-05-30 19:31:44 +02:00
  • 8f623cc97a .. lain 2019-05-30 18:52:36 +02:00
  • dc6794e1b0 . lain 2019-05-30 18:31:31 +02:00
  • f4f0d4e116 . lain 2019-05-30 18:12:14 +02:00
  • b6efac3230 . lain 2019-05-30 18:02:08 +02:00
  • fb4d927c80 . lain 2019-05-30 17:43:22 +02:00
  • e646bddecc . lain 2019-05-30 16:17:13 +02:00
  • 91ac8b075b Merge branch 'use-pleroma-config' into 'develop' lambda 2019-05-30 13:16:08 +00:00
  • 99f70c7e20 Use Pleroma.Config everywhere Egor Kislitsyn 2019-05-30 15:33:58 +07:00
  • ab3f3af7cf Merge branch 'revert-57e58d26' into 'develop' kaniini 2019-05-29 22:19:13 +00:00
  • 6aec0d1b58 Revert "Merge branch 'feature/search-authenticated-only' into 'develop'" kaniini 2019-05-29 22:10:16 +00:00
  • 5cee2fe9fe Replace Application.get_env/2 with Pleroma.Config.get/1 Roman Chvanikov 2019-05-29 21:31:27 +03:00
  • e912f81c82 Update docs to reflect we accept nickname for id for both of these endpoints Mark Felder 2019-05-29 12:22:14 -05:00
  • e7edfd9fec Permit fetching statuses from API with nickname or id Mark Felder 2019-05-29 12:20:18 -05:00
  • ce47017c89 Merge develop Roman Chvanikov 2019-05-29 18:18:22 +03:00
  • 7e889786b8 Merge branch 'fix/mastodon-search-limit' into 'develop' lambda 2019-05-29 14:25:53 +00:00
  • 6fb67b74da Merge branch 'issue/936' into 'develop' lambda 2019-05-29 14:04:58 +00:00
  • db94294dfb [#936] fix tests Maksim 2019-05-29 14:04:58 +00:00
  • 672fddb721 Default search limit should be 40 Mark Felder 2019-05-29 08:06:26 -05:00
  • 57e58d2602 Merge branch 'feature/search-authenticated-only' into 'develop' kaniini 2019-05-29 11:33:37 +00:00
  • 0159a6dbe9 router: require oauth_read for searching William Pitcock 2019-05-29 10:58:45 +00:00
  • 26e7613824 Merge branch 'varnish-improvements' into 'develop' feld 2019-05-28 21:20:24 +00:00
  • abc15b6dcc Improve Varnish config. We set sane headers from the backend now. feld 2019-05-28 21:20:24 +00:00
  • b949a37ef5 Merge branch 'respect-proxy-settings-federation' into 'develop' kaniini 2019-05-28 06:49:54 +00:00
  • 9f3bcf0efe Respect proxy settings federation jeff 2019-05-28 06:49:53 +00:00
  • 1452a96ad6 ability to set and reset avatar, profile banner and backgroud in Mastodon API Sachin Joshi 2019-05-27 15:31:01 +05:45
  • 5bb843ceec Merge branch 'refactor/die-httpoison-die' into 'develop' lambda 2019-05-26 13:33:11 +00:00