Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | Merge branch 'ICU-764' into release-4.7 | Derrick Anderson | 2018-02-14 | 2 | -45/+81 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | gofmt | Stephen Kiers | 2018-02-13 | 1 | -2/+0 | |
| | * | | | | | | | | | | | rerun jenkins? | Stephen Kiers | 2018-02-13 | 1 | -0/+1 | |
| | * | | | | | | | | | | | remove debug statement | Stephen Kiers | 2018-02-13 | 1 | -2/+0 | |
| | * | | | | | | | | | | | Added more tests and simplified code | Stephen Kiers | 2018-02-13 | 2 | -48/+57 | |
| | * | | | | | | | | | | | Added another test | Stephen Kiers | 2018-02-12 | 1 | -0/+9 | |
| | * | | | | | | | | | | | Fixes ICU-764 | Stephen Kiers | 2018-02-12 | 2 | -0/+21 | |
| | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | | Merge branch 'jespino-XYZ-111' into release-4.7 | Derrick Anderson | 2018-02-14 | 3 | -3/+102 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | Merge branch 'XYZ-111' of https://github.com/jespino/platform into jespino-XY... | Derrick Anderson | 2018-02-14 | 3 | -3/+102 | |
| |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | XYZ-111: Check max users per team on re-join after leave a team | Jesús Espino | 2018-02-13 | 3 | -3/+102 | |
| | |/ / / / / / / / / / | ||||||
| * | | / / / / / / / / | ping jenkins | Derrick Anderson | 2018-02-14 | 0 | -0/+0 | |
| | |_|/ / / / / / / / | |/| | | | | | | | | | ||||||
| | | | * | | | | | | | ICU-753 Added unit tests for messages with only push notifications | Harrison Healey | 2018-02-13 | 3 | -3/+27 | |
| | | | * | | | | | | | ICU-753 Added unit tests for push notification contents | Harrison Healey | 2018-02-13 | 2 | -39/+262 | |
| | | | * | | | | | | | ICU-753 Remove special behaviour for group messages in generic push notificat... | Harrison Healey | 2018-02-13 | 1 | -2/+2 | |
| | |_|/ / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | always return non-nil client license (#8317) | Chris | 2018-02-16 | 1 | -3/+5 | |
* | | | | | | | | | | [PLT-539] Update incoming webhooks to accept multipart/form-data content (#7873) | Carlos Tadeu Panato Junior | 2018-02-16 | 4 | -18/+57 | |
* | | | | | | | | | | Upgrading server dependancies (#8308) | Christopher Speller | 2018-02-16 | 602 | -129158/+23070 | |
* | | | | | | | | | | Send systemd READY notification (#8296) | Pierre de La Morinerie | 2018-02-15 | 2 | -0/+96 | |
* | | | | | | | | | | PLT-8723: Fix DeadLock on reactions insertions (#8225) | Jesús Espino | 2018-02-15 | 1 | -6/+20 | |
* | | | | | | | | | | XYZ-114 Adding mandatory membership to town-square in bulk-import (#8274) | Jesús Espino | 2018-02-15 | 1 | -0/+6 | |
* | | | | | | | | | | Modified advanced mail implementation to properly support multiple attachment... | Jonathan | 2018-02-15 | 2 | -16/+36 | |
* | | | | | | | | | | Wait for goroutines to finish before shuting down server (#8259) | Pierre de La Morinerie | 2018-02-14 | 1 | -5/+15 | |
* | | | | | | | | | | Merge branch 'release-4.7-t3merge3' | Derrick Anderson | 2018-02-14 | 4 | -64/+149 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | ||||||
| * | | | | | | | | | gofmt | Derrick Anderson | 2018-02-13 | 4 | -4/+4 | |
| * | | | | | | | | | Merge release-4.7 with master in side branch | Derrick Anderson | 2018-02-13 | 7 | -68/+153 | |
|/| | | | | | | | | | |/ / / / / / / / | ||||||
| * | | | | | | | | Merge branch 'ccbrown-rm-willnorris-proxy-support' into release-4.7 | Derrick Anderson | 2018-02-13 | 4 | -67/+14 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | ||||||
| | * | | | | | | | Merge branch 'release-4.7' into rm-willnorris-proxy-support | Chris | 2018-02-12 | 86 | -1349/+1358 | |
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | Merge branch 'release-4.7-revertmaster' into release-4.7 | Derrick Anderson | 2018-02-12 | 84 | -1345/+1216 | |
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | ||||||
| | * | | | | | | | revert master changes | Derrick Anderson | 2018-02-12 | 84 | -1345/+1216 | |
| |/ / / / / / / | ||||||
| * | | | | | | | Merge branch 'icu669' into release-4.7 | Derrick Anderson | 2018-02-12 | 2 | -4/+142 | |
| |\ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | Merge branch 'release-4.7' into icu669 | Derrick Anderson | 2018-02-12 | 91 | -1234/+1527 | |
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | ||||||
| | * | | | | | | | Fixed typo in unit test | Harrison Healey | 2018-02-12 | 1 | -1/+1 | |
| | * | | | | | | | ICU-669 Handle relative links better | Harrison Healey | 2018-02-09 | 2 | -12/+19 | |
| | * | | | | | | | ICU-669 Ensured all URLs returned from OpenGraph are absolute | Harrison Healey | 2018-02-08 | 2 | -4/+135 | |
| | | * | | | | | | poke jenkins | Christopher Brown | 2018-02-12 | 0 | -0/+0 | |
| | | * | | | | | | remove willnorris/imageproxy support | Christopher Brown | 2018-02-12 | 4 | -66/+13 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | XYZ-110: Cherrypicking changes from release-4.7 to master (#8254) | Jonathan | 2018-02-13 | 6 | -32/+45 | |
| |_|_|_|_|_|/ |/| | | | | | | ||||||
* | | | | | | | ABC-176 Prevent changing PluginSettings.EnableUploads through the API (#8249) | Joram Wilander | 2018-02-13 | 4 | -2/+39 | |
| |_|_|_|_|/ |/| | | | | | ||||||
* | | | | | | Merge branch 'release-4.7-t4merge' | Derrick Anderson | 2018-02-12 | 7 | -18/+100 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Merge remote-tracking branch 'origin/release-4.7' into release-4.7-t4merge | Derrick Anderson | 2018-02-12 | 7 | -18/+100 | |
|/| | | | | | | |/ / / / / | ||||||
| * | | | | | Merge branch 'master' into release-4.7 | Chris | 2018-02-12 | 84 | -1216/+1345 | |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
* | | | | | | Add tests for the `platform server` command (#8231) | Pierre de La Morinerie | 2018-02-12 | 4 | -10/+89 | |
* | | | | | | ABC-228 Update GetPosts caching to work for non-60 limits (#8233) | Joram Wilander | 2018-02-09 | 2 | -7/+31 | |
* | | | | | | Add /v4/image api (#8230) | Chris | 2018-02-09 | 4 | -0/+82 | |
* | | | | | | Merge branch 'release-4.7' | Derrick Anderson | 2018-02-09 | 4 | -3/+4 | |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
* | | | | | | Remove license globals entirely (#8229) | Chris | 2018-02-09 | 29 | -429/+256 | |
* | | | | | | use mattermost fork of go-bindata (#8216) | Chris | 2018-02-08 | 1 | -2/+2 | |
* | | | | | | Add prepatory code for 4.8.0 (#8226) | Derrick Anderson | 2018-02-08 | 1 | -0/+9 | |
* | | | | | | fix client4 post sanitization (#8219) | Chris | 2018-02-08 | 3 | -8/+67 | |
* | | | | | | Merge branch 'release-4.7' | Derrick Anderson | 2018-02-08 | 6 | -34/+34 | |
|\ \ \ \ \ \ |