sjw
/
pleroma
mirror of https://git.pleroma.social/sjw/pleroma.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Commit Graph

  • a9baf955fa Merge branch 'feld-varnish' into 'develop' lambda 2018-05-06 18:43:57 +0000
  • 6c2903d9a1 Merge branch 'feld-warnings' into 'develop' lambda 2018-05-06 18:42:31 +0000
  • 2b708f76e0 Merge branch 'fix/unsafe-variables' into 'develop' lambda 2018-05-06 18:41:46 +0000
  • 0a1fd8adf0 Added headers for a more secure default. Artik Banana 2018-05-06 14:19:29 +0000
  • bfad57c7c9 Get rid of unsafe variables. eal 2018-05-06 09:58:59 +0300
  • 1e83727fdd Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop lain 2018-05-05 13:41:27 +0200
  • 9810153aeb Streamer: Don't send out stream events for blocked users. lain 2018-05-05 13:40:47 +0200
  • 96add86b50 Unify wss uri generation. lain 2018-05-05 13:40:31 +0200
  • c8ba7501b7 Merge branch 'feld-test.secret' into 'develop' lambda 2018-05-05 09:58:17 +0000
  • c464355d1a Idempotency: Use special cache, keep for 6 hours. lain 2018-05-05 11:15:57 +0200
  • 7a884d70d8 Group def renders here as well Mark Felder 2018-05-04 22:31:46 +0000
  • 31ea9cbcd8 Group def renders together to fix warning Mark Felder 2018-05-04 22:28:13 +0000
  • 955bd643ff Merge branch 'feld-test.secret' into feld-warnings Mark Felder 2018-05-04 22:05:19 +0000
  • 737c42920a Speling Mark Felder 2018-05-04 22:05:01 +0000
  • 14c0c6d16b Fix formatting Mark Felder 2018-05-04 22:03:14 +0000
  • 2a402fb395 Group response declarations together Mark Felder 2018-05-04 21:59:21 +0000
  • a24eed0f57 That last change was stupid. Multiline comments in Elixir don't really exist. Mark Felder 2018-05-04 21:53:52 +0000
  • 79d41aa12e Dirty hack to remove the warning Mark Felder 2018-05-04 21:48:30 +0000
  • aaacebd906 Fix unused variables, imports, and aliases Mark Felder 2018-05-04 21:42:20 +0000
  • 42f1a098aa Fix build. Too eager with the fixing of unused variables. Mark Felder 2018-05-04 21:26:33 +0000
  • 636f0fa402 Clean up unused aliases and imports Mark Felder 2018-05-04 21:25:31 +0000
  • 762f6edc29 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop lain 2018-05-04 23:16:16 +0200
  • 943820ae29 More unused variables Mark Felder 2018-05-04 21:16:02 +0000
  • 12f0ad1392 update frontend lain 2018-05-04 23:15:33 +0200
  • 5855ffd322 Merge branch 'feld-test.secret' into feld-warnings Mark Felder 2018-05-04 21:02:14 +0000
  • d30907e573 Make it possible to use custom database connection parameters Mark Felder 2018-05-04 21:00:18 +0000
  • ab4aa5720a Fix a bunch of unused variable warnings Mark Felder 2018-05-04 20:59:01 +0000
  • 11a1241d41 Merge branch 'feature/nodeinfo' into 'develop' lambda 2018-05-04 19:17:19 +0000
  • 90c4bed0af Don't expire idempotency cache for five minutes. lain 2018-05-04 21:15:39 +0200
  • fcd3eca167 MastodonAPI: Support idempotency key. lain 2018-05-04 20:30:29 +0200
  • 8b4ee0ea51 Fix formatting Francis Dinh 2018-05-04 03:19:48 -0400
  • c3f9e24c70
         Use a variable for stats to avoid double call Dashie 2018-05-03 15:31:39 +0200
  • 724f096ac7
         Add metadata.nodeName Dashie 2018-05-03 10:52:20 +0200
  • 804497542d
         Return the right content-type for the schema call Dashie 2018-05-03 10:50:02 +0200
  • e448734952
         Explicit error message Dashie 2018-05-02 22:45:20 +0200
  • fd0bf3aa71
         Simplify version and fix typo Dashie 2018-05-02 22:44:13 +0200
  • b8789cc8b6
         Add localPosts count, also set to 0 if null Dashie 2018-05-02 22:36:19 +0200
  • abeb009acc
         Change path of nodeinfo to use .json format Dashie 2018-05-02 22:16:19 +0200
  • 65168393d8
         Format files Dashie 2018-05-02 21:43:12 +0200
  • 67dadd954e
         Add first try at nodeinfo Dashie 2018-05-02 21:31:42 +0200
  • 5b6d6d7f2d update frontend lain 2018-04-29 16:56:13 +0200
  • bc215f5684 Fix format. lain 2018-04-29 11:28:26 +0200
  • b7584edcea Merge branch 'patch-bio' into 'develop' lambda 2018-04-29 09:26:47 +0000
  • a3d1d4894f ActivityPub core: fix handling of unlisted statuses by leveraging a similar strategy as for blocks William Pitcock 2018-04-29 02:53:19 +0000
  • 4d55d7c95e Insert object after being rewritten. lain 2018-04-28 16:10:24 +0200
  • a7a40bb8f1 Merge branch 'fix/blocked-user-boosts' into 'develop' lambda 2018-04-28 13:49:12 +0000
  • 6908f29e0a Added a test (written by @andrewzah) for the MR Wim Vanderbauwhede 2018-04-28 12:01:43 +0100
  • 634c0c52a1 Merge remote-tracking branch 'upstream/develop' into patch-bio Wim Vanderbauwhede 2018-04-28 11:59:01 +0100
  • 39c80a3667 Merge branch 'bugfix/mrf-simple-media-stripping' into 'develop' lambda 2018-04-27 05:49:12 +0000
  • 6eb274f278 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop lain 2018-04-26 07:07:04 +0200
  • 3bad2b827a Resurrect instance specific panel. lain 2018-04-26 07:06:32 +0200
  • 90bbd94614 ActivityPub MRF SimplePolicy: fix media stripping William Pitcock 2018-04-25 21:25:56 +0000
  • 845bd56c9c Merge branch 'patch-1' into 'develop' eal 2018-04-25 14:35:44 +0000
  • a7eb148d61 Optionally deactivate public timelines. lain 2018-04-25 16:10:18 +0200
  • 279b1d19f0 Align local bio limits to remote limit. lain 2018-04-25 15:41:59 +0200
  • 2d775bf1be Merge branch 'feature/unrepeats' of git.pleroma.social:normandy/pleroma into feature/unrepeats Francis Dinh 2018-04-25 01:58:50 -0400
  • e981280fa7 Formatting fixes Francis Dinh 2018-04-25 01:43:45 -0400
  • 9e0dd21ed6 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats Francis Dinh 2018-04-25 00:46:28 -0400
  • 0df1a4efc8 Fix comment grammar Francis Dinh 2018-04-25 00:46:06 -0400
  • 715c90e54f Fix typo in MastoFE login page. Normandy 2018-04-24 21:58:45 +0000
  • d4a54a90c9 Merge branch 'gitignore' into 'develop' lambda 2018-04-24 19:26:01 +0000
  • c78e7d8b11 Fix formatting. lain 2018-04-24 21:25:31 +0200
  • 52b1bc782b Add common files to gitignore Rachel H 2018-04-24 12:18:23 -0700
  • 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