summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Fix spelling of occurredjramsay-spelling-occurredJames Ramsay2017-09-2614-17/+17
* Merge branch 'changes-bar-dynamic-placeholder' into 'master'Filipa Lacerda2017-09-263-16/+32
|\
| * refactor tests to actually test browser behaviourPhil Hughes2017-09-251-1/+1
| * removed commented out CSSPhil Hughes2017-09-252-6/+1
| * spec fixesPhil Hughes2017-09-221-0/+6
| * Dynamically create offset for sticky barPhil Hughes2017-09-222-12/+27
* | Moves cycle analytics components into vue filesFilipa Lacerda2017-09-2618-432/+399
* | Merge branch 'remove-old-nav-styles' into 'master'Phil Hughes2017-09-268-141/+83
|\ \
| * | Fix UI bugsremove-old-nav-stylesAnnabel Dunstone Gray2017-09-253-12/+15
| * | Remove all old sub nav barsAnnabel Dunstone Gray2017-09-252-6/+4
| * | Combine all search releated CSSAnnabel Dunstone Gray2017-09-252-110/+47
| * | Remove unused admin subnavsAnnabel Dunstone Gray2017-09-252-34/+36
| * | Move new nav into main CSS folderAnnabel Dunstone Gray2017-09-253-0/+2
* | | Merge branch 'winh-user-dropdown-nowrap' into 'master'Phil Hughes2017-09-261-0/+8
|\ \ \
| * | | Avoid wrapping users in dropdownwinh-user-dropdown-nowrapWinnie Hellmann2017-09-211-0/+8
* | | | Merge branch '31094-define-color-priorities' into 'master'Annabel Dunstone Gray2017-09-2612-58/+58
|\ \ \ \
| * | | | Update light colors, remove ’25’ and add ‘950’ shades31094-define-color-prioritiesPedro Moreira da Silva2017-09-2312-58/+58
* | | | | Merge branch 'acet-repo-editor-fix-reopening-existing-file' into 'master'Jacob Schatz2017-09-251-1/+1
|\ \ \ \ \
| * | | | | RepoEditor: Fix reopening the existing file on refresh.acet-repo-editor-fix-reopening-existing-fileFatih Acet2017-09-221-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'docs/chmod-644' into 'master'Rémy Coutable2017-09-251-0/+0
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Check for exec permissions also in app/docs/chmod-644Achilleas Pipinellis2017-09-251-0/+0
* | | | | Removes cycle analytics service and store from global namespaceFilipa Lacerda2017-09-253-59/+49
* | | | | Merge branch 'fly-out-nav-mousepos-error' into 'master'Filipa Lacerda2017-09-251-1/+1
|\ \ \ \ \
| * | | | | spec fixesfly-out-nav-mousepos-errorPhil Hughes2017-09-221-1/+1
| * | | | | Fixed fly-out error if mousePos array is emptyPhil Hughes2017-09-221-1/+1
| | |_|_|/ | |/| | |
* | | | | Remove navbar gradient37287-remove-nav-gradientAnnabel Dunstone Gray2017-09-221-2/+2
| |_|_|/ |/| | |
* | | | Removed old icons from project pagePhil Hughes2017-09-222-7/+2
|/ / /
* | | Merge branch '32782-i18n-support-pagination' into 'master'Tim Zallmann2017-09-221-4/+6
|\ \ \
| * | | Add i18n support for pagination testkushalpandya2017-09-211-4/+6
* | | | Merge branch 'emoji-dom-size' into 'master'Fatih Acet2017-09-222-6/+43
|\ \ \ \ | |_|/ / |/| | |
| * | | Remove eslint-disable, and use arrow function.emoji-dom-sizeBryce Johnson2017-09-201-3/+2
| * | | Reverse order in showMenuElement for readability.Bryce Johnson2017-09-201-2/+2
| * | | Move display:none to emoji-menu base class.Bryce Johnson2017-09-201-4/+1
| * | | Remove emoji-menu from the render tree when hidden.Bryce Johnson2017-09-192-6/+47
* | | | Resolve "Better SVG Usage in the Frontend"Tim Zallmann2017-09-2232-80/+3425
* | | | Merge branch 'acet-fix-double-note-render' into 'master'Jacob Schatz2017-09-223-9/+26
|\ \ \ \
| * | | | Fix rendering double note issue.Fatih Acet2017-09-223-9/+26
| | |_|/ | |/| |
* | | | IssueNotes: Switch back to Write pane when note cancel or submit.acet-switch-markdown-paneFatih Acet2017-09-221-1/+3
|/ / /
* | | Merge branch 'acet-fix-comment-form-resize' into 'master'Jacob Schatz2017-09-211-0/+8
|\ \ \
| * | | IssueNotes: Resize comment form after note submit and discard.acet-fix-comment-form-resizeFatih Acet2017-09-211-0/+8
| |/ /
* | | Standardize access to CSRF token in JavaScriptBryce Johnson2017-09-214-12/+63
* | | Merge branch 'force-two-up-view' into 'master'Filipa Lacerda2017-09-211-6/+14
|\ \ \
| * | | Force two up viewClement Ho2017-09-201-6/+14
* | | | Merge branch '37220-es-modules' into 'master'Phil Hughes2017-09-2135-534/+563
|\ \ \ \
| * | | | Exports all the methods in the same place37220-es-modulesFilipa Lacerda2017-09-181-25/+28
| * | | | Merge branch 'master' into 37220-es-modulesMike Greiling2017-09-1826-252/+540
| |\ \ \ \
| * | | | | Fix context for jquery eventFilipa Lacerda2017-09-151-7/+5
| * | | | | fixed todos specPhil Hughes2017-09-121-11/+6
| * | | | | Merge branch 'master' into 37220-es-modulesFilipa Lacerda2017-09-1212-41/+33
| |\ \ \ \ \
| * | | | | | Import modules instead of using the ones in global namespaceFilipa Lacerda2017-09-0926-85/+105
View Lorry Controller Status