2 files changed
+2
-2
lines changed- .editorconfig+13
- .eslintignore+2
- .eslintrc+31
- .gitignore+1
- app/api/gitAPI.js+49-1
- app/commands/commandBindings/git.js+46-8
- app/commands/commandBindings/misc.js+4
- app/commands/keymaps.js+1-1
- app/commands/lib/keycodes.js+2-2
- app/components/AceEditor/actions.js+5-5
- app/components/AceEditor/index.jsx+9-3
- app/components/DragAndDrop/actions.js+1-1
- app/components/DragAndDrop/index.jsx+37-10
- app/components/EditorWrapper/actions.js+9
- app/components/EditorWrapper/index.jsx+77
- app/components/EditorWrapper/reducer.js+22
- app/components/FileTree/index.jsx+58-44
- app/components/Git/GitBranchWidget.jsx+87
- app/components/Git/GitCommitView.jsx+37
- app/components/Git/GitCommitViewFlat.jsx+51
- app/components/Git/GitFileTree.jsx+225
- app/components/Git/ace-merge.js+935
- app/components/Git/actions.js+237-17
- app/components/Git/index.jsx+2-116
- app/components/Git/modals/commitDiff.jsx+51
- app/components/Git/modals/merge.jsx+53
- app/components/Git/modals/mergeFile.jsx+157
- app/components/Git/modals/newBranch.jsx+64
- app/components/Git/modals/rebaseInput.jsx+65
- app/components/Git/modals/rebasePrepare.jsx+287
- app/components/Git/modals/rebaseStart.jsx+230
- app/components/Git/modals/reset.jsx+1-2
- app/components/Git/modals/resolveConflicts.jsx+56
- app/components/Git/modals/tag.jsx+75
- app/components/Git/reducer.js+173-25
- app/components/MarkdownEditor/actions.js+26
- app/components/MarkdownEditor/index.jsx+148
- app/components/MarkdownEditor/reducer.js+40
- app/components/Menu/index.jsx+28-4
- app/components/MenuBar/index.jsx+17-3
- app/components/MenuBar/menuBarItems.js+53-1
- app/components/Modal/actions.js+11-3
- app/components/Modal/index.jsx+63-21
- app/components/Modal/modals/Prompt.jsx+1-1
- app/components/Modal/modals/index.js+10
- app/components/Modal/reducer.js+34-62
- app/components/Pane/PaneAxis.jsx+23-10
- app/components/Pane/actions.js+3-2
- app/components/Pane/index.js+2-2
- app/components/Pane/reducer.js+13-8
- app/components/Panel/index.jsx+2-2
- app/components/PictureEditor/index.jsx+30
- app/components/ResizeBar.jsx+152
- app/components/Setting/actions.js+24
- app/components/Setting/index.jsx+168
- app/components/Setting/reducer.js+121
- app/components/Tab/actions.js+11-6
- app/components/Tab/index.jsx+52-32
- app/components/Tab/reducer.js+29-2
- app/components/ThemeProvider.js+42
- app/components/Workspace/actions.js+1
- app/components/Workspace/index.jsx+54-10
- app/containers/Panels.jsx+3-3
- app/containers/Root.jsx-29
- app/containers/Root/actions.js+6
- app/containers/Root/index.jsx+40
- app/containers/Root/reducer.js+18
- app/i18n/en_US.js+4
- app/i18n/index.js+2
- app/i18n/zh_CN.js+4
- app/index.js+1-1
- app/states/index.js-1
- app/store.js+33-3
- app/styles/components/FileTree.styl+40-6
- app/styles/components/Git.styl+13-4
- app/styles/components/GitMerge.styl+276
- app/styles/components/Settings.styl+57
- app/styles/components/Tab.styl+34-7
- app/styles/components/Workspace.styl+4
- app/styles/components/index.styl+5-1
- app/styles/main.styl+1-1
- app/styles/mixins.styl+8
- app/styles/themes/dark/styles/tabs.styl+1-1
- app/styles/themes/light/styles/tabs.styl+1-1
- app/styles/variables.styl+2-1
- app/utils/createI18n.js+33
- app/utils/index.js+1
- app/utils/request.js+9-3
- package.json+12-1
- webpack_configs/devServer.config.js+16-1
- yarn.lock+846-355
0 commit comments