summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* translations PR 20180215Elias Nahum2018-02-1514-61/+113
* Merge branch 'icu753' into release-4.7Derrick Anderson2018-02-143-41/+288
|\
| * Merge branch 'release-4.7' into icu753Derrick Anderson2018-02-1423-320/+420
| |\ | |/ |/|
* | Merge branch 'XYZ-110' into release-4.7Derrick Anderson2018-02-145-28/+45
|\ \
| * | Renamed file to match existing schemeJonathan Fritz2018-02-131-0/+0
| * | Merge branch 'release-4.7' into XYZ-110Jonathan Fritz2018-02-1387-1408/+1230
| |\ \
| * | | Removed unused fields from ChannelMemberHistory table, introduced new model.C...Jonathan Fritz2018-02-126-32/+45
* | | | Merge branch 'translations-20180212' into release-4.7Derrick Anderson2018-02-1414-244/+192
|\ \ \ \
| * | | | translations PR 20180212Elias Nahum2018-02-1214-244/+192
* | | | | Merge branch 'ICU-764' into release-4.7Derrick Anderson2018-02-142-45/+81
|\ \ \ \ \
| * | | | | gofmtStephen Kiers2018-02-131-2/+0
| * | | | | rerun jenkins?Stephen Kiers2018-02-131-0/+1
| * | | | | remove debug statementStephen Kiers2018-02-131-2/+0
| * | | | | Added more tests and simplified codeStephen Kiers2018-02-132-48/+57
| * | | | | Added another testStephen Kiers2018-02-121-0/+9
| * | | | | Fixes ICU-764Stephen Kiers2018-02-122-0/+21
| |/ / / /
* | | | | Merge branch 'jespino-XYZ-111' into release-4.7Derrick Anderson2018-02-143-3/+102
|\ \ \ \ \
| * | | | | Merge branch 'XYZ-111' of https://github.com/jespino/platform into jespino-XY...Derrick Anderson2018-02-143-3/+102
|/| | | | |
| * | | | | XYZ-111: Check max users per team on re-join after leave a teamJesús Espino2018-02-133-3/+102
| |/ / / /
* | | / / ping jenkinsDerrick Anderson2018-02-140-0/+0
| |_|/ / |/| | |
| | | * ICU-753 Added unit tests for messages with only push notificationsHarrison Healey2018-02-133-3/+27
| | | * ICU-753 Added unit tests for push notification contentsHarrison Healey2018-02-132-39/+262
| | | * ICU-753 Remove special behaviour for group messages in generic push notificat...Harrison Healey2018-02-131-2/+2
| |_|/ |/| |
* | | Merge branch 'ccbrown-rm-willnorris-proxy-support' into release-4.7Derrick Anderson2018-02-134-67/+14
|\ \ \ | |/ / |/| |
| * | Merge branch 'release-4.7' into rm-willnorris-proxy-supportChris2018-02-1286-1349/+1358
| |\ \ | |/ / |/| |
* | | Merge branch 'release-4.7-revertmaster' into release-4.7Derrick Anderson2018-02-1284-1345/+1216
|\ \ \ | |_|/ |/| |
| * | revert master changesDerrick Anderson2018-02-1284-1345/+1216
|/ /
* | Merge branch 'icu669' into release-4.7Derrick Anderson2018-02-122-4/+142
|\ \
| * \ Merge branch 'release-4.7' into icu669Derrick Anderson2018-02-1291-1234/+1527
| |\ \ | |/ / |/| |
| * | Fixed typo in unit testHarrison Healey2018-02-121-1/+1
| * | ICU-669 Handle relative links betterHarrison Healey2018-02-092-12/+19
| * | ICU-669 Ensured all URLs returned from OpenGraph are absoluteHarrison Healey2018-02-082-4/+135
| | * poke jenkinsChristopher Brown2018-02-120-0/+0
| | * remove willnorris/imageproxy supportChristopher Brown2018-02-124-66/+13
| |/ |/|
* | Merge branch 'master' into release-4.7Chris2018-02-1284-1216/+1345
|\ \
| * | Add tests for the `platform server` command (#8231)Pierre de La Morinerie2018-02-124-10/+89
| * | ABC-228 Update GetPosts caching to work for non-60 limits (#8233)Joram Wilander2018-02-092-7/+31
| * | Add /v4/image api (#8230)Chris2018-02-094-0/+82
| * | Merge branch 'release-4.7'Derrick Anderson2018-02-094-3/+4
| |\|
| * | Remove license globals entirely (#8229)Chris2018-02-0929-429/+256
| * | use mattermost fork of go-bindata (#8216)Chris2018-02-081-2/+2
| * | Add prepatory code for 4.8.0 (#8226)Derrick Anderson2018-02-081-0/+9
| * | fix client4 post sanitization (#8219)Chris2018-02-083-8/+67
| * | Merge branch 'release-4.7'Derrick Anderson2018-02-086-34/+34
| |\ \
| * | | Eliminate utils.SetLicense calls (#8217)Chris2018-02-0714-665/+91
| * | | ABC-132: sign error page parameters (#8197)Chris2018-02-0712-36/+226
| * | | PLT-7537: Move channel CLI command posts system message to channel. (#8161)Vordimous2018-02-076-8/+80
| * | | XYZ-35: Added Support for GlobalRelay Compliance Export FormatJonathan2018-02-0717-51/+413
| * | | allow plugins to set command hints (#8214)Chris2018-02-071-0/+1
| * | | Remove fmt.Println trace on api4 tests (#8212)Jesús Espino2018-02-071-2/+1