77fc40d5d7
Fix generate config
2018-04-19 12:52:24 +02:00
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
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
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
32a26eb910
Fix TwitterAPI.delete call
2018-04-18 20:43:03 -04:00
ee6f15529d
CommonAPI post: kill \r with fire
2018-04-18 15:46:39 -05:00
b586ead6b8
rm_user: also ensure that cache is running.
2018-04-18 17:52:25 +03:00
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
4e3fc530db
Fix rm_user task.
2018-04-18 17:39:27 +03:00
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
947431e9aa
MastoAPI and OAuth: allow login with either email or username.
2018-04-18 13:13:57 +03:00
7b4f55238e
Handle unrepeats via the TwitterAPI
2018-04-18 06:00:40 -04:00
687db1bc3a
Expose unannounce activity so that it can be tested
2018-04-18 03:39:42 -04:00
0251690e96
Add federation for unrepeats
2018-04-17 20:35:07 -04:00
e153b364a7
update frontend
2018-04-17 11:09:19 +02:00
c9e7b984d5
Add make_unannounce_data helper function
2018-04-17 04:13:08 -04:00
85bd191291
Remove unretweet function for now
2018-04-17 04:12:16 -04:00
42279f54cf
Return target status in MastoAPI endpoint instead of reblog activity
2018-04-16 23:30:52 -04:00
d16877251a
doc fixes
2018-04-16 10:59:32 -04:00
5b0d0b9ab2
Add unreblogging tests
2018-04-14 22:34:06 -04:00
b949577472
Add unrepeat functionality
2018-04-14 20:19:48 -04:00
d24ddd9fb9
ActivityPub MRF: implement the SimplePolicy policy
2018-04-14 06:32:45 -05:00
4a178b3d65
ActivityPub: implement MRF core hook and baseline noop policy object
2018-04-14 06:32:44 -05:00
fef8daa454
Update README.md
2018-04-13 09:46:58 +00:00
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
13a64b82e3
Switch to User.delete for rm_user task
2018-04-12 14:30:53 -04:00
4478b9115c
Add rm_user mix task
2018-04-12 02:43:48 -04:00
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
5612716c25
update frontend
2018-04-11 22:03:28 +02:00
a8dddd9279
update frontend
2018-04-11 21:55:38 +02:00
2de2e29df2
Oops
2018-04-11 15:51:02 -04:00
3a5c0465eb
Add unit test for pinned statuses
2018-04-11 15:48:32 -04:00
907df9b8ed
Fix issue #124
2018-04-11 14:55:49 -04:00
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
366138fa72
Update httpoison to get the latest hackney.
...
Works on my computer ^TM
2018-04-11 13:55:54 +00:00
b910483c16
Fix register_user task.
2018-04-10 21:05:53 +02:00
1dd2c8163f
Order masto searches by date.
2018-04-10 18:38:52 +02:00
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
6ff583e5e1
Merge branch 'feld-varnish' into 'develop'
...
Remove attempted caching of toots
See merge request pleroma/pleroma!106
2018-04-10 14:45:46 +00:00
fcb32345d7
Remove attempted caching of toots
...
This does not work as expected. We should not attempt to be clever here.
Varnish will do the right thing if we just teach Pleroma to set headers
properly for content we know can be cached.
2018-04-10 14:17:23 +00:00
fcc941adfd
Merge branch 'patch-1' into 'develop'
...
Indentation for Apache vhost
See merge request pleroma/pleroma!105
2018-04-10 08:14:38 +00:00
73ca18744e
Indentation for Apache vhost
2018-04-10 08:08:27 +00:00
fc13a3ff24
Bring mastofe up-to-date with 250c885de655ed0b45b76cc35c5782e019b5a0ec
2018-04-09 22:00:42 +02:00
d7c2909ce2
Merge branch 'bugfix/user-search-with-at-sign' into 'develop'
...
user: strip leading @ from user query when searching for users if present
Closes #117
See merge request pleroma/pleroma!99
2018-04-09 08:42:01 +00:00
210755ac46
Merge branch 'develop' into 'develop'
...
Fix max upload size in nginx config.
See merge request pleroma/pleroma!102
2018-04-09 08:41:34 +00:00
2edde06042
user: strip leading @ from user query when searching for users if present
...
closes #117
2018-04-09 02:42:37 -05:00
2d0a2d9466
Merge branch 'develop' into 'develop'
...
Apache config for everything on one host.
See merge request pleroma/pleroma!103
2018-04-09 06:58:28 +00:00
5cb3d441bc
Apache config for everything on one host.
2018-04-08 19:22:24 +00:00
7e262c2997
Fix max upload size in nginx config.
...
The built-in nginx default does not allow users to upload images
larger than 1 MB. This increases the maximum request size to match
the default Pleroma config upload_limit parameter. Some helpful
comments were also added.
2018-04-08 11:21:29 -04:00
9998b4519d
Merge branch 'feature/mastodon-api-for-tootstream' into 'develop'
...
mastodon api emulation improvements for tootstream
Closes #101
See merge request pleroma/pleroma!100
2018-04-08 06:02:11 +00:00
lain
Dominik V. Salonen
eal
lambda
Francis Dinh
William Pitcock
Phenethylamine
Gian Sass
Mark Felder
Stanislas
Morgan Bazalgette
nepfag
Hector A. Escobedo