summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | fix contains merge conflicts buttonRegis2017-03-031-2/+1
| * | | | | | | | | Improve CSS for treeview with pipelines to make it responsibleFilipa Lacerda2017-03-042-40/+33
| * | | | | | | | | add grey lines - adequate spacing for action buttonsRegis2017-03-034-34/+104
| * | | | | | | | | Merge branch 'master' into widget-widget-widget-funFilipa Lacerda2017-03-03197-1399/+1449
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Change the size of CI icon in MR heading [ci skip]Filipa Lacerda2017-02-282-1/+6
| * | | | | | | | | | Merge branch 'master' into widget-widget-widget-funRegis2017-02-27428-3528/+4009
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | shape header - bold correct text - border radius - white background for the r...Regis2017-02-172-3/+11
* | | | | | | | | | | | Merge branch '26371-native-emojis-v3' into 'master' Filipa Lacerda2017-03-071817-2246/+2799
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix up @DouweM reviewEric Eastwood2017-03-062-1/+4
| * | | | | | | | | | | | Fix wrong image src with cached gl-emoji and relative rootEric Eastwood2017-03-061-3/+14
| * | | | | | | | | | | | Fix up potential for build finish event to fire for wrong menuEric Eastwood2017-03-061-4/+3
| * | | | | | | | | | | | Fix up off index when reading canvas and something failedEric Eastwood2017-03-061-3/+6
| * | | | | | | | | | | | Fix up emoji not being next to autocomplete labelEric Eastwood2017-03-061-0/+7
| * | | | | | | | | | | | Fix emoji cut-off line-heightEric Eastwood2017-03-063-4/+3
| * | | | | | | | | | | | Fix up `watch` alias lookup in FirefoxEric Eastwood2017-03-062-2/+3
| * | | | | | | | | | | | Use native unicode emojisEric Eastwood2017-03-0624-2247/+2777
| * | | | | | | | | | | | Add emoji images (generated from `rake gemojione:sprite`)Eric Eastwood2017-03-061792-0/+0
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'use-publish-to-post-notifications' into 'master' Rémy Coutable2017-03-071-8/+5
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Update notification codeKamil Trzcinski2017-03-061-6/+4
| * | | | | | | | | | | | Add support for Workhorse notificationsKamil Trzcinski2017-03-031-6/+5
* | | | | | | | | | | | | Restore keyboard shortcuts for "Activity" and "Charts"Kushal Pandya2017-03-063-4/+34
| |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'rs-carrierwave-db' into 'master' Douwe Maan2017-03-0611-1/+165
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 'rs-carrierwave-db'rs-carrierwave-dbDouwe Maan2017-03-0615-6/+148
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Add `has_many` associations for models that can have Upload recordsRobert Speicher2017-03-064-0/+4
| * | | | | | | | | | | | Handle relative and absolute Upload paths in the UploadersRobert Speicher2017-03-063-6/+45
| * | | | | | | | | | | | Add `RecordsUploads` module to record Upload records via callbacksRobert Speicher2017-03-064-0/+46
| * | | | | | | | | | | | Add Upload model and UploadChecksumWorker workerRobert Speicher2017-03-062-0/+75
* | | | | | | | | | | | | Merge branch 'remove-subscribe-label-tooltip' into 'master' Alfredo Sumaran2017-03-061-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Remove tooltips and titles from label subscription buttonsremove-subscribe-label-tooltipAnnabel Dunstone Gray2017-03-031-2/+2
* | | | | | | | | | | | | Merge branch 'zj-create-mattermost-team' into 'master' Kamil Trzciński2017-03-0615-6/+148
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix JS linting errorzj-create-mattermost-teamZ.J. van de Weg2017-03-061-1/+1
| * | | | | | | | | | | | Fix no out element caseZ.J. van de Weg2017-03-061-0/+3
| * | | | | | | | | | | | Merge branch 'master' into 'zj-create-mattermost-team'Zeger-Jan van de Weg2017-03-0619-39/+68
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Fix eslintZ.J. van de Weg2017-03-063-7/+4
| * | | | | | | | | | | | Merge branch 'master' into zj-create-mattermost-teamZ.J. van de Weg2017-03-06306-1054/+989
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Minor edits, incorporate reviewZ.J. van de Weg2017-03-061-1/+1
| * | | | | | | | | | | | Fix linter errorsZ.J. van de Weg2017-03-032-2/+2
| * | | | | | | | | | | | Merge branch 'master' into 'zj-create-mattermost-team'Luke "Jared" Bennett2017-03-0215-122/+131
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Corrected JS for new master js build updates [ci skip]Luke "Jared" Bennett2017-03-024-7/+8
| * | | | | | | | | | | | Merge branch 'master' into zj-create-mattermost-teamZ.J. van de Weg2017-03-02180-1882/+2485
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Improve UXZ.J. van de Weg2017-03-026-25/+30
| * | | | | | | | | | | | | Review changesLuke "Jared" Bennett2017-02-284-6/+6
| * | | | | | | | | | | | | Fix testsZ.J. van de Weg2017-02-245-12/+21
| * | | | | | | | | | | | | Merge branch 'master' into zj-create-mattermost-teamZ.J. van de Weg2017-02-24198-1099/+1429
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Finished up mattermost team creationzj-create-mattermost-team-lbLuke "Jared" Bennett2017-02-226-15/+61
| * | | | | | | | | | | | | | Merge branch 'master' into zj-create-mattermost-teamZ.J. van de Weg2017-02-20235-2296/+2216
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Transactional mattermost team creationZ.J. van de Weg2017-02-206-34/+29
| * | | | | | | | | | | | | | | Sends checkbox parameters as booleanFilipa Lacerda2017-02-161-1/+1
| * | | | | | | | | | | | | | | Fix form fields to bing to correct modelFilipa Lacerda2017-02-161-6/+6
| * | | | | | | | | | | | | | | Improve DRYness of viewsZ.J. van de Weg2017-02-167-41/+37
View Lorry Controller Status