lambda
|
3163311098
|
Merge branch 'feature/remote-follow' into 'develop'
Add remote following of local profiles.
See merge request pleroma/pleroma!59
|
2018-02-02 07:33:09 +00:00 |
|
eal
|
29be70c008
|
Add remote following of local profiles.
|
2018-02-02 00:14:05 +02:00 |
|
eal
|
ab83e0de6d
|
TwitterAPI: Add is_local to user view.
|
2018-02-01 21:41:19 +02:00 |
|
eal
|
15cb3f2b01
|
Revert renaming emoji.txt
|
2018-01-31 23:47:42 +02:00 |
|
eal
|
0f194dc56b
|
Merge branch 'feature/instance-thumbnail-api' into 'develop'
Provide instance thumbnail in /api/v1/instance
See merge request pleroma/pleroma!55
|
2018-01-31 18:34:52 +00:00 |
|
lambda
|
3fa6f3ae42
|
Merge branch 'fix/split-custom-emoji' into 'develop'
Split emoji to default and custom.
See merge request pleroma/pleroma!56
|
2018-01-31 15:24:36 +00:00 |
|
eal
|
ab8b9ababa
|
Split emoji to default and custom.
|
2018-01-31 16:29:22 +02:00 |
|
Hakaba Hitoyo
|
03c15a54f5
|
provide instance thumbnail at /api/v1/instance (debug)
|
2018-01-31 23:09:47 +09:00 |
|
Hakaba Hitoyo
|
e47f60c053
|
provide instance thumbnail at /api/v1/instance (debug)
|
2018-01-31 23:04:34 +09:00 |
|
Hakaba Hitoyo
|
10753178ea
|
provide instance thumbnail at /api/v1/instance (debug)
|
2018-01-31 22:57:43 +09:00 |
|
Hakaba Hitoyo
|
a4335e391f
|
provide instance thumbnail at /api/v1/instance
|
2018-01-31 22:51:25 +09:00 |
|
Roger Braun
|
5e37adedfb
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
|
2018-01-30 12:21:05 +01:00 |
|
Roger Braun
|
ad0ab3a57b
|
Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-logo' into develop
|
2018-01-30 12:20:39 +01:00 |
|
Roger Braun
|
4501094606
|
Make specs less breaky.
|
2018-01-30 12:20:14 +01:00 |
|
Roger Braun
|
1bb3ba02f3
|
Fix specs.
|
2018-01-30 12:17:01 +01:00 |
|
Hakaba Hitoyo
|
cefb6cfea1
|
provide logo at feed.atom (debug)
|
2018-01-30 19:37:04 +09:00 |
|
Hakaba Hitoyo
|
b713b28dfd
|
provide logo at feed.atom
|
2018-01-30 19:26:07 +09:00 |
|
lambda
|
2f23ae5b68
|
Merge branch 'pr-upstream-http-proxy' into 'develop'
Pr upstream http proxy
See merge request pleroma/pleroma!43
|
2018-01-30 08:16:31 +00:00 |
|
lambda
|
189e9d63bc
|
Merge branch 'feature/caddyfile' into 'develop'
Add a Caddyfile.
See merge request pleroma/pleroma!50
|
2018-01-30 08:14:07 +00:00 |
|
Roger Braun
|
ede4883ac9
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
|
2018-01-29 17:45:44 +01:00 |
|
Roger Braun
|
64e51c2cfa
|
Fix incoming Pleroma CWs. Closes #96.
|
2018-01-29 17:44:35 +01:00 |
|
Jeff Becker
|
066fe1a697
|
use nil instead of empty string
|
2018-01-29 10:06:16 -05:00 |
|
lambda
|
8db83c3dc0
|
Merge branch 'feature/longfox' into 'develop'
add longfox emojis
See merge request pleroma/pleroma!53
|
2018-01-27 11:57:34 +00:00 |
|
Hakaba Hitoyo
|
7e1d4819ca
|
add longfox emojis
|
2018-01-27 08:38:48 +09:00 |
|
lambda
|
46c8f79cd7
|
Merge branch 'feature/cross-origin' into 'develop'
Access-Control-Allow-Origin
See merge request pleroma/pleroma!52
|
2018-01-26 23:30:11 +00:00 |
|
Hakaba Hitoyo
|
9c0c40cf1e
|
Access-Control-Allow-Origin
|
2018-01-26 22:58:58 +00:00 |
|
Roger Braun
|
e97864bfcb
|
Update frontend.
|
2018-01-26 15:12:34 +01:00 |
|
Roger Braun
|
5957c6517d
|
Fix config.
|
2018-01-26 14:31:52 +01:00 |
|
Roger Braun
|
cd3210c9b8
|
Update frontend.
|
2018-01-26 14:28:27 +01:00 |
|
Jeff Becker
|
dffde6631d
|
Merge remote-tracking branch 'upstream/develop' into pr-upstream-http-proxy
|
2018-01-24 13:15:54 -05:00 |
|
Roger Braun
|
0f722a8c22
|
Stats: Make less crashy and improve query.
|
2018-01-20 18:38:30 +01:00 |
|
lambda
|
2ed17541b7
|
Merge branch 'feature/remote-follow' into 'develop'
remote follow
See merge request pleroma/pleroma!51
|
2018-01-20 15:02:04 +00:00 |
|
eal
|
beb13bf3a9
|
Revert "Revert "Add remote follow pages.""
This reverts commit b259b4e4d1.
|
2018-01-18 18:42:44 +02:00 |
|
eal
|
57d413e655
|
Revert "Revert "Add remote follow path to webfinger.""
This reverts commit fb5aa34092.
|
2018-01-18 18:42:32 +02:00 |
|
eal
|
b259b4e4d1
|
Revert "Add remote follow pages."
This reverts commit 47e8c8db05.
|
2018-01-18 03:42:18 +02:00 |
|
eal
|
fb5aa34092
|
Revert "Add remote follow path to webfinger."
This reverts commit bc689740f0.
|
2018-01-18 03:42:09 +02:00 |
|
eal
|
47e8c8db05
|
Add remote follow pages.
|
2018-01-18 03:11:03 +02:00 |
|
eal
|
bc689740f0
|
Add remote follow path to webfinger.
|
2018-01-18 02:38:02 +02:00 |
|
lambda
|
ac7580df78
|
Merge branch 'fix/background-profile-fetch' into 'develop'
Fetch external profile in the background.
See merge request pleroma/pleroma!49
|
2018-01-16 14:18:07 +00:00 |
|
eal
|
6678fe3217
|
Add a Caddyfile.
|
2018-01-16 15:48:27 +02:00 |
|
eal
|
b3e7d7ae6d
|
Fetch external profile in the background.
|
2018-01-16 15:31:03 +02:00 |
|
eal
|
80f6ac412a
|
Merge branch 'default-pictures' into 'develop'
Add a default profile picture and banner.
See merge request pleroma/pleroma!48
|
2018-01-15 20:26:49 +00:00 |
|
eal
|
14b086eec2
|
Add a default profile picture and banner.
This removes the placehold.it dependency.
|
2018-01-15 22:18:17 +02:00 |
|
eal
|
baf66caefd
|
Merge branch 'prod.exs' into 'develop'
Correct prod.exs
See merge request pleroma/pleroma!47
|
2018-01-15 17:44:49 +00:00 |
|
eal
|
db5dfd1b3e
|
Merge branch 'fix/pleroma.nginx' into 'develop'
Correct pleroma.nginx
See merge request pleroma/pleroma!46
|
2018-01-15 17:26:41 +00:00 |
|
lambda
|
5a6f54b336
|
Merge branch 'stats-daemon' into 'develop'
Add a stats agent for storing data from expensive queries.
See merge request pleroma/pleroma!45
|
2018-01-15 08:04:54 +00:00 |
|
Hakaba Hitoyo
|
aceef36e56
|
Correct pleroma.nginx
|
2018-01-14 10:57:25 +00:00 |
|
Hakaba Hitoyo
|
048f61d7f8
|
#95 Correct prod.exs
|
2018-01-14 08:54:28 +00:00 |
|
eal
|
6e1cb86166
|
Fix instance test.
|
2018-01-14 08:28:35 +02:00 |
|
eal
|
d8db39564e
|
Move user count to stats agent.
|
2018-01-14 08:15:11 +02:00 |