gsathecat
/
lemmy
mirror of https://github.com/LemmyNet/lemmy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,822 Commits
1,009 Branches
538 Tags
45 MiB
Commit Graph

82 Commits (ace5b715365df8f0de7fbed2da15fc556a8df0d9)

Author SHA1 Message Date
Dessalines dc94e58cbf Merge branch 'master' into federation_merge_from_master_2 2020-06-23 21:11:38 -04:00
Dessalines 983a45e178 Merge branch 'master' into iav-arm-musl-dessalines 2020-06-22 14:57:55 -04:00
Dessalines 186e261fc0 Fixing docker-compose to rely on pictrs 2020-06-22 12:53:39 -04:00
Dessalines cb128256ed Updating nginx.conf, upgrading pict-rs 2020-06-22 08:31:15 -04:00
Dessalines bda657b638 Some reorg of Dockerfiles. 2020-06-14 16:36:18 -04:00
Igor Velkov 6f58be9493 dockerfile for x64 and arm building with musl 2020-06-14 01:28:50 +03:00
Dessalines 5594bed6a8 Merge branch 'master' into use-pictrs-1 2020-06-12 17:51:37 -04:00
Dessalines f647f2ae6c Blocking pict-rs import location 2020-06-12 17:05:19 -04:00
Dessalines 7cb7c1f0f9 Adding lld to docker builds. #810 2020-06-12 16:17:01 -04:00
Felix Ableitner 4ea6c4ad5d Various build optimizations 2020-06-12 21:45:23 +02:00
Dessalines cddc23494d Upgrading pict-rs for working gifs. 2020-06-12 09:48:51 -04:00
Dessalines 4cf1f080bf Adding delete picture via pict-rs delete tokens. Fixes #505 2020-06-10 22:47:06 -04:00
Dessalines bd26e4e9c1 Fixing some front end pictshare to pictrs conversions. 2020-06-09 17:17:24 -04:00
Felix Ableitner 0f1a8ec928 Merge branch 'master' into federation 2020-06-09 14:01:26 +02:00
Felix Ableitner e583e45d9a Use pictrs instead of pictshare 2020-06-08 19:52:32 +02:00
Dessalines 1e88b815da Updating pictshare docker image. 2020-06-02 19:29:29 -04:00
Felix 5753c4feaa Let community announce posts 2020-05-28 13:15:51 +02:00
Felix 4e80543edb Update test_deploy.sh, supporting different branches 2020-04-21 19:19:10 +02:00
Dessalines 6d5518cbd4 Merge branch 'dev' into admin_settings 2020-04-14 10:54:04 -04:00
Dessalines b9aef5891f Fixing test deploy. 2020-04-14 10:07:40 -04:00
Dessalines bb287cbd07 Adding an admin settings page. 
- Fixes #620
- Adding a UserListing component. Fixes #627
 2020-04-10 16:55:57 -04:00
Dessalines 6e5729c660 Fixing deploy script. 2020-04-03 14:44:10 -04:00
Dessalines dc14719b08 Updating rust, rust deps, yarn deps. Fixes #605 2020-03-18 22:30:16 -04:00
Dessalines 62ab68d317 Adding full logging. 2020-03-13 11:08:42 -04:00
nutomic bf1db428f6 Move volumes into subfolder (ref #474) (#23) 
Change ports and container names

Move volumes into subfolder (ref #474)

Merge pull request #587 from StaticallyTypedRice/patch-2

Clarify that content violating this code of conduct will likely be removed.
Clarify that content violating this code of conduct will likely be removed.

Lemmy has a general policy of removing any content that violates the rules whenever possible, which is typically a good thing, and I felt it important to mention that in the code of conduct.

Co-authored-by: Felix <me@nutomic.com>
Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
Co-authored-by: Richie Zhang <12566991+StaticallyTypedRice@users.noreply.github.com>
 2020-03-09 16:50:28 +00:00
Dessalines 9c50d5f073 Fix weblate deploy. 2020-03-01 18:21:52 -05:00
Dessalines 565524a80b Adding git add to deploy. 2020-02-29 15:49:09 -05:00
Felix Ableitner ee7949a0fc update deploy script to pull translations from weblate 2020-02-29 20:25:35 +01:00
Dessalines 55f91ac5dc First pass at adding oembeds / iframely. 2020-02-17 11:18:01 -05:00
Felix 032ebe7a9e Integrate email relay in Ansible setup 2020-02-03 14:10:24 +01:00
Dessalines f2f9502ab6 Merge pull request #498 from iav/docs4arm 
Add doc compilation to multiplatform workflow
 2020-02-02 20:06:42 -05:00
Igor Velkov c6c95204f8 Add doc compilation to multiplatform workflow 
Change rust builder version to current
 2020-02-03 01:39:41 +02:00
Dessalines 025d6dcd80 Fixing ansible deploy. 2020-02-02 17:13:59 -05:00
Dessalines cc6c173828 Formatting translation file, changing deploy script to const. 2020-01-26 16:38:08 -05:00
Dessalines 222374583b Adding to deploy. 2020-01-20 14:39:41 -05:00
Dessalines 5c5650d123 Fix aarch64 dockerfile. 2020-01-17 13:28:29 -05:00
Dessalines a93ab4bcd1 Adding an env deploy. Fixes #410 2020-01-14 17:14:02 -05:00
Dessalines f3dbedb5c5 Merge branch 'actix-2.0' into dev 2020-01-11 19:19:38 -05:00
Dessalines bc804521e8 Upping rust-musl to 1.40.0 2020-01-11 19:07:44 -05:00
Dessalines 6f2f9995f2 Adding ssh docker commands to dev deploy. 2020-01-07 12:53:32 -05:00
Dessalines dc331d5293 Fixing deploy and version for clippy. 2020-01-02 10:34:40 -05:00
Dessalines 3d4412a704 Merge branch 'mdbook' of https://yerbamate.dev/Nutomic/lemmy into Nutomic-mdbook 2020-01-01 16:42:38 -05:00
Felix Ableitner 62ba018b19 Include docs in docker image 2020-01-01 18:14:09 +01:00
Dessalines 4faa46ac29 Only do arm build on major deploy. Fixes #393 2020-01-01 11:39:23 -05:00
Dessalines 786be3fa66 Config fixes. 
- Adding front_end_dir to settings.
- Adding unit test for PasswordResetRequest encryption.
- Readme points to lemmy.hjson
- Fixing docker prod, dev, and ansible builds.
- Removing redundant env files, as all config is now in a single file.
- Some formatting fixes.
 2019-12-28 16:11:03 -05:00
Felix Ableitner b7c24a372b Fix review comments 2019-12-27 17:30:46 +01:00
Felix Ableitner 1f7546789a update documentation, docker and ansible files 2019-12-27 17:28:46 +01:00
Dessalines ab53840324 Upping rate limit for register and community creation to 3/hour. 
- Fixes #353
 2019-12-06 20:57:48 -08:00
Dessalines e5f17f7bc7 Removing git checkout master from dev deploy. 2019-12-01 22:24:43 -08:00
Dessalines 52ea7a32db Some RSS work. 
- Display rss buttons on front end for user, /c/all, and community
pages. Fixes #348.
- Some clean up and additions to RSS feeds.
 2019-12-01 17:23:52 -08:00