Commit graph

4214 commits

Author SHA1 Message Date
d4bc70b61e Merge branch 'websocket_reconnect_reload' into dev 2020-02-04 12:21:49 -05:00
2286394f79 Some corrections to total user points. 2020-02-04 11:29:54 -05:00
ae6c6ea055 Merge branch 'StaticallyTypedRice-webclient' of https://github.com/StaticallyTypedRice/lemmy into StaticallyTypedRice-StaticallyTypedRice-webclient 2020-02-04 11:20:58 -05:00
b0b50098a4 Websocket reconnect reload page data. Fixes #504 2020-02-04 11:19:05 -05:00
Dessalines
07db70f5f1 Merge pull request #503 from xyvs/master
Spanish translations
2020-02-04 10:35:31 -05:00
Jose Francisco Martinez Salgado
70ae5cde4e Translations report updated 2020-02-04 09:11:47 -06:00
Jose Francisco Martinez Salgado
fbdb9edd5e New words and typo 2020-02-04 09:08:16 -06:00
Jose Francisco Martinez Salgado
6e99aa8637 Merge remote-tracking branch 'upstream/master' 2020-02-04 08:57:13 -06:00
e4dfa5e52f Combine duplicate front page posts. Fixes #284 2020-02-03 19:52:39 -05:00
Richie Zhang
f42b7b0e9d Translate total_number_of_points to German. 2020-02-03 15:23:36 -08:00
Richie Zhang
bf9a45e2a1 Display a given user's total score. 2020-02-03 15:20:59 -08:00
Richie Zhang
45a8464dee Add total_number_of_points. 2020-02-03 15:14:10 -08:00
Richie Zhang
5a71dc2e5b Merge pull request #10 from dessalines/dev
Merge upstream
2020-02-03 15:10:39 -08:00
a28f8c7ac4 Updating sponsors. 2020-02-03 18:01:14 -05:00
347b290747 Add disclaimer about image uploading. Fixes #501 2020-02-03 18:00:41 -05:00
7e64d033bf Version v0.6.10 2020-02-03 10:58:17 -05:00
471c1179d3 bump 2020-02-03 15:00:08 +01:00
032ebe7a9e Integrate email relay in Ansible setup 2020-02-03 14:10:24 +01:00
5ab4d0257a Merge branch 'master' of https://github.com/dessalines/lemmy 2020-02-02 22:54:05 -05:00
ee2038a75a Returning specific slurs from slur filter on failure. Fixes #463 2020-02-02 22:51:54 -05: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
a2267aa056 Version v0.6.9 2020-02-02 17:15:48 -05:00
025d6dcd80 Fixing ansible deploy. 2020-02-02 17:13:59 -05:00
46727f72df Dont show deleted / removed replies or messages in inbox. Fixes #493 2020-02-02 17:07:16 -05:00
cd57e612c1 Doing UserJoin on connect / reconnect. 2020-02-02 16:37:57 -05:00
caba049da1 Merge branch 'dev' into websocket_scopes 2020-02-02 14:37:19 -05:00
6124133e85 Doing comment-node, comment-form and private-message. 2020-02-02 14:22:35 -05:00
ccda4d8453 Some minor fixes. 2020-02-02 14:10:15 -05:00
ac943f8951 Finishing up interpolation rework. 2020-02-02 13:50:44 -05:00
23daba54b4 Merge branch 'dev' into richardj-feature/frontend-a11y 2020-02-02 12:56:07 -05:00
606fb9d326 Merge branch 'feature/frontend-a11y' of https://github.com/richardj/lemmy into richardj-feature/frontend-a11y 2020-02-02 12:55:45 -05:00
142b19bf86 Updating ansible version. 2020-02-02 12:54:35 -05:00
96a7e99e57 Removing PostLikeResponse in favor of PostResponse. Consolidating comment and post_sends. 2020-02-02 12:45:41 -05:00
cda1e6e741 Fixing issue with multiple notifications. 2020-02-02 10:09:01 -05:00
4d95be06b5 Merge branch 'dev' into websocket_scopes 2020-02-02 09:15:02 -05:00
e8a604d0ed Testing out reconnecting websocket instead of rxJS one. #496 2020-02-01 22:52:16 -05:00
8035976e40 Adding username and email case insensitivity uniqueness. Fixes #341 2020-02-01 20:11:12 -05:00
5d84d474d0 Version v0.6.8 2020-02-01 16:56:31 -05:00
1856ab62a4 Adding an i386 theme. Fixes #476 2020-02-01 16:34:54 -05:00
12cbb20d28 Adding materia theme. Fixes #478 2020-02-01 14:44:26 -05:00
Richard
ecb6d90f63 changed h2 back to h5 2020-02-01 19:24:11 +01:00
9f2b61708e Merge branch 'dev' into websocket_scopes 2020-02-01 00:37:34 -05:00
81998d9f89 Merge branch 'feature/frontend-a11y' of https://github.com/richardj/lemmy into richardj-feature/frontend-a11y 2020-01-31 23:46:04 -05:00
cb1acd2cf0 Merge branch 'StaticallyTypedRice-StaticallyTypedRice-documentation' into dev 2020-01-31 23:08:18 -05:00
d9dde4c4f9 Merge branch 'dev' into StaticallyTypedRice-StaticallyTypedRice-minor-changes 2020-01-31 23:06:52 -05:00
7c93e17fbb Merge branch 'StaticallyTypedRice-minor-changes' of https://github.com/StaticallyTypedRice/lemmy into StaticallyTypedRice-StaticallyTypedRice-minor-changes 2020-01-31 23:06:46 -05:00
b08f27bb60 Merge branch 'dev' into richardj-language/dutch-language-update-2 2020-01-31 23:05:32 -05:00
ecbf7e8f85 Merge branch 'dev' into nutomic-ansible 2020-01-31 23:01:19 -05:00
895d857825 Merge branch 'dev' into nutomic-api-benchmark 2020-01-31 22:53:55 -05:00