summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-05-04Fix unused variables, imports, and aliasesMark Felder
2018-05-04Fix build. Too eager with the fixing of unused variables.Mark Felder
== Compilation error in file lib/pleroma/web/activity_pub/views/user_view.ex == ** (CompileError) lib/pleroma/web/activity_pub/views/user_view.ex:54: undefined function _total/0 (stdlib) lists.erl:1338: :lists.foreach/2 (stdlib) erl_eval.erl:670: :erl_eval.do_apply/6
2018-05-04Clean up unused aliases and importsMark Felder
2018-05-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain
2018-05-04More unused variablesMark Felder
2018-05-04update frontendlain
2018-05-04Merge branch 'feld-test.secret' into feld-warningsMark Felder
2018-05-04Make it possible to use custom database connection parametersMark Felder
2018-05-04Fix a bunch of unused variable warningsMark Felder
2018-05-04Merge branch 'feature/nodeinfo' into 'develop'lambda
Implements the nodeinfo endpoints See merge request pleroma/pleroma!140
2018-05-04Don't expire idempotency cache for five minutes.lain
2018-05-04MastodonAPI: Support idempotency key.lain
2018-05-04Fix formattingFrancis Dinh
2018-05-03Use a variable for stats to avoid double callDashie
2018-05-03Add metadata.nodeNameDashie
2018-05-03Return the right content-type for the schema callDashie
2018-05-02Explicit error messageDashie
2018-05-02Simplify version and fix typoDashie
2018-05-02Add localPosts count, also set to 0 if nullDashie
2018-05-02Change path of nodeinfo to use .json formatDashie
2018-05-02Format filesDashie
2018-05-02Add first try at nodeinfoDashie
2018-04-29update frontendlain
2018-04-29Fix format.lain
2018-04-29Merge branch 'patch-bio' into 'develop'lambda
replace newlines in profiles with <br> See merge request pleroma/pleroma!136
2018-04-28ActivityPub core: fix handling of unlisted statuses by leveraging a similar ↵William Pitcock
strategy as for blocks
2018-04-28Insert object after being rewritten.lain
2018-04-28Merge branch 'fix/blocked-user-boosts' into 'develop'lambda
ActivityPub.ex: do not return boosted statuses from blocked users. See merge request pleroma/pleroma!111
2018-04-28Added a test (written by @andrewzah) for the MRWim Vanderbauwhede
2018-04-28Merge remote-tracking branch 'upstream/develop' into patch-bioWim Vanderbauwhede
2018-04-27Merge branch 'bugfix/mrf-simple-media-stripping' into 'develop'lambda
ActivityPub MRF SimplePolicy: fix media stripping See merge request pleroma/pleroma!133
2018-04-26Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain
2018-04-26Resurrect instance specific panel.lain
2018-04-25ActivityPub MRF SimplePolicy: fix media strippingWilliam Pitcock
2018-04-25Merge branch 'patch-1' into 'develop'eal
Fix typo in MastoFE login page. See merge request pleroma/pleroma!132
2018-04-25Optionally deactivate public timelines.lain
2018-04-25Align local bio limits to remote limit.lain
2018-04-25Merge branch 'feature/unrepeats' of git.pleroma.social:normandy/pleroma into ↵Francis Dinh
feature/unrepeats
2018-04-25Formatting fixesFrancis Dinh
2018-04-25Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into ↵Francis Dinh
feature/unrepeats
2018-04-25Fix comment grammarFrancis Dinh
2018-04-24Fix typo in MastoFE login page. Normandy
see https://git.pleroma.social/pleroma/mastofe/issues/13
2018-04-24Merge branch 'gitignore' into 'develop'lambda
Gitignore See merge request pleroma/pleroma!131
2018-04-24Fix formatting.lain
2018-04-24Add common files to gitignoreRachel H
2018-04-24Merge branch 'feature/message-rewrite-facility' into 'develop'lambda
message rewrite facility See merge request pleroma/pleroma!112
2018-04-24Update .gitlab-ci.ymllambda
2018-04-24Changed to support \r\n and \nWim Vanderbauwhede
2018-04-24Merge branch 'dashie/pleroma-fix/delete-decrement-statuses-count' into developlain
2018-04-24Patch to replace newlines with <br> tags in bioWim Vanderbauwhede