scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-07 15:33:50 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix rebasing problems

Browse source
This commit is contained in:
Luka Murn 2017-09-19 16:47:55 +02:00
parent 44877a13a5
commit decdce17fa
3 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/javascript/src/scenes/SettingsPage/scenes/team/index.jsx
View file

@ -1,6 +1,5 @@
import React, { Component } from "react";
import ReactRouterPropTypes from "react-router-prop-types";
import { Link } from "react-router-dom";
import styled from "styled-components";
import { Breadcrumb, Row, Col, Glyphicon, Well } from "react-bootstrap";
import { LinkContainer } from "react-router-bootstrap";
@ -10,10 +9,8 @@ import prettysize from "prettysize";
import axios from "../../../../config/axios";
import { SETTINGS_TEAMS_ROUTE } from "../../../../config/routes";
import { TEAM_DETAILS_PATH, SETTINGS_TEAMS } from "../../../../config/api_endpoints";
import { TEAM_DETAILS_PATH } from "../../../../config/api_endpoints";
import { BORDER_LIGHT_COLOR } from "../../../../config/constants/colors";
import { SETTINGS_TEAMS_ROUTE } from "../../../../app/dom_routes";
import { TEAM_DETAILS_PATH } from "../../../../app/routes";
import TeamsMembers from "./components/TeamsMembers";
import UpdateTeamDescriptionModal from "./components/UpdateTeamDescriptionModal";

2
app/javascript/src/scenes/SettingsPage/scenes/teams/components/TeamsPageDetails.jsx
View file

@ -4,7 +4,7 @@ import PropTypes, { number, string, bool } from "prop-types";
import styled from "styled-components";
import { FormattedMessage, FormattedPlural } from "react-intl";
import { Button, Glyphicon } from "react-bootstrap";
import { SETTINGS_NEW_TEAM_ROUTE } from "../../../../../app/dom_routes";
import { SETTINGS_NEW_TEAM_ROUTE } from "../../../../../config/routes";
const Wrapper = styled.div`margin: 15px 0;`;
const TeamsPageDetails = ({ teams }) => {

0
app/javascript/packs/src/settings/components/teams/new/components/NameFormControl.jsx → app/javascript/src/scenes/SettingsPage/scenes/teams/new/components/NameFormControl.jsx
View file