sjw
/
pleroma
mirror of https://git.pleroma.social/sjw/pleroma.git
1
0
Fork 0
Code Issues Releases Wiki Activity
16,408 Commits 136 Branches 24 Tags 254 MiB
Commit Graph

16408 Commits

Author SHA1 Message Date
lain 279b1d19f0 Align local bio limits to remote limit. 2018-04-25 15:41:59 +02:00
Francis Dinh 2d775bf1be Merge branch 'feature/unrepeats' of git.pleroma.social:normandy/pleroma into feature/unrepeats 2018-04-25 01:58:50 -04:00
Francis Dinh e981280fa7 Formatting fixes 2018-04-25 01:43:45 -04:00
Francis Dinh 9e0dd21ed6 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats 2018-04-25 00:46:28 -04:00
Francis Dinh 0df1a4efc8 Fix comment grammar 2018-04-25 00:46:06 -04:00
Normandy 715c90e54f Fix typo in MastoFE login page. 
see https://git.pleroma.social/pleroma/mastofe/issues/13
 2018-04-24 21:58:45 +00:00
lambda d4a54a90c9 Merge branch 'gitignore' into 'develop' 
Gitignore

See merge request pleroma/pleroma!131
 2018-04-24 19:26:01 +00:00
lain c78e7d8b11 Fix formatting. 2018-04-24 21:25:31 +02:00
Rachel H 52b1bc782b Add common files to gitignore 2018-04-24 12:18:23 -07:00
lambda 7a52c4549c Merge branch 'feature/message-rewrite-facility' into 'develop' 
message rewrite facility

See merge request pleroma/pleroma!112
 2018-04-24 17:21:28 +00:00
lambda bbd549c018 Update .gitlab-ci.yml 2018-04-24 12:28:59 +00:00
Wim Vanderbauwhede 7517155544 Changed to support \r\n and \n 2018-04-24 13:28:55 +01:00
lain 3f9385096e Merge branch 'dashie/pleroma-fix/delete-decrement-statuses-count' into develop 2018-04-24 14:25:17 +02:00
Wim Vanderbauwhede 52ee91efce Patch to replace newlines with <br> tags in bio 2018-04-24 13:20:17 +01:00
Dashie afe892ddac
Correct syntax with mix format 2018-04-24 14:12:23 +02:00
Dashie 9972678a68
Add User.decrease_note_count and call it from ActivityPub.delete 2018-04-24 11:34:18 +02:00
lambda 62a2287bba Merge branch 'favicon_tag' into 'develop' 
Fix endpoint for favicon

See merge request pleroma/pleroma!84
 2018-04-24 05:54:28 +00:00
lain fc6f5bcad3 update frontend 2018-04-23 19:23:45 +02:00
lain 661fd3c93e update frontend 2018-04-23 19:09:24 +02:00
Francis Dinh 8c0806539c Embed announce activity data instead of linking to it 2018-04-22 21:28:51 -04:00
Francis Dinh b1742eca42 Revert "Rename make_unannounce_data helper to make_undo_data" 
This reverts commit c649ca8958.
 2018-04-22 19:42:28 -04:00
lain 0574df273c Small cleanup. 2018-04-22 10:01:10 +02:00
lain 114ca9e069 Merge branch 'develop' into fix/note-count-not-updating 2018-04-22 09:56:24 +02:00
Francis Dinh c649ca8958 Rename make_unannounce_data helper to make_undo_data 
This makes it a bit more easier to adapt for unlikes as well in the
future.
 2018-04-22 01:55:41 -04:00
lain 26af5bad33 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop 2018-04-21 18:28:24 +02:00
lain 0c221943ef Formatter: Use proper escaping for links. 2018-04-21 18:27:31 +02:00
eal 22bfeac256 Update note count in ActivityPub.create. 2018-04-21 12:58:04 +03:00
lambda d0b1c498a0 Merge branch '146-enable-custom-panel-by-default-and-have-default-content' into 'develop' 
Resolve "Enable custom panel by default and have default content"

Closes #146

See merge request pleroma/pleroma!124
 2018-04-21 08:05:36 +00:00
lambda b7669c6efe Merge branch 'readme-update' into 'develop' 
Elaborate on setup steps and CLI commands.

See merge request pleroma/pleroma!126
 2018-04-21 08:05:04 +00:00
lambda b4b314be5d Merge branch 'nginx-certbot-doc' into 'develop' 
Add info about certbot with the webroot plugin to pleroma.nginx

See merge request pleroma/pleroma!125
 2018-04-21 07:59:49 +00:00
lambda 04276f0f53 Update README.md 2018-04-21 07:57:33 +00:00
lain 9e6ae44729 Formatting fixes. 2018-04-21 09:43:53 +02:00
lain ce7618f6f6 add formatter 2018-04-21 09:34:23 +02:00
lain 21510f6990 . 2018-04-21 09:30:15 +02:00
lain 44a7789732 . 2018-04-21 09:28:44 +02:00
lain 34aab9f877 .. 2018-04-21 09:27:35 +02:00
lain b68c4bd271 Update CI. 2018-04-21 09:24:51 +02:00
lain ff5e957476 Make search use id index too. 
Seems to be faster in general, query planner chooses well.
 2018-04-21 09:22:31 +02:00
Francis Dinh f0798440de Use correct activity for undo 2018-04-20 23:22:16 -04:00
Francis Dinh 4b9f2ab526 Fix federation of unreblog activity 2018-04-20 23:09:19 -04:00
csaurus caf30646b1 Elaborate on setup steps and CLI commands. 
* How to use MIX_ENV

* How to create a user

* Link to certbot's site with the webform which advises how to obtain
  a certificate based on web server/OS.
 2018-04-20 18:46:09 -04:00
csaurus 1c6a691570 Add info about certbot with the webroot plugin to pleroma.nginx 2018-04-20 18:43:49 -04:00
Francis Dinh c5dc7e6e31 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats 2018-04-20 16:48:18 -04:00
Kawen 90ad55b8ff formatting 2018-04-20 19:21:48 +02:00
Kawen b0671be283 enable instance panel by default, added some content 2018-04-20 19:04:57 +02:00
lain a61e8ac154 Formatting. 2018-04-20 13:10:57 +02:00
lain 18c3ca7844 Add format checking to CI. 2018-04-20 13:09:41 +02:00
lain 193be32f45 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop 2018-04-19 21:44:29 +02:00
lain 0b4ff1bfe2 fix again 2018-04-19 21:44:11 +02:00
lambda 3f7b02e7c4 Merge branch 'feature/qvitter-notification-endpoint' into 'develop' 
TwitterAPI: Add Qvitter notification endpoint.

Closes #142

See merge request pleroma/pleroma!123
 2018-04-19 19:03:35 +00:00