summaryrefslogtreecommitdiffstats
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | 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
| | | |
* | | | Don't proxy same-site image urls (#8238)Chris2018-02-092-2/+16
|/ / / | | | | | | | | | | | | | | | * don't proxy same-site urls * fix empty site url case
* | / 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
| | | | | | | | | | Previously, an error occuring in NewRateLimiter would return a nil reference – which would be de-referenced just after, making the server crash.
* | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ABC-179: check email verification last This change changes the authentication checks to be: * "preflight checks" ** mfa ** not disabled ** login attempts * password * "postflight checks" ** email verified Checking whether the email is verified or not last avoids the weird edge case where entering any bogus password for an account with an unverified email shows a message about verifying the email and offering to resend. * fix invalid unit test assertion Client.CreateUser returns a user whose password has been sanitized. Adopt the pattern in the previous assertions to use a new variable name and test the password on the original model.User object. This didn't expose any underlying broken behaviour, but the test wouldn't have caught it if it had regressed. Also fix a minor typo.
* | 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
| |
* | ABC-153: don't use http redirects with 4xx/5xx status codes (#8178)Chris2018-02-021-1/+1
| | | | | | | | | | | | * don't use http redirects with 4xx/5xx status codes * minor html syntax fix
* | fix image url replacement for blank urls (#8184)Chris2018-02-012-1/+7
| |
* | [PLT-8494] Add delete_team websocket event (#8167)Saturnino Abril2018-02-011-4/+8
| | | | | | | | | | | | * add delete_team websocket event * add to PermanentDeleteTeam
* | User based rate limiting (#8152)Christopher Speller2018-01-315-30/+318
| |
* | ABC-79: Optimize channel autocomplete query (#8163)Chris2018-01-311-0/+8
| | | | | | | | | | | | * optimize channel autocomplete query * move to new autocomplete endpoint
* | Moving to golang.org/x/crypto/acme/autocert for Let's Encrypt functionality. ↵Christopher Speller2018-01-301-13/+28
| | | | | | | | (#8165)
* | Used a consistent tense for system messages (#8079)Harrison Healey2018-01-261-1/+1
|/
* PLT-3658 Added support for Slack attachments in outgoing webhook response ↵Joey Lee2018-01-261-2/+13
| | | | (#7774) (#8102)
* XYZ-32: Increases size of position to 128 characters. (#8148)Martin Kraft2018-01-261-1/+1
| | | | | | | | | | * XYZ-32: Changes type of 'position' column on 'users' table. * XYZ-32: Uncomment to run on CI and pre-release. * XYZ-32: Reverts translation changes. * XYZ-32: Fix for gofmt.
* Add GET /emojis/name/{emoji_name} API endpoint (#8142)Joram Wilander2018-01-241-0/+16
|
* [ICU-621] Add ExperimentalGroupUnreadChannels setting (#8127)enahum2018-01-231-0/+1
| | | | | | * Add ExperimentalGroupUnreadChannels setting * track ExperimentalGroupUnreadChannels in diagnostics
* Merge branch 'release-4.6'Harrison Healey2018-01-233-33/+64
|\
| * Update diagnostics.go for 4.6 release (#8082)Jason Blais2018-01-101-27/+40
| | | | | | | | | | | | * Update diagnostics.go * Fix formatting error
| * PLT-8522 Added separate messages for being removed from channel or team (#8078)Harrison Healey2018-01-102-6/+24
| |
* | use markdown parsing to identify mentions (#8139)Chris2018-01-232-392/+338
| |
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-30 23:29:18 +0000