itepechi/akkoma
1
0
Fork 0
Code Issues Pull requests Releases Activity

Commit graph

  • 1d52afe83e Merge branch 'feature/instance-specific-panel' into 'develop' lambda 2018-02-11 09:32:48 +0000
  • 9cf293c84b Merge remote-tracking branch 'hakabahitoyo/feature/instance-specific-panel' into feature/instance-specific-panel Hakaba Hitoyo 2018-02-11 18:08:27 +0900
  • 52200998c9 Merge branch 'develop' into feature/activitypub Roger Braun 2018-02-11 09:50:55 +0100
  • 0e2ca77eec update frontend Roger Braun 2018-02-09 17:14:11 +0100
  • a61f21ff4f print <link rel="next"> element in atom.feed hakabahitoyo 2018-02-09 23:03:28 +0900
  • 7124f12a94 introduce max_id parameter in feed.atom (debug) Hakaba Hitoyo 2018-02-09 21:46:05 +0900
  • 08f458e6df UtilController: Fix statusnet config api compatibility. Roger Braun 2018-02-09 13:43:12 +0100
  • 9c61f60558 introduce max_id parameter in feed.atom Hakaba Hitoyo 2018-02-09 21:41:30 +0900
  • af854f7e01 Merge branch 'develop' into 'develop' lambda 2018-02-09 08:57:54 +0000
  • f0cde24f71 Merge branch 'fix/config-disable-chat' into 'develop' lambda 2018-02-08 18:18:28 +0000
  • 73249fa5ff Changed fallback controller to handle all cases from OAuthController Calv Collins 2018-02-08 18:15:59 +0000
  • 314f4775c5 Merge branch 'develop' of https://git.pleroma.social/calv/pleroma into develop Calv Collins 2018-02-08 16:58:31 +0000
  • bdb5dd2194 Create action_fallback for username/password incorrect input Calv Collins 2018-02-08 16:57:30 +0000
  • 2f291576e4 Fix compile errors on 1.4.5 Roger Braun 2018-02-08 16:03:30 +0100
  • 103eca482c update frontend Roger Braun 2018-02-07 13:44:52 +0100
  • b1edfba3b9 Update required Elixir version in README eal 2018-02-06 00:06:29 +0200
  • 8df0aee889 Merge branch 'fix/no-image-upload-filetype' into 'develop' eal 2018-02-05 21:57:17 +0000
  • 286f6698ee Detect file type if none given. eal 2018-02-04 15:14:08 +0200
  • a2fac9b0e8 adjust panel.html Hakaba Hitoyo 2018-02-04 00:31:46 +0900
  • bffc78f2a8 add backend default for instance specific panel Hakaba Hitoyo 2018-02-03 23:09:26 +0900
  • 61c16193de Merge branch 'move-backend-images' into 'develop' lambda 2018-02-03 13:05:20 +0000
  • c8a2931549 add backend endpoint /images Hakaba Hitoyo 2018-02-03 20:52:01 +0900
  • ea6d1b2b17 move avi.png & banner.png from /priv/static/static to /priv/static/images Hakaba Hitoyo 2018-02-03 20:43:14 +0900
  • f0745148a3 Add config option for enabling/disabling chat. eal 2018-02-01 19:23:26 +0200
  • 9a9766d648 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop Roger Braun 2018-02-02 17:14:58 +0100
  • 2203fa2fdb Update frontend. Roger Braun 2018-02-02 17:14:23 +0100
  • 3163311098 Merge branch 'feature/remote-follow' into 'develop' lambda 2018-02-02 07:33:09 +0000
  • 29be70c008 Add remote following of local profiles. eal 2018-02-02 00:00:48 +0200
  • ab83e0de6d TwitterAPI: Add is_local to user view. eal 2018-02-01 21:41:19 +0200
  • 15cb3f2b01 Revert renaming emoji.txt eal 2018-01-31 23:47:42 +0200
  • 0f194dc56b Merge branch 'feature/instance-thumbnail-api' into 'develop' eal 2018-01-31 18:34:52 +0000
  • 3fa6f3ae42 Merge branch 'fix/split-custom-emoji' into 'develop' lambda 2018-01-31 15:24:36 +0000
  • ab8b9ababa Split emoji to default and custom. eal 2018-01-31 16:23:31 +0200
  • 03c15a54f5 provide instance thumbnail at /api/v1/instance (debug) Hakaba Hitoyo 2018-01-31 23:09:47 +0900
  • e47f60c053 provide instance thumbnail at /api/v1/instance (debug) Hakaba Hitoyo 2018-01-31 23:04:34 +0900
  • 10753178ea provide instance thumbnail at /api/v1/instance (debug) Hakaba Hitoyo 2018-01-31 22:57:43 +0900
  • a4335e391f provide instance thumbnail at /api/v1/instance Hakaba Hitoyo 2018-01-31 22:51:25 +0900
  • 5e37adedfb Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop Roger Braun 2018-01-30 12:21:05 +0100
  • ad0ab3a57b Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-logo' into develop Roger Braun 2018-01-30 12:20:39 +0100
  • 4501094606 Make specs less breaky. Roger Braun 2018-01-30 12:20:14 +0100
  • 1bb3ba02f3 Fix specs. Roger Braun 2018-01-30 12:17:01 +0100
  • cefb6cfea1 provide logo at feed.atom (debug) Hakaba Hitoyo 2018-01-30 19:37:04 +0900
  • b713b28dfd provide logo at feed.atom Hakaba Hitoyo 2018-01-30 19:26:07 +0900
  • 2f23ae5b68 Merge branch 'pr-upstream-http-proxy' into 'develop' lambda 2018-01-30 08:16:31 +0000
  • 189e9d63bc Merge branch 'feature/caddyfile' into 'develop' lambda 2018-01-30 08:14:07 +0000
  • ede4883ac9 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop Roger Braun 2018-01-29 17:45:44 +0100
  • 64e51c2cfa Fix incoming Pleroma CWs. Closes #96. Roger Braun 2018-01-29 17:44:35 +0100
  • 066fe1a697
         use nil instead of empty string Jeff Becker 2018-01-29 10:06:16 -0500
  • 8db83c3dc0 Merge branch 'feature/longfox' into 'develop' lambda 2018-01-27 11:57:34 +0000
  • 7e1d4819ca add longfox emojis Hakaba Hitoyo 2018-01-27 08:38:48 +0900
  • 46c8f79cd7 Merge branch 'feature/cross-origin' into 'develop' lambda 2018-01-26 23:30:11 +0000
  • 9c0c40cf1e Access-Control-Allow-Origin Hakaba Hitoyo 2018-01-26 22:58:58 +0000
  • e97864bfcb Update frontend. Roger Braun 2018-01-26 15:12:34 +0100
  • 5957c6517d Fix config. Roger Braun 2018-01-26 14:31:52 +0100
  • cd3210c9b8 Update frontend. Roger Braun 2018-01-26 14:28:27 +0100
  • dffde6631d
         Merge remote-tracking branch 'upstream/develop' into pr-upstream-http-proxy Jeff Becker 2018-01-24 13:15:54 -0500
  • 0f722a8c22 Stats: Make less crashy and improve query. Roger Braun 2018-01-20 18:38:30 +0100
  • 2ed17541b7 Merge branch 'feature/remote-follow' into 'develop' lambda 2018-01-20 15:02:04 +0000
  • beb13bf3a9 Revert "Revert "Add remote follow pages."" eal 2018-01-18 18:42:44 +0200
  • 57d413e655 Revert "Revert "Add remote follow path to webfinger."" eal 2018-01-18 18:42:32 +0200
  • b259b4e4d1 Revert "Add remote follow pages." eal 2018-01-18 03:42:18 +0200
  • fb5aa34092 Revert "Add remote follow path to webfinger." eal 2018-01-18 03:42:09 +0200
  • 47e8c8db05 Add remote follow pages. eal 2018-01-18 00:22:08 +0200
  • bc689740f0 Add remote follow path to webfinger. eal 2018-01-16 02:17:55 +0200
  • ac7580df78 Merge branch 'fix/background-profile-fetch' into 'develop' lambda 2018-01-16 14:18:07 +0000
  • 6678fe3217 Add a Caddyfile. eal 2018-01-16 15:48:27 +0200
  • b3e7d7ae6d Fetch external profile in the background. eal 2018-01-16 15:31:03 +0200
  • 80f6ac412a Merge branch 'default-pictures' into 'develop' eal 2018-01-15 20:26:49 +0000
  • 14b086eec2 Add a default profile picture and banner. eal 2018-01-15 22:18:17 +0200
  • baf66caefd Merge branch 'prod.exs' into 'develop' eal 2018-01-15 17:44:49 +0000
  • db5dfd1b3e Merge branch 'fix/pleroma.nginx' into 'develop' eal 2018-01-15 17:26:41 +0000
  • 5a6f54b336 Merge branch 'stats-daemon' into 'develop' lambda 2018-01-15 08:04:54 +0000
  • aceef36e56 Correct pleroma.nginx Hakaba Hitoyo 2018-01-14 10:57:25 +0000
  • 048f61d7f8 #95 Correct prod.exs Hakaba Hitoyo 2018-01-14 08:54:28 +0000
  • 6e1cb86166 Fix instance test. eal 2018-01-14 08:28:35 +0200
  • d8db39564e Move user count to stats agent. eal 2018-01-14 08:15:11 +0200
  • 9717166d10 Add a stats agent for storing data from expensive queries. eal 2018-01-13 18:24:16 +0200
  • d49109ca17 Merge branch 'add-mediaproxy-question-to-configgen' into 'develop' eal 2018-01-12 20:57:31 +0000
  • d56ab43609 Ask for proxy URL if proxy enabled. eal 2018-01-12 22:38:14 +0200
  • 29b7e822fb
         added question about activating mediaproxy to config generator Sebastian Huebner 2018-01-09 12:31:11 +0100
  • 1e185b9301
         apply proxy settings to media_proxy Jeff Becker 2017-12-31 09:25:00 -0500
  • 39854d6c11
         clarify Jeff Becker 2017-12-30 13:04:26 -0500
  • 658c4754ff
         docs Jeff Becker 2017-12-30 13:02:51 -0500
  • 5ddd15d794
         make httppoison use configurable http proxy Jeff Becker 2017-12-30 11:35:53 -0500
  • 5c09d8d3f1 Unlink follow import process from the one processing request. eal 2017-12-23 16:40:43 +0200
  • ad180ad6dd Merge branch 'media-proxy-fix-encoding' into 'develop' lambda 2017-12-22 12:07:10 +0000
  • 0ccd0e5cc9
         Remove a useless URI.encode call in MediaProxy href 2017-12-21 20:59:10 +0100
  • 35ac549a99 Merge branch 'media-proxy' into 'develop' lambda 2017-12-20 14:22:24 +0000
  • 2a744cdff8 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop Lain Iwakura 2017-12-19 16:15:45 +0100
  • f1f79c0dca Fix timelines in subway tooter. Lain Iwakura 2017-12-19 16:15:07 +0100
  • 29c9812789 Merge branch 'fix/twitterapi-follow-lists' into 'develop' lambda 2017-12-18 22:44:15 +0000
  • 47887ac848 MastoAPI: Fix always-sensitive bugs. Lain Iwakura 2017-12-18 16:56:03 +0100
  • 846d59a536 Send out salmons before websub. Lain Iwakura 2017-12-18 16:16:22 +0100
  • 1969773fb4 Fix follower/following lists. eal 2017-12-18 16:23:04 +0200
  • 6b48489237 Merge branch 'feature/follow-import' into 'develop' lambda 2017-12-18 10:59:57 +0000
  • fdfb508259 Run follow import in the background. eal 2017-12-12 21:04:41 +0200
  • d89193a8d7 Allow uploading a file for follow import. eal 2017-12-12 21:03:28 +0200
  • 4a13b84887 Add recipients field to activities. Lain Iwakura 2017-12-12 18:07:14 +0100
  • 39ccfdc084 Add follow import. eal 2017-12-12 18:35:23 +0200
  • f909aec050
         proxy emojis href 2017-12-12 12:30:24 +0100