summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* ensure webpack dev server proxy connects regardless of request headersfix-webpack-dev-server-proxyMike Greiling2017-02-271-6/+6
* Merge branch 'remove-require-context-application-bundle' into 'master' Alfredo Sumaran2017-02-241-11/+170
|\
| * add missing require statement and don't require selfremove-require-context-application-bundleMike Greiling2017-02-231-1/+1
| * remove require.context from application.jsMike Greiling2017-02-231-11/+170
* | Merge branch 'user-callouts' into 'master' Filipa Lacerda2017-02-2410-0/+185
|\ \
| * | Corrected indentation on the template stringuser-calloutsJose Ivan Vargas2017-02-241-10/+9
| * | Fix failing specsAlfredo Sumaran2017-02-231-5/+9
| * | Modified the user_callout behaviourJose Ivan Vargas2017-02-237-45/+44
| * | Removed disabled rules from the user_callout_spec.jsJose Ivan Vargas2017-02-234-17/+12
| * | Moved the dismiss-icon listener to close the callout to a buttonJose Ivan Vargas2017-02-235-7/+7
| * | Changed the javascript class from using the global scope to exporting it via ...Jose Ivan Vargas2017-02-239-78/+73
| * | Added CHANGELOG and corrected linter errorsJose Ivan Vargas2017-02-235-4/+7
| * | Created unit tests, fixtures and integration testsJose Ivan Vargas2017-02-2310-33/+142
| * | Initial version of the user-calloutsJose Ivan Vargas2017-02-235-2/+83
* | | Merge branch 'remove-require-context-profile-bundle' into 'master' Alfredo Sumaran2017-02-241-3/+2
|\ \ \
| * | | remove require.context from profile_bundleremove-require-context-profile-bundleMike Greiling2017-02-231-3/+2
* | | | Merge branch 'remove-require-context-protected-branches-bundle' into 'master' Alfredo Sumaran2017-02-241-3/+5
|\ \ \ \
| * | | | remove require.context from protected_branches_bundleremove-require-context-protected-branches-bundleMike Greiling2017-02-231-3/+5
| |/ / /
* | | | Merge branch 'remove-require-context-snippet-bundle' into 'master' Alfredo Sumaran2017-02-241-4/+0
|\ \ \ \
| * | | | remove require.context from snippet_bundleremove-require-context-snippet-bundleMike Greiling2017-02-231-4/+0
| |/ / /
* | | | Merge branch 'remove-require-context-users-bundle' into 'master' Alfredo Sumaran2017-02-241-3/+1
|\ \ \ \
| * | | | remove require.context from users_bundleremove-require-context-users-bundleMike Greiling2017-02-231-3/+1
| |/ / /
* | | | Merge branch 'remove-jquery-ui-plugins' into 'master' Jacob Schatz2017-02-2413-63/+76
|\ \ \ \
| * | | | Removed jQuery UI highlight & autocompleteremove-jquery-ui-pluginsPhil Hughes2017-02-0913-63/+76
* | | | | Merge branch '28366-renamed-file-tooltip-contains-html' into 'master' Filipa Lacerda2017-02-242-2/+6
|\ \ \ \ \
| * | | | | Remove markup showing in tooltip for renamed files in diff view28366-renamed-file-tooltip-contains-htmlSam Rose2017-02-202-2/+6
* | | | | | Merge branch 'refactor-graphs-bundle' into 'master' Filipa Lacerda2017-02-248-558/+507
|\ \ \ \ \ \
| * | | | | | refactor stat_graph_contributors to es6 module syntaxrefactor-graphs-bundleMike Greiling2017-02-242-102/+100
| * | | | | | refactor stat_graph_contributors_graph to es6 module syntaxMike Greiling2017-02-244-282/+274
| * | | | | | refactor stat_graph_contributors_util to es6 module syntaxMike Greiling2017-02-244-137/+135
| * | | | | | remove unused StatGraph classMike Greiling2017-02-243-39/+0
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'boards-card-template-to-js' into 'master' Filipa Lacerda2017-02-246-74/+239
|\ \ \ \ \ \
| * | | | | | Fixed eslint errorsboards-card-template-to-jsPhil Hughes2017-02-232-11/+15
| * | | | | | Issue boards card in JSPhil Hughes2017-02-236-74/+235
* | | | | | | Merge branch '28367-fix-unfold-diff-line-number-copy-paste' into 'master' Jacob Schatz2017-02-242-2/+6
|\ \ \ \ \ \ \
| * | | | | | | fixes line number copy issue for unfolded parallel view diff28367-fix-unfold-diff-line-number-copy-pasteNur Rony2017-02-202-2/+6
* | | | | | | | Merge branch '27847-auth0-doc-typo' into 'master' Achilleas Pipinellis2017-02-241-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix typo in auth0.md doc 27847-auth0-doc-typoReb2017-02-081-1/+1
* | | | | | | | | Merge branch '12726-preserve-issues-after-deleting-users' into 'master' Douwe Maan2017-02-2418-18/+320
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix specs for the ghost user feature.12726-preserve-issues-after-deleting-usersTimothy Andrew2017-02-242-3/+5
| * | | | | | | | | Don't allow deleting a ghost user.Timothy Andrew2017-02-248-5/+59
| * | | | | | | | | Implement final review comments from @DouweM and @rymaiTimothy Andrew2017-02-246-61/+62
| * | | | | | | | | Remove the default value for the `users.ghost` database column.Timothy Andrew2017-02-242-7/+3
| * | | | | | | | | Implement review comments from @rymai and @yorickpeterseTimothy Andrew2017-02-244-81/+61
| * | | | | | | | | Use a `ghost` boolean to track ghost users.Timothy Andrew2017-02-246-6/+44
| * | | | | | | | | Implement review comments from @DouweM and @nick.thomas.Timothy Andrew2017-02-243-2/+85
| * | | | | | | | | Extract code from `Namespace#clean_path` for ghost user generation.Timothy Andrew2017-02-244-24/+42
| * | | | | | | | | Deleting a user shouldn't delete associated issues.Timothy Andrew2017-02-245-4/+129
| * | | | | | | | | Don't send notifications to ghost users.Timothy Andrew2017-02-241-0/+1
| * | | | | | | | | Add CE CHANGELOG for #12726.Timothy Andrew2017-02-241-0/+4
View Lorry Controller Status