summaryrefslogtreecommitdiffstats
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into advanced-permissions-phase-1Martin Kraft2018-03-2310-28/+68
|\
| * Improved bulkload error handling (#8491)Jesse Hallam2018-03-232-18/+19
| * Timezone feature (#8185)Chris Duarte2018-03-222-0/+33
| * Fix various segfaults when running `go test` manually (#8448)Jesse Hallam2018-03-215-8/+14
| * Fixed missing error in log message (#8485)Harrison Healey2018-03-211-1/+1
| * Update plugin.go (#8486)Jason Blais2018-03-211-1/+1
* | Merge branch 'master' into advanced-permissions-phase-1George Goldberg2018-03-193-14/+59
|\|
| * [MM-9703] Push notifications are sent for own DM's (#8439)Carlos Tadeu Panato Junior2018-03-151-4/+9
| * MM-9688: Better error message for plugin enabling in HA mode (#8433)Chris2018-03-131-0/+3
| * Better error handling for failed plugin activation (#8361)Joram Wilander2018-03-132-9/+46
| * Merge remote-tracking branch 'origin/release-4.8' into t3mergetomasterDerrick Anderson2018-03-121-1/+1
| |\
| | * ICU-682 Stopped sending out of channel mention warnings for system messages (...Harrison Healey2018-03-091-1/+1
* | | Merge branch 'master' into advanced-permissions-phase-1George Goldberg2018-03-1326-209/+455
|\| |
| * | Adding new global relay settings to diagnostics and default.json (#8441)Jesús Espino2018-03-121-5/+9
| * | Removed mssola/user_agent library (#8417)Harrison Healey2018-03-121-8/+6
| * | [MM-9725] Slack compatibility code in webhooks captures incorrect text (#8428)Carlos Tadeu Panato Junior2018-03-122-1/+59
| * | Remove query to update channel extra_update_at field on user activation/deact...Joram Wilander2018-03-091-4/+0
| * | MM-9274- Sort Users in Channel by status (#8181)Stephen Kiers2018-03-096-23/+213
| * | general cleanup (#8387)Chris2018-03-078-105/+16
| * | XYZ-87: GlobalRelay DM Exports do not Include Channel Name (#8275)Jonathan2018-03-072-8/+80
| * | Add addedUser IDs to render correctly in client based on teammate name displa...Philippe GRANET2018-03-071-0/+5
| * | MM-9664 Add invalidation metrics for store caches (#8340)Joram Wilander2018-03-052-5/+8
| * | MM-8604: emit config/license websocket events (#8371)Jesse Hallam2018-03-053-1/+42
| * | remove `go Publish(...)` idiom (#8373)Chris2018-03-028-63/+19
* | | Merge branch 'master' into advanced-permissions-phase-1George Goldberg2018-03-0216-183/+754
|\| |
| * | PLT-7567: Integration of Team Icons (#8284)Christian Hoff2018-03-011-0/+90
| |/
| * 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
| * 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
| * 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
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-05-20 01:19:15 +0000