Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use border-radius-default instead of hardcoding value.login-fixups | Bryce Johnson | 2016-10-18 | 1 | -4/+4 |
* | Fix aesthetic issues on CROWD login. | Bryce Johnson | 2016-10-18 | 1 | -2/+2 |
* | Fix top border-radius of tabs. | Bryce Johnson | 2016-10-18 | 1 | -0/+5 |
* | Contain normal signin in loginbox. | Bryce Johnson | 2016-10-18 | 1 | -1/+3 |
* | Fix login tests for crowd to use #crowd. | Bryce Johnson | 2016-10-18 | 1 | -2/+2 |
* | Fix superfluous margin on new_ldap submit. | Bryce Johnson | 2016-10-18 | 1 | -1/+1 |
* | Use correct verbiage for username in login form. | Bryce Johnson | 2016-10-18 | 1 | -1/+1 |
* | Fix href to server pane. | Bryce Johnson | 2016-10-18 | 1 | -1/+1 |
* | Fix tab refs in ldap tabs. | Bryce Johnson | 2016-10-18 | 1 | -3/+3 |
* | Split login box into different panes, for ldap enabled screens. | Bryce Johnson | 2016-10-18 | 1 | -14/+15 |
* | Fix aesthetic issues on LDAP login. | Bryce Johnson | 2016-10-18 | 1 | -2/+2 |
* | Merge branch 'merge-conflicts-editor-2' into 'master' | Jacob Schatz | 2016-10-18 | 44 | -586/+1560 |
|\ | |||||
| * | Provide better error message to the usermerge-conflicts-editor-2 | Alfredo Sumaran | 2016-10-17 | 1 | -1/+1 |
| * | Merge branch 'master' into merge-conflicts-editor-2 | Alfredo Sumaran | 2016-10-17 | 21 | -150/+317 |
| |\ | |||||
| * \ | Merge branch 'master' into merge-conflicts-editor-2 | Sean McGivern | 2016-10-17 | 246 | -1531/+3847 |
| |\ \ | |||||
| * | | | Update CHANGELOG | Alfredo Sumaran | 2016-10-13 | 1 | -1/+0 |
| * | | | Add syntax highlighting to files | Alfredo Sumaran | 2016-10-13 | 1 | -0/+1 |
| * | | | Add blob_ace_mode to conflict content response | Sean McGivern | 2016-10-13 | 3 | -0/+17 |
| * | | | Fix discard message | Alfredo Sumaran | 2016-10-13 | 1 | -1/+1 |
| * | | | Update CHANGELOG | Alfredo Sumaran | 2016-10-13 | 1 | -0/+2 |
| * | | | Use plain JS to get elements and data and values | Alfredo Sumaran | 2016-10-13 | 1 | -5/+5 |
| * | | | Remove unused files | Alfredo Sumaran | 2016-10-13 | 2 | -550/+0 |
| * | | | Fix column limit on mysql | Alfredo Sumaran | 2016-10-13 | 1 | -1/+1 |
| * | | | Add more tests to check conflicts resolution | Alfredo Sumaran | 2016-10-13 | 4 | -51/+101 |
| * | | | Improve components for PhantomJs compatibility | Alfredo Sumaran | 2016-10-13 | 17 | -76/+140 |
| * | | | Use .some instead of .find for phantomjs compatibility | Alfredo Sumaran | 2016-10-13 | 1 | -9/+1 |
| * | | | Improve diff view switching and components | Alfredo Sumaran | 2016-10-13 | 6 | -61/+54 |
| * | | | Do not show Diff view switcher if all files are can be only resolved with an ... | Alfredo Sumaran | 2016-10-13 | 3 | -2/+15 |
| * | | | Ability to resolve conflicts for files with `text-editor` as conflict type | Alfredo Sumaran | 2016-10-13 | 7 | -159/+213 |
| * | | | Refactor JS code | Alfredo Sumaran | 2016-10-13 | 10 | -11/+545 |
| * | | | Fix editor spec | Sean McGivern | 2016-10-13 | 1 | -0/+1 |
| * | | | Add tests to check if files are resolved with Edit Inline mode | Alfredo Sumaran | 2016-10-13 | 1 | -0/+26 |
| * | | | check if files is set before counting | Alfredo Sumaran | 2016-10-13 | 1 | -0/+4 |
| * | | | Replace loading text with spinner | Alfredo Sumaran | 2016-10-13 | 2 | -3/+4 |
| * | | | Style for resolve conflicts form | Alfredo Sumaran | 2016-10-13 | 2 | -10/+21 |
| * | | | Styles for discard alert | Alfredo Sumaran | 2016-10-13 | 3 | -6/+18 |
| * | | | Replace textarea with Ace editor | Alfredo Sumaran | 2016-10-13 | 4 | -8/+30 |
| * | | | Implement editor to manually resolve merge conflicts | Alfredo Sumaran | 2016-10-13 | 11 | -73/+300 |
| * | | | We now support resolving conflicts with ambiguous markers | Douwe Maan | 2016-10-13 | 1 | -1/+0 |
| * | | | Simplify conflict file JSON creation | Sean McGivern | 2016-10-13 | 1 | -7/+15 |
| * | | | Add JSON Schema | Sean McGivern | 2016-10-13 | 2 | -0/+141 |
| * | | | Fix resolve service specs | Sean McGivern | 2016-10-13 | 1 | -2/+2 |
| * | | | Fix MR model spec | Sean McGivern | 2016-10-13 | 1 | -6/+6 |
| * | | | Fix specs | Sean McGivern | 2016-10-13 | 2 | -4/+4 |
| * | | | Make RuboCop happy | Sean McGivern | 2016-10-13 | 1 | -1/+0 |
| * | | | Allow setting content for resolutions | Sean McGivern | 2016-10-13 | 11 | -42/+395 |
| * | | | Add instrumentation to conflict classes | Sean McGivern | 2016-10-13 | 1 | -0/+1 |
* | | | | Merge branch 'fix-username-validator-endpoint' into 'master' | Stan Hu | 2016-10-17 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Update endpoint to username validator | Alfredo Sumaran | 2016-10-17 | 1 | -1/+1 |
* | | | | | Merge branch '21395-standarize-markdown-headlines' into 'master' | Annabel Dunstone Gray | 2016-10-17 | 3 | -24/+17 |
|\ \ \ \ \ | |/ / / / |/| | | | |