Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5,290 Commits 1 Branch 0 Tags 222 MiB
f4e2595592
Commit Graph

248 Commits

Author SHA1 Message Date
rinpatch
026b245dbc Merge branch 'develop' into feature/polls-2-electric-boogalo 2019-06-03 11:14:52 +03:00
rinpatch
65db5e9f52 Resolve merge conflicts 2019-06-01 16:29:58 +03:00
Haelwenn (lanodan) Monnier
5d3ece2861
Remove now useless flavours switching 2019-06-01 01:44:10 +02:00
feld
88414151b4 Formatting 2019-05-30 21:35:31 +00:00
feld
75a37a68d4 Install docs should clone from master branch 2019-05-30 21:30:42 +00:00
kaniini
75e78d4e23 Merge branch 'feature/mrf-user-filter' into 'develop' 
mrf: add support for filtering users

See merge request pleroma/pleroma!1188
 2019-05-22 19:03:14 +00:00
kaniini
f0516d9114 Merge branch 'ssh-fixes' into 'develop' 
Ssh fixes

Closes #869 and #925

See merge request pleroma/pleroma!1191
 2019-05-22 18:57:34 +00:00
William Pitcock
7d9b33b3ce update documentation for the new MRF features [no-ci] 2019-05-22 18:53:30 +00:00
Maksim
620908a2db [#699] add worker to clean expired oauth tokens 2019-05-22 15:44:50 +00:00
lambda
714d8d4ef9 Merge branch 'feature/object-pruning' into 'develop' 
Object pruning

See merge request pleroma/pleroma!1181
 2019-05-22 11:04:30 +00:00
lain
b22145cbc4 Documentation: Specify PEM format for SSH keys. 
Otherwise openssh-client 7.9 will generate a different format that can't be used
by esshd.
 2019-05-22 10:44:26 +02:00
kaniini
79c2cef2fb Merge branch 'mongooseim-support' into 'develop' 
MongooseIM: Add basic integration endpoints.

See merge request pleroma/pleroma!1172
 2019-05-22 04:06:54 +00:00
William Pitcock
16b260fb19 add mix task to prune the object database using a configured retention period 2019-05-21 21:38:56 +00:00
lain
d378b342ba MongooseIM: Add documentation. 2019-05-21 18:57:36 +02:00
rinpatch
76a7429bef Add poll limits to /api/v1/instance and initial state 2019-05-21 09:13:10 +03:00
kaniini
943d1b2f26 Merge branch 'feature/user-configurable-mascot' into 'develop' 
Feature: user configurable mascot

See merge request pleroma/pleroma!1177
 2019-05-20 18:17:42 +00:00
Aaron Tinio
5aa107d912 Document MRF.Simple :report_removal 2019-05-21 00:59:12 +08:00
Sadposter
daeae8e2e7
Move default mascot configuration to config/ 2019-05-20 16:12:55 +01:00
Sadposter
54e9cb5c2d
Add API endpoints for a custom user mascot 2019-05-20 12:39:23 +01:00
lain
412a3d8a0f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index 2019-05-17 12:26:59 +02:00
kaniini
bf84d50c76 Merge branch 'feature/890-add-report-uri' into 'develop' 
Feature/890 add report uri

Closes #890

See merge request pleroma/pleroma!1164
 2019-05-16 20:11:12 +00:00
Sergey Suprunenko
e2b3a27204 Add Reports to Admin API 2019-05-16 19:09:18 +00:00
Alex S
8355d0607e trailing spaces 2019-05-16 17:03:12 +07:00
Alex S
9d14214eb9 Merge branch 'develop' into feature/890-add-report-uri 2019-05-16 12:54:06 +07:00
Alex S
aa11fa4864 add report uri and report to 2019-05-16 12:49:40 +07:00
kaniini
a2771869a3 Merge branch 'docs/update_debian_instructions' into 'develop' 
Added package to dependency list documentation

See merge request pleroma/pleroma!1161
 2019-05-16 05:03:37 +00:00
Angelina Filippova
107c83ab2b Note that nicknames is an array 2019-05-16 01:48:53 +03:00
Angelina Filippova
0641e685c1 Note that nicknames is an array 2019-05-16 01:46:43 +03:00
Angelina Filippova
1d2923e5d0 Update tag/untag docs 2019-05-16 01:36:26 +03:00
PolymerWitch
0ae15c2306 Added package to dependency list 
Added the erlang-ssh package to the dependency list and the installation
command instructions. The project wouldn't build otherwise.
 2019-05-15 15:36:20 -07:00
lain
f1e67bdc31 Search: Add optional rum indexing / searching. 2019-05-15 15:28:01 +02:00
Egor Kislitsyn
5e2b491276 Merge remote-tracking branch 'pleroma/develop' into feature/disable-account 2019-05-14 18:15:56 +07:00
Alexander Strizhakov
a2be420f94 differences_in_mastoapi_responses.md: fullname & bio are optionnal 
[ci skip]
 2019-05-13 18:35:45 +00:00
Sachin Joshi
f01f995816 make url uniform in admin api 2019-05-11 14:46:00 +05:45
Alexander Strizhakov
bfeb33e951 Merge develop 
Merge conflict in lib/pleroma/activity.ex
 2019-05-08 14:34:36 +00:00
Egor Kislitsyn
1557b99beb Merge remote-tracking branch 'pleroma/develop' into feature/disable-account 2019-05-07 16:51:11 +07:00
Alex S
f46295faa7 unused config paramater 2019-05-07 09:07:06 +07:00
Maksim
1040caf096 fix format 
Modified-by: Maksim Pechnikov <parallel588@gmail.com>
 2019-05-06 17:51:03 +00:00
lambda
aacac9da0b Merge branch 'feature/bbs' into 'develop' 
BBS / SSH

See merge request pleroma/pleroma!997
 2019-05-06 17:17:03 +00:00
Alexander Strizhakov
ce6ca0fefe Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion 2019-05-06 16:45:22 +00:00
lain
6ad8ddfd29 Merge remote-tracking branch 'origin/develop' into feature/bbs 2019-05-04 15:00:45 +02:00
xse
2982061dfa Fix syntax highlighting + clarify :frontend_configuration 2019-05-01 01:26:14 +02:00
rinpatch
ce3789e39a Add default_scope to /api/v1/update_credentials 2019-04-27 23:55:54 +03:00
kaniini
48f68fd133 Merge branch 'feature/mastoapi-new-config' into 'develop' 
Fix leaking private configuration parameters in Mastodon and Twitter APIs, 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

See merge request pleroma/pleroma!1093
 2019-04-26 02:41:35 +00:00
Mark Felder
24c3e2db2c Add mediaproxy whitelist capability 2019-04-25 18:11:47 -05:00
rinpatch
dfc8425659 Move settings to Source subentity 2019-04-25 10:31:14 +03:00
Egor Kislitsyn
c157e27a00 Merge branch 'develop' into feature/disable-account 2019-04-25 13:41:10 +07:00
rinpatch
4baea6e6d9 Fix leaking private configuration parameters in Mastodon and Twitter APIs, 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 20:01:42 +03:00
Sergey Suprunenko
9dd36e5bcb Extend Mastodon API with public endpoint for getting Favorites timeline of any user (#789) 2019-04-23 02:47:43 +00:00
kaniini
10c40e13d2 Merge branch 'mastoapi/add-in-reply-to-screen-name' into 'develop' 
Add `in_reply_to_account_acct` to MastoAPI status entity

See merge request pleroma/pleroma!1086
 2019-04-23 02:43:53 +00:00