summaryrefslogtreecommitdiffstats
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* PLT-7567: Integration of Team Icons (#8284)Christian Hoff2018-03-011-0/+90
| | | | | | | | | | * PLT-7567: Integration of Team Icons * PLT-7567: Read replica workaround, upgrade logic moved, more concrete i18n key * PLT-7567: Read replica workaround, corrections * PLT-7567: upgrade correction
* Fix forward 80 to 443 to not bind on all interfaces. (#8360)Christopher Speller2018-02-231-12/+17
|
* fix scheduled task race (#8355)Chris2018-02-231-5/+13
|
* 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-228-20/+27
| | | | | | | | * remove global site url * missed one * revert mysterious change
* Fix push notification content for file only messages (#8346)Joram Wilander2018-02-222-2/+12
|
* MM-8681 Adding config settings necessary for using CloudFront. (#8307)Christopher Speller2018-02-203-0/+15
| | | | | | * Adding config settings nessisary for using CloudFront. * Adding new config settings to diagnostics.
* MM-8710: Web Hub optimizations (#8293)Chris2018-02-201-50/+83
| | | | | | | | | | | | * webhub optimizations * test fix * minor fix * big perf improvement to ToJson after precomputing * fix hub connection count
* MM-9556 Added ability to upload files without a multipart request (#8306)Harrison Healey2018-02-201-9/+30
| | | | | | * MM-9556 Added ability to upload files without a multipart request * MM-9556 Handled some unusual test behaviour
* 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 ↵Jonathan Fritz2018-02-121-10/+10
| | | | | | | | | | | | | | | | | | | | model.ChannelMemberHistoryResult object that includes those fields that are selected from a join on other tables
| | * | | 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 ↵Derrick Anderson2018-02-142-3/+98
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | jespino-XYZ-111
| | | * | | 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 ↵Harrison Healey2018-02-131-2/+2
| |/ / / | | | | | | | | | | | | notifications
* | | | 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
|/ / | | | | | | | | | | | | | | * Cherry-picking 7b2861de3a09cf00d00b0872cc537d54302c4bfa to master because enterprise/master has code in it that enterprise/release-4.7 does not, and I don't want enterprise/master to break the next time somebody merges enterprise/release-4.7 to enterprise/master * Renamed file to match existing scheme (cherry picked from commit 8c22c5c6c6f835a6e73faf19036bad2a51bb9127)
* | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Cleanup app state on initialization error When returning an initialization error, the app state was not cleaned up. This is especially visible during tests, as `appCount` is not decremented, and makes the new app initialization fail. * Test the `platform server` command As the `platform server` command only exits when interrupted by a signal, it is not possible to test it as the other cobra commands. Instead we directly test the actual command function. The internal command handler is slighly refactored to take a channel in argument, and registers it as the signal handler. Nothing very different—except than controlling this channel from the outside allows the test to send the system signal itself, thus preventing the server to run forever.
| * | Remove license globals entirely (#8229)Chris2018-02-0910-38/+197
| | | | | | | | | | | | | | | | | | | | | | | | * remove license globals entirely * fix infinite recursion * test fix
| * | Eliminate utils.SetLicense calls (#8217)Chris2018-02-074-21/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * eliminate utils.SetLicense calls * test fix * another test fix * more test fixes
| * | ABC-132: sign error page parameters (#8197)Chris2018-02-073-8/+111
| | | | | | | | | | | | | | | | | | * sign error page parameters * add comments
| * | PLT-7537: Move channel CLI command posts system message to channel. (#8161)Vordimous2018-02-072-4/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [PTL-7537] implement feature and test * [PTL-7537] Update feature to post the the room requiring a username flag to be used * [PTL-7537] update tests with username * update test to remove changes to the test helper struct * use the basic team and user
| * | XYZ-35: Added Support for GlobalRelay Compliance Export FormatJonathan2018-02-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | * Added username to ChannelMemberHistory struct in anticipation of supporting GlobalRelay in Compliance Export * Removed translation from debug output - this makes it complicated to use utils functions from tests in the enterprise repo * Added an advanced email function that allows for greater control over message details. Updated MessageExport config to support GlobalRelay. Added attachment support to InBucket unit tests * Moving templates in from enterprise to solve test issues * Added export format to diagnostics * Changed email attachment code to use FileBackend so that S3 storage is properly supported
| * | 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
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only a handful of critical errors are present in the codebase. They all occur during server startup (in `app.StartServer()`). Currently, when one of these critical error occurs, it is simpled mentionned in the logs – then the error is discarded, and the app attempts to continue the execution (and probably fails pretty quickly in a weird way). Rather than continuing operations in an unknow state, these errors should trigger a clean exit. This commit rewrites critical startup errors to be correctly propagated, logged, and then terminate the command execution. Additionnaly, it makes the server return a proper error code to the shell.
* | Added invite_id field to email invite url, along with validation of this ↵Jonathan2018-02-123-0/+73
| | | | | | | | field on the server (#8235)
* | minor addition to #8238Christopher Brown2018-02-092-5/+7
| |
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-06-26 07:41:23 +0000