| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 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 | second level of headertext change in doc | Alex S | |
| 2019-04-02 | syntax highlighting | Alex S | |
| 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 branch 'remove-user-activities' into 'develop' | lambda | |
| [#757] Add mix task to delete user's activities See merge request pleroma/pleroma!1008 | |||
| 2019-04-02 | Merge branch 'get_by_id' into 'develop' | lambda | |
| Replace `Repo.get_by` with existing functions See merge request pleroma/pleroma!1010 | |||
| 2019-04-02 | Merge develop into feature/770-add-emoji-tags | Alex S | |
| 2019-04-02 | Merge branch 'features/pleroma-tan' into 'develop' | lambda | |
| priv/static/images: Add pleroma-tan See merge request pleroma/pleroma!913 | |||
| 2019-04-02 | Rename fake param to preview and make the tests check that the object was ↵ | rinpatch | |
| not inserted to the db | |||
| 2019-04-02 | Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth | Ivan Tashkinov | |
| # Conflicts: # lib/pleroma/web/oauth/oauth_controller.ex # lib/pleroma/web/router.ex | |||
| 2019-04-02 | replace `Repo.get_by(User, nickname: nickname)` with ↵ | Egor Kislitsyn | |
| `User.get_by_nickname(nickname)` in tests | |||
| 2019-04-02 | Merge branch 'features/mastoapi/2.6.0-force-login-option' into 'develop' | lambda | |
| MastoAPI 2.6.0 `force_login` option Closes #734 See merge request pleroma/pleroma!999 | |||
| 2019-04-02 | Merge branch 'get_by_id' into 'develop' | lambda | |
| Replace `Repo.get(Module, id)` with `Module.get_by_id(id)` where possible See merge request pleroma/pleroma!1009 | |||
| 2019-04-02 | Merge branch 'fix/nicknames-beginning-with-numbers' into 'develop' | lambda | |
| Fix account lookup for nicknames beginning with numbers See merge request pleroma/pleroma!1003 | |||
| 2019-04-02 | Fix account lookup for nicknames beginning with numbers | cascode | |
| 2019-04-02 | [#923] Merge remote-tracking branch 'remotes/upstream/develop' into ↵ | Ivan Tashkinov | |
| twitter_oauth # Conflicts: # mix.exs | |||
| 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 | replace `Repo.get_by(User, nickname: nickname)` with ↵ | Egor Kislitsyn | |
| `User.get_by_nickname(nickname)` | |||
| 2019-04-02 | Added "GET /oauth/authorize" tests. | Ivan Tashkinov | |
| 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 | change `Repo.get(Activity, id)` => `Activity.get_by_id(id)` | Egor Kislitsyn | |
| 2019-04-02 | Ignore dates in wrong formats | Sergey Suprunenko | |
| 2019-04-02 | add `user delete_activities` mix task | Egor Kislitsyn | |
| 2019-04-02 | test fix | Alex S | |
| 2019-04-02 | little changes and typos | Alex S | |
| 2019-04-02 | updating custom_emoji docs | Alex S | |
| 2019-04-02 | Merge branch 'ci-speedup-2-electric-boogalo' into 'develop' | lambda | |
| CI speedup: split into proper stages to benefit from parallel execution See merge request pleroma/pleroma!1007 | |||
| 2019-04-02 | refactoring of emoji tags config to use groups | Alex S | |
| 2019-04-02 | Merge remote-tracking branch 'pleroma/develop' into remove-user-activities | Egor Kislitsyn | |
| 2019-04-02 | add support for all status type (ostatus) and replase case with if | Sachin Joshi | |
| 2019-04-02 | Merge remote-tracking branch 'remotes/upstream/develop' into ↵ | Ivan Tashkinov | |
| features/mastoapi/2.6.0-conversations | |||
| 2019-04-02 | remove reduntant services in docs deploy and change job names to kebab case | rinpatch | |
| 2019-04-02 | what the fuck | rinpatch | |
| 2019-04-02 | huh | rinpatch | |
| 2019-04-02 | Separate CI jobs to 3 stages to allow them to be executed in parallel | rinpatch | |
| 2019-04-02 | Merge branch 'bugfix/mastoapi/2.8.0-fake_identityproof' into 'develop' | rinpatch | |
| router: Add fake identity proof endpoint See merge request pleroma/pleroma!1006 | |||
| 2019-04-02 | fetch url for OStatus to know if it is a/c or status | Sachin Joshi | |
| 2019-04-02 | router: Add fake identity proof endpoint | Haelwenn (lanodan) Monnier | |
| 2019-04-01 | Merge branch 'fix/default-mail-adapter' into 'develop' | lambda | |
| Add default mail adapter settings to config See merge request pleroma/pleroma!994 | |||
| 2019-04-01 | Merge branch 'documentation-improvements' into 'develop' | lambda | |
| Small documentation improvements See merge request pleroma/pleroma!1001 | |||
| 2019-04-01 | Handle dates in the Unix timestamp format (Fixes #763) | Sergey Suprunenko | |
| 2019-04-01 | [OStatus] adds status to pleroma instance if the url given is a status | Sachin Joshi | |
| 2019-04-01 | COPYING: Wording | Haelwenn (lanodan) Monnier | |
| [ci skip] | |||
| 2019-04-01 | update mastodon api link in README to point to a non-outdated docs | rinpatch | |
| 2019-04-01 | Merge branch 'update-readme' into 'develop' | rinpatch | |
| Fix dead links in README.md and add note about new docs site See merge request pleroma/pleroma!1000 | |||
| 2019-04-01 | Make only important note bold rather than the whole paragraph because it ↵ | rinpatch | |
| looks better that way | |||
| 2019-04-01 | Remove outdated howto change config and port and move it to config.md instead | rinpatch | |
| 2019-04-01 | Link to docs page instead of to clients.md | Karen Konou | |
| 2019-04-01 | COPYING: wrap to 79, city.jpg Unsplash, wording | Haelwenn (lanodan) Monnier | |
| [ci skip] | |||
 |
index : pleroma | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summaryrefslogtreecommitdiff |