summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'release-3.7' into master.George Goldberg2017-03-1791-799/+939
|\
| * PLT-5804 Fix email blue error not showing up (#5749)Joram Wilander2017-03-141-1/+1
| * Fix permalink in email for DMs/GMs (#5751)Joram Wilander2017-03-131-2/+1
| * Report correct session for React Native app (#5734)enahum2017-03-131-2/+2
| * PLT-5800 Cleaned up duplicated code for adding slack attachments to posts (#5...Harrison Healey2017-03-104-91/+19
| * translations PR 20170309 (#5710)enahum2017-03-1022-435/+489
| * PLT-5792 Fixed all ephemeral posts using system message icons (#5709)Harrison Healey2017-03-101-3/+1
| * PLT-5765 Passed SiteURL to SendNotifications (#5705)Harrison Healey2017-03-1035-118/+120
| * Fix user list updating when removing a user from team (#5712)Joram Wilander2017-03-101-2/+2
| * PLT-5772: Use standardised javascript method instead of Chrome-only one. (#5708)George Goldberg2017-03-091-1/+1
| * Fix posts from your own webhook not showing as unread until refresh (#5703)Joram Wilander2017-03-092-2/+6
| * Fix GMs showing up on refresh after being hidden (#5702)Joram Wilander2017-03-093-2/+6
| * Multiple bug fixes (#5699)Asaad Mahmood2017-03-095-4/+15
| * Remove race between clearing lists and search requests (#5686)Joram Wilander2017-03-095-10/+15
| * Fix MFA page showing up when not active on account switch (#5687)Joram Wilander2017-03-092-3/+3
| * PLT-5769 Translations filenames and values consistent (#5689)enahum2017-03-095-2/+2
| * Bug fixes (#5682)Asaad Mahmood2017-03-081-0/+7
| * Added additional validation for slack attachment format on server (#5680)Harrison Healey2017-03-086-86/+152
| * Ui improvements and bug fixes (#5677)Asaad Mahmood2017-03-086-12/+21
| * Add sync logic for DMs/GMs when network reconnects (#5676)Joram Wilander2017-03-085-24/+74
| * Fix badge count for push notifications (#5672)enahum2017-03-071-1/+7
| * Adding index and cache to reactinos store (#5654)Christopher Speller2017-03-076-10/+97
| * Save schema version for 3.7 (#5675)Joram Wilander2017-03-071-0/+2
* | Ui improvements (#5755)Asaad Mahmood2017-03-1714-56/+76
* | 'Other words' for mentions no longer includes '@username' (#5746)Ryan Wang2017-03-171-0/+3
* | Fxing code coverage numbers + APIv4 tests with EE (#5789)Christopher Speller2017-03-164-55/+52
* | Add IDs for Account Settings > Notifications (#5788)Eric Sethna2017-03-163-0/+28
* | Fixing ids for UI automation (#5772)Corey Hulen2017-03-162-3/+26
* | Implement GET /logs endpoint for APIv4 (#5778)Joram Wilander2017-03-166-7/+89
* | PLT-3181 Added crossorigin='anonymous' to all external images (#5774)Harrison Healey2017-03-167-5/+15
* | Implement some channel endpoints for APIv4 (#5767)Joram Wilander2017-03-1611-1/+399
* | Sort favorite channels alphabetically regardless of type (#5739)Ryan Wang2017-03-161-6/+8
* | Add IDs to Security > password fields (#5777)lindalumitchell2017-03-161-0/+3
* | cannot change ID and deleteat when trying to update the hook (#5784)Carlos Tadeu Panato Junior2017-03-161-0/+1
* | Implement update IncomingHook for apiV4 (#5762)Carlos Tadeu Panato Junior2017-03-153-0/+238
* | PLT-5321: Add markdown unit tests for images (#5770)VeraLyu2017-03-151-0/+55
* | Prevent double join calls when joining a public channel (#5761)Joram Wilander2017-03-151-0/+1
* | Add IDs to Account Settings > General (#5763)Eric Sethna2017-03-142-0/+6
* | Moving HTTP request counter to the start of ServeHTTP so count time is not ef...Christopher Speller2017-03-141-2/+4
* | PLT-5764 Fixed channel name minimum length (#5693)Ruzette Tanyag2017-03-143-4/+6
* | [APIV4] POST /caches/invalidate - endpoint for apiV4 (#5756)Carlos Tadeu Panato Junior2017-03-143-0/+47
* | PLT-4606: Date separator in RHS (#5606)Mika Andrianarijaona2017-03-145-42/+90
* | Allow saving of identical team name (#5738)Ryan Wang2017-03-142-7/+3
* | Implement brand image endpoints for APIv4 (#5733)Joram Wilander2017-03-147-15/+204
* | Add implementation for POST /config/reload apiV4 - Reload Configuration (#5713)Carlos Tadeu Panato Junior2017-03-143-0/+44
* | Implement admin LDAP endpoints for APIv4 (#5720)Joram Wilander2017-03-145-0/+110
* | APIv4 DELETE channels/{channel_id} (#5723)Saturnino Abril2017-03-146-0/+337
* | APIv4: GET /files/{file_id}/public (#5665)Saturnino Abril2017-03-133-0/+120
* | Removing goamz (#5753)Christopher Speller2017-03-13140-38156/+2
* | Update eslint (#5752)Christopher Speller2017-03-137-26/+37