LemmyNet/lemmy
2
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-11-30 08:11:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/dessalines/lemmy into nocross-nomusl

Browse source
This commit is contained in:
Igor Velkov 2019-09-06 23:22:07 +03:00
commit 2642215a80
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docker/prod/docker-compose.yml vendored
View file

@ -10,7 +10,7 @@ services:
volumes: volumes:
- lemmy_db:/var/lib/postgresql/data - lemmy_db:/var/lib/postgresql/data
lemmy: lemmy:
image: dessalines/lemmy:v0.1.0 image: dessalines/lemmy:v0.1.0.3
ports: ports:
- "8536:8536" - "8536:8536"
environment: environment:

1
ui/src/components/main.tsx vendored
View file

@ -107,7 +107,6 @@ export class Main extends Component<any, MainState> {
// Necessary for back button for some reason // Necessary for back button for some reason
componentWillReceiveProps(nextProps: any) { componentWillReceiveProps(nextProps: any) {
if (nextProps.history.action == 'POP' || nextProps.history.action == 'PUSH') { if (nextProps.history.action == 'POP' || nextProps.history.action == 'PUSH') {
this.state = this.emptyState;
this.state.type_ = this.getListingTypeFromProps(nextProps); this.state.type_ = this.getListingTypeFromProps(nextProps);
this.state.sort = this.getSortTypeFromProps(nextProps); this.state.sort = this.getSortTypeFromProps(nextProps);
this.state.page = this.getPageFromProps(nextProps); this.state.page = this.getPageFromProps(nextProps);

2
ui/src/version.ts vendored
View file

@ -1 +1 @@
export let version: string = "v0.1.0-0-g5b91b7b"; export let version: string = "v0.1.0.3-0-gfd8928a";