squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
8,278 Commits 154 Branches 42 Tags 503 MiB
9581d57382
Commit Graph

8278 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Felder
9581d57382 First round at cleaning up descriptions 2020-02-11 15:21:36 -06:00
feld
d056f7f722 Merge branch 'restore-twitter-api-tests' into 'develop' 
Restore TwitterAPI tests

Closes #1257

See merge request pleroma/pleroma!2200
 2020-02-11 21:08:37 +00:00
Egor Kislitsyn
58b2017aa0
Restore TwitterAPI tests 2020-02-12 00:51:05 +04:00
feld
f98090272a Merge branch 'update/admin-fe-20200211' into 'develop' 
Update AdminFE build

See merge request pleroma/pleroma!2198
 2020-02-11 20:08:28 +00:00
lain
01984d15ce Merge branch 'revert-3fee859b' into 'develop' 
Revert "Merge branch 'feat/floki-fasthtml' into 'develop'"

See merge request pleroma/pleroma!2199
 2020-02-11 17:09:48 +00:00
feld
237b2068f9 Revert "Merge branch 'feat/floki-fasthtml' into 'develop'" 
This reverts merge request !2194
 2020-02-11 16:55:18 +00:00
Mark Felder
f9eb35d48e Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update/admin-fe-20200211 2020-02-11 10:33:41 -06:00
Mark Felder
de0fea4634 Update AdminFE build 2020-02-11 10:24:38 -06:00
lain
3fee859b60 Merge branch 'feat/floki-fasthtml' into 'develop' 
Make Floki use fast_html

See merge request pleroma/pleroma!2194
 2020-02-11 13:22:35 +00:00
rinpatch
ea1631d7e6 Make Floki use fast_html 2020-02-11 16:17:21 +03:00
rinpatch
58299fcfb4 deps: update fast_sanitize to 0.1.7 
needed to get new fast_html version since 1.0.1 had an attribute parsing
bug
 2020-02-11 16:17:03 +03:00
rinpatch
9172540f8d deps: update floki to 0.25.0 
needed to make it use fast_html
 2020-02-11 16:16:29 +03:00
lain
335cbe2e1b Merge branch 'uguu-uwu-notices-bulge' into 'develop' 
EmojiReactions: Align API endpoints

See merge request pleroma/pleroma!2183
 2020-02-11 13:14:05 +00:00
lain
60de311164 Update frontend 2020-02-11 13:59:04 +01:00
lain
24c526a0b1 Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge 2020-02-11 13:58:36 +01:00
lain
2f1c61255f Merge branch 'doc/unlisted-search' into 'develop' 
differences_in_mastoapi_responses.md: Add note about unlisted results

Closes #1164

See merge request pleroma/pleroma!2195
 2020-02-11 11:44:33 +00:00
lain
36c6dc1c10 Merge branch 'oban-crontab-fix' into 'develop' 
Set oban crontab to false in tests

See merge request pleroma/pleroma!2197
 2020-02-11 09:55:16 +00:00
Alexander Strizhakov
bfd16fe41e
set oban crontab to false in tests 2020-02-11 12:19:06 +03:00
lain
5ebffd5224 Merge branch 'docs/kyclos' into 'develop' 
clients.md: Add Kyclos

See merge request pleroma/pleroma!2196
 2020-02-11 08:04:58 +00:00
Haelwenn (lanodan) Monnier
209e4d8432
clients.md: Add Kyclos 2020-02-11 02:27:40 +01:00
Haelwenn (lanodan) Monnier
ad16f38b9c
differences_in_mastoapi_responses.md: Add note about unlisted results 
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1164
 2020-02-11 01:59:27 +01:00
rinpatch
94e5ca1105 Merge branch 'issue/1383' into 'develop' 
[#1383] Switch periodic jobs from quantum to oban

See merge request pleroma/pleroma!2015
 2020-02-11 00:04:06 +00:00
Haelwenn
a7287e2e3a Merge branch 'docs_backup_restore' into 'develop' 
DOCS Backup/Restore/Migrate your instance

See merge request pleroma/pleroma!2107
 2020-02-10 23:53:26 +00:00
Ilja
a9e946b99a DOCS Backup/Restore/Migrate your instance 
* Added "Migrate" to the title because these steps can also be used to migrate the instance to another server
* Added an optional step to reinstall pleroma (esp. for migrating servers)
* Currently the steps threw an error 'could not execute query: ERROR: function "activity_visibility already exists with the same argument types'
   * I added a new step to drop and recreate an empty pleroma-database
   * I played around with the `-c` and `-C` options of pg_restore, but dropping and recreating seemd to be the only way I got it working
   * This was tested on Debian Stretch, psql (PostgreSQL) 9.6.15
 2020-02-10 23:53:26 +00:00
rinpatch
32a7b4dadd Merge branch 'fix/compilation-error-docs' into 'develop' 
Fix a compilation error under certain circumstances

See merge request pleroma/pleroma!2193
 2020-02-10 18:25:12 +00:00
Maksim Pechnikov
6813c0302c Merge branch 'develop' into issue/1383 2020-02-10 20:49:20 +03:00
rinpatch
c55301e760 Fix a compilation error under certain circumstances 
I've noticed that sometimes when switching from develop to stable and back,
develop fails to compile and rm -r ing the _build and deps dirs doesn't
help at all.

This is due to Admin API controller needing to generate JSON description
of the config at compile time.  Evaluating `config/description.exs`
calls `Generator.list_modules_in_dir/2`, which in turn predicts the
module names of files in the directory and tries to convert the
predicted name to *existing* atoms. Sometimes the compiler will
call that function before compiling the modules in the said directory,
so the conversion will of course fail.

This fixes it by removing the requirement of the atoms being existent.
The function is not subjected to any untrusted user input so this should
be safe. An ideal fix would be to block the compilation of docs before
all modules are compiled and then get a list of compiled elixir modules
under the namespace we want instead of directory hacks, but I have not
been able to figure out how to do that.
 2020-02-10 18:41:02 +03:00
rinpatch
544bdbfb90 Merge branch 'fix/email-task-otp' into 'develop' 
Fix email mix task on OTP releases

Closes #1548

See merge request pleroma/pleroma!2191
 2020-02-09 12:05:32 +00:00
rinpatch
8fda6303ba Fix email mix task on OTP releases 
Closes pleroma#1548
 2020-02-09 03:27:29 +03:00
lain
964b4d82a0 Merge branch 'fix/upload-limit-otp' into 'develop' 
Actually fix upload limit on OTP releases

Closes #1109

See merge request pleroma/pleroma!2185
 2020-02-08 14:02:36 +00:00
rinpatch
15ea75cd2a Actually fix upload limit on OTP releases 
Closes #1109
 2020-02-07 20:14:06 +03:00
Haelwenn
1262357ddb Merge branch 'cancel-follow-request' into 'develop' 
Add support for cancellation of a follow request

Closes #1522

See merge request pleroma/pleroma!2175
 2020-02-07 16:10:43 +00:00
rinpatch
8d01aaa702 Merge branch 'questions-timezone' into 'develop' 
Questions: Add timezone to `closed` property

Closes #1552

See merge request pleroma/pleroma!2184
 2020-02-07 16:04:40 +00:00
Lain Soykaf
d85bcc8627 Questions: Add timezone to closed property 2020-02-07 16:57:46 +01:00
rinpatch
f57cea17bc deps: update plug to 1.9 
Includes functionality needed to fix upload limit not being changed at
runtime:
087cd64d86
 2020-02-07 18:38:36 +03:00
lain
57098713c0 Apply suggestion to docs/API/pleroma_api.md 2020-02-07 15:18:05 +00:00
lain
713645d5c5 Apply suggestion to docs/API/pleroma_api.md 2020-02-07 15:17:42 +00:00
Lain Soykaf
4538a1ee01 EmojiReactions: Remove old API endpoints 2020-02-07 15:01:45 +01:00
Lain Soykaf
ce95882009 EmojiReactions: Add docs and Changelog 2020-02-07 14:59:26 +01:00
Lain Soykaf
f875b9650a EmojiReactions: Add Mastodon-aligned reaction endpoints, change response 2020-02-07 14:52:13 +01:00
Egor Kislitsyn
bc2e98b200
Add User.get_follow_state/2 2020-02-07 16:17:34 +04:00
rinpatch
f13b7878b4 Merge branch 'rename_emoji_reactios' into 'develop' 
EmojiReactions: Rename to EmojiReacts

See merge request pleroma/pleroma!2181
 2020-02-07 10:35:37 +00:00
rinpatch
1b51390e4c Merge branch 'docs-fix' into 'develop' 
Fix for config.md

See merge request pleroma/pleroma!2182
 2020-02-07 10:10:34 +00:00
Alexander Strizhakov
01da001da1
fix 2020-02-07 10:48:10 +03:00
Lain Soykaf
8a79f20c21 EmojiReactions: Rename to EmojiReacts 2020-02-06 18:09:57 +01:00
rinpatch
5b1ef335de Merge branch 'update/fe-bundle-20200206' into 'develop' 
Update FE bundle

See merge request pleroma/pleroma!2180
 2020-02-06 17:00:46 +00:00
Mark Felder
fed9b0d1e0 Update FE bundle 2020-02-06 10:59:41 -06:00
feld
df0b00b32d Merge branch 'mastoapi-non-html-strings' into 'develop' 
mastodon API: do not sanitize html in non-html fields

See merge request pleroma/pleroma!2167
 2020-02-06 16:08:23 +00:00
feld
e12bf05f23 Merge branch 'fix/dymamic-docs' into 'develop' 
Simplify in-database config docs

See merge request pleroma/pleroma!2178
 2020-02-06 16:03:29 +00:00
feld
5499f172b2 Merge branch 'config-changes' into 'develop' 
Config changes

Closes #1547

See merge request pleroma/pleroma!2174
 2020-02-06 16:02:46 +00:00