Commit graph

3576 commits

Author SHA1 Message Date
cfa2ef3a05 Merge branch 'master' into dev 2019-08-23 19:59:23 -07:00
ba9f357b14 Messing with travis build. 2019-08-23 19:54:38 -07:00
3561ef93a0 Adding Community and Site transfer
- Fixes #139
2019-08-23 19:40:41 -07:00
d5b9ba724d Add missing by and to translations. 2019-08-23 15:55:48 -07:00
d9bc02eca4 Adding repo language in gitattributes.
- #230
2019-08-23 14:59:10 -07:00
b1e1dcf163 Upping version. 2019-08-22 20:49:56 -07:00
9510612b44 readme update. 2019-08-22 20:45:20 -07:00
e905615710 Merge branch 'dev' 2019-08-22 18:34:56 -07:00
5cbbf5a4ac Adding spanish translation.
- Fixes #191
2019-08-22 18:34:24 -07:00
77bba69eab Merge branch 'dev' and similar_post_fetch
- Fixes #131
2019-08-22 16:18:26 -07:00
20fec100b5 Cross posting working. 2019-08-22 16:13:26 -07:00
23150946d8 Merge branch 'dev' into similar_url_search 2019-08-22 12:19:39 -07:00
bfc3bbc371 Don't allow html rendering in markdown parser
- Fixes #229
2019-08-22 12:09:17 -07:00
954c89edaf cross-posting almost done. 2019-08-22 11:46:54 -07:00
b7e73a5559 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
512cde82ef Some README updates. 2019-08-21 21:09:46 -07:00
c86a1d339e Adding new favicon.
- Fixes #225
2019-08-21 20:59:54 -07:00
bdb1c72153 Updating docker-compose to version 3
- Removing health checks.
- #227
2019-08-21 15:29:35 -07:00
e7c588cbbc Fix inferno link. 2019-08-20 17:05:57 -07:00
431210025d 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
06a9417671 Merge branch 'ansible' of https://github.com/Nutomic/lemmy into Nutomic-ansible 2019-08-20 14:49:23 -07:00
b5fc4bca10 Merge branch 'dev' 2019-08-20 14:48:48 -07:00
cc40916bf5 Adding Monero sponsor link
- Fixes #224
2019-08-20 14:47:19 -07:00
baf205e113 Removing navbar toggler border. 2019-08-20 14:40:51 -07:00
5e44ac207b copy template files into docker/prod folder 2019-08-20 19:51:07 +02:00
ac28ed6875 various fixes 2019-08-20 19:38:10 +02:00
cce330fa2d add security headers to nginx (fixes #208) 2019-08-20 19:38:10 +02:00
c45ad217c4 added env file 2019-08-20 19:38:10 +02:00
6fa0bfce32 initial ansible implementation 2019-08-20 19:36:49 +02:00
46363811f0 Separate sidebar. 2019-08-19 21:45:06 -07:00
977c043509 Adding extra margin. 2019-08-19 20:16:34 -07:00
297755e757 Adding cards for sidebars in UI. 2019-08-19 19:37:32 -07:00
ee9d053251 Fixing comment buttons now. 2019-08-19 15:39:45 -07:00
1fe8ecaf7a Try changing votes to buttons. 2019-08-19 15:32:32 -07:00
1e9cd32e1d Fixing logout after browser close. 2019-08-19 15:22:05 -07:00
64c0f7ed6e Upping version. 2019-08-19 15:06:38 -07:00
1297c687ee Merge branch 'AutomCoding-master' 2019-08-19 14:56:22 -07:00
eb629be1ce Merge branch 'master' of https://github.com/AutomCoding/lemmy into AutomCoding-master 2019-08-19 14:56:06 -07:00
5ea8ec0837 Merge branch 'matthiasbeyer-add-more-translations-de' 2019-08-19 14:53:52 -07:00
5aaf0601f8 Adding german to readme. 2019-08-19 14:53:36 -07:00
f019a56a1d 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
7c99f97ddf Adding russian to readme. 2019-08-19 14:30:28 -07:00
5a1c7a2605 Merge branch 'master' into dev 2019-08-19 14:29:52 -07:00
f4a63fb12e Merge branch 'digitalkiller-master' 2019-08-19 14:29:38 -07:00
fa625e560b Adding russian locales. 2019-08-19 14:29:28 -07:00
70354d6e10 Upping title size again. 2019-08-19 14:13:15 -07:00
Autom
14fb74abd1 Missing space 2019-08-19 00:11:35 +02:00
digitalkiller
a5b68527bb Added a Russian localization 2019-08-18 22:02:34 +05:00
cc492b44a3 Add missing translations 2019-08-18 11:18:16 +02:00
Autom
215a82ac98 Fix character escaping 2019-08-18 08:08:54 +02:00