Commit graph

826 commits

Author SHA1 Message Date
Dessalines
f89727f1a0 Merge branch 'master' into dev 2019-08-23 19:59:23 -07:00
Dessalines
5e7c9f9d0a Messing with travis build. 2019-08-23 19:54:38 -07:00
Dessalines
1e83aa8c72 Adding Community and Site transfer
- Fixes #139
2019-08-23 19:40:41 -07:00
Dessalines
addfc72080 Add missing by and to translations. 2019-08-23 15:55:48 -07:00
Dessalines
325e62f3e6 Adding repo language in gitattributes.
- #230
2019-08-23 14:59:10 -07:00
Dessalines
89ff4daa6a Upping version. 2019-08-22 20:49:56 -07:00
Dessalines
ffc498ce1d readme update. 2019-08-22 20:45:20 -07:00
Dessalines
4dd995e868 Merge branch 'dev' 2019-08-22 18:34:56 -07:00
Dessalines
0dc26d41e3 Adding spanish translation.
- Fixes #191
2019-08-22 18:34:24 -07:00
Dessalines
1a273cbe70 Merge branch 'dev' and similar_post_fetch
- Fixes #131
2019-08-22 16:18:26 -07:00
Dessalines
6d42d114e4 Cross posting working. 2019-08-22 16:13:26 -07:00
Dessalines
f7ef3fb7f8 Merge branch 'dev' into similar_url_search 2019-08-22 12:19:39 -07:00
Dessalines
b0f4066c78 Don't allow html rendering in markdown parser
- Fixes #229
2019-08-22 12:09:17 -07:00
Dessalines
9b8d8d3246 cross-posting almost done. 2019-08-22 11:46:54 -07:00
Dessalines
9b558611b4 View where a URL has been cross-posted to in the past
- This shows when creating a post, or when viewing a post.
- Fixes #131
2019-08-21 22:17:15 -07:00
Dessalines
973538bcda Some README updates. 2019-08-21 21:09:46 -07:00
Dessalines
2c895c355d Adding new favicon.
- Fixes #225
2019-08-21 20:59:54 -07:00
Dessalines
283d8cd692 Updating docker-compose to version 3
- Removing health checks.
- #227
2019-08-21 15:29:35 -07:00
Dessalines
c275c50b6f Fix inferno link. 2019-08-20 17:05:57 -07:00
Dessalines
6fe4b9eb37 Some fixes for the docker build.
- Messed with readme.
- They needed to be `.env`, not `env`.
- Leaving the nginx file there, but extracting it out of the main setup. Ppl might use apache, or none at all.
- Docker 3.3 doesn't work with the DB health check unfortunately, so I changed that back to 2.4.
- Changed the env in the docker folder so it doesn't need to be edited, someone could just pull this and start it up if they just wanna test it.
2019-08-20 16:20:46 -07:00
Dessalines
f0313744f1 Merge branch 'ansible' of https://github.com/Nutomic/lemmy into Nutomic-ansible 2019-08-20 14:49:23 -07:00
Dessalines
dcef1bbd7c Merge branch 'dev' 2019-08-20 14:48:48 -07:00
Dessalines
5dc8da1cae Adding Monero sponsor link
- Fixes #224
2019-08-20 14:47:19 -07:00
Dessalines
9c8cc659fc Removing navbar toggler border. 2019-08-20 14:40:51 -07:00
Felix Ableitner
cf5c0ec9cb copy template files into docker/prod folder 2019-08-20 19:51:07 +02:00
Felix Ableitner
f5d4b2302c various fixes 2019-08-20 19:38:10 +02:00
Felix Ableitner
ed6fadc7da add security headers to nginx (fixes #208) 2019-08-20 19:38:10 +02:00
Felix Ableitner
db2767e89d added env file 2019-08-20 19:38:10 +02:00
Felix Ableitner
5adf1806df initial ansible implementation 2019-08-20 19:36:49 +02:00
Dessalines
1fa2cfce51 Separate sidebar. 2019-08-19 21:45:06 -07:00
Dessalines
dec4661dd5 Adding extra margin. 2019-08-19 20:16:34 -07:00
Dessalines
21a7243491 Adding cards for sidebars in UI. 2019-08-19 19:37:32 -07:00
Dessalines
1b72e0c0e3 Fixing comment buttons now. 2019-08-19 15:39:45 -07:00
Dessalines
10917489fc Try changing votes to buttons. 2019-08-19 15:32:32 -07:00
Dessalines
aae235279e Fixing logout after browser close. 2019-08-19 15:22:05 -07:00
Dessalines
0c89ea980c Upping version. 2019-08-19 15:06:38 -07:00
Dessalines
d3632e4668 Merge branch 'AutomCoding-master' 2019-08-19 14:56:22 -07:00
Dessalines
34ab142b5e Merge branch 'master' of https://github.com/AutomCoding/lemmy into AutomCoding-master 2019-08-19 14:56:06 -07:00
Dessalines
cbcd17fc22 Merge branch 'matthiasbeyer-add-more-translations-de' 2019-08-19 14:53:52 -07:00
Dessalines
4ccf68b460 Adding german to readme. 2019-08-19 14:53:36 -07:00
Dessalines
0acb08b5e7 Merge branch 'add-more-translations-de' of https://github.com/matthiasbeyer/lemmy into matthiasbeyer-add-more-translations-de 2019-08-19 14:51:17 -07:00
Dessalines
9a1620ddad Adding russian to readme. 2019-08-19 14:30:28 -07:00
Dessalines
ceda1e88e7 Merge branch 'master' into dev 2019-08-19 14:29:52 -07:00
Dessalines
67d949722b Merge branch 'digitalkiller-master' 2019-08-19 14:29:38 -07:00
Dessalines
9c6c490b20 Adding russian locales. 2019-08-19 14:29:28 -07:00
Dessalines
7805246b87 Upping title size again. 2019-08-19 14:13:15 -07:00
Autom
42ab3928ea Missing space 2019-08-19 00:11:35 +02:00
digitalkiller
266597a6a9 Added a Russian localization 2019-08-18 22:02:34 +05:00
Matthias Beyer
42ba61c2a1 Add missing translations 2019-08-18 11:18:16 +02:00
Autom
2958cb241d Fix character escaping 2019-08-18 08:08:54 +02:00