summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | MM-9698 Fixing Minio with server side encryption. (#8367)Christopher Speller2018-02-262-7/+39
* | | | | | | | add individual platform packaging targets (#8366)Chris2018-02-262-9/+7
* | | | | | | | Fix forward 80 to 443 to not bind on all interfaces. (#8360)Christopher Speller2018-02-231-12/+17
* | | | | | | | Merge branch 'merge47intomaster'Derrick Anderson2018-02-231-2/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Merge remote-tracking branch 'origin/release-4.7' into merge47intomasterDerrick Anderson2018-02-231-2/+4
|/| | | | | | | |
| * | | | | | | | Change log level of 404s to DEBUG (#8339)Joram Wilander2018-02-211-2/+4
* | | | | | | | | fix scheduled task race (#8355)Chris2018-02-233-208/+70
* | | | | | | | | MM-8593 Default APIv3 to disabled for new installs (#8353)Joram Wilander2018-02-234-1/+4
* | | | | | | | | Fall back to constructured URL for OAuth SSO if SiteURL not set (#8352)Joram Wilander2018-02-231-1/+6
* | | | | | | | | Remove global site url (#8343)Chris2018-02-2212-35/+32
* | | | | | | | | Fix push notification content for file only messages (#8346)Joram Wilander2018-02-223-2/+16
* | | | | | | | | Adding saml migration command (#8263)Jesús Espino2018-02-213-28/+176
* | | | | | | | | MM-8681 Adding config settings necessary for using CloudFront. (#8307)Christopher Speller2018-02-208-0/+43
* | | | | | | | | Update en.json (#8332)Jason Blais2018-02-201-1/+1
* | | | | | | | | MM-8710: Web Hub optimizations (#8293)Chris2018-02-203-50/+156
* | | | | | | | | MM-9556 Added ability to upload files without a multipart request (#8306)Harrison Healey2018-02-208-36/+242
* | | | | | | | | Added t.Helper to CheckXStatus test functions (#8305)Harrison Healey2018-02-201-21/+28
* | | | | | | | | translations PR 20180220 (#8334)enahum2018-02-2014-241/+345
* | | | | | | | | Merge branch 'merge-4.7'Derrick Anderson2018-02-1920-376/+770
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Remove unnecesary lineJesús Espino2018-02-191-1/+0
| * | | | | | | | merge 4.7.1 to masterSaturnino Abril2018-02-1920-376/+771
|/| | | | | | | | | |/ / / / / / /
| * | | | | | | Merge branch 'mm-9633' into release-4.7Derrick Anderson2018-02-163-1/+13
| |\ \ \ \ \ \ \
| | * | | | | | | Add upgrade code from 4.7.0 to 4.7.1JoramWilander2018-02-162-0/+13
| | * | | | | | | Remove bad field from ChannelMemberHistory modelJoramWilander2018-02-161-1/+0
| |/ / / / / / /
| * | | | | | | Merge branch 'translations-20180215' into release-4.7Derrick Anderson2018-02-1414-61/+113
| |\ \ \ \ \ \ \
| | * | | | | | | 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
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | always return non-nil client license (#8317)Chris2018-02-161-3/+5
* | | | | | | | | | [PLT-539] Update incoming webhooks to accept multipart/form-data content (#7873)Carlos Tadeu Panato Junior2018-02-164-18/+57