summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Added t.Helper to CheckXStatus test functions (#8305)Harrison Healey2018-02-201-21/+28
* | translations PR 20180220 (#8334)enahum2018-02-2014-241/+345
* | Merge branch 'merge-4.7'Derrick Anderson2018-02-1920-376/+770
|\ \
| * | Remove unnecesary lineJesús Espino2018-02-191-1/+0
| * | merge 4.7.1 to masterSaturnino Abril2018-02-1920-376/+771
|/| | | |/
| * Merge branch 'mm-9633' into release-4.7Derrick Anderson2018-02-163-1/+13
| |\
| | * Add upgrade code from 4.7.0 to 4.7.1JoramWilander2018-02-162-0/+13
| | * Remove bad field from ChannelMemberHistory modelJoramWilander2018-02-161-1/+0
| |/
| * Merge branch 'translations-20180215' into release-4.7Derrick Anderson2018-02-1414-61/+113
| |\
| | * translations PR 20180215Elias Nahum2018-02-1514-61/+113
| |/
| * Merge branch 'icu753' into release-4.7Derrick Anderson2018-02-143-41/+288
| |\
| | * Merge branch 'release-4.7' into icu753Derrick Anderson2018-02-1423-320/+420
| | |\ | | |/ | |/|
| * | Merge branch 'XYZ-110' into release-4.7Derrick Anderson2018-02-145-28/+45
| |\ \
| | * | Renamed file to match existing schemeJonathan Fritz2018-02-131-0/+0
| | * | Merge branch 'release-4.7' into XYZ-110Jonathan Fritz2018-02-1387-1408/+1230
| | |\ \
| | * | | Removed unused fields from ChannelMemberHistory table, introduced new model.C...Jonathan Fritz2018-02-126-32/+45
| * | | | Merge branch 'translations-20180212' into release-4.7Derrick Anderson2018-02-1414-244/+192
| |\ \ \ \
| | * | | | translations PR 20180212Elias Nahum2018-02-1214-244/+192
| * | | | | 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 'jespino-XYZ-111' into release-4.7Derrick Anderson2018-02-143-3/+102
| |\ \ \ \ \
| | * | | | | Merge branch 'XYZ-111' of https://github.com/jespino/platform into jespino-XY...Derrick Anderson2018-02-143-3/+102
| |/| | | | |
| | * | | | | XYZ-111: Check max users per team on re-join after leave a teamJesús Espino2018-02-133-3/+102
| | |/ / / /
| * | | / / ping jenkinsDerrick Anderson2018-02-140-0/+0
| | |_|/ / | |/| | |
| | | | * ICU-753 Added unit tests for messages with only push notificationsHarrison Healey2018-02-133-3/+27
| | | | * 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
* | | | [PLT-539] Update incoming webhooks to accept multipart/form-data content (#7873)Carlos Tadeu Panato Junior2018-02-164-18/+57
* | | | Upgrading server dependancies (#8308)Christopher Speller2018-02-16602-129158/+23070
* | | | Send systemd READY notification (#8296)Pierre de La Morinerie2018-02-152-0/+96
* | | | PLT-8723: Fix DeadLock on reactions insertions (#8225)Jesús Espino2018-02-151-6/+20
* | | | XYZ-114 Adding mandatory membership to town-square in bulk-import (#8274)Jesús Espino2018-02-151-0/+6
* | | | Modified advanced mail implementation to properly support multiple attachment...Jonathan2018-02-152-16/+36
* | | | Wait for goroutines to finish before shuting down server (#8259)Pierre de La Morinerie2018-02-141-5/+15
* | | | Merge branch 'release-4.7-t3merge3'Derrick Anderson2018-02-144-64/+149
|\ \ \ \
| * | | | gofmtDerrick Anderson2018-02-134-4/+4
| * | | | Merge release-4.7 with master in side branchDerrick Anderson2018-02-137-68/+153
|/| | | | | |/ / /
| * | | Merge branch 'ccbrown-rm-willnorris-proxy-support' into release-4.7Derrick Anderson2018-02-134-67/+14
| |\ \ \ | | |/ / | |/| |
| | * | Merge branch 'release-4.7' into rm-willnorris-proxy-supportChris2018-02-1286-1349/+1358
| | |\ \ | | |/ / | |/| |
| * | | Merge branch 'release-4.7-revertmaster' into release-4.7Derrick Anderson2018-02-1284-1345/+1216
| |\ \ \ | | |_|/ | |/| |
| | * | revert master changesDerrick Anderson2018-02-1284-1345/+1216
| |/ /
| * | Merge branch 'icu669' into release-4.7Derrick Anderson2018-02-122-4/+142
| |\ \
| | * \ Merge branch 'release-4.7' into icu669Derrick Anderson2018-02-1291-1234/+1527
| | |\ \ | | |/ / | |/| |
| | * | Fixed typo in unit testHarrison Healey2018-02-121-1/+1