Commit Graph

1309 Commits

Author SHA1 Message Date
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
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
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
eal
fa37acfcc7 TwitterAPI: Add Qvitter notification endpoint. 2018-04-19 21:46:59 +03:00
lambda
678fed47ee Merge branch 'patch-2' into 'develop'
Ignore setup_db.psql and specify a folder for custom emojis

See merge request pleroma/pleroma!121
2018-04-19 14:30:13 +00:00
lain
7b96a756fb fix again 2018-04-19 13:04:29 +02:00
lain
77fc40d5d7 Fix generate config 2018-04-19 12:52:24 +02:00
Dominik V. Salonen
8696c25efd Ignore setup_db.psql and ignore a folder for custom emojis
Wiki page should also be updated to recommend that admins put their custom emojis in /priv/static/emoji/custom/. This both makes for less hassle when doing a pull. And also prevents more mess in the /priv/static/emoji/ folder.
2018-04-19 10:42:22 +00:00
eal
e30a056476 Revert "Ask for proxy URL if proxy enabled."
The most common case is running it on the same server.
2018-04-19 13:29:14 +03:00
lambda
e4da81d662 Merge branch 'bugfix/strange-formatting-on-mastodon' into 'develop'
CommonAPI post: kill \r with fire

See merge request pleroma/pleroma!120
2018-04-19 07:41:09 +00:00
William Pitcock
ee6f15529d CommonAPI post: kill \r with fire 2018-04-18 15:46:39 -05:00
eal
b586ead6b8 rm_user: also ensure that cache is running. 2018-04-18 17:52:25 +03:00
lambda
8b5ea91f68 Merge branch 'fix/rm-user-task' into 'develop'
Fix rm_user task.

See merge request pleroma/pleroma!119
2018-04-18 14:41:03 +00:00
eal
4e3fc530db Fix rm_user task. 2018-04-18 17:39:27 +03:00
lambda
a80cdd5906 Merge branch 'fix/login-with-username-or-email' into 'develop'
MastoAPI and OAuth: allow login with either email or username.

See merge request pleroma/pleroma!118
2018-04-18 11:26:38 +00:00
eal
947431e9aa MastoAPI and OAuth: allow login with either email or username. 2018-04-18 13:13:57 +03:00
lain
e153b364a7 update frontend 2018-04-17 11:09:19 +02:00
lambda
fef8daa454 Update README.md 2018-04-13 09:46:58 +00:00
lambda
3b68eaa0ce Merge branch 'mix_task_rm_user' into 'develop'
Add rm_user mix task

See merge request pleroma/pleroma!109
2018-04-13 07:43:32 +00:00
Phenethylamine
13a64b82e3 Switch to User.delete for rm_user task 2018-04-12 14:30:53 -04:00
Phenethylamine
4478b9115c Add rm_user mix task 2018-04-12 02:43:48 -04:00
lambda
3d636cf533 Merge branch 'develop' into 'develop'
Fix issue #124

Closes #124

See merge request pleroma/pleroma!108
2018-04-11 20:58:25 +00:00
lain
5612716c25 update frontend 2018-04-11 22:03:28 +02:00
lain
a8dddd9279 update frontend 2018-04-11 21:55:38 +02:00
Gian Sass
2de2e29df2 Oops 2018-04-11 15:51:02 -04:00
Gian Sass
3a5c0465eb Add unit test for pinned statuses 2018-04-11 15:48:32 -04:00
Gian Sass
907df9b8ed Fix issue #124 2018-04-11 14:55:49 -04:00
lambda
faa0feb095 Merge branch 'feld-hackneyupdate' into 'develop'
Update httpoison to get the latest hackney.

See merge request pleroma/pleroma!107
2018-04-11 14:27:52 +00:00
Mark Felder
366138fa72 Update httpoison to get the latest hackney.
Works on my computer ^TM
2018-04-11 13:55:54 +00:00
lain
b910483c16 Fix register_user task. 2018-04-10 21:05:53 +02:00
lain
1dd2c8163f Order masto searches by date. 2018-04-10 18:38:52 +02:00
lambda
d7654f4b3c Merge branch 'mastofe-250c885de655ed0b45b76cc35c5782e019b5a0ec' into 'develop'
Bring mastofe up-to-date with 250c885de655ed0b45b76cc35c5782e019b5a0ec

See merge request pleroma/pleroma!104
2018-04-10 14:46:04 +00:00