Alex S
|
3465b7ba9a
|
syntax highlighting
|
6 years ago |
Alex S
|
9e0567ec52
|
Merge develop into feature/770-add-emoji-tags
|
6 years ago |
lambda
|
bd961a3bad
|
Merge branch 'features/pleroma-tan' into 'develop'
priv/static/images: Add pleroma-tan
See merge request pleroma/pleroma!913
|
6 years ago |
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
|
6 years ago |
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
|
6 years ago |
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
|
6 years ago |
cascode
|
95c92c49c9
|
Fix account lookup for nicknames beginning with numbers
|
6 years ago |
Ivan Tashkinov
|
15ce710460
|
Added "GET /oauth/authorize" tests.
|
6 years ago |
Egor Kislitsyn
|
11c2d6bdc4
|
change `Repo.get(Activity, id)` => `Activity.get_by_id(id)` in tests
|
6 years ago |
Egor Kislitsyn
|
1b3d921921
|
change `Repo.get(User, id)` => `User.get_by_id(id)`
|
6 years ago |
Egor Kislitsyn
|
4212527928
|
change `Repo.get(Activity, id)` => `Activity.get_by_id(id)`
|
6 years ago |
Alex S
|
484162c187
|
test fix
|
6 years ago |
Alex S
|
08d64b977f
|
little changes and typos
|
6 years ago |
Alex S
|
851c5bf093
|
updating custom_emoji docs
|
6 years ago |
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
|
6 years ago |
Alex S
|
9b2188da7c
|
refactoring of emoji tags config to use groups
|
6 years ago |
rinpatch
|
8c71ea5a1a
|
remove reduntant services in docs deploy and change job names to kebab case
|
6 years ago |
rinpatch
|
5ee54d8183
|
what the fuck
|
6 years ago |
rinpatch
|
7827b929fc
|
huh
|
6 years ago |
rinpatch
|
4861558b93
|
Separate CI jobs to 3 stages to allow them to be executed in parallel
|
6 years ago |
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
|
6 years ago |
Haelwenn (lanodan) Monnier
|
f56eef8d8c
|
router: Add fake identity proof endpoint
|
6 years ago |
lambda
|
fd7dd8f9a2
|
Merge branch 'fix/default-mail-adapter' into 'develop'
Add default mail adapter settings to config
See merge request pleroma/pleroma!994
|
6 years ago |
lambda
|
fc2bef5ac3
|
Merge branch 'documentation-improvements' into 'develop'
Small documentation improvements
See merge request pleroma/pleroma!1001
|
6 years ago |
Haelwenn (lanodan) Monnier
|
66e7d4966d
|
COPYING: Wording
[ci skip]
|
6 years ago |
rinpatch
|
5373077501
|
update mastodon api link in README to point to a non-outdated docs
|
6 years ago |
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
|
6 years ago |
rinpatch
|
e2b94d8f33
|
Make only important note bold rather than the whole paragraph because it looks better that way
|
6 years ago |
rinpatch
|
a309b49c2d
|
Remove outdated howto change config and port and move it to config.md instead
|
6 years ago |
Karen Konou
|
41f02e87a1
|
Link to docs page instead of to clients.md
|
6 years ago |
Haelwenn (lanodan) Monnier
|
715a31c1ed
|
COPYING: wrap to 79, city.jpg Unsplash, wording
[ci skip]
|
6 years ago |
Karen Konou
|
3c9abf5dee
|
Fix dead links and add note about new docs site
|
6 years ago |
Ivan Tashkinov
|
6910fb371b
|
Fixed local MastoFE authentication / `force_login` option.
|
6 years ago |
rinpatch
|
949cfde065
|
restart makes no sense here as we instructed to stop the service before
|
6 years ago |
rinpatch
|
bff8cde0cf
|
Instruct to stop the service only after git pulling and getting deps to minimize downtimes
|
6 years ago |
rinpatch
|
7c69c6f624
|
change bold text to be proper geadings in introduction.md
|
6 years ago |
rinpatch
|
b46e6f0949
|
Fix backup/restore page to have proper headings
|
6 years ago |
Ivan Tashkinov
|
cbe09d94d1
|
Added `force_login` authentication option (previously applied by default).
|
6 years ago |
Alex S
|
49733f6176
|
add docs folder to gitignore
ref #770
|
6 years ago |
Alex S
|
17d3d05a71
|
code style
little fix
|
6 years ago |
Alex S
|
3601f03147
|
Adding tag to emoji ets table
changes in apis
|
6 years ago |
Haelwenn (lanodan) Monnier
|
0bab2661ae
|
COPYING: Add copyright notice for the finmojis
[ci skip]
|
6 years ago |
Mark Felder
|
d5a1e08bf1
|
Add default mail adapter settings to config
|
6 years ago |
Haelwenn (lanodan) Monnier
|
8ae4837abd
|
COPYING: Add copyright notice for the whole repository
[ci skip]
|
6 years ago |
Haelwenn (lanodan) Monnier
|
362603c723
|
LICENSE → AGPL-3
[ci skip]
|
6 years ago |
Haelwenn (lanodan) Monnier
|
32e843f033
|
CC-BY-SA-4.0: Add a copy of the CC-BY-SA-4.0 license
[ci skip]
|
6 years ago |
lambda
|
dc39d8d3fb
|
Merge branch 'fix/job-queue-doc' into 'develop'
Improve PleromaJobQeue config documentation
See merge request pleroma/pleroma!993
|
6 years ago |
rinpatch
|
afbc905a1c
|
qs
|
6 years ago |
rinpatch
|
11584488d1
|
Improve PleromaJobQeue config documentation
|
6 years ago |
lambda
|
a5edc4da62
|
Merge branch 'pleroma_job_queue' into 'develop'
Replace Pleroma.Jobs with `pleroma_job_queue`
See merge request pleroma/pleroma!992
|
6 years ago |