Alex S
|
3465b7ba9a
|
syntax highlighting
|
2019-04-02 20:32:37 +07:00 |
|
lambda
|
180b87257c
|
Merge branch 'bugfix/share-mastodon' into 'develop'
[OStatus] adds status to pleroma instance if the url given is a status
See merge request pleroma/pleroma!1002
|
2019-04-02 12:47:40 +00:00 |
|
lambda
|
ce9284b36f
|
Merge branch 'remove-user-activities' into 'develop'
[#757] Add mix task to delete user's activities
See merge request pleroma/pleroma!1008
|
2019-04-02 12:45:29 +00:00 |
|
lambda
|
b95cf3d490
|
Merge branch 'get_by_id' into 'develop'
Replace `Repo.get_by` with existing functions
See merge request pleroma/pleroma!1010
|
2019-04-02 12:43:28 +00:00 |
|
Alex S
|
9e0567ec52
|
Merge develop into feature/770-add-emoji-tags
|
2019-04-02 19:16:29 +07:00 |
|
lambda
|
bd961a3bad
|
Merge branch 'features/pleroma-tan' into 'develop'
priv/static/images: Add pleroma-tan
See merge request pleroma/pleroma!913
|
2019-04-02 11:54:04 +00:00 |
|
rinpatch
|
fdb4357e9b
|
Rename fake param to preview and make the tests check that the object was not inserted to the db
|
2019-04-02 14:31:18 +03:00 |
|
Ivan Tashkinov
|
37925cbe78
|
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
# lib/pleroma/web/oauth/oauth_controller.ex
# lib/pleroma/web/router.ex
|
2019-04-02 14:05:34 +03:00 |
|
Egor Kislitsyn
|
20c619f85f
|
replace Repo.get_by(User, nickname: nickname) with User.get_by_nickname(nickname) in tests
|
2019-04-02 17:58:32 +07:00 |
|
lambda
|
091baf9316
|
Merge branch 'features/mastoapi/2.6.0-force-login-option' into 'develop'
MastoAPI 2.6.0 `force_login` option
Closes #734
See merge request pleroma/pleroma!999
|
2019-04-02 10:57:38 +00:00 |
|
lambda
|
26d509cc86
|
Merge branch 'get_by_id' into 'develop'
Replace `Repo.get(Module, id)` with `Module.get_by_id(id)` where possible
See merge request pleroma/pleroma!1009
|
2019-04-02 10:52:29 +00:00 |
|
lambda
|
b5d486d9ac
|
Merge branch 'fix/nicknames-beginning-with-numbers' into 'develop'
Fix account lookup for nicknames beginning with numbers
See merge request pleroma/pleroma!1003
|
2019-04-02 10:51:33 +00:00 |
|
cascode
|
95c92c49c9
|
Fix account lookup for nicknames beginning with numbers
|
2019-04-02 10:51:33 +00:00 |
|
Ivan Tashkinov
|
590c935d95
|
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
# mix.exs
|
2019-04-02 13:50:12 +03:00 |
|
Egor Kislitsyn
|
9a59c26619
|
replace Repo.get_by(User, ap_id: ap_id) with User.get_by_ap_id(ap_id)
|
2019-04-02 17:47:52 +07:00 |
|
Egor Kislitsyn
|
88d3cb44c3
|
replace Repo.get_by(User, nickname: nickname) with User.get_by_nickname(nickname)
|
2019-04-02 17:47:02 +07:00 |
|
Ivan Tashkinov
|
15ce710460
|
Added "GET /oauth/authorize" tests.
|
2019-04-02 13:43:33 +03:00 |
|
Egor Kislitsyn
|
11c2d6bdc4
|
change Repo.get(Activity, id) => Activity.get_by_id(id) in tests
|
2019-04-02 17:08:03 +07:00 |
|
Egor Kislitsyn
|
1b3d921921
|
change Repo.get(User, id) => User.get_by_id(id)
|
2019-04-02 17:01:26 +07:00 |
|
Egor Kislitsyn
|
4212527928
|
change Repo.get(Activity, id) => Activity.get_by_id(id)
|
2019-04-02 16:50:31 +07:00 |
|
Sergey Suprunenko
|
3db9235150
|
Ignore dates in wrong formats
|
2019-04-02 11:32:36 +02:00 |
|
Egor Kislitsyn
|
a14742f495
|
add user delete_activities mix task
|
2019-04-02 16:30:11 +07:00 |
|
Alex S
|
484162c187
|
test fix
|
2019-04-02 16:26:40 +07:00 |
|
Alex S
|
08d64b977f
|
little changes and typos
|
2019-04-02 16:13:34 +07:00 |
|
Alex S
|
851c5bf093
|
updating custom_emoji docs
|
2019-04-02 15:57:57 +07:00 |
|
lambda
|
9305e241cb
|
Merge branch 'ci-speedup-2-electric-boogalo' into 'develop'
CI speedup: split into proper stages to benefit from parallel execution
See merge request pleroma/pleroma!1007
|
2019-04-02 08:50:47 +00:00 |
|
Alex S
|
9b2188da7c
|
refactoring of emoji tags config to use groups
|
2019-04-02 15:44:56 +07:00 |
|
Egor Kislitsyn
|
a1869f5272
|
Merge remote-tracking branch 'pleroma/develop' into remove-user-activities
|
2019-04-02 15:41:30 +07:00 |
|
Sachin Joshi
|
f20e8d28de
|
add support for all status type (ostatus) and replase case with if
|
2019-04-02 12:18:00 +05:45 |
|
rinpatch
|
8c71ea5a1a
|
remove reduntant services in docs deploy and change job names to kebab case
|
2019-04-02 09:13:34 +03:00 |
|
rinpatch
|
5ee54d8183
|
what the fuck
|
2019-04-02 09:07:58 +03:00 |
|
rinpatch
|
7827b929fc
|
huh
|
2019-04-02 09:02:21 +03:00 |
|
rinpatch
|
4861558b93
|
Separate CI jobs to 3 stages to allow them to be executed in parallel
|
2019-04-02 08:58:09 +03:00 |
|
rinpatch
|
f8aa917eef
|
Merge branch 'bugfix/mastoapi/2.8.0-fake_identityproof' into 'develop'
router: Add fake identity proof endpoint
See merge request pleroma/pleroma!1006
|
2019-04-02 05:31:41 +00:00 |
|
Sachin Joshi
|
6386c1c9c1
|
fetch url for OStatus to know if it is a/c or status
|
2019-04-02 10:26:09 +05:45 |
|
Haelwenn (lanodan) Monnier
|
f56eef8d8c
|
router: Add fake identity proof endpoint
|
2019-04-02 01:53:38 +02:00 |
|
lambda
|
fd7dd8f9a2
|
Merge branch 'fix/default-mail-adapter' into 'develop'
Add default mail adapter settings to config
See merge request pleroma/pleroma!994
|
2019-04-01 21:47:40 +00:00 |
|
lambda
|
fc2bef5ac3
|
Merge branch 'documentation-improvements' into 'develop'
Small documentation improvements
See merge request pleroma/pleroma!1001
|
2019-04-01 21:20:11 +00:00 |
|
Sergey Suprunenko
|
b6f9f7b8aa
|
Handle dates in the Unix timestamp format (Fixes #763)
|
2019-04-01 22:45:24 +02:00 |
|
Sachin Joshi
|
1d01e8e656
|
[OStatus] adds status to pleroma instance if the url given is a status
|
2019-04-01 22:26:58 +05:45 |
|
Haelwenn (lanodan) Monnier
|
66e7d4966d
|
COPYING: Wording
[ci skip]
|
2019-04-01 18:34:53 +02:00 |
|
rinpatch
|
5373077501
|
update mastodon api link in README to point to a non-outdated docs
|
2019-04-01 19:27:40 +03:00 |
|
rinpatch
|
d976cc5df7
|
Merge branch 'update-readme' into 'develop'
Fix dead links in README.md and add note about new docs site
See merge request pleroma/pleroma!1000
|
2019-04-01 16:25:02 +00:00 |
|
rinpatch
|
e2b94d8f33
|
Make only important note bold rather than the whole paragraph because it looks better that way
|
2019-04-01 19:24:50 +03:00 |
|
rinpatch
|
a309b49c2d
|
Remove outdated howto change config and port and move it to config.md instead
|
2019-04-01 19:19:06 +03:00 |
|
|
|
41f02e87a1
|
Link to docs page instead of to clients.md
|
2019-04-01 18:13:42 +02:00 |
|
Haelwenn (lanodan) Monnier
|
715a31c1ed
|
COPYING: wrap to 79, city.jpg Unsplash, wording
[ci skip]
|
2019-04-01 18:13:13 +02:00 |
|
|
|
3c9abf5dee
|
Fix dead links and add note about new docs site
|
2019-04-01 18:02:58 +02:00 |
|
Ivan Tashkinov
|
6910fb371b
|
Fixed local MastoFE authentication / force_login option.
|
2019-04-01 17:25:25 +03:00 |
|
rinpatch
|
949cfde065
|
restart makes no sense here as we instructed to stop the service before
|
2019-04-01 16:26:46 +03:00 |
|
