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

Commit Graph

  • ff10b9927b Merge branch 'support/bugfix_272' into 'develop' lambda 2018-12-10 19:05:16 +00:00
  • 6786ad3d98 Merge branch 'fix/theora-detection-read-bytes' into 'develop' lambda 2018-12-10 19:04:06 +00:00
  • 0554d91dcd Merge branch 'anonymize-filter-text' into 'develop' lambda 2018-12-10 19:03:06 +00:00
  • bda25b999b Merge branch 'develop' into 'fix/mix-task-uploads-moduledoc' lambda 2018-12-10 18:33:36 +00:00
  • ab98c92d86 Merge branch 'parallel588/pleroma-support/compile_warnings' into 'develop' lambda 2018-12-10 18:28:02 +00:00
  • b621ebb7a6 Format. lain 2018-12-10 19:19:40 +01:00
  • c81c74d847 Treat warnings as errors outside of tests. lain 2018-12-10 19:13:53 +01:00
  • e94c3442f4 updates Maksim Pechnikov 2018-12-10 09:39:57 +03:00
  • 993c8c8bd4 Keep the shortdoc descriptive rinpatch 2018-12-10 08:03:17 +03:00
  • 09c13d0929 Use "~" as a route namespace symbol on FE Maxim Filippov 2018-12-10 01:22:50 +03:00
  • 9ba4a1c5fe Fixes #415. Properly handle nil and empty string by User.parse_bio raeno 2018-12-10 01:01:43 +04:00
  • cbe048bb3f Mix tasks: improve uploads.ex moduledoc Rin Toshaka 2018-12-09 20:17:35 +01:00
  • 074fa790ba fix compile warnings Maksim Pechnikov 2018-12-09 12:12:48 +03:00
  • cf85a9aea1 Merge branch 'angristan-docker' into 'develop' Haelwenn 2018-12-09 13:53:20 +00:00
  • 88e463e797 Update angristan/docker-pleroma link Stanislas 2018-12-09 12:56:29 +00:00
  • 100a06afe1 config.md: Fix typos and add option description Rin Toshaka 2018-12-09 11:09:21 +01:00
  • 068353ac0b formatting Maksim Pechnikov 2018-12-07 07:53:14 +03:00
  • 9442588ae9 fix hashtags in api response Maksim Pechnikov 2018-12-06 21:50:34 +03:00
  • 15616eda5e Make uploadlimit an object that stores upload limits for avatars, banners, backgrounds, general content Rin Toshaka 2018-12-08 21:48:49 +01:00
  • f079ca7181
         Remove french. href 2018-12-08 11:09:35 +01:00
  • 5436aaad4f Merge branch 'fix/add-upload.ex' into 'develop' lambda 2018-12-08 09:12:37 +00:00
  • beadeaffa1 Merge branch 'fix/nodeinfo-nil-features' into 'develop' lambda 2018-12-08 09:12:06 +00:00
  • 8fa5c66eab Merge branch 'fix/media-proxy-url-encoded' into 'develop' lambda 2018-12-08 09:11:18 +00:00
  • 4976a8b05f Merge branch 'fix/typo-relay-ex' into 'develop' lambda 2018-12-08 09:08:56 +00:00
  • 6c73136aec [#283] Mix Tasks: Fix a typo in relay.ex Rin Toshaka 2018-12-08 08:30:34 +01:00
  • bdc8112e40
         Media proxy: fix url encoding href 2018-12-07 21:44:04 +01:00
  • 578051809f Add uploadlimit to Twitter API config Rin Toshaka 2018-12-07 20:03:30 +01:00
  • 7d86c0c53f Merge branch 'fix/gopher-respect-ip' into 'develop' lambda 2018-12-07 18:49:40 +00:00
  • 94ac0075bf Merge branch 'media-proxy-follow-redirect' into 'develop' lambda 2018-12-07 18:48:26 +00:00
  • 134cc94cbd
         Nodeinfo: remove null features; relay feature. href 2018-12-07 19:44:45 +01:00
  • d8fcf7c5cf
         Media proxy: follow HTTP redirects by default href 2018-12-07 19:36:44 +01:00
  • 94d8f1ab30 Merge branch '394_user_tags' into 'develop' lambda 2018-12-07 18:25:38 +00:00
  • 09f20de0d7 Make gopher respect ip Rin Toshaka 2018-12-07 19:21:58 +01:00
  • fd5c7b445f Fix a typo Rin Toshaka 2018-12-07 19:19:14 +01:00
  • da4315b5ef Merge branch 'emoji-alphabetical-ordering' into 'develop' lambda 2018-12-07 18:13:39 +00:00
  • a02e0c18bc Mix Tasks: Add task uploads.ex for migrating local uploads. Rin Toshaka 2018-12-07 15:13:57 +01:00
  • 3b27f61ffa
         AnonymizeFilename: allow for a pre-defined text instead of random string href 2018-12-07 14:07:11 +01:00
  • 3c925e9d88
         Emojis: Alphabetical ordering href 2018-12-07 11:16:27 +01:00
  • 1cea97df64 [#394] Refactoring of User.tag and User.untag (removed User.tag_or_untag etc.) Ivan Tashkinov 2018-12-07 12:27:32 +03:00
  • 8764f64690 Merge branch 'fix/add-user-unsubscribe-to-doc' into 'develop' lambda 2018-12-07 09:23:56 +00:00
  • 4b90c7cc9d Merge branch 'fix/typo-in-relay-doc' into 'develop' lambda 2018-12-07 09:19:15 +00:00
  • 4e2250b1dd Fix a typo in relay.ex moduledoc rinpatch 2018-12-07 11:41:01 +03:00
  • 6ed5044c4e [#394] Refactoring (using Ecto.Multi; "untag" route change). Ivan Tashkinov 2018-12-07 11:04:39 +03:00
  • f7e23aee90 Oops rinpatch 2018-12-07 10:44:54 +03:00
  • f661813807 Add mix pleroma.user unsubscribe to mix doc rinpatch 2018-12-07 10:39:54 +03:00
  • c88db2c1b1 Merge branch 'fix/add-common.ex' into 'develop' eal 2018-12-07 06:48:39 +00:00
  • 08e10a70ec Rename def to defval rinpatch 2018-12-07 09:46:13 +03:00
  • 1d11c4cf11 add common.ex Rin Toshaka 2018-12-07 06:12:39 +01:00
  • 220de24002 Merge branch 'refactor/mix-tasks' into 'develop' kaniini 2018-12-06 22:09:27 +00:00
  • 7a2162bbcb [#394] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map. Ivan Tashkinov 2018-12-06 22:26:25 +03:00
  • f5726a2e12 Update README.md Rin Toshaka 2018-12-06 18:45:07 +01:00
  • abbf347dc7 [#394] View tests fix. Ivan Tashkinov 2018-12-06 20:38:52 +03:00
  • 71d5cf9ed8 Remove unused vars from user.ex Rin Toshaka 2018-12-06 18:25:39 +01:00
  • 7bcb6a183a [#394] Refactoring. Ivan Tashkinov 2018-12-06 20:23:16 +03:00
  • 66313cda02 Update instance.ex for web push Rin Toshaka 2018-12-06 18:16:51 +01:00
  • 22830c8fc9 [#394] Formatting fix. Ivan Tashkinov 2018-12-06 20:13:07 +03:00
  • 88f92693f2 Merge develop Rin Toshaka 2018-12-06 18:11:22 +01:00
  • 7b19487389 [#394] Added users.tags and admin routes to tag and untag users. Added tests. Ivan Tashkinov 2018-12-06 20:06:50 +03:00
  • ca7b46fb3b Refactor common functions to common.ex Rin Toshaka 2018-12-06 18:01:28 +01:00
  • 4a2a7ce636 Refactor common functions to common.ex Rin Toshaka 2018-12-06 18:00:24 +01:00
  • 3a84511df1 remove migrate_local_uploads.ex Rin Toshaka 2018-12-06 17:35:33 +01:00
  • 1d531fd2f3 Merge branch 'fix/mastodon-api-settings' into 'develop' kaniini 2018-12-06 16:01:58 +00:00
  • abead01ab6 Merge branch 'correct-and-improve-http-options' into 'develop' kaniini 2018-12-06 15:57:56 +00:00
  • b0adea30b3 Merge branch 're-mrf' into 'develop' kaniini 2018-12-06 15:36:41 +00:00
  • 776179c2ed Merge branch 'feature/compat/push-subscriptions' into 'develop' kaniini 2018-12-06 15:35:30 +00:00
  • 2ae1128d9f MastoAPI: Fix put_settings rinpatch 2018-12-06 17:42:07 +03:00
  • d27e3f269f Rename regular expression 'have_re' to 'reply_prefix'. scarlett 2018-12-06 14:00:41 +00:00
  • 6f36e903b0 use User.avatar_url Egor Kislitsyn 2018-12-06 20:55:46 +07:00
  • 79668c08fc cleanup Egor Kislitsyn 2018-12-06 20:50:20 +07:00
  • 3dff61ebec Harden re: detection. scarlett 2018-12-06 13:48:12 +00:00
  • 3d492795b7 clean up Egor Kislitsyn 2018-12-06 20:42:00 +07:00
  • 0020b22688 add VAPID to test config Egor Kislitsyn 2018-12-06 20:17:00 +07:00
  • 4944498133 Merge branch 'develop' into feature/compat/push-subscriptions Egor Kislitsyn 2018-12-06 20:15:16 +07:00
  • bac58b1524 show warning if VAPID is not set Egor Kislitsyn 2018-12-06 19:56:56 +07:00
  • 8b4397c704 Merge branch 'develop' into feature/compat/push-subscriptions Egor Kislitsyn 2018-12-06 19:55:58 +07:00
  • 04a48286e6 Add web push support Egor Kislitsyn 2018-12-06 19:29:04 +07:00
  • 6a6aaa0e1a Use object.normalize. scarlett 2018-12-06 11:37:29 +00:00
  • a09ed0f5af avoid mix format bug Hakaba Hitoyo 2018-12-06 18:41:29 +09:00
  • ccf0b46dd6 Merge branch '210_twitter_api_uploads_alt_text' into 'develop' kaniini 2018-12-06 07:36:21 +00:00
  • 3e90f688f1 [#210] Mastodon: actor storing for media uploads, ownership check to update_media. Refactoring. Ivan Tashkinov 2018-12-06 10:26:17 +03:00
  • 96ba95df2e remove follow_redirect options Hakaba Hitoyo 2018-12-06 11:38:33 +09:00
  • 27792b2d77 remove pool and timeout options which duplicate with the default Hakaba Hitoyo 2018-12-06 11:23:15 +09:00
  • 505d820827 Merge remote-tracking branch 'origin/debug-suggestions-api' into correct-and-improve-http-options Hakaba Hitoyo 2018-12-06 10:48:05 +09:00
  • 48a0315646 Merge branch 'follower-hiding' into 'develop' kaniini 2018-12-05 21:41:53 +00:00
  • 6ab58fdfa1 Merge branch 'dev_vald_fe/data_tag' into 'develop' kaniini 2018-12-05 20:47:44 +00:00
  • 194869c7db added data attrs to twitter scrubber Vald 2018-12-06 02:14:56 +05:30
  • 7d5720f2e4 Fix merge. lain 2018-12-05 21:31:02 +01:00
  • 76d6b1c6ab Merge remote-tracking branch 'origin' into follower-hiding lain 2018-12-05 21:27:56 +01:00
  • 3ea4476445 MastodonAPI: Show users their own network. lain 2018-12-05 21:25:06 +01:00
  • 3c8ffe7ed3 resolved activity view test Vald 2018-12-06 01:54:04 +05:30
  • 028904c333 lint Vald 2018-12-06 01:46:53 +05:30
  • 911a877576 resolved api and controller test failures Vald 2018-12-06 01:46:30 +05:30
  • fdac215091 TwitterAPI: Show users their own network. lain 2018-12-05 21:14:06 +01:00
  • 743a09132b linting Vald 2018-12-06 01:28:52 +05:30
  • 812b20d49f resolved formatter_test failures Vald 2018-12-06 01:27:08 +05:30
  • 3ccfe226c0 added data attrs for user and tag Vald 2018-12-06 01:05:41 +05:30
  • 3b5be09f45 [#210] Stylistic change. Ivan Tashkinov 2018-12-05 21:48:21 +03:00
  • 839526a913 TwitterAPI: Add network hiding. lain 2018-12-05 19:22:40 +01:00
  • dfc9c08796 formating Rin Toshaka 2018-12-05 19:12:23 +01:00
  • ffec96d8cc Everything should use Mix.Task.Run Rin Toshaka 2018-12-05 19:05:37 +01:00