Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2224 from asaadmahmoodspin/ui-improvements | Christopher Speller | 2016-02-23 | 1 | -1/+20 |
|\ | | | | | UI improvements | ||||
| * | UI improvements | Asaad Mahmood | 2016-02-23 | 1 | -1/+20 |
| | | |||||
* | | Merge pull request #2216 from mattermost/fix-cmds | Joram Wilander | 2016-02-23 | 1 | -16/+13 |
|\ \ | | | | | | | Fixing localization error in commands | ||||
| * | | Fixing localization error in commands | Christopher Speller | 2016-02-22 | 1 | -16/+13 |
| | | | |||||
* | | | Merge pull request #2217 from mattermost/fix-droid | Joram Wilander | 2016-02-23 | 6 | -18/+179 |
|\ \ \ | |_|/ |/| | | Fixing device id column for droid | ||||
| * | | Fixing postgres | =Corey Hulen | 2016-02-22 | 2 | -3/+3 |
| | | | |||||
| * | | Fixing device id column for droid | =Corey Hulen | 2016-02-22 | 6 | -18/+179 |
| | | | |||||
* | | | Merge pull request #2223 from ZBoxApp/fix-locs | Christopher Speller | 2016-02-23 | 7 | -905/+904 |
|\ \ \ | | | | | | | | | Fix for PLT-1945, PLT-2012, PLT-2045 & PLT-2067 | ||||
| * | | | Fix for PLT-1945, PLT-2012, PLT-2045 & PLT-2067 | Elias Nahum | 2016-02-23 | 7 | -905/+904 |
| | | | | | | | | | | | | | | | | | | | | - Missing locs on server - Fix spanish locs | ||||
* | | | | Merge pull request #2214 from hmhealey/plt1422 | Corey Hulen | 2016-02-22 | 1 | -1/+6 |
|\ \ \ \ | |/ / / |/| | | | PLT-1422 Fixed Makefile to properly kill watchify on stop-client | ||||
| * | | | Fixed Makefile to properly kill watchify on stop-client | hmhealey | 2016-02-22 | 1 | -1/+6 |
| | | | | |||||
* | | | | Merge pull request #2213 from hmhealey/ps | Christopher Speller | 2016-02-22 | 5 | -141/+91 |
|\ \ \ \ | | | | | | | | | | | Updated perfect-scrollbar to 0.6.10 | ||||
| * | | | | Updated perfect-scrollbar to 0.6.10 | hmhealey | 2016-02-22 | 5 | -141/+91 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #2210 from hmhealey/plt1258 | Christopher Speller | 2016-02-22 | 4 | -159/+207 |
|\ \ \ \ | |_|/ / |/| | | | PLT-1258 Ported RenameChannelModal to React-Bootstrap | ||||
| * | | | Ported RenameChannelModal to React-Bootstrap | hmhealey | 2016-02-22 | 4 | -159/+207 |
|/ / / | |||||
* | | | Merge pull request #2211 from mattermost/asaadmahmoodspin-ui-improvements | Christopher Speller | 2016-02-22 | 13 | -7/+26 |
|\ \ \ | |/ / |/| | | Adding back button for login pages | ||||
| * | | Localizing back button | =Corey Hulen | 2016-02-22 | 11 | -9/+14 |
| | | | |||||
| * | | Merge branch 'ui-improvements' of ↵ | =Corey Hulen | 2016-02-22 | 11 | -7/+21 |
| |\ \ | | |/ | |/| | | | | https://github.com/asaadmahmoodspin/platform into asaadmahmoodspin-ui-improvements | ||||
| | * | Fixing link on find_team | Asaad Mahmood | 2016-02-11 | 1 | -1/+1 |
| | | | |||||
| | * | Adding back button for login pages | Asaad Mahmood | 2016-02-11 | 11 | -7/+21 |
| | | | |||||
* | | | 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 |