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

Commit Graph

  • d64c3b604e twitterapi: use order constraint to force descending order William Pitcock 2019-05-07 19:30:51 +00:00
  • 6020ff3fb6 activitypub: add optional order constraint to timeline query builder William Pitcock 2019-05-07 19:30:27 +00:00
  • 4c5125dedc Remove bookmarks assoc and add a fake bookmark assoc instead rinpatch 2019-05-07 18:00:50 +03:00
  • be067ec2ab Use with_preloaded_bookmark in create_by_object_ap_id_with_object rinpatch 2019-05-04 13:50:39 +03:00
  • 3a7c14645e - Actually use preloaded bookmarks in views - Preload bookmarks in bookmark timeline - Rework bookmark preload tests rinpatch 2019-05-04 13:42:54 +03:00
  • f841eb7cdb Preload bookmarks wherever the object is preloaded rinpatch 2019-05-04 12:46:42 +03:00
  • 06947c9147 Remove bookmarks assoc rinpatch 2019-05-03 22:15:47 +03:00
  • a1a0df19c4 Merge branch 'docs/MRF-modules' into 'develop' kaniini 2019-05-07 16:15:27 +00:00
  • e71ddf23ba containment: remove pointless moduledoc line William Pitcock 2019-05-07 16:11:10 +00:00
  • 238dd72fad Merge branch 'conversations_three' into 'develop' lambda 2019-05-07 14:43:21 +00:00
  • 1557b99beb Merge remote-tracking branch 'pleroma/develop' into feature/disable-account Egor Kislitsyn 2019-05-07 16:51:11 +07:00
  • 6518644db1 Merge branch 'unused-config-parameter' into 'develop' rinpatch 2019-05-07 02:35:31 +00:00
  • f46295faa7 unused config paramater Alex S 2019-05-07 09:07:06 +07:00
  • d26998c2ac Merge branch 'fix/ex_doc-source-links' into 'develop' rinpatch 2019-05-07 00:32:07 +00:00
  • c81b707030 Fix/ex_doc source links xse 2019-05-07 00:32:07 +00:00
  • 6b79be4a06 Merge branch 'issue_800' into 'develop' lambda 2019-05-06 17:51:03 +00:00
  • 1040caf096 fix format Maksim 2019-05-06 17:51:03 +00:00
  • aacac9da0b Merge branch 'feature/bbs' into 'develop' lambda 2019-05-06 17:17:03 +00:00
  • 4dabf64af4 Merge branch 'feature/845-improve-status-deletion' into 'develop' lambda 2019-05-06 16:45:22 +00:00
  • ce6ca0fefe Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion Alexander Strizhakov 2019-05-06 16:45:22 +00:00
  • 69a5074893
         Remove H1 in @moduledoc Haelwenn (lanodan) Monnier 2019-05-06 04:47:04 +02:00
  • e41a2f98d5
         mrf/tag_policy.ex: Add some documentation Haelwenn (lanodan) Monnier 2019-05-06 03:43:11 +02:00
  • af62ace954
         Add short documentation on every MRF Policy Haelwenn (lanodan) Monnier 2019-05-06 04:28:04 +02:00
  • eb0fb73ddb BBS: Credo fixes. lain 2019-05-04 15:47:50 +02:00
  • c58fd4c038 BBS: Fix tests. lain 2019-05-04 15:36:48 +02:00
  • c9d1cb2dce BBS: Use cached user fetcher. lain 2019-05-04 15:08:07 +02:00
  • 4c76f49e60 BBS: small fixes. lain 2019-05-04 15:06:18 +02:00
  • 6ad8ddfd29 Merge remote-tracking branch 'origin/develop' into feature/bbs lain 2019-05-04 15:00:45 +02:00
  • d089ff2460 Merge branch 'fix/embeded-relationship-in-follows' into 'develop' rinpatch 2019-05-03 20:36:13 +00:00
  • 9907e974ca Merge branch 'fix-search-speed' into 'develop' rinpatch 2019-05-03 18:35:02 +00:00
  • a23206a4ae Just have Benchee in all environments. lain 2019-05-03 20:28:06 +02:00
  • a7709cc267 Mix: Also have benchee in test. lain 2019-05-03 19:42:49 +02:00
  • 4948a73e37 Merge branch 'bugfix/emoji-size' into 'develop' lambda 2019-05-03 17:26:39 +00:00
  • 0e37fddd5a Search: Add fts index on objects table. lain 2019-05-03 19:15:55 +02:00
  • b5ad1715b2
         MastoAPI: profile update with emoji_map Haelwenn (lanodan) Monnier 2019-02-23 00:57:42 +01:00
  • 46bbf9e1cf
         TwitterAPI: profile update with emoji_map Haelwenn (lanodan) Monnier 2019-02-23 00:09:11 +01:00
  • 85434669bb
         Web.TwitterAPI.UserView: Also view local user emojis Haelwenn (lanodan) Monnier 2019-02-22 22:35:47 +01:00
  • 2f76a40d02
         formatter.ex: Add get_emoji_map/1 Haelwenn (lanodan) Monnier 2019-02-12 14:59:34 +01:00
  • d70af32127
         Pleroma.User: remove emojify on parse_bio Haelwenn (lanodan) Monnier 2019-02-11 23:47:32 +01:00
  • 85b5c60694
         Pleroma.Formatter: width/height to class=emoji Haelwenn (lanodan) Monnier 2019-02-07 16:41:20 +01:00
  • c42ded13a2 Credo fixes. lain 2019-05-03 13:53:17 +02:00
  • 027ded0df7 Merge branch 'fix/replace-ws' into 'develop' lambda 2019-05-03 11:45:04 +00:00
  • acb04306b6 Standardize construction of websocket URL feld 2019-05-03 11:45:04 +00:00
  • a0c755cc4a MastodonApi: Bump api level. lain 2019-05-03 13:40:43 +02:00
  • 81d1aa424d Streamer: Stream out Conversations/Participations. lain 2019-05-03 13:39:14 +02:00
  • 38b79461df Fix embeded relationships in Mastodon API rinpatch 2019-05-02 22:19:14 +03:00
  • 497d34b825 Merge branch 'iss-849' into 'develop' lambda 2019-05-02 14:17:17 +00:00
  • a53a6c9d64 Add oauth plug tests for url and body parameters AkiraFukushima 2019-05-02 22:25:21 +09:00
  • dff6afc7c8 fix: Add mix deps.get before unit-testing AkiraFukushima 2019-04-29 23:53:48 +09:00
  • 533d8cd581 Parse access_token from body parameters and URL parameters AkiraFukushima 2019-05-02 21:04:00 +09:00
  • 3c4cab9be1 Merge branch 'develop' into update-oauth-template Mark Felder 2019-05-01 12:32:17 -05:00
  • 9a98f48ec3 Remove incorrect statement about valid characters Mark Felder 2019-05-01 12:29:48 -05:00
  • 8af55728e4 Fix tests Roman Chvanikov 2019-04-29 03:44:04 +07:00
  • 45f790becc Merge remote-tracking branch 'origin/develop' into conversations_three lain 2019-05-01 18:40:41 +02:00
  • d107919b3d Merge branch 'support/oauth' into 'develop' lambda 2019-05-01 13:28:04 +00:00
  • c854bff8f5 Refactored Pleroma.Web.Auth.Authenticator Maksim 2019-05-01 13:28:04 +00:00
  • 622c804c9a Merge branch 'fix/remove-redundant-ensure-scrubbed-html' into 'develop' rinpatch 2019-05-01 11:02:08 +00:00
  • 51e26f14f7 Remove redundant ensure_scrubbed_html rinpatch 2019-05-01 13:52:44 +03:00
  • a58813e7a1 Merge branch 'features/download-mastofe-build' into 'develop' lambda 2019-05-01 10:48:30 +00:00
  • 0bcdaf378e Merge branch 'bugfix/web-notification-special-char' into 'develop' lambda 2019-05-01 10:45:32 +00:00
  • 297596ce48 Merge branch 'harmonize_return_types_in_user_module' into 'develop' lambda 2019-05-01 10:41:00 +00:00
  • a7c9e3b242 Merge branch 'docs/fix-config.md' into 'develop' rinpatch 2019-05-01 09:16:25 +00:00
  • 7c5f1ef327 Merge branch 'update_auto_linker' into 'develop' rinpatch 2019-05-01 09:14:10 +00:00
  • a3dc02d282 Add addressable lists Egor Kislitsyn 2019-05-01 16:11:17 +07:00
  • f11e7037c2 test fixes Alex S 2019-05-01 16:09:53 +07:00
  • 04fd7cf817 Update auto_linker Egor Kislitsyn 2019-05-01 15:18:12 +07:00
  • bdfa3a6fa8 Merging with develop Alex S 2019-05-01 12:29:33 +07:00
  • 2982061dfa Fix syntax highlighting + clarify :frontend_configuration xse 2019-05-01 01:26:14 +02:00
  • 85fa2fbce4 add scrubber for html special char Sachin Joshi 2019-05-01 01:37:17 +05:45
  • cd6da3606b Merge branch 'develop' into bugfix/web-notification-special-char Sachin Joshi 2019-05-01 00:21:30 +05:45
  • 77690b9d03 Merge branch 'fix/stream_out-normalize-only-creates' into 'develop' rinpatch 2019-04-30 17:31:48 +00:00
  • ce4825c1dc Do not normalize objects in stream_out unless the activity type is Create rinpatch 2019-04-30 20:21:28 +03:00
  • 0f0cc2703b Merge develop Roman Chvanikov 2019-04-30 20:17:52 +07:00
  • 32a4501d2d Merge branch 'hotfix/migrateoldbookmarks-crashing-on-deleted-activities' into 'develop' rinpatch 2019-04-29 18:33:06 +00:00
  • f8f6af4cc1 Fix MigrateOldBookmarks migration crashing on deleted activities rinpatch 2019-04-29 21:25:30 +03:00
  • 41d78f9108 Merge branch 'fix-webpush' into 'develop' rinpatch 2019-04-29 16:24:33 +00:00
  • b0951a8849 WebPush: Use Object.normalize, rewrite tests so they test reality. lain 2019-04-29 18:15:30 +02:00
  • 0fd176b990 Merge branch 'fix/add-default-scope-mastoapi' into 'develop' rinpatch 2019-04-29 06:45:18 +00:00
  • 8e266e02da Merge branch 'fix/uploads-folder-issues' into 'develop' kaniini 2019-04-28 23:05:50 +00:00
  • 292c69481b Merge branch 'regression/rights-only-for-admin' into 'develop' kaniini 2019-04-28 23:05:14 +00:00
  • 61ca2f7a4e Fix rights in TwitterAPI's user entity being present only for Admins/Moderators rinpatch 2019-04-28 19:42:43 +03:00
  • 31852f906e fix issues with the uploads directory xse 2019-04-28 06:43:00 +02:00
  • f2a4156d49 Merge branch 'fix/bookmark-depend-on-embeded-object' into 'develop' kaniini 2019-04-28 00:21:32 +00:00
  • ce3789e39a Add default_scope to /api/v1/update_credentials rinpatch 2019-04-27 23:55:54 +03:00
  • c3e9fcf098 Fix bookmarks depending on embeded object and move checking if the status is bookmarked to SQL rinpatch 2019-04-27 23:06:46 +03:00
  • 002ea343f8 Merge branch 'feature/bbcode' into 'develop' kaniini 2019-04-27 07:44:24 +00:00
  • 81bc274930 Merge branch 'update/pleroma-fe-20190426' into 'develop' kaniini 2019-04-27 07:42:01 +00:00
  • 52bdfced32 update pleroma frontend William Pitcock 2019-04-27 07:34:59 +00:00
  • ef52aa0e66 tests: fix up for changed bbcode library output and verify html is properly escaped William Pitcock 2019-04-26 22:38:56 +00:00
  • 501af917b5 add support for bbcode William Pitcock 2019-04-26 10:17:57 +00:00
  • 2bd880be88 mix: add bbcode dependency William Pitcock 2019-04-26 09:22:26 +00:00
  • 4de5fef1f8 Merge branch 'feature/807-bookmark-endpoint-extension' into 'develop' lambda 2019-04-26 11:59:47 +00:00
  • 48f68fd133 Merge branch 'feature/mastoapi-new-config' into 'develop' kaniini 2019-04-26 02:41:35 +00:00
  • fd45c74e6f Merge branch 'chore/update-changelog' into 'develop' kaniini 2019-04-25 23:35:13 +00:00
  • 99b0792751 update Changelog William Pitcock 2019-04-25 23:27:38 +00:00
  • 5b2791698c Merge branch 'feature/mediaproxy-whitelist' into 'develop' kaniini 2019-04-25 23:23:27 +00:00
  • 24c3e2db2c Add mediaproxy whitelist capability Mark Felder 2019-04-25 18:11:47 -05:00
  • 8c9227c1f1 Merge branch 'feature/auto-reject-follow-requests-blocked' into 'develop' Haelwenn 2019-04-25 09:47:42 +00:00
  • dfc8425659 Move settings to Source subentity rinpatch 2019-04-25 09:14:35 +03:00
  • a825056d4d test fixes Alex S 2019-04-25 14:09:57 +07:00