Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge pull request #2111 from ZBoxApp/locs | Joram Wilander | 2016-02-09 | 4 | -3/+4 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Add/Remove & Fix loc strings | |||||
| * | | | | Add/Remove & Fix loc strings | Elias Nahum | 2016-02-09 | 4 | -3/+4 | |
|/ / / / | ||||||
* | | | | Merge pull request #2107 from rgarmsen2295/plt-1715 | Joram Wilander | 2016-02-08 | 3 | -7/+0 | |
|\ \ \ \ | | | | | | | | | | | PLT-1715 - Removed the ability to disable file storage from the admin console | |||||
| * | | | | Removed the ability to disable file storage from the admin console | Reed Garmsen | 2016-02-08 | 3 | -7/+0 | |
| | |_|/ | |/| | | ||||||
* | | | | Merge pull request #2108 from rgarmsen2295/plt-1718 | Joram Wilander | 2016-02-08 | 2 | -0/+12 | |
|\ \ \ \ | | | | | | | | | | | PLT-1718 - Provides error message on user sign-up page when no sign-up methods are enabled | |||||
| * | | | | Provides error message on user sign-up page when no sign-up methods are enabled | Reed Garmsen | 2016-02-08 | 2 | -0/+12 | |
| |/ / / | ||||||
* | | | | Merge pull request #2109 from mattermost/fix-device | Corey Hulen | 2016-02-08 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / |/| | | | Fixing attaching device id | |||||
| * | | | Fixing attaching device id | =Corey Hulen | 2016-02-08 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge pull request #2106 from mattermost/PLT-1900 | Joram Wilander | 2016-02-08 | 7 | -56/+43 | |
|\ \ \ | | | | | | | | | PLT-1900 removing lang from preview and making spanish beta | |||||
| * | | | Fixing eslint error | =Corey Hulen | 2016-02-08 | 1 | -1/+0 | |
| | | | | ||||||
| * | | | PLT-1900 removing lang from preview and making spanish beta | =Corey Hulen | 2016-02-08 | 7 | -55/+43 | |
| | | | | ||||||
* | | | | Merge pull request #2103 from mattermost/plt-1884 | Christopher Speller | 2016-02-08 | 1 | -10/+12 | |
|\ \ \ \ | |/ / / |/| | | | PLT-1884 Fix pending posts not updating to failed | |||||
| * | | | Fix pending posts not updating to failed | JoramWilander | 2016-02-08 | 1 | -10/+12 | |
| | | | | ||||||
* | | | | Merge pull request #2104 from mattermost/minor-fix-jw | Corey Hulen | 2016-02-08 | 1 | -2/+2 | |
|\ \ \ \ | | | | | | | | | | | Fix accidental adding of change listener on unmount | |||||
| * | | | | Fix accidental adding of change listener on unmount | JoramWilander | 2016-02-08 | 1 | -2/+2 | |
| |/ / / | ||||||
* | | | | Merge pull request #2102 from mattermost/plt-1697 | Corey Hulen | 2016-02-08 | 1 | -0/+3 | |
|\ \ \ \ | |_|_|/ |/| | | | PLT-1697 Add ExpiresAt to session cookie so that IE/Edge store the cookie | |||||
| * | | | Add ExpiresAt to session cookie so that IE/Edge store the cookie | JoramWilander | 2016-02-08 | 1 | -0/+3 | |
| | |/ | |/| | ||||||
* | | | Merge pull request #2095 from mattermost/plt-1787 | Christopher Speller | 2016-02-08 | 2 | -6/+8 | |
|\ \ \ | | | | | | | | | PLT-1787 Fix statuses not rendering until a change in the LHS | |||||
| * | | | Fix statuses not rendering until a change in the LHS | JoramWilander | 2016-02-08 | 2 | -6/+8 | |
| | | | | ||||||
* | | | | Merge pull request #2101 from hmhealey/plt1415 | Christopher Speller | 2016-02-08 | 27 | -120/+120 | |
|\ \ \ \ | |_|_|/ |/| | | | PLT-1415 Renamed RECIEVED_* to RECEIVED_* | |||||
| * | | | Renamed RECIEVED_* to RECEIVED_* | hmhealey | 2016-02-08 | 27 | -120/+120 | |
| | |/ | |/| | ||||||
* | | | Merge pull request #2097 from mattermost/plt-1781 | Joram Wilander | 2016-02-08 | 1 | -1/+4 | |
|\ \ \ | | | | | | | | | PLT-1781 Fixing slack import. | |||||
| * | | | Fixing slack import. | Christopher Speller | 2016-02-08 | 1 | -1/+4 | |
| | |/ | |/| | ||||||
* | | | Merge pull request #2096 from ZBoxApp/new-locs | Joram Wilander | 2016-02-08 | 4 | -15/+17 | |
|\ \ \ | | | | | | | | | Add new localizations in english and spanish | |||||
| * | | | Fix intro message | Elias Nahum | 2016-02-08 | 2 | -2/+2 | |
| | | | | ||||||
| * | | | Fix english messages with white spaces | Elias Nahum | 2016-02-08 | 1 | -15/+15 | |
| | | | | ||||||
| * | | | Add new localizations in english and spanish | Elias Nahum | 2016-02-08 | 3 | -30/+32 | |
| | |/ | |/| | ||||||
* | | | Merge pull request #2100 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2016-02-08 | 5 | -14/+51 | |
|\ \ \ | |/ / |/| | | Multiple UI Improvements | |||||
| * | | Updating time stamp | Asaad Mahmood | 2016-02-08 | 1 | -2/+3 | |
| | | | ||||||
| * | | Updating username width in RHS | Asaad Mahmood | 2016-02-08 | 3 | -1/+22 | |
| | | | ||||||
| * | | Multiple UI Improvements | Asaad Mahmood | 2016-02-08 | 3 | -12/+27 | |
|/ / | ||||||
* | | Merge pull request #2089 from mattermost/plt-1205 | Joram Wilander | 2016-02-08 | 10 | -158/+176 | |
|\ \ | | | | | | | PLT-1205 Remove appearance settings tab and move theme management to display s… | |||||
| * | | Fix cancel bug | JoramWilander | 2016-02-08 | 1 | -1/+3 | |
| | | | ||||||
| * | | Remove appearance settings tab and move theme management to display settings tab | JoramWilander | 2016-02-05 | 10 | -159/+175 | |
| | | | ||||||
* | | | Merge pull request #2083 from mattermost/plt-1879 | Christopher Speller | 2016-02-08 | 10 | -29/+104 | |
|\ \ \ | | | | | | | | | PLT-1879 Add config setting to accept unsigned TLS certs for SSO and outgoing hooks, also fix delete… | |||||
| * | | | Make insecure TLS connections configurable | JoramWilander | 2016-02-05 | 9 | -30/+95 | |
| | | | | ||||||
| * | | | Accept unsigned TLS certs for SSO and outgoing hooks, also fix delete hooks bug | JoramWilander | 2016-02-05 | 3 | -3/+13 | |
| |/ / | ||||||
* | | | Merge pull request #2092 from mattermost/fix-slash | Christopher Speller | 2016-02-08 | 4 | -28/+55 | |
|\ \ \ | | | | | | | | | Fixing slash commands | |||||
| * | | | Fixing slash commands | =Corey Hulen | 2016-02-05 | 1 | -8/+46 | |
| | | | | ||||||
| * | | | Fixing slash commands | =Corey Hulen | 2016-02-05 | 4 | -22/+11 | |
| | | | | ||||||
* | | | | Merge pull request #2094 from mattermost/GIT-1812 | Christopher Speller | 2016-02-08 | 2 | -8/+22 | |
|\ \ \ \ | |_|_|/ |/| | | | GIT-1812 fixing wesocket issue with firefox | |||||
| * | | | GIT-1812 fixing wesocket issue with firefox | =Corey Hulen | 2016-02-05 | 2 | -8/+22 | |
| | | | | ||||||
* | | | | Merge pull request #2090 from hmhealey/plt1847 | Joram Wilander | 2016-02-06 | 2 | -8/+21 | |
|\ \ \ \ | | | | | | | | | | | PLT-1847 Disabled keyboard focus code changes on mobile | |||||
| * | | | | Disabled keyboard focus code changes on mobile | hmhealey | 2016-02-05 | 2 | -8/+21 | |
| | |/ / | |/| | | ||||||
* | | | | Merge pull request #2093 from rgarmsen2295/plt-1615 | Joram Wilander | 2016-02-06 | 2 | -2/+9 | |
|\ \ \ \ | |_|/ / |/| | | | PLT-1615 Limits hashtag links to a minimum of three characters | |||||
| * | | | Limits hashtag linking to a minimum of three characters | Reed Garmsen | 2016-02-05 | 2 | -2/+9 | |
| | | | | ||||||
* | | | | Merge pull request #2091 from rgarmsen2295/plt-1797 | Corey Hulen | 2016-02-05 | 4 | -3/+4 | |
|\ \ \ \ | |/ / / |/| | | | PLT-1797 Increased username max length | |||||
| * | | | Increased username max length | Reed Garmsen | 2016-02-05 | 4 | -3/+4 | |
| | | | | ||||||
* | | | | Merge pull request #2074 from rgarmsen2295/plt-1882 | Joram Wilander | 2016-02-05 | 2 | -1/+17 | |
|\ \ \ \ | |_|/ / |/| | | | PLT-1882 Fixed issue with on-hover timestamps | |||||
| * | | | Separated displayTime functions for component/string form | Reed Garmsen | 2016-02-05 | 2 | -2/+38 | |
| | | | |