Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | translations PR 20180215 | Elias Nahum | 2018-02-15 | 14 | -61/+113 | |
| |/ | ||||||
| * | Merge branch 'icu753' into release-4.7 | Derrick Anderson | 2018-02-14 | 3 | -41/+288 | |
| |\ | ||||||
| | * | Merge branch 'release-4.7' into icu753 | Derrick Anderson | 2018-02-14 | 23 | -320/+420 | |
| | |\ | | |/ | |/| | ||||||
| * | | Merge branch 'XYZ-110' into release-4.7 | Derrick Anderson | 2018-02-14 | 5 | -28/+45 | |
| |\ \ | ||||||
| | * | | Renamed file to match existing scheme | Jonathan Fritz | 2018-02-13 | 1 | -0/+0 | |
| | | | | ||||||
| | * | | Merge branch 'release-4.7' into XYZ-110 | Jonathan Fritz | 2018-02-13 | 87 | -1408/+1230 | |
| | |\ \ | ||||||
| | * | | | Removed unused fields from ChannelMemberHistory table, introduced new ↵ | Jonathan Fritz | 2018-02-12 | 6 | -32/+45 | |
| | | | | | | | | | | | | | | | | | | | | model.ChannelMemberHistoryResult object that includes those fields that are selected from a join on other tables | |||||
| * | | | | Merge branch 'translations-20180212' into release-4.7 | Derrick Anderson | 2018-02-14 | 14 | -244/+192 | |
| |\ \ \ \ | ||||||
| | * | | | | translations PR 20180212 | Elias Nahum | 2018-02-12 | 14 | -244/+192 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'ICU-764' into release-4.7 | Derrick Anderson | 2018-02-14 | 2 | -45/+81 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | gofmt | Stephen Kiers | 2018-02-13 | 1 | -2/+0 | |
| | | | | | | | ||||||
| | * | | | | | rerun jenkins? | Stephen Kiers | 2018-02-13 | 1 | -0/+1 | |
| | | | | | | | ||||||
| | * | | | | | remove debug statement | Stephen Kiers | 2018-02-13 | 1 | -2/+0 | |
| | | | | | | | ||||||
| | * | | | | | Added more tests and simplified code | Stephen Kiers | 2018-02-13 | 2 | -48/+57 | |
| | | | | | | | ||||||
| | * | | | | | Added another test | Stephen Kiers | 2018-02-12 | 1 | -0/+9 | |
| | | | | | | | ||||||
| | * | | | | | Fixes ICU-764 | Stephen Kiers | 2018-02-12 | 2 | -0/+21 | |
| | |/ / / / | ||||||
| * | | | | | Merge branch 'jespino-XYZ-111' into release-4.7 | Derrick Anderson | 2018-02-14 | 3 | -3/+102 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Merge branch 'XYZ-111' of https://github.com/jespino/platform into ↵ | Derrick Anderson | 2018-02-14 | 3 | -3/+102 | |
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | jespino-XYZ-111 | |||||
| | * | | | | | XYZ-111: Check max users per team on re-join after leave a team | Jesús Espino | 2018-02-13 | 3 | -3/+102 | |
| | |/ / / / | ||||||
| * | | / / | ping jenkins | Derrick Anderson | 2018-02-14 | 0 | -0/+0 | |
| | |_|/ / | |/| | | | ||||||
| | | | * | ICU-753 Added unit tests for messages with only push notifications | Harrison Healey | 2018-02-13 | 3 | -3/+27 | |
| | | | | | ||||||
| | | | * | ICU-753 Added unit tests for push notification contents | Harrison Healey | 2018-02-13 | 2 | -39/+262 | |
| | | | | | ||||||
| | | | * | ICU-753 Remove special behaviour for group messages in generic push ↵ | Harrison Healey | 2018-02-13 | 1 | -2/+2 | |
| | |_|/ | |/| | | | | | | | | | | notifications | |||||
* | | | | always return non-nil client license (#8317) | Chris | 2018-02-16 | 1 | -3/+5 | |
| | | | | ||||||
* | | | | [PLT-539] Update incoming webhooks to accept multipart/form-data content (#7873) | Carlos Tadeu Panato Junior | 2018-02-16 | 4 | -18/+57 | |
| | | | | ||||||
* | | | | Upgrading server dependancies (#8308) | Christopher Speller | 2018-02-16 | 602 | -129158/+23070 | |
| | | | | ||||||
* | | | | Send systemd READY notification (#8296) | Pierre de La Morinerie | 2018-02-15 | 2 | -0/+96 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, when starting Mattermost programmatically, it's hard to tell when the server is actually ready to receive network connections. This isn't convenient for monitoring (the systemd service status is "running" although the server is still booting), nor for programatic use (where a script would need to know when the server is ready to perform further actions). To improve this, systemd allow processes to tell when they started successfully. The launcher waits for this notification before reporting the service as successfully launched. The way processes notify systemd is by sending a `READY=1` string over a standard unix socket, whose path is provided in an environment var. The systemd service is then told to expect this notification: ```diff [Service] -Type=simple +Type=notify ExecStart=/home/vagrant/go/bin/platform ``` Now, when starting the server, systemd will actually wait for the server to be ready before returning the control to the shell. Additionally, during this time, querying the server status with `service mattermost status` will report the service as "activating" – before transitioning to "running" when the server is ready. | |||||
* | | | | PLT-8723: Fix DeadLock on reactions insertions (#8225) | Jesús Espino | 2018-02-15 | 1 | -6/+20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | * PLT-8723: Fix DeadLock on reactions insertions * Improved the HasReactions update SQL | |||||
* | | | | XYZ-114 Adding mandatory membership to town-square in bulk-import (#8274) | Jesús Espino | 2018-02-15 | 1 | -0/+6 | |
| | | | | ||||||
* | | | | Modified advanced mail implementation to properly support multiple ↵ | Jonathan | 2018-02-15 | 2 | -16/+36 | |
| | | | | | | | | | | | | | | | | attachments with the same file name (#8289) | |||||
* | | | | Wait for goroutines to finish before shuting down server (#8259) | Pierre de La Morinerie | 2018-02-14 | 1 | -5/+15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running server tests, the server will exit while some jobs spawned through a goroutine are still running. This may crash the test harness, as the jobs try to access a shut down app instance. Fortunately the fix is easy: we just have to use the same App goroutine-counting facility than the rest of the method's goroutines. | |||||
* | | | | Merge branch 'release-4.7-t3merge3' | Derrick Anderson | 2018-02-14 | 4 | -64/+149 | |
|\ \ \ \ | ||||||
| * | | | | gofmt | Derrick Anderson | 2018-02-13 | 4 | -4/+4 | |
| | | | | | ||||||
| * | | | | Merge release-4.7 with master in side branch | Derrick Anderson | 2018-02-13 | 7 | -68/+153 | |
|/| | | | | |/ / / | ||||||
| * | | | Merge branch 'ccbrown-rm-willnorris-proxy-support' into release-4.7 | Derrick Anderson | 2018-02-13 | 4 | -67/+14 | |
| |\ \ \ | | |/ / | |/| | | ||||||
| | * | | Merge branch 'release-4.7' into rm-willnorris-proxy-support | Chris | 2018-02-12 | 86 | -1349/+1358 | |
| | |\ \ | | |/ / | |/| | | ||||||
| * | | | Merge branch 'release-4.7-revertmaster' into release-4.7 | Derrick Anderson | 2018-02-12 | 84 | -1345/+1216 | |
| |\ \ \ | | |_|/ | |/| | | ||||||
| | * | | revert master changes | Derrick Anderson | 2018-02-12 | 84 | -1345/+1216 | |
| |/ / | ||||||
| * | | Merge branch 'icu669' into release-4.7 | Derrick Anderson | 2018-02-12 | 2 | -4/+142 | |
| |\ \ | ||||||
| | * \ | Merge branch 'release-4.7' into icu669 | Derrick Anderson | 2018-02-12 | 91 | -1234/+1527 | |
| | |\ \ | | |/ / | |/| | | ||||||
| | * | | Fixed typo in unit test | Harrison Healey | 2018-02-12 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | ICU-669 Handle relative links better | Harrison Healey | 2018-02-09 | 2 | -12/+19 | |
| | | | | ||||||
| | * | | ICU-669 Ensured all URLs returned from OpenGraph are absolute | Harrison Healey | 2018-02-08 | 2 | -4/+135 | |
| | | | | ||||||
| | | * | poke jenkins | Christopher Brown | 2018-02-12 | 0 | -0/+0 | |
| | | | | ||||||
| | | * | remove willnorris/imageproxy support | Christopher Brown | 2018-02-12 | 4 | -66/+13 | |
| | |/ | |/| | ||||||
* | | | XYZ-110: Cherrypicking changes from release-4.7 to master (#8254) | Jonathan | 2018-02-13 | 6 | -32/+45 | |
| | | | | | | | | | | | | | | | | | | | | | | | | * 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) | |||||
* | | | ABC-176 Prevent changing PluginSettings.EnableUploads through the API (#8249) | Joram Wilander | 2018-02-13 | 4 | -2/+39 | |
| | | | | | | | | | | | | | | | | | | * Prevent changing PluginSettings.EnableUploads through the API * Contain api4 test case in it's own test | |||||
* | | | Merge branch 'release-4.7-t4merge' | Derrick Anderson | 2018-02-12 | 7 | -18/+100 | |
|\ \ \ | ||||||
| * | | | Merge remote-tracking branch 'origin/release-4.7' into release-4.7-t4merge | Derrick Anderson | 2018-02-12 | 7 | -18/+100 | |
|/| | | | |/ / | ||||||
| * | | Merge branch 'master' into release-4.7 | Chris | 2018-02-12 | 84 | -1216/+1345 | |
| |\ \ | |/ / |/| | |