Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #887 from asaadmahmoodspin/plt-375 | Joram Wilander | 2015-10-05 | 17 | -89/+69 |
|\ | | | | | plt-375 - Making modals compatible with themes | ||||
| * | Increasing spacing for bottom unread notification | Asaad Mahmood | 2015-10-05 | 1 | -1/+1 |
| | | |||||
| * | Updating theme colours for popovers, drop downs etc | Asaad Mahmood | 2015-10-05 | 6 | -52/+33 |
| | | |||||
| * | Updating search colours | Asaad Mahmood | 2015-10-05 | 1 | -1/+2 |
| | | |||||
| * | Updating jpg to png for theme names | Asaad Mahmood | 2015-10-05 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' of https://github.com/mattermost/platform into plt-375 | Asaad Mahmood | 2015-10-05 | 2 | -12/+38 |
| |\ | |||||
| * | | Changing jpeg images back to png | Asaad Mahmood | 2015-10-02 | 8 | -0/+0 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/mattermost/platform into plt-375 | Asaad Mahmood | 2015-10-02 | 31 | -281/+572 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: web/react/components/user_settings/user_settings_appearance.jsx | ||||
| * | | | pot-375 - Making modals compatible with themes | Asaad Mahmood | 2015-10-01 | 18 | -52/+51 |
| | | | | |||||
* | | | | Merge pull request #900 from mattermost/PLT-462 | Harrison Healey | 2015-10-05 | 8 | -3/+141 |
|\ \ \ \ | |_|_|/ |/| | | | PLT-462 Adding diagnostic info | ||||
| * | | | Fixing break | =Corey Hulen | 2015-10-02 | 1 | -1/+1 |
| | | | | |||||
| * | | | Adding offical build function | =Corey Hulen | 2015-10-02 | 3 | -2/+6 |
| | | | | |||||
| * | | | Merge branch 'master' into PLT-462 | =Corey Hulen | 2015-10-02 | 27 | -268/+498 |
| |\ \ \ | |||||
| * | | | | PLT-462 Adding diagnostic info | =Corey Hulen | 2015-10-01 | 7 | -3/+137 |
| | | | | | |||||
* | | | | | Merge pull request #905 from chengkun/patch-1 | it33 | 2015-10-04 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Fixed typo in single-container-install.md | ||||
| * | | | | | Fixed typo in single-container-install.md | Chengkun | 2015-10-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | Remove the typo of quotation marks after 'docker-machine create -d virtualbox dev' | ||||
* | | | | | | Update CHANGELOG.md | it33 | 2015-10-02 | 1 | -11/+37 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Merge pull request #904 from teviot/teviot-patch-1 | Corey Hulen | 2015-10-02 | 1 | -5/+5 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Increase test timeouts to accommodate slow dev environments | ||||
| * | | | | Increase test timeouts to accommodate slow dev environments | Teviot Systems | 2015-10-02 | 1 | -5/+5 |
| |/ / / | |||||
* | | | | Merge pull request #912 from hmhealey/plt174 | Christopher Speller | 2015-10-02 | 1 | -2/+4 |
|\ \ \ \ | | | | | | | | | | | PLT-174 Added emailto: to the beginning of email links | ||||
| * | | | | Added emailto: to the beginning of email links | hmhealey | 2015-10-02 | 1 | -2/+4 |
| | | | | | |||||
* | | | | | Merge pull request #909 from mattermost/plt-446 | Harrison Healey | 2015-10-02 | 1 | -0/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-446 Added help text to incoming webhooks. | ||||
| * | | | | | Added help text for incoming webhooks. | JoramWilander | 2015-10-02 | 1 | -0/+2 |
| | | | | | | |||||
* | | | | | | Merge pull request #913 from mattermost/it33-patch-3 | Harrison Healey | 2015-10-02 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Change text to avoid confusion with Slack Import | ||||
| * | | | | | | Change text to avoid confusion with Slack Import | it33 | 2015-10-02 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #911 from hmhealey/plt437 | Christopher Speller | 2015-10-02 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | PLT-437 Removed $ from time tooltip | ||||
| * | | | | | Removed $ from time tooltip | hmhealey | 2015-10-02 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #906 from teviot/teviot-patch-2 | Christopher Speller | 2015-10-02 | 3 | -1/+19 |
|\ \ \ \ \ | | | | | | | | | | | | | Pass-through post creation time when importing posts | ||||
| * | | | | | Pass-through post creation time when importing posts | Teviot Systems | 2015-10-02 | 3 | -1/+19 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #881 from hmhealey/plt194 | Joram Wilander | 2015-10-02 | 16 | -253/+443 |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-194 Changes to ChannelMember notification settings | ||||
| * | | | | | Moved ChannelMember.NotifyLevel into ChannelMember.NotifyProps | hmhealey | 2015-10-01 | 13 | -233/+31 |
| | | | | | | |||||
| * | | | | | Replaced ChannelMember.MarkUnreadLevel with ChannelMember.NotifyProps | hmhealey | 2015-10-01 | 13 | -117/+225 |
| | | | | | | |||||
| * | | | | | Changed notification preference submission to only be updated when options ↵ | hmhealey | 2015-09-30 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | have actually changed | ||||
| * | | | | | Removed deprecated constants related to quiet mode | hmhealey | 2015-09-30 | 1 | -3/+1 |
| | | | | | | |||||
| * | | | | | Added channel id to updateLastViewed api calls to prevent multiple updates ↵ | hmhealey | 2015-09-30 | 1 | -7/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | to different channels from clashing | ||||
| * | | | | | Implemented ChannelMember.MarkUnreadLevel so that it actually functions | hmhealey | 2015-09-30 | 2 | -2/+2 |
| | | | | | | |||||
| * | | | | | Added additional test cases and fixed existing ones for ↵ | hmhealey | 2015-09-30 | 5 | -0/+119 |
| | | | | | | | | | | | | | | | | | | | | | | | | ChannelMember.MarkUnreadLevel | ||||
| * | | | | | Removed UI for quiet mode and added UI to set when a channel will be marked ↵ | hmhealey | 2015-09-30 | 6 | -115/+244 |
| | | | | | | | | | | | | | | | | | | | | | | | | unread in the sidebar | ||||
| * | | | | | Added 'default' option to channel notification settings that just uses the ↵ | hmhealey | 2015-09-30 | 5 | -39/+65 |
| | | | | | | | | | | | | | | | | | | | | | | | | user's notification level | ||||
* | | | | | | Update slack-import.md | it33 | 2015-10-02 | 1 | -1/+4 |
| |_|/ / / |/| | | | | |||||
* | | | | | Added link to Slack Import | it33 | 2015-10-02 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Create slack-import.md | it33 | 2015-10-02 | 1 | -0/+15 |
| | | | | | |||||
* | | | | | Merge pull request #901 from hmhealey/paossword | Joram Wilander | 2015-10-02 | 1 | -1/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Fixed typo in mattermost.go help text | ||||
| * | | | | Fixed typo in mattermost.go help text | hmhealey | 2015-10-01 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #898 from tmuwandi/patch-1 | it33 | 2015-10-01 | 1 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Fixed incorrect punctuation | ||||
| * | | | | | Update prod-ubuntu.md | tmuwandi | 2015-10-01 | 1 | -2/+2 |
| |/ / / / | |||||
* | | | | | Merge pull request #894 from thomas9987/patch-1 | it33 | 2015-10-01 | 1 | -2/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Fixed formatting | ||||
| * | | | | | Fixed formatting | thomas9987 | 2015-10-01 | 1 | -2/+1 |
| | |_|/ / | |/| | | | | | | | | Removed empty bullet point | ||||
* | | | | | Merge pull request #897 from chuck5/patch-1 | it33 | 2015-10-01 | 1 | -1/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Changed comma to period to correct grammar error. | ||||
| * | | | | Changed comma to period to correct grammar error. | chuck5 | 2015-10-01 | 1 | -1/+1 |
| |/ / / |