Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2208 from mattermost/client-upgrades | Harrison Healey | 2016-02-22 | 90 | -406/+449 |
|\ | | | | | Updating some client deps + eslint | ||||
| * | Updating some client deps + eslint | Christopher Speller | 2016-02-22 | 90 | -406/+449 |
| | | |||||
* | | Merge pull request #2204 from kernicPanel/PLT-1880 | Joram Wilander | 2016-02-22 | 4 | -9/+9 |
|\ \ | |/ |/| | PLT-1800 Replace webhooks documentation URL | ||||
| * | PLT-1800 Replace webhooks documentation URL | Nicolas Clerc | 2016-02-21 | 4 | -9/+9 |
| | | |||||
* | | Merge pull request #2199 from rgarmsen2295/plt-1688 | Christopher Speller | 2016-02-22 | 1 | -1/+1 |
|\ \ | | | | | | | PLT-1688 Fixed issue with corrupted custom mentions on username change | ||||
| * | | Fixed issue with corrupted custom mentions on username change | Reed Garmsen | 2016-02-19 | 1 | -1/+1 |
| | | | |||||
* | | | Formatting tweaks to README | it33 | 2016-02-21 | 1 | -25/+25 |
| | | | |||||
* | | | Re-organized README | it33 | 2016-02-21 | 1 | -99/+34 |
| |/ |/| | |||||
* | | Merge pull request #2198 from timlyo/patch-1 | it33 | 2016-02-19 | 1 | -1/+1 |
|\ \ | |/ |/| | Fixed dead link | ||||
| * | Fixed dead link | Tim | 2016-02-19 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #2191 from hmhealey/plt1256 | Joram Wilander | 2016-02-18 | 4 | -95/+116 |
|\ | | | | | PLT-1256 Ported PostDeletedModal to React-Bootstrap | ||||
| * | Ported PostDeletedModal to React-Bootstrap | hmhealey | 2016-02-18 | 4 | -95/+116 |
| | | |||||
* | | Merge pull request #2192 from rgarmsen2295/plt-1622 | Joram Wilander | 2016-02-18 | 3 | -52/+58 |
|\ \ | | | | | | | PLT-1622 Removed ability to copy a permalink on mobile | ||||
| * | | Removed ability to copy a permalink on mobile | Reed Garmsen | 2016-02-18 | 3 | -52/+58 |
| | | | |||||
* | | | Merge pull request #2193 from rgarmsen2295/plt-1858 | Joram Wilander | 2016-02-18 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | PLT-1858 Fixed content security policy header | ||||
| * | | Fixed content security policy header | Reed Garmsen | 2016-02-18 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #2189 from mattermost/plt-2042 | Harrison Healey | 2016-02-18 | 57 | -4139/+1 |
|\ \ | | | | | | | PLT-2042 Moving /loadtest url tests to /tests and removing /doc folder. | ||||
| * | | Moving tests to /tests and removing /doc folder. Docs are now in seperate ↵ | Christopher Speller | 2016-02-18 | 57 | -4139/+1 |
|/ / | | | | | | | repository | ||||
* | | Merge pull request #2188 from ZBoxApp/missing-locs-es | Christopher Speller | 2016-02-18 | 3 | -12/+18 |
|\ \ | | | | | | | Added missing spanish translations | ||||
| * | | Added missing spanish translations | Elias Nahum | 2016-02-18 | 3 | -12/+18 |
|/ / | |||||
* | | Merge pull request #2183 from mattermost/file-upload-fix | Corey Hulen | 2016-02-17 | 3 | -3/+4 |
|\ \ | | | | | | | Fix loc error with cancelling in progress uploads | ||||
| * | | Fix loc error with cancelling in progress uploads | JoramWilander | 2016-02-17 | 3 | -3/+4 |
| | | | |||||
* | | | Merge pull request #2181 from mattermost/plt-1707 | Christopher Speller | 2016-02-17 | 4 | -117/+119 |
|\ \ \ | | | | | | | | | PLT-1707 Added help text to sso switching and removed redundant divs | ||||
| * | | | Added help text to sso switching and removed redundant divs | JoramWilander | 2016-02-17 | 4 | -117/+119 |
| | | | | |||||
* | | | | Update README.md | it33 | 2016-02-17 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #2182 from rgarmsen2295/plt-1515 | Corey Hulen | 2016-02-17 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | PLT-1515 Changed wording in the password change email to be consistent | ||||
| * | | | | Changed wording of password change email to be more generalized | Reed Garmsen | 2016-02-17 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #2180 from hmhealey/plt1422 | Corey Hulen | 2016-02-17 | 1 | -18/+30 |
|\ \ \ \ | |/ / / |/| | | | PLT-1422 Added restart-server target to Makefile | ||||
| * | | | Added restart-server target to Makefile | hmhealey | 2016-02-17 | 1 | -18/+30 |
| |/ / | |||||
* | | | Merge pull request #2179 from mattermost/fix-droid | Corey Hulen | 2016-02-17 | 1 | -12/+16 |
|\ \ \ | |_|/ |/| | | Fixing JS bug with droid | ||||
| * | | Fixing JS bug with droid | =Corey Hulen | 2016-02-17 | 1 | -12/+16 |
| | | | |||||
* | | | Merge pull request #2176 from rgarmsen2295/plt-1870 | Harrison Healey | 2016-02-17 | 2 | -12/+59 |
|\ \ \ | |_|/ |/| | | PLT-1870 Added license audit parsing to the audit table | ||||
| * | | Added license audit parsing to audit table | Reed Garmsen | 2016-02-16 | 2 | -12/+59 |
|/ / | |||||
* | | Merge pull request #2171 from asaadmahmoodspin/ui-fixes | Joram Wilander | 2016-02-16 | 9 | -17/+212 |
|\ \ | |/ |/| | Multiple UI Improvements | ||||
| * | Other minor improvements | Asaad Mahmood | 2016-02-15 | 3 | -3/+25 |
| | | |||||
| * | Fixing custom theme header click event | Asaad Mahmood | 2016-02-15 | 2 | -6/+10 |
| | | |||||
| * | Multiple UI Improvements | Asaad Mahmood | 2016-02-15 | 6 | -14/+183 |
|/ | |||||
* | Merge pull request #2146 from ttyniwa/feature/PLT-1908 | Corey Hulen | 2016-02-14 | 3 | -17/+118 |
|\ | | | | | PLT-1908 Add a warning when demoting yourself from System Administrator from the team Manage Members menu | ||||
| * | add translated messages to es.json. | Tatsuya Niwa | 2016-02-12 | 1 | -0/+4 |
| | | |||||
| * | delete not translated messages in es.json | Tatsuya Niwa | 2016-02-12 | 1 | -4/+0 |
| | | |||||
| * | Add a warning when demoting yourself from System Administrator from the team ↵ | Tatsuya Niwa | 2016-02-11 | 3 | -17/+118 |
| | | | | | | | | Manage Members menu | ||||
* | | Merge pull request #2168 from ZBoxApp/permalink-spanish | Corey Hulen | 2016-02-14 | 1 | -0/+2 |
|\ \ | | | | | | | RHS spanish translations for permalink | ||||
| * | | RHS spanish translations for permalink | Elias Nahum | 2016-02-14 | 1 | -0/+2 |
| | | | |||||
* | | | Merge pull request #2165 from ZBoxApp/update-locs | Corey Hulen | 2016-02-14 | 2 | -2/+2 |
|\ \ \ | |/ / |/| | | Update loc strings | ||||
| * | | Update loc strings | Elias Nahum | 2016-02-12 | 2 | -2/+2 |
| | | | |||||
* | | | Merge pull request #2123 from hmhealey/plt1711 | Joram Wilander | 2016-02-14 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | PLT-1711 Prevent the admin console from switching to a team that is being remo… | ||||
| * | | | Prevent the admin console from switching to a team that is being removed ↵ | hmhealey | 2016-02-09 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | from the sidebar | ||||
* | | | | Merge pull request #2138 from rgarmsen2295/plt-1672 | Joram Wilander | 2016-02-14 | 4 | -1/+48 |
|\ \ \ \ | | | | | | | | | | | PLT-1672 Added permalink feature to posts in the RHS | ||||
| * | | | | Added permalink feature to posts in the RHS | Reed Garmsen | 2016-02-12 | 4 | -1/+48 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'release-2.0' | Christopher Speller | 2016-02-13 | 6 | -17/+52 |
|\ \ \ \ | |/ / / |/| | | |