Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #2321 from ZBoxApp/plt-1796-es | Harrison Healey | 2016-03-03 | 4 | -62/+81 | |
|\ \ \ | | | | | | | | | Add missing es loc strings to server and frontend | |||||
| * | | | Add missing es loc strings to server and frontend | Elias Nahum | 2016-03-02 | 4 | -62/+81 | |
| | | | | | | | | | | | | | | | | - Sort files contents by id | |||||
* | | | | Merge pull request #2325 from rodrigocorsi2/review_pt_translations | Harrison Healey | 2016-03-03 | 2 | -18/+44 | |
|\ \ \ \ | |/ / / |/| | | | Revised and added some translations in pt | |||||
| * | | | Revised and added some translations in pt | Rodrigo Corsi | 2016-03-03 | 2 | -18/+44 | |
|/ / / | ||||||
* | | | Merge pull request #2258 from mattermost/plt-1796 | Corey Hulen | 2016-03-02 | 29 | -1093/+1438 | |
|\ \ \ | | | | | | | | | PLT-1796 Refactor and modularize analytics on the client | |||||
| * | | | Fix unit test for session counting | JoramWilander | 2016-03-01 | 1 | -0/+1 | |
| | | | | ||||||
| * | | | Update pt.json for localization | JoramWilander | 2016-03-01 | 1 | -17/+20 | |
| | | | | ||||||
| * | | | Don't count expired sessions | JoramWilander | 2016-03-01 | 1 | -3/+4 | |
| | | | | ||||||
| * | | | Refactor and modularize analytics on the client | JoramWilander | 2016-03-01 | 28 | -1076/+1416 | |
| |/ / | ||||||
* | | | Merge pull request #2317 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2016-03-02 | 1 | -2/+1 | |
|\ \ \ | |_|/ |/| | | PLT-2191- Fixing search loading icon on mobile | |||||
| * | | PLT-2191- Fixing search loading icon on mobile | Asaad Mahmood | 2016-03-02 | 1 | -2/+1 | |
|/ / | ||||||
* | | Merge pull request #2302 from ZBoxApp/member_list-es | Christopher Speller | 2016-03-01 | 1 | -0/+3 | |
|\ \ | | | | | | | channel_headers errors and member_list locs | |||||
| * | | channel_headers errors and member_list locs | Elias Nahum | 2016-03-01 | 1 | -0/+3 | |
| |/ | ||||||
* | | Merge pull request #2293 from mattermost/esethna-patch-2 | Joram Wilander | 2016-03-01 | 4 | -5/+5 | |
|\ \ | |/ |/| | Update sys console GitLab set up help text | |||||
| * | Update pt.json | Eric Sethna | 2016-02-26 | 1 | -2/+2 | |
| | | ||||||
| * | Update es.json | Eric Sethna | 2016-02-26 | 1 | -1/+1 | |
| | | ||||||
| * | Update en.json | Eric Sethna | 2016-02-26 | 1 | -1/+1 | |
| | | ||||||
| * | Update gitlab_settings.jsx | Eric Sethna | 2016-02-26 | 1 | -2/+2 | |
| | | ||||||
* | | Merge pull request #2294 from rodrigocorsi2/member_list | Christopher Speller | 2016-03-01 | 2 | -1/+11 | |
|\ \ | | | | | | | Added translation member_list.jsx | |||||
| * | | Added translation member_list.jsx | rodrigo | 2016-02-29 | 2 | -1/+11 | |
| | | | ||||||
* | | | Merge pull request #2249 from GuillaumeAmat/GIT-1806-2 | Harrison Healey | 2016-03-01 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Fixes the notification display in Firefox (refs #1806) | |||||
| * | | | Fixes the notification display in Firefox (refs #1806) | Guillaume AMAT | 2016-02-25 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge pull request #2292 from mozilla/PLT-2064 | Harrison Healey | 2016-03-01 | 2 | -2/+4 | |
|\ \ \ \ | | | | | | | | | | | PLT-2064 Slash command hints don't autocomplete | |||||
| * | | | | PLT-2064 Slash command hints don't autocomplete | Alan Mooiman | 2016-02-29 | 2 | -2/+4 | |
| | |/ / | |/| | | ||||||
* | | | | Merge pull request #2296 from khoa-le/PLT-2123 | Harrison Healey | 2016-03-01 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | PLT-2123 Do not show up inactive account in Suggestion Box of Channel | |||||
| * | | | | Do not show up inactive account in Suggestion Box of Channel | Khoa, Le Ngoc | 2016-03-01 | 1 | -1/+1 | |
| |/ / / | ||||||
* | | | | Merge pull request #2276 from mattermost/PLT-2030 | Christopher Speller | 2016-03-01 | 7 | -42/+58 | |
|\ \ \ \ | | | | | | | | | | | PLT-2030 fixing error handling | |||||
| * | | | | Adding missing localization | =Corey Hulen | 2016-02-27 | 4 | -8/+31 | |
| | | | | | ||||||
| * | | | | Fxing initial connection | =Corey Hulen | 2016-02-26 | 1 | -0/+4 | |
| | | | | | ||||||
| * | | | | PLT-2030 fixing error handling | =Corey Hulen | 2016-02-26 | 5 | -36/+25 | |
| | | | | | ||||||
* | | | | | Merge pull request #2261 from daizenberg/PLT-867 | Christopher Speller | 2016-03-01 | 1 | -5/+12 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | PLT-867: Removed member cnt icon in Direct channels | |||||
| * | | | | minor optimization; following jwilander's recommendation | Dmitri Aizenberg | 2016-02-26 | 1 | -3/+3 | |
| | | | | | ||||||
| * | | | | fixed | Dmitri Aizenberg | 2016-02-25 | 1 | -5/+12 | |
| | | | | | ||||||
* | | | | | Merge pull request #2283 from ZBoxApp/fix-es | Corey Hulen | 2016-02-29 | 2 | -6/+9 | |
|\ \ \ \ \ | | | | | | | | | | | | | Change Frontend 'es' strings to match 'en' | |||||
| * | | | | | Fix typo | Elias Nahum | 2016-02-29 | 1 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | Change Frontend 'es' strings to match 'en' | Elias Nahum | 2016-02-29 | 1 | -4/+7 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #2267 from mattermost/esethna-patch-1 | Joram Wilander | 2016-02-29 | 6 | -13/+7 | |
|\ \ \ \ \ | | | | | | | | | | | | | Update user settings integrations help text | |||||
| * | | | | | Removing updated entries in pt.json for integrations help text | Eric Sethna | 2016-02-26 | 1 | -4/+1 | |
| | | | | | | ||||||
| * | | | | | Removing updated entries in es.json for integrations help text | Eric Sethna | 2016-02-26 | 1 | -3/+0 | |
| | | | | | | ||||||
| * | | | | | Update integrations help text in en.json | Eric Sethna | 2016-02-26 | 1 | -3/+3 | |
| | | | | | | ||||||
| * | | | | | Update manage_command_hooks.jsx | Eric Sethna | 2016-02-26 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Update manage_outgoing_hooks.jsx | Eric Sethna | 2016-02-26 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Update manage_incoming_hooks.jsx | Eric Sethna | 2016-02-26 | 1 | -1/+1 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge pull request #2282 from mattermost/fix-test | Corey Hulen | 2016-02-28 | 1 | -2/+2 | |
|\ \ \ \ \ | | | | | | | | | | | | | Fixing load test | |||||
| * | | | | | Fixing load test | =Corey Hulen | 2016-02-28 | 1 | -2/+2 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #2281 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2016-02-28 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | Fixing not being able to scroll at the bottom in the LHS | |||||
| * | | | | | Fixing not being able to scroll at the bottom in the LHS | Asaad Mahmood | 2016-02-28 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #2269 from mattermost/esethna-patch-3 | Corey Hulen | 2016-02-28 | 5 | -22/+19 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Break up emoticon tests so each post is <4000 characters | |||||
| * | | | | | Create test-emoticons4.md | Eric Sethna | 2016-02-26 | 1 | -0/+2 | |
| | | | | | | ||||||
| * | | | | | Create test-emoticons3.md | Eric Sethna | 2016-02-26 | 1 | -0/+3 | |
| | | | | | |