gsathecat
/
lemmy
mirror of https://github.com/LemmyNet/lemmy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev'

pull/283/head
Dessalines 2019-06-01 15:48:58 -07:00
parent d58007223a 2109016614
commit 236c1183cc
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/migrations/2019-06-01-222649_remove_admin/down.sql 100644
View File

@ -0,0 +1 @@
insert into user_ (name, fedi_name, password_encrypted) values ('admin', 'TBD', 'TBD');

1
server/migrations/2019-06-01-222649_remove_admin/up.sql 100644
View File

@ -0,0 +1 @@
delete from user_ where name like 'admin';

1
ui/src/components/main.tsx
View File

@ -71,6 +71,7 @@ export class Main extends Component<any, MainState> {
super(props, context); super(props, context);
this.state = this.emptyState; this.state = this.emptyState;
this.handleEditCancel = this.handleEditCancel.bind(this);
this.subscription = WebSocketService.Instance.subject this.subscription = WebSocketService.Instance.subject
.pipe(retryWhen(errors => errors.pipe(delay(3000), take(10)))) .pipe(retryWhen(errors => errors.pipe(delay(3000), take(10))))

4
ui/src/components/sidebar.tsx
View File

@ -115,8 +115,8 @@ export class Sidebar extends Component<SidebarProps, SidebarState> {
<li class="list-inline-item"><Link class="text-info" to={`/u/${mod.user_name}`}>{mod.user_name}</Link></li> <li class="list-inline-item"><Link class="text-info" to={`/u/${mod.user_name}`}>{mod.user_name}</Link></li>
)} )}
</ul> </ul>
<Link class="btn btn-sm btn-secondary btn-block mb-3" <Link class={`btn btn-sm btn-secondary btn-block mb-3 ${(community.deleted || community.removed) && 'no-click'}`}
to={`/create_post/c/${community.name}`}>Create a Post</Link> to={`/create_post/c/${community.name}`}>Create a Post</Link>
<div> <div>
{community.subscribed {community.subscribed
? <button class="btn btn-sm btn-secondary btn-block mb-3" onClick={linkEvent(community.id, this.handleUnsubscribe)}>Unsubscribe</button> ? <button class="btn btn-sm btn-secondary btn-block mb-3" onClick={linkEvent(community.id, this.handleUnsubscribe)}>Unsubscribe</button>