summaryrefslogtreecommitdiffstats
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* MM-8710: Web Hub optimizations (#8293)Chris2018-02-201-50/+83
* MM-9556 Added ability to upload files without a multipart request (#8306)Harrison Healey2018-02-201-9/+30
* Remove unnecesary lineJesús Espino2018-02-191-1/+0
* merge 4.7.1 to masterSaturnino Abril2018-02-194-87/+465
|\
| * Merge branch 'release-4.7' into icu753Derrick Anderson2018-02-145-58/+189
| |\
| | * Merge branch 'XYZ-110' into release-4.7Derrick Anderson2018-02-141-10/+10
| | |\
| | | * Merge branch 'release-4.7' into XYZ-110Jonathan Fritz2018-02-1320-487/+81
| | | |\
| | | * | Removed unused fields from ChannelMemberHistory table, introduced new model.C...Jonathan Fritz2018-02-121-10/+10
| | * | | 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 'XYZ-111' of https://github.com/jespino/platform into jespino-XY...Derrick Anderson2018-02-142-3/+98
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | XYZ-111: Check max users per team on re-join after leave a teamJesús Espino2018-02-132-3/+98
| | | |/ /
| * | | | ICU-753 Added unit tests for messages with only push notificationsHarrison Healey2018-02-132-1/+25
| * | | | 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
* | | | XYZ-114 Adding mandatory membership to town-square in bulk-import (#8274)Jesús Espino2018-02-151-0/+6
* | | | gofmtDerrick Anderson2018-02-132-2/+2
* | | | Merge release-4.7 with master in side branchDerrick Anderson2018-02-133-63/+147
|\| | |
| * | | Merge branch 'release-4.7' into rm-willnorris-proxy-supportChris2018-02-1220-427/+213
| |\| |
| | * | revert master changesDerrick Anderson2018-02-1218-423/+71
| | |/
| | * Merge branch 'release-4.7' into icu669Derrick Anderson2018-02-1222-76/+517
| | |\
| | * | 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
| * | | remove willnorris/imageproxy supportChristopher Brown2018-02-122-63/+9
| | |/ | |/|
* / | XYZ-110: Cherrypicking changes from release-4.7 to master (#8254)Jonathan2018-02-131-10/+10
|/ /
* | Merge branch 'master' into release-4.7Chris2018-02-1218-71/+423
|\ \
| * | Add tests for the `platform server` command (#8231)Pierre de La Morinerie2018-02-121-2/+9
| * | Remove license globals entirely (#8229)Chris2018-02-0910-38/+197
| * | Eliminate utils.SetLicense calls (#8217)Chris2018-02-074-21/+19
| * | ABC-132: sign error page parameters (#8197)Chris2018-02-073-8/+111
| * | PLT-7537: Move channel CLI command posts system message to channel. (#8161)Vordimous2018-02-072-4/+30
| * | XYZ-35: Added Support for GlobalRelay Compliance Export FormatJonathan2018-02-071-0/+1
| * | allow plugins to set command hints (#8214)Chris2018-02-071-0/+1
| * | Abort on critical error during server startup (#8204)Pierre de La Morinerie2018-02-074-7/+64
| |/
* | Added invite_id field to email invite url, along with validation of this fiel...Jonathan2018-02-123-0/+73
* | minor addition to #8238Christopher Brown2018-02-092-5/+7
* | Don't proxy same-site image urls (#8238)Chris2018-02-092-2/+16
|/
* add App.License, remove utils.IsLicensed / utils.License calls (#8203)Chris2018-02-0615-38/+45
* handle RateLimiter initialization errors (#8199)Pierre de La Morinerie2018-02-053-9/+28
* Add missing diagnostics for v4.7 (#8195)Jason Blais2018-02-051-1/+5
* ABC-179: check email verification last (#8172)Jesse Hallam2018-02-051-5/+25
* Update zoom plugin to latest (#8194)Joram Wilander2018-02-023-6/+6
* Fix panic when invalid types used in post props (#8191)Joram Wilander2018-02-021-6/+6