Commit Graph

  • 7a52c4549c Merge branch 'feature/message-rewrite-facility' into 'develop' lambda 2018-04-24 17:21:28 +0000
  • bbd549c018 Update .gitlab-ci.yml lambda 2018-04-24 12:28:59 +0000
  • 7517155544 Changed to support \r\n and \n Wim Vanderbauwhede 2018-04-24 13:28:55 +0100
  • 3f9385096e Merge branch 'dashie/pleroma-fix/delete-decrement-statuses-count' into develop lain 2018-04-24 14:25:17 +0200
  • 52ee91efce Patch to replace newlines with <br> tags in bio Wim Vanderbauwhede 2018-04-24 13:20:17 +0100
  • afe892ddac
    Correct syntax with mix format Dashie 2018-04-24 14:12:23 +0200
  • 9972678a68
    Add User.decrease_note_count and call it from ActivityPub.delete Dashie 2018-04-24 11:34:18 +0200
  • 62a2287bba Merge branch 'favicon_tag' into 'develop' lambda 2018-04-24 05:54:28 +0000
  • fc6f5bcad3 update frontend lain 2018-04-23 19:23:45 +0200
  • 661fd3c93e update frontend lain 2018-04-23 19:09:24 +0200
  • 8c0806539c Embed announce activity data instead of linking to it Francis Dinh 2018-04-22 21:28:51 -0400
  • b1742eca42 Revert "Rename make_unannounce_data helper to make_undo_data" Francis Dinh 2018-04-22 19:42:28 -0400
  • 0574df273c Small cleanup. lain 2018-04-22 10:01:10 +0200
  • 114ca9e069 Merge branch 'develop' into fix/note-count-not-updating lain 2018-04-22 09:56:24 +0200
  • c649ca8958 Rename make_unannounce_data helper to make_undo_data Francis Dinh 2018-04-22 01:55:41 -0400
  • 26af5bad33 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop lain 2018-04-21 18:28:24 +0200
  • 0c221943ef Formatter: Use proper escaping for links. lain 2018-04-21 18:24:45 +0200
  • 22bfeac256 Update note count in ActivityPub.create. eal 2018-04-21 12:58:04 +0300
  • d0b1c498a0 Merge branch '146-enable-custom-panel-by-default-and-have-default-content' into 'develop' lambda 2018-04-21 08:05:36 +0000
  • b7669c6efe Merge branch 'readme-update' into 'develop' lambda 2018-04-21 08:05:04 +0000
  • b4b314be5d Merge branch 'nginx-certbot-doc' into 'develop' lambda 2018-04-21 07:59:49 +0000
  • 04276f0f53 Update README.md lambda 2018-04-21 07:57:33 +0000
  • 9e6ae44729 Formatting fixes. lain 2018-04-21 09:43:53 +0200
  • ce7618f6f6 add formatter lain 2018-04-21 09:34:23 +0200
  • 21510f6990 . lain 2018-04-21 09:30:15 +0200
  • 44a7789732 . lain 2018-04-21 09:28:44 +0200
  • 34aab9f877 .. lain 2018-04-21 09:27:35 +0200
  • b68c4bd271 Update CI. lain 2018-04-21 09:24:51 +0200
  • ff5e957476 Make search use id index too. lain 2018-04-21 09:22:31 +0200
  • f0798440de Use correct activity for undo Francis Dinh 2018-04-20 23:22:16 -0400
  • 4b9f2ab526 Fix federation of unreblog activity Francis Dinh 2018-04-20 23:09:19 -0400
  • caf30646b1 Elaborate on setup steps and CLI commands. csaurus 2018-04-20 18:17:01 -0400
  • 1c6a691570 Add info about certbot with the webroot plugin to pleroma.nginx csaurus 2018-04-20 18:43:49 -0400
  • c5dc7e6e31 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats Francis Dinh 2018-04-20 16:47:44 -0400
  • 90ad55b8ff formatting Kawen 2018-04-20 19:21:48 +0200
  • b0671be283 enable instance panel by default, added some content Kawen 2018-04-20 19:04:57 +0200
  • a61e8ac154 Formatting. lain 2018-04-20 13:10:57 +0200
  • 18c3ca7844 Add format checking to CI. lain 2018-04-20 13:09:41 +0200
  • 193be32f45 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop lain 2018-04-19 21:44:29 +0200
  • 0b4ff1bfe2 fix again lain 2018-04-19 21:44:11 +0200
  • 3f7b02e7c4 Merge branch 'feature/qvitter-notification-endpoint' into 'develop' lambda 2018-04-19 19:03:35 +0000
  • 8dbb4c6c50 Remove hack for /about/more as we are doing this in Pleroma now Mark Felder 2018-04-19 18:58:13 +0000
  • fa37acfcc7 TwitterAPI: Add Qvitter notification endpoint. eal 2018-04-19 21:46:59 +0300
  • 678fed47ee Merge branch 'patch-2' into 'develop' lambda 2018-04-19 14:30:13 +0000
  • f08f9d4498 ActivityPub MRF: fix nsfw tagging of objects with attachments by looking at the right object (the child in this case) nenolod@dereferenced.org 2018-04-19 12:29:35 +0000
  • 7b96a756fb fix again lain 2018-04-19 13:04:29 +0200
  • 77fc40d5d7 Fix generate config lain 2018-04-19 12:50:25 +0200
  • 8696c25efd Ignore setup_db.psql and ignore a folder for custom emojis Dominik V. Salonen 2018-04-19 10:42:22 +0000
  • e30a056476 Revert "Ask for proxy URL if proxy enabled." eal 2018-04-19 13:29:14 +0300
  • e4da81d662 Merge branch 'bugfix/strange-formatting-on-mastodon' into 'develop' lambda 2018-04-19 07:41:09 +0000
  • 32a26eb910 Fix TwitterAPI.delete call Francis Dinh 2018-04-18 20:41:12 -0400
  • ee6f15529d CommonAPI post: kill \r with fire William Pitcock 2018-04-18 20:30:59 +0000
  • b586ead6b8 rm_user: also ensure that cache is running. eal 2018-04-18 17:52:25 +0300
  • 8b5ea91f68 Merge branch 'fix/rm-user-task' into 'develop' lambda 2018-04-18 14:41:03 +0000
  • 4e3fc530db Fix rm_user task. eal 2018-04-18 17:39:27 +0300
  • a80cdd5906 Merge branch 'fix/login-with-username-or-email' into 'develop' lambda 2018-04-18 11:26:38 +0000
  • 947431e9aa MastoAPI and OAuth: allow login with either email or username. eal 2018-04-18 13:13:57 +0300
  • 7b4f55238e Handle unrepeats via the TwitterAPI Francis Dinh 2018-04-18 06:00:40 -0400
  • 687db1bc3a Expose unannounce activity so that it can be tested Francis Dinh 2018-04-18 03:39:42 -0400
  • 0251690e96 Add federation for unrepeats Francis Dinh 2018-04-17 20:35:07 -0400
  • e153b364a7 update frontend lain 2018-04-17 11:09:19 +0200
  • c9e7b984d5 Add make_unannounce_data helper function Francis Dinh 2018-04-17 04:13:08 -0400
  • 85bd191291 Remove unretweet function for now Francis Dinh 2018-04-17 04:12:16 -0400
  • 42279f54cf Return target status in MastoAPI endpoint instead of reblog activity Francis Dinh 2018-04-16 23:30:52 -0400
  • d16877251a doc fixes Francis Dinh 2018-04-16 10:59:32 -0400
  • 5b0d0b9ab2 Add unreblogging tests Francis Dinh 2018-04-14 22:34:06 -0400
  • b949577472 Add unrepeat functionality Francis Dinh 2018-04-14 03:39:16 -0400
  • d24ddd9fb9 ActivityPub MRF: implement the SimplePolicy policy William Pitcock 2018-04-14 11:31:12 +0000
  • 4a178b3d65 ActivityPub: implement MRF core hook and baseline noop policy object William Pitcock 2018-04-14 09:20:18 +0000
  • 48380aeccc ActivityPub.ex: do not return boosted statuses from blocked users. eal 2018-04-14 14:26:20 +0300
  • 5256c712dc Caching /objects/ URLs breaks them in Mastoweb as they don't redirect to the /notice/ Mark Felder 2018-04-13 13:40:24 +0000
  • fef8daa454 Update README.md lambda 2018-04-13 09:46:58 +0000
  • 3b68eaa0ce Merge branch 'mix_task_rm_user' into 'develop' lambda 2018-04-13 07:43:32 +0000
  • 13a64b82e3 Switch to User.delete for rm_user task Phenethylamine 2018-04-12 14:30:53 -0400
  • 4478b9115c Add rm_user mix task Phenethylamine 2018-04-12 02:43:48 -0400
  • 3d636cf533 Merge branch 'develop' into 'develop' lambda 2018-04-11 20:58:25 +0000
  • 5612716c25 update frontend lain 2018-04-11 22:03:28 +0200
  • a8dddd9279 update frontend lain 2018-04-11 21:55:38 +0200
  • 2de2e29df2 Oops Gian Sass 2018-04-11 15:51:02 -0400
  • 3a5c0465eb Add unit test for pinned statuses Gian Sass 2018-04-11 15:48:32 -0400
  • 907df9b8ed Fix issue #124 Gian Sass 2018-04-11 14:55:49 -0400
  • faa0feb095 Merge branch 'feld-hackneyupdate' into 'develop' lambda 2018-04-11 14:27:52 +0000
  • 366138fa72 Update httpoison to get the latest hackney. Mark Felder 2018-04-11 13:55:54 +0000
  • b910483c16 Fix register_user task. lain 2018-04-10 21:05:53 +0200
  • 1dd2c8163f Order masto searches by date. lain 2018-04-10 18:38:52 +0200
  • d7654f4b3c Merge branch 'mastofe-250c885de655ed0b45b76cc35c5782e019b5a0ec' into 'develop' lambda 2018-04-10 14:46:04 +0000
  • 6ff583e5e1 Merge branch 'feld-varnish' into 'develop' lambda 2018-04-10 14:45:46 +0000
  • fcb32345d7 Remove attempted caching of toots Mark Felder 2018-04-10 14:17:23 +0000
  • fcc941adfd Merge branch 'patch-1' into 'develop' lambda 2018-04-10 08:14:38 +0000
  • 73ca18744e Indentation for Apache vhost Stanislas 2018-04-10 08:08:27 +0000
  • fc13a3ff24 Bring mastofe up-to-date with 250c885de655ed0b45b76cc35c5782e019b5a0ec Morgan Bazalgette 2018-04-09 22:00:42 +0200
  • d7c2909ce2 Merge branch 'bugfix/user-search-with-at-sign' into 'develop' lambda 2018-04-09 08:42:01 +0000
  • 210755ac46 Merge branch 'develop' into 'develop' lambda 2018-04-09 08:41:34 +0000
  • 2edde06042 user: strip leading @ from user query when searching for users if present William Pitcock 2018-04-07 21:44:55 +0000
  • 2d0a2d9466 Merge branch 'develop' into 'develop' lambda 2018-04-09 06:58:28 +0000
  • 5cb3d441bc Apache config for everything on one host. nepfag 2018-04-08 19:22:24 +0000
  • 7e262c2997 Fix max upload size in nginx config. Hector A. Escobedo 2018-04-08 11:15:04 -0400
  • 9998b4519d Merge branch 'feature/mastodon-api-for-tootstream' into 'develop' lambda 2018-04-08 06:02:11 +0000
  • 9a2d3705c6 Merge branch 'fix/persisted-mastofe-settings' into 'develop' lambda 2018-04-08 06:01:06 +0000
  • 1857f403be mastodon api: report version as the Mastodon API version supported with the real version in parenthesis William Pitcock 2018-04-07 22:27:16 +0000