summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/repo
Commit message (Expand)AuthorAgeFilesLines
* Refactor to use template URL from backendnew-mr-repo-editorEric Eastwood2017-10-103-6/+5
* Rename/refactor things per reviewEric Eastwood2017-10-103-51/+48
* Merge branch 'master' into new-mr-repo-editorEric Eastwood2017-10-104-5/+2
|\
| * removed global eslint for remaining filesflash-es6-modulePhil Hughes2017-10-101-1/+0
| * karma spec fixesPhil Hughes2017-10-101-3/+2
| * Flash is now a ES6 modulePhil Hughes2017-10-103-6/+5
* | Merge branch 'master' into new-mr-repo-editorEric Eastwood2017-10-066-17/+58
|\ \ | |/
| * Show confirmation modal before deleting accountWinnie Hellmann2017-10-061-1/+1
| * Merge branch 'ide-fix-back-btn' into 'master'Fatih Acet2017-10-065-16/+57
| |\
| | * Good old dangling commaide-fix-back-btnTim Zallmann2017-10-061-1/+1
| | * Resetting of active Line + setting it for the async display functionsTim Zallmann2017-10-063-13/+22
| | * Fixed Linting Error + Error with Line Highlighter found in TestTim Zallmann2017-10-051-2/+2
| | * CHanged to Helper MethodTim Zallmann2017-10-051-1/+1
| | * Refactored Highlighting mechanismTim Zallmann2017-10-053-13/+12
| | * Optimising IfTim Zallmann2017-10-041-2/+2
| | * Added Check for Line Number ElementTim Zallmann2017-10-041-1/+1
| | * Fixed Repo Sidebar TestsTim Zallmann2017-10-041-29/+30
| | * Fixed Eslint ErrorsTim Zallmann2017-10-041-4/+4
| | * Polished Back Button for files that are not in the tree anymoreTim Zallmann2017-10-041-1/+10
| | * Fixed Back Button for files + line number jumping for preview and editorTim Zallmann2017-10-044-7/+30
* | | Fix up repo commit section specsEric Eastwood2017-10-062-11/+20
* | | Fix up eslintEric Eastwood2017-10-052-17/+20
* | | Merge branch 'master' into new-mr-repo-editorEric Eastwood2017-10-051-2/+2
|\ \ \ | |/ /
| * | Fix inconsistent use of sentence casejramsay-fix-file-list-title-caseJames Ramsay2017-10-041-2/+2
| |/
* | Add checkbox for new MR with redirectJacob Schatz2017-10-033-2/+8
* | Merge branch 'reject-push-simplier' into new-mr-repo-editorJacob Schatz2017-10-034-18/+95
|\ \
| * | Allow user to create branch when branch already updated.Jacob Schatz2017-10-023-4/+14
| * | Show popupdialogJacob Schatz2017-10-022-27/+66
| * | Check for branch changes.Jacob Schatz2017-10-024-1/+29
| |/
* | Add create merge checkbox.Jacob Schatz2017-10-032-0/+9
|/
* Fix incorrectly aligned last updated timeJames Ramsay2017-09-292-2/+2
* Merge branch 'dm-json-page-title' into 'master'Jacob Schatz2017-09-292-5/+7
|\
| * Not the Test will also work with other tests beforeTim Zallmann2017-09-291-1/+1
| * Added Test for PageTitle / Removed Gitlab Part from TItleTim Zallmann2017-09-291-1/+1
| * Added Page Title setting for files + directoriesTim Zallmann2017-09-262-4/+6
* | Merge branch 'remove-target-dd' into 'master'Filipa Lacerda2017-09-294-17/+2
|\ \
| * | Fix static analysis.remove-target-ddJacob Schatz2017-09-281-1/+0
| * | Removes the target branch and only uses the source branch.Jacob Schatz2017-09-284-16/+2
* | | Merge branch 'acet-repo-editor-prevent-extra-request' into 'master'Jacob Schatz2017-09-282-7/+18
|\ \ \
| * | | RepoEditor: Prevent extra network call for already opened files.acet-repo-editor-prevent-extra-requestFatih Acet2017-09-272-7/+18
| |/ /
* | | Merge branch 'jramsay-spelling-occurred' into 'master'Jacob Schatz2017-09-282-2/+2
|\ \ \ | |/ / |/| |
| * | Fix spelling of occurredjramsay-spelling-occurredJames Ramsay2017-09-262-2/+2
| |/
* | Merge branch 'acet-repo-editor-fix-link-linking' into 'master'Jacob Schatz2017-09-271-5/+9
|\ \ | |/ |/|
| * RepoEditor: Implement line and range linking.Fatih Acet2017-09-221-5/+9
* | RepoEditor: Fix reopening the existing file on refresh.acet-repo-editor-fix-reopening-existing-fileFatih Acet2017-09-221-1/+1
|/
* Merge branch 'thenable-ajax-api-calls' into 'master'Fatih Acet2017-08-242-10/+14
|\
| * Added repo_service_spec for commitFlash and corrected repo_commit-Secion api ...thenable-ajax-api-callsLuke "Jared" Bennett2017-08-231-7/+9
| * fix eslint violations in repo editor filesMike Greiling2017-08-172-9/+10
| * Add thenable ajax calls.Jacob Schatz2017-08-172-5/+6
* | Merge branch 'update-monaco-loader-test' into 'master'Jacob Schatz2017-08-221-4/+2
|\ \
View Lorry Controller Status