| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2019-05-14 | Merge remote-tracking branch 'pleroma/develop' into feature/disable-account | Egor Kislitsyn | |
| 2019-05-13 | differences_in_mastoapi_responses.md: fullname & bio are optionnal | Alexander Strizhakov | |
| [ci skip] | |||
| 2019-05-09 | Use "repeated" instead of "retweeted" for repeated statuses in Twitter API | Francis Dinh | |
| This makes it consistent with the language used in Pleroma FE (at least in English). Resolves https://git.pleroma.social/pleroma/pleroma-fe/issues/533 | |||
| 2019-05-07 | Merge remote-tracking branch 'pleroma/develop' into feature/disable-account | Egor Kislitsyn | |
| 2019-05-03 | formatter.ex: Add get_emoji_map/1 | Haelwenn (lanodan) Monnier | |
| 2019-05-03 | Pleroma.Formatter: width/height to class=emoji | Haelwenn (lanodan) Monnier | |
| 2019-05-01 | Merge branch 'develop' into bugfix/web-notification-special-char | Sachin Joshi | |
| 2019-04-28 | Fix `rights` in TwitterAPI's user entity being present only for | rinpatch | |
| Admins/Moderators In !1093 I reused `maybe_with_role` for `rights` object, however I missed that `maybe_with_role` is called only for admins/moderators. | |||
| 2019-04-25 | Merge branch 'develop' into feature/disable-account | Egor Kislitsyn | |
| 2019-04-24 | Fix leaking private configuration parameters in Mastodon and Twitter APIs, ↵ | rinpatch | |
| and add new configuration parameters to Mastodon API This patch: - Fixes `rights` in twitterapi ignoring `show_role` - Fixes exposing default scope of the user to anyone in Mastodon API - Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674) Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs | |||
| 2019-04-24 | fix the status notification with special char | Sachin Joshi | |
| 2019-04-22 | Use `User.get_cached*` everywhere | Egor | |
| 2019-04-22 | Feature/826 healthcheck endpoint | Alexander Strizhakov | |
| 2019-04-22 | Merge remote-tracking branch 'pleroma/develop' into feature/disable-account | Egor Kislitsyn | |
| 2019-04-20 | Fix tests that used finmoji | Ekaterina Vaartis | |
| 2019-04-17 | Update functions in object fetcher for tesla and set up a proper mock for tests | rinpatch | |
| 2019-04-17 | Merge branch 'develop' into feature/database-compaction | rinpatch | |
| 2019-04-16 | Merge branch 'feature/788-separate-email-addresses' into 'develop' | kaniini | |
| Feature/788 separate email addresses Closes #788 See merge request pleroma/pleroma!1040 | |||
| 2019-04-16 | Handle new-style mastodon follow lists | Normandy | |
| Fixes https://git.pleroma.social/pleroma/pleroma/issues/814 | |||
| 2019-04-15 | Remove inReplyToStatusId | rinpatch | |
| 2019-04-13 | naming fix | Alex S | |
| 2019-04-12 | Merge branch 'bugfix/pleroma-email-naming' into 'develop' | lambda | |
| Make the filename and module name of Pleroma.Emails.* orthogonal See merge request pleroma/pleroma!1029 | |||
| 2019-04-12 | more tests | Egor Kislitsyn | |
| 2019-04-10 | Merge branch 'develop' into feature/788-separate-email-addresses | Alex S | |
| 2019-04-10 | adding notify_email setting for trigger emails | Alex S | |
| 2019-04-10 | Merge branch 'feature/767-multiple-use-invite-token' into 'develop' | lambda | |
| Feature/767 multiple use invite token See merge request pleroma/pleroma!1032 | |||
| 2019-04-10 | Merge branch 'fix/emoji-api-nonsense' into 'develop' | lambda | |
| Change response format of /api/pleroma/emoji so it makes sense See merge request pleroma/pleroma!1038 | |||
| 2019-04-10 | s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/ | Haelwenn (lanodan) Monnier | |
| 2019-04-10 | Merge branch 'notification-pleroma-settings' into 'develop' | kaniini | |
| Notification controls Closes #738 See merge request pleroma/pleroma!988 | |||
| 2019-04-09 | Change response format of /api/pleroma/emoji to the one that actually makes ↵ | rinpatch | |
| sense | |||
| 2019-04-08 | removing not needed invite update | Alex S | |
| 2019-04-08 | renaming expire_at -> expires_at | Alex S | |
| keyword style change | |||
| 2019-04-06 | token -> invite renaming | Alex S | |
| 2019-04-06 | twitter api registration | Alex S | |
| fix for twitter api tests | |||
| 2019-04-02 | Merging develop into feature/770-add-emoji-tags | Alex S | |
| Conflict test/web/twitter_api/util_controller_test.exs | |||
| 2019-04-02 | Merge branch 'bugfix/share-mastodon' into 'develop' | lambda | |
| [OStatus] adds status to pleroma instance if the url given is a status See merge request pleroma/pleroma!1002 | |||
| 2019-04-02 | Merge develop into feature/770-add-emoji-tags | Alex S | |
| 2019-04-02 | replace `Repo.get_by(User, nickname: nickname)` with ↵ | Egor Kislitsyn | |
| `User.get_by_nickname(nickname)` in tests | |||
| 2019-04-02 | replace `Repo.get_by(User, ap_id: ap_id)` with `User.get_by_ap_id(ap_id)` | Egor Kislitsyn | |
| 2019-04-02 | change `Repo.get(Activity, id)` => `Activity.get_by_id(id)` in tests | Egor Kislitsyn | |
| 2019-04-02 | change `Repo.get(User, id)` => `User.get_by_id(id)` | Egor Kislitsyn | |
| 2019-04-02 | fetch url for OStatus to know if it is a/c or status | Sachin Joshi | |
| 2019-04-01 | [OStatus] adds status to pleroma instance if the url given is a status | Sachin Joshi | |
| 2019-04-01 | Adding tag to emoji ets table | Alex S | |
| changes in apis | |||
| 2019-03-28 | Add PUT /api/pleroma/notification_settings endpoint | eugenijm | |
| 2019-03-26 | Credo is upset about me not remembering the alphabet | rinpatch | |
| 2019-03-26 | Fix formatting | rinpatch | |
| 2019-03-26 | Remove ActivityRepresenter | rinpatch | |
| 2019-03-22 | Merge branch 'safe-mentions' into 'develop' | kaniini | |
| Add safe dm mode option. See merge request pleroma/pleroma!958 | |||
| 2019-03-21 | tests: fixup | William Pitcock | |
 |
index : pleroma.git | |
| [no description] |
| aboutsummaryrefslogtreecommitdiff |