46 Commits

Author	SHA1	Message	Date
Norm	0cb3812ac0	Add docker override file to docs and gitignore ... The docker-compose.yml file is likely to be edited quite extensively by admins when setting up an instance. This would likely cause problems when dealing with updating Akkoma as merge conflicts would likely occur. Docker-compose already has the ability to use override files in addition to the main `docker-compose.yml` file. Admins can instead put any overrides (additional volumes, container for elasticsearch, etc.) into a file that won't be tracked by git and thus won't run into merge conflicts in the future. In particular, the `docker-compose.override.yml` will be checked by docker compose in addition to the main file if it exists and override definitions from the latter with the former.	2023-08-07 13:09:04 -04:00
ilja	e74e1efe1c	Change docs README for new way of building docs ... Docs used to be a separate repo who cloned pleroma and pelroma-fe. Now the docs are just the BE docs and completely part of the Akkoma repo. I moved back to using venv because that's what I used and cleaner imo since it keeps everything nice in the repo. (Iirc virtualenv stored things in the Home folder or smthng)	2023-01-26 15:42:53 +01:00
FloatingGhost	c2054f82ab	allow users with admin:metrics to read app metrics	2022-12-16 03:32:51 +00:00
FloatingGhost	dcc36df8cf	add manual deploy for docs	2022-11-10 10:55:57 +00:00
floatingghost	66f913355a	Docker builds (#231) ... Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk> Reviewed-on: #231	2022-10-16 19:25:54 +00:00
floatingghost	656afe7803	Merge pull request 'ignore generated docs' (#74) from gitignore into develop ... Reviewed-on: #74	2022-07-15 12:30:40 +00:00
FloatingGhost	0e7b248036	ignore generated docs	2022-07-15 13:30:10 +01:00
floatingghost	d2a185c013	Documentation updates for stable release (#73) ... Reviewed-on: #73	2022-07-15 12:27:16 +00:00
sadposter	b63dd6a5a2	don't track vmargs	2021-12-06 10:23:02 +00:00
sadposter	ca2bd8b72b	remove deactivated_users call	2021-12-06 10:18:16 +00:00
sadposter	e56c319e8f	merge	2021-06-27 22:31:37 +01:00
Alex Gleason	230ad82dad	gitignore `config/runtime.exs`	2021-05-16 13:22:07 -05:00
sadposter	292ddf730c	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2021-03-03 13:51:07 +00:00
Mark Felder	978627c5e1	Vi and emacs temp files	2021-02-24 12:11:50 -06:00
sadposter	3aa25b008d	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2021-01-23 22:38:07 +00:00
Ilja	6284e8f4b2	Add development section ... * I cretaed a folder 'development' * I split up the file dev.md into three parts and moved it to this folder * index.md * authentication_authorization.md * mrf.md * I also moved ap_extensions.md * I created a new file setting_up_pleroma_dev.md	2021-01-10 08:25:36 +00:00
sadposter	6cd0586ef9	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2020-12-29 13:16:14 +00:00
Mark Felder	fecefe68f8	Add test/instance to .gitignore	2020-12-23 14:09:22 -06:00
sadposter	ddf36b096e	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2020-11-01 12:22:28 +00:00
Maksim Pechnikov	20e68b30f0	added generated `pleroma.env`	2020-10-15 22:28:26 +03:00
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 fe7fd33126, reversing changes made to 4fabf83ad0.	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