mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-11-18 07:32:50 +00:00
Code Issues Projects Releases Wiki Activity
12972 commits 259 branches 58 tags 334 MiB
Commit graph

930 commits

Author SHA1 Message Date
feld
69c560cfba Merge branch 'active-user-count' into 'develop' 
Monthly Active Users

Closes #2332

See merge request pleroma/pleroma!3283
 2021-02-02 17:07:57 +00:00
Lain Soykaf
93e3b89350 Update frontend 2021-02-01 10:12:05 +01:00
Egor Kislitsyn
793fc77b16
Add active user count 2021-01-27 18:20:06 +04:00
Mark Felder
c3dd06b540 Update PleromaFE: pleroma-fe@eb2975b64d849af6bdc327dabac34b8e6d952eae 2021-01-25 09:50:26 -06:00
Mark Felder
9e3fcb4b29 Update AdminFE: admin-fe@8a390584676b27b611d3363eca2a1194d94ed71f 2021-01-25 09:45:58 -06:00
Mark Felder
537ba1c5e0 Merge branch 'develop' into refactor/deactivated_user_field 2021-01-25 09:45:06 -06:00
feld
2926713fe5 Merge branch 'deprecate-public_endpoint' into 'develop' 
Deprecate Uploaders.S3, :public_endpoint

See merge request pleroma/pleroma!3251
 2021-01-20 22:48:48 +00:00
feld
2905df841b Merge branch 'update/oban' into 'develop' 
Update Oban to 2.3.4

See merge request pleroma/pleroma!3256
 2021-01-20 20:32:23 +00:00
