Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1893 from asaadmahmoodspin/ui-improvements | Joram Wilander | 2016-01-21 | 30 | -15/+55 |
|\ | |||||
| * | Fixing height for icon | Asaad Mahmood | 2016-01-20 | 1 | -1/+1 |
| * | Updating status icon css | Asaad Mahmood | 2016-01-20 | 1 | -1/+3 |
| * | Fixing status icon in IE11 | Asaad Mahmood | 2016-01-20 | 1 | -0/+1 |
| * | Merge branch 'master' of https://github.com/mattermost/platform into ui-impro... | Asaad Mahmood | 2016-01-20 | 1 | -3/+3 |
| |\ | |||||
| * | | Updating favicon file | Asaad Mahmood | 2016-01-15 | 1 | -1/+1 |
| * | | Updating favicon file | Asaad Mahmood | 2016-01-15 | 1 | -1/+1 |
| * | | Adding gradient bg behind logo | Asaad Mahmood | 2016-01-15 | 18 | -0/+0 |
| * | | Adding bg behind logos | Asaad Mahmood | 2016-01-15 | 18 | -0/+0 |
| * | | Updating logo | Asaad Mahmood | 2016-01-15 | 28 | -14/+51 |
* | | | Merge pull request #1886 from rgarmsen2295/plt-549c | Joram Wilander | 2016-01-21 | 1 | -2/+10 |
|\ \ \ | |||||
| * | | | Fixed react warning issue with setState in RHS | Reed Garmsen | 2016-01-13 | 1 | -2/+10 |
* | | | | Merge pull request #1885 from rgarmsen2295/plt-406 | Joram Wilander | 2016-01-21 | 2 | -0/+5 |
|\ \ \ \ | |||||
| * | | | | Fix issue with file overlay getting stuck in ie11 | Reed Garmsen | 2016-01-13 | 1 | -0/+1 |
| * | | | | Fix issue with drag n drop overlay in ie11 | Reed Garmsen | 2016-01-12 | 1 | -0/+4 |
* | | | | | Revert " PLT-7 adding loc for db calls" | Corey Hulen | 2016-01-20 | 2 | -51/+50 |
* | | | | | PLT-7 adding loc db calls for users table | =Corey Hulen | 2016-01-20 | 2 | -10/+10 |
* | | | | | PLT-7 adding loc db calls for posts table | =Corey Hulen | 2016-01-20 | 1 | -1/+1 |
* | | | | | PLT-7 adding loc db calls for session table | =Corey Hulen | 2016-01-20 | 1 | -3/+3 |
* | | | | | PLT-7 adding loc db calls for oauth table | =Corey Hulen | 2016-01-20 | 1 | -10/+10 |
* | | | | | PLT-7 adding loc db calls for oauth table | =Corey Hulen | 2016-01-20 | 1 | -6/+6 |
* | | | | | PLT-7 adding loc db calls for webhooks table | =Corey Hulen | 2016-01-20 | 1 | -1/+1 |
* | | | | | PLT-7 adding loc db calls for team table | =Corey Hulen | 2016-01-20 | 1 | -13/+13 |
* | | | | | PLT-7 adding loc for db calls audits and prefs | =Corey Hulen | 2016-01-20 | 1 | -6/+7 |
| |_|_|/ |/| | | | |||||
* | | | | Merge pull request #1894 from mattermost/release-1.4 | Corey Hulen | 2016-01-14 | 1 | -3/+3 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Encode url query properly for SSO switching | JoramWilander | 2016-01-14 | 1 | -3/+3 |
* | | | | Fix error message | JoramWilander | 2016-01-14 | 1 | -5/+10 |
* | | | | Minor update to about modal | JoramWilander | 2016-01-14 | 1 | -4/+1 |
* | | | | Added license validation and settings | JoramWilander | 2016-01-14 | 11 | -27/+397 |
| |_|/ |/| | | |||||
* | | | Merge pull request #1855 from rgarmsen2295/plt-1006 | Corey Hulen | 2016-01-13 | 4 | -7/+45 |
|\ \ \ | |||||
| * | | | Changed statistics to show usernames with an email tooltip | Reed Garmsen | 2016-01-11 | 4 | -7/+45 |
* | | | | Merge pull request #1853 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2016-01-13 | 5 | -6/+20 |
|\ \ \ \ | |||||
| * | | | | Adding away icon and changing online and offline icons | Asaad Mahmood | 2016-01-11 | 5 | -6/+20 |
* | | | | | Merge pull request #1850 from mattermost/preview-mode | Corey Hulen | 2016-01-13 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Update email_settings.jsx | it33 | 2016-01-09 | 1 | -1/+1 |
| * | | | | | Documenting how Preview Mode turns off | it33 | 2016-01-09 | 1 | -1/+1 |
* | | | | | | Merge pull request #1876 from mattermost/release-1.4 | Corey Hulen | 2016-01-12 | 1 | -1/+3 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | / | |_|_|_|/ |/| | | | | |||||
| * | | | | Add removal comments | JoramWilander | 2016-01-12 | 1 | -2/+2 |
| * | | | | Support old oauth routes | JoramWilander | 2016-01-12 | 1 | -1/+3 |
* | | | | | Merge pull request #1830 from rgarmsen2295/plt-1599 | Joram Wilander | 2016-01-12 | 1 | -2/+8 |
|\ \ \ \ \ | |||||
| * | | | | | Help text in invite member modal now updates according to town-square display... | Reed Garmsen | 2016-01-07 | 1 | -2/+8 |
* | | | | | | Merge pull request #1852 from mattermost/PLT-1608 | Joram Wilander | 2016-01-12 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Upgrade logging package | =Corey Hulen | 2016-01-11 | 1 | -1/+1 |
| | |_|/ / | |/| | | | |||||
* | | | | | Adding push-test.mattermost.com | it33 | 2016-01-11 | 1 | -2/+2 |
* | | | | | Merge pull request #1854 from hmhealey/plt1608 | Joram Wilander | 2016-01-11 | 1 | -1/+1 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Fixed developer errors storing invalid error objects | hmhealey | 2016-01-11 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #1849 from hmhealey/plt1578 | Corey Hulen | 2016-01-11 | 2 | -8/+36 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Restricted file uploads on iOS Chrome and the iOS app to work around iOS bugs | hmhealey | 2016-01-11 | 2 | -8/+36 |
| | |/ | |/| | |||||
* | | | Merge pull request #1822 from asaadmahmoodspin/ui-improvements | Harrison Healey | 2016-01-11 | 5 | -5/+13 |
|\ \ \ | |||||
| * | | | Updating fix | Asaad Mahmood | 2016-01-08 | 1 | -1/+1 |