sadposter
735ceb2115
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2020-08-13 20:03:33 +01:00
lain
5c4548d5e7
Revert "Merge branch 'issue/1023' into 'develop'"
...
This reverts merge request !2763
2020-08-10 13:05:13 +00:00
sadposter
992deaa09b
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2020-08-01 19:32:31 +01:00
Maksim Pechnikov
3062f86613
added generated pleroma.env
2020-07-14 09:05:34 +03:00
Mark Felder
6167593881
Support Exiftool for stripping EXIF data
...
We really only want to strip location data anyway, and mogrify strips color profiles.
2020-07-10 16:46:26 -05:00
sadposter
3508f698b9
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2020-03-03 11:16:59 +00:00
Alexander Strizhakov
32d1e04817
ActivityPub actions & side-effects in transaction
2020-03-01 12:01:39 +03:00
sadposter
4714b739a7
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-09-16 12:14:48 +01:00
Egor Kislitsyn
96816ceaa2
Revert "Merge branch 'revert-4fabf83a' into 'develop'"
...
This reverts commit fe7fd331264fabf83ad0
2019-09-16 17:55:04 +07:00
kaniini
c623b4324d
Revert "Merge branch 'streamer-refactoring' into 'develop'"
...
This reverts merge request !1653
2019-09-16 09:09:21 +00:00
Steven Fuchs
aab264db82
Streamer refactoring
2019-09-16 07:44:03 +00:00
Alex S
4da0da9aa4
don't track generated_config.md
2019-09-13 19:13:04 +03:00
sadposter
13f1c9474d
thing
2019-09-10 21:09:47 +01:00
Mark Felder
c869ec2504
Prevent committing code coverage results to the repo
2019-05-09 10:53:43 -05:00
lain
6ad8ddfd29
Merge remote-tracking branch 'origin/develop' into feature/bbs
2019-05-04 15:00:45 +02:00
xse
31852f906e
fix issues with the uploads directory
2019-04-28 06:43:00 +02:00
Alex S
49733f6176
add docs folder to gitignore
...
ref #770
2019-04-01 18:28:19 +07:00
lain
3fc4ea45df
BBS: Add documentation.
2019-03-31 18:14:51 +02:00
witches.live
47eb557617
ARGLE GARBLE
...
Update .gitignore
2019-02-05 07:03:54 +00:00
href
b1860fe85a
Instance/Static runtime plug
...
This allows to set-up an arbitrary directory which overrides most of the
static files: index.html static/ emoji/ packs/ sounds/ images/ instance/
favicon.png.
If the files are not present in the directory, the bundled ones in
priv/static will be used.
2018-12-17 22:50:59 +01:00
href
b19597f602
reverse proxy / uploads
2018-11-30 18:00:47 +01:00
Rachel H
1525a0404b
Fix follow errors
2018-06-07 00:39:24 -07:00
Rachel H
52b1bc782b
Add common files to gitignore
2018-04-24 12:18:23 -07: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
Roger Braun
e1525edbe8
Ignore uploads.
2017-03-30 14:34:34 +02:00
Roger Braun
a93f3421a7
Phoenix skeleton
2017-03-17 17:09:58 +01:00