Alexander Strizhakov
87c468f009
use correct versions for oban migrations 2021-01-20 20:07:24 +03:00
João Rodrigues
8d1554f08b Translated using Weblate (Portuguese (Portugal)) 
Currently translated at 100.0% (106 of 106 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pt_PT/
 2021-01-18 21:19:25 +00:00
João Rodrigues
ca114df523 Added translation using Weblate (Portuguese (Portugal)) 2021-01-18 21:19:25 +00:00
Mark Felder
28581e03ad Merge branch 'develop' into refactor/deactivated_user_field 2021-01-18 14:58:21 -06:00
Mark Felder
d49387e9d2 Update AdminFE: admin-fe@27db721e3969d9d017a70b9e16dc262d4f31202f 2021-01-18 13:44:59 -06:00
Mark Felder
44a86951a3 Merge branch 'develop' into refactor/approval_pending_user_field 2021-01-18 12:05:05 -06:00
Mark Felder
8a230667cc Update AdminFE: pleroma/admin-fe@d4c7989f05 2021-01-18 11:25:13 -06:00
Alexander Strizhakov
0e48c80d7f
start oban app in migrations and mix tasks 2021-01-17 09:58:41 +03:00
Alexander Strizhakov
02dbf1c51d
use explicitly oban migration version 2021-01-17 09:58:07 +03:00
Mark Felder
d2382ab5f4 Update Oban to 2.3.4 2021-01-15 15:01:48 -06:00
Mark Felder
2c0fe2ea9e Remove toggle_confirmation; require explicit state change 
Also cosmetic changes to make the code clearer
 2021-01-15 13:11:51 -06:00
Mark Felder
d36182c088 Change user.confirmation_pending field to user.is_confirmed 2021-01-15 12:44:41 -06:00
Mark Felder
a59e32f1dd Add copyright header 2021-01-15 11:24:46 -06:00
Mark Felder
860b5c7804 Change user.deactivated field to user.is_active 2021-01-15 11:24:46 -06:00
Mark Felder
f7e59c28ed Change user.approval_pending field to user.is_approved 2021-01-15 10:42:02 -06:00
Mark Felder
12c8ce481c Bump Copyright year 2021-01-14 13:58:52 -06:00
Mark Felder
fb47e83adc Add ConfigDB migration 2021-01-14 13:53:55 -06:00
Mark Felder
f0ab60189e truncated_namespace should default to nil 2021-01-13 11:54:00 -06:00
Haelwenn (lanodan) Monnier
c4439c630f
Bump Copyright to 2021 
grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>;'
 2021-01-13 07:49:50 +01:00
Mark Felder
8b28dce82a Deprecate Pleroma.Uploaders.S3, :public_endpoint 2021-01-12 16:31:35 -06:00
Ilja
6284e8f4b2 Add development section 
* I cretaed a folder 'development'
* I split up the file dev.md into three parts and moved it to this folder
  * index.md
  * authentication_authorization.md
  * mrf.md
* I also moved ap_extensions.md
* I created a new file setting_up_pleroma_dev.md
 2021-01-10 08:25:36 +00:00
Alex Gleason
e73c7fa7e5
Merge remote-tracking branch 'upstream/develop' into confirm-users 2021-01-08 07:48:19 -06:00
Mark Felder
8864ac65c6 Add dinosaur gif from https://gifs.cc 
"Our animations are free to be used to enhance your website."
 2021-01-05 13:25:14 -06:00
Alex Gleason
7b44605cb8
Migration to confirm previously-logged-in users 2020-12-31 14:04:51 -06:00
Haelwenn
3966add048 Revert "Merge branch 'features/hashtag-column' into 'develop'" 
This reverts merge request !2824
 2020-12-28 12:02:16 +00:00
Haelwenn
b122b6ffa3 Merge branch 'features/hashtag-column' into 'develop' 
Insert text representation of hashtags into object["hashtags"]

See merge request pleroma/pleroma!2824
 2020-12-28 10:14:58 +00:00
Haelwenn (lanodan) Monnier
acb03d591b
Insert text representation of hashtags into object["hashtags"] 
Includes a new mix task: pleroma.database fill_old_hashtags
 2020-12-22 05:15:34 +01:00
Mark Felder
d5746e8447 Do not include pool_size in the template. It encourages unwanted fiddling :) 2020-12-21 15:19:24 -06:00
Ivan Tashkinov
62bf4a1292 [#2353] Virtually never-expiring OAuth tokens (new and already issued ones). 2020-12-17 20:49:00 +03:00
lain
8b8c317c0f Merge branch 'fix/2336-mastoapi-ws-posts-dropping' into 'develop' 
Fix mastoapi ws posts dropping

Closes #2336

See merge request pleroma/pleroma!3198
 2020-12-16 11:35:45 +00:00
lain
6bb4f4e172 Merge branch 'support/2255_posix_errors' into 'develop' 
[#2255] added error messages for posix error code

See merge request pleroma/pleroma!3138
 2020-12-15 15:16:03 +00:00
shironeko
2d29fd7c8f Translated using Weblate (Chinese (Simplified)) 
Currently translated at 87.7% (93 of 106 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/zh_Hans/
 2020-12-15 11:33:10 +00:00
Alexander Strizhakov
cebe3c7def Fix for dropping posts/notifs in WS when mix task is executed 
- start oban in mix tasks with empty queues, plugins and crontab
- fix for update_users_following_followers_counts
- fix for removed logo.png
- typo in resend confirmation emails mix task docs
- fix for uploads mix task (start Majic.Pool)
- fix for creating user mix task (start :fast_html app)
 2020-12-14 11:02:32 -06:00
ZEN
2db42ac978 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (106 of 106 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/uk/
 2020-12-11 00:56:57 +00:00
ZEN
98deed65b3 Added translation using Weblate (Ukrainian) 2020-12-10 16:09:45 +00:00
Ivan Tashkinov
f1b07a2b2b OAuth form user remembering feature. Local MastoFE login / logout fixes. 2020-11-28 21:51:06 +03:00
Haelwenn (lanodan) Monnier
3cfc20083e
scrubbers/default: Add ruby element and it's childs 
This allows to format Japanese furigana (aka ruby) notation.

Present in XHTML 1.1, HTML 5 and later. Absent in XHTML 1.0, HTML 4 and earlier.

See https://www.w3.org/TR/ruby/
 2020-11-25 00:40:21 +01:00
Guy Sheffer
d5f5d01495 Translated using Weblate (Hebrew) 
Currently translated at 100.0% (106 of 106 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/he/
 2020-11-21 18:12:07 +00:00
feld
cd1b4155d5 Merge branch 'oban-jobs-to-simple-tasks' into 'develop' 
Moving some background jobs into simple tasks

Closes #1790

See merge request pleroma/pleroma!3129
 2020-11-19 20:32:32 +00:00
Maksim
3c00af82dc Apply 1 suggestion(s) to 1 file(s) 2020-11-18 05:19:37 +00:00
Maksim
137b7f9e28 Apply 1 suggestion(s) to 1 file(s) 2020-11-18 05:19:30 +00:00
Maksim
e91e2399ee Apply 1 suggestion(s) to 1 file(s) 2020-11-18 05:19:22 +00:00