aboutsummaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2019-06-23Merge branch 'rich_media_titles_two' into 'develop'kaniini
Rich media titles two See merge request pleroma/pleroma!1325
2019-06-23Merge branch 'admin-config' into 'develop'kaniini
Admin config See merge request pleroma/pleroma!1328
2019-06-23support for config groupsAlex S
2019-06-23Merge branch 'develop' into 'remove-avatar-header'Sachin Joshi
# Conflicts: # CHANGELOG.md
2019-06-22support for tuples with more than 2 valuesAlex S
2019-06-22Rich Media Parser: Do not return just a title if nothing else is there.lain
2019-06-22Revert "Revert "Merge branch 'fix/ogp-title' into 'develop'""lain
This reverts commit b6af80f769195b5047ee8da07166f022c2e29b0a.
2019-06-22Support RUM indexes in the config generatorrinpatch
2019-06-22Merge branch 'develop' into release-docsrinpatch
2019-06-22Merge branch 'fix/ecto-tasks-release' into 'develop'rinpatch
Ecto tasks: Resolve relative path using the application directory instead of cwd and load the application before doing anything See merge request pleroma/pleroma!1322
2019-06-22notifications: fix notification generation for non-create activitiesWilliam Pitcock
in 300d94c62, an Object.normalize() call was introduced. calling Object.normalize() on an activity with a non-object URI (say, a user) causes Really Bad Things to happen. so don't do that.
2019-06-22fix for int and modulesAlex S
2019-06-22Load the application before executing the create taskrinpatch
2019-06-22Ecto tasks: Resolve relative path using the application directoryrinpatch
instead of cwd and load the application before doing anything In OTP releases cwd != app directory and the configuration is read only if the application is loaded
2019-06-22Remove the getting started steps from pleroma.instance gen taskrinpatch
They are not compatible with every platform, different for OTP releases and may become outdated. We are better off just telling people to refer to the installation guides for their particular platform
2019-06-22Merge branch 'develop' into release-docsrinpatch
2019-06-21Merge branch 'feature/mrf-anti-link-spam' into 'develop'kaniini
implement anti link spam MRF See merge request pleroma/pleroma!1307
2019-06-21Merge branch 'oauth_secure_redirect' into 'develop'kaniini
OAuth security improvements (`redirect_uri` listing enforcement) See merge request pleroma/pleroma!1302
2019-06-21Merge branch 'revert-6f5a0cc1' into 'develop'kaniini
Revert "Merge branch 'fix/ogp-title' into 'develop'" See merge request pleroma/pleroma!1317
2019-06-21change the anti-link-spam MRF implementation to use old_user? instead of the ↵William Pitcock
previous name
2019-06-21Move config templates to priv so they can be found in releasesrinpatch
2019-06-21Revert "Merge branch 'fix/ogp-title' into 'develop'"feld
This reverts merge request !1277
2019-06-21Default DB configuration to false and set the default database name torinpatch
`pleroma` instead of `pleroma_dev`
2019-06-20Merge branch 'fix/config-gen-releases' into 'develop'rinpatch
Refactor mix tasks a bit and make config generator work with releases See merge request pleroma/pleroma!1312
2019-06-20Fixes for dynamic configurationAlexander Strizhakov
2019-06-20Allow setting upload/static directories in the config generatorrinpatch
2019-06-20Remove deprecated dedupe_media from the config templaterinpatch
2019-06-20Remove a useless binding from config template callrinpatch
2019-06-20Release Tasks: Ensure the application is loaded before getting therinpatch
modules Needed for non-rpc tasks to work
2019-06-20Rename Pleroma.Mix.Tasks.Common -> Mix.Pleroma and import it's functionsrinpatch
instead of aliasing This seems to be the convention for functions that can be reused between different mix tasks in all Elixir projects I've seen and it gets rid on an error message when someone runs mix pleroma.common Also in this commit by accident: - Move benchmark task under a proper namespace - Insert a space after the prompt
2019-06-19Apply suggestion to lib/mix/tasks/pleroma/user.exIvan Tashkinov
2019-06-19User sign out mix task.Ivan Tashkinov
2019-06-19unbreak pollsWilliam Pitcock
2019-06-19implement anti link spam MRFWilliam Pitcock
2019-06-19aliases for mix tasksAlexander Strizhakov
ecto.migrate ecto.rollback
2019-06-19Merge branch 'begone-the-dot-hack' into 'develop'rinpatch
Remove the dot hack when posting from Mastodon API and add proper errors when the post exceeds character limits See merge request pleroma/pleroma!1298
2019-06-19Merge branch 'fix/rich-media-hashtags-again' into 'develop'lain
Rich Media: Skip Microformats hashtags See merge request pleroma/pleroma!1304
2019-06-19Rich Media: Skip Microformats hashtagsrinpatch
When fixing this problem I incorrectly assumed a.hashtag is the proper way for detecting hashtags, but it is just something Pleroma and Mastodon add. Per microformats it should be detected by the presense of rel=tag. This MR adds a check for rel=tag, but I still left a.hashtag just in case
2019-06-18Merge branch 'deps/update-auto-linker' into 'develop'lain
Deps: Update auto_linker See merge request pleroma/pleroma!1300
2019-06-18Minor edit (comment).Ivan Tashkinov
2019-06-18Added more `redirect_uri` checks to prevent redirect to not explicitly ↵Ivan Tashkinov
listed URI.
2019-06-18Deps: Update auto_linkerrinpatch
2019-06-18Mastodon API: Sanitize display namesrinpatch
Closes #1000
2019-06-18Add proper error handling for when the post exceeds character limitsrinpatch
2019-06-18Mastodon API: Remove the dot hackrinpatch
2019-06-17Merge branch 'removing-test-errors' into 'develop'rinpatch
Removing test errors See merge request pleroma/pleroma!1296
2019-06-16Merge branch 'fix/sanitize-report-content' into 'develop'Haelwenn
Sanitize HTML in ReportView Closes #990 See merge request pleroma/pleroma!1293
2019-06-16salmon fixAlex S
removed some ownership sandbox error
2019-06-16[#570] add user:notification streamMaksim
2019-06-16Fix report content stopping to be nullablerinpatch
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-24 02:10:32 +0000