Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'release-4.7' into icu753 | Derrick Anderson | 2018-02-14 | 23 | -320/+420 |
|\ | |||||
| * | Merge branch 'XYZ-110' into release-4.7 | Derrick Anderson | 2018-02-14 | 5 | -28/+45 |
| |\ | |||||
| | * | Renamed file to match existing scheme | Jonathan Fritz | 2018-02-13 | 1 | -0/+0 |
| | * | Merge branch 'release-4.7' into XYZ-110 | Jonathan Fritz | 2018-02-13 | 87 | -1408/+1230 |
| | |\ | |||||
| | * | | Removed unused fields from ChannelMemberHistory table, introduced new model.C... | Jonathan Fritz | 2018-02-12 | 6 | -32/+45 |
| * | | | Merge branch 'translations-20180212' into release-4.7 | Derrick Anderson | 2018-02-14 | 14 | -244/+192 |
| |\ \ \ | |||||
| | * | | | translations PR 20180212 | Elias Nahum | 2018-02-12 | 14 | -244/+192 |
| * | | | | 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 |
|/ / / | |||||
* | | | 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 |
| |/ |/| | |||||
* | | 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 |
| |\ \ | |||||
| * | | | Eliminate utils.SetLicense calls (#8217) | Chris | 2018-02-07 | 14 | -665/+91 |
| * | | | ABC-132: sign error page parameters (#8197) | Chris | 2018-02-07 | 12 | -36/+226 |
| * | | | PLT-7537: Move channel CLI command posts system message to channel. (#8161) | Vordimous | 2018-02-07 | 6 | -8/+80 |
| * | | | XYZ-35: Added Support for GlobalRelay Compliance Export Format | Jonathan | 2018-02-07 | 17 | -51/+413 |
| * | | | allow plugins to set command hints (#8214) | Chris | 2018-02-07 | 1 | -0/+1 |
| * | | | Remove fmt.Println trace on api4 tests (#8212) | Jesús Espino | 2018-02-07 | 1 | -2/+1 |
| * | | | Abort on critical error during server startup (#8204) | Pierre de La Morinerie | 2018-02-07 | 9 | -14/+95 |
* | | | | Added invite_id field to email invite url, along with validation of this fiel... | Jonathan | 2018-02-12 | 5 | -13/+79 |