mirror of https://github.com/micromata/borgbackup-butler.git

...
Kai Reinhard
09.54.2018 c15b6b740fdb6d887aa14d3640485936fe1fccc3
...
1 files deleted
6 files modified
150 ■■■■■ changed files
.gitignore 1 ●●●● patch | view | raw | blame | history
borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/LoggingRest.java 4 ●●●● patch | view | raw | blame | history
borgbutler-webapp/src/components/general/Menu.jsx 4 ●●●● patch | view | raw | blame | history
borgbutler-webapp/src/components/views/config/ConfigurationServerTab.jsx 6 ●●●● patch | view | raw | blame | history
borgbutler-webapp/src/components/views/config/UpdatePage.jsx 126 ●●●●● patch | view | raw | blame | history
borgbutler-webapp/src/containers/WebApp.jsx 7 ●●●●● patch | view | raw | blame | history
borgbutler-webapp/src/reducers/index.js 2 ●●●●● patch | view | raw | blame | history
.gitignore
@@ -38,3 +38,4 @@
borgbutler-core/build
borgbutler-core/out
borgbutler-server/out
borgbutler-webapp/node_modules
borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/LoggingRest.java
@@ -26,8 +26,6 @@
     * @param maxSize          Max size of the result list.
     * @param ascendingOrder   Default is false (default is descending order).
     * @param lastReceivedOrderNumber The last received order number for updating log entries (preventing querying all entries again).
     * @param mdcTemplatePk
     * @param mdcTemplateDefinitionPk
     * @param prettyPrinter
     * @return
     */
@@ -38,8 +36,6 @@
                        @QueryParam("search") String search, @QueryParam("treshold") String logLevelTreshold,
                        @QueryParam("maxSize") Integer maxSize, @QueryParam("ascendingOrder") Boolean ascendingOrder,
                        @QueryParam("lastReceivedOrderNumber") Integer lastReceivedOrderNumber,
                        @QueryParam("mdcTemplatePk") String mdcTemplatePk,
                        @QueryParam("mdcTemplateDefinitionPk") String mdcTemplateDefinitionPk,
                        @QueryParam("prettyPrinter") boolean prettyPrinter) {
        LogFilter filter = new LogFilter();
        filter.setSearch(search);
borgbutler-webapp/src/components/general/Menu.jsx
@@ -46,7 +46,6 @@
            failed: false,
            isOpen: false
        };
        this.uploadFile = this.uploadFile.bind(this);
    }
     toggle() {
@@ -70,9 +69,6 @@
                            ))
                        }
                    </Nav>
                    <DropArea id={'menuDropZone'} className={'menu'}
                              upload={this.uploadFile}
                    />
                </Collapse>
                <LoadingOverlay active={this.state.loading} />
                <FailedOverlay
borgbutler-webapp/src/components/views/config/ConfigurationServerTab.jsx
@@ -1,6 +1,6 @@
import React from 'react';
import {Button, Collapse} from 'reactstrap';
import DirectoryItemsFieldset from './DirectoryItemsFieldset';
//import DirectoryItemsFieldset from './DirectoryItemsFieldset';
import {
    FormButton,
    FormCheckbox,
@@ -175,10 +175,6 @@
                                  name="showTestData"
                                  onChange={this.handleCheckboxChange}/>
                </FormLabelField>
                <DirectoryItemsFieldset items={this.state.directoryItems} addItem={this.addDirectoryItem}
                                        removeItem={this.removeDirectoryItem}
                                        onDirectoryChange={this.handleDirectoryChange}
                                        onRecursiveFlagChange={this.handleRecursiveFlagChange}/>
                <FormLabelField>
                    <Button className={'btn-outline-primary'}
                            onClick={() => this.setState({expertSettingsOpen: !this.state.expertSettingsOpen})}>
borgbutler-webapp/src/components/views/config/UpdatePage.jsx
File was deleted
borgbutler-webapp/src/containers/WebApp.jsx
@@ -30,13 +30,6 @@
            [getTranslation('configuration'), '/config', ConfigurationPage]
        ];
        if (this.props.version.updateVersion) {
            routes.push([getTranslation('update'), '/update', UpdatePage, {
                badge: <Badge color={'danger'}><I18n name={'common.new'}/></Badge>,
                className: 'danger'
            }]);
        }
        if (isDevelopmentMode()) {
            routes.push(['Rest services', '/restServices', RestServices]);
        }
borgbutler-webapp/src/reducers/index.js
@@ -1,11 +1,9 @@
import {combineReducers} from 'redux';
import log from './log';
import template from './template';
import version from './version';
const reducers = combineReducers({
    log,
    template,
    version
});