Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | Update SMTP instructions | esethna | 2015-10-14 | 1 | -18/+23 | |
| |/ / / | | | | | | | | | Needs dev review. | |||||
* | | | | Clarifying description | it33 | 2015-10-14 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Update Slack-Import.md | it33 | 2015-10-14 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Clarifying instruction | it33 | 2015-10-14 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Adjusting formatting | it33 | 2015-10-14 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Update Slack-Import.md | it33 | 2015-10-14 | 1 | -6/+11 | |
| | | | | ||||||
* | | | | Update Slack-Import.md | it33 | 2015-10-14 | 1 | -8/+10 | |
| | | | | ||||||
* | | | | Update Slack-Import.md | it33 | 2015-10-14 | 1 | -1/+1 | |
| |/ / |/| | | ||||||
* | | | Merge pull request #1047 from hmhealey/sidebar | Joram Wilander | 2015-10-14 | 1 | -1/+1 | |
|\ \ \ | | |/ | |/| | Fixed overwritten CSS class in the sidebar | |||||
| * | | Fixed overwritten CSS class in the sidebar | hmhealey | 2015-10-14 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #1046 from asaadmahmoodspin/ui-improvements | Harrison Healey | 2015-10-14 | 15 | -42/+74 | |
|\ \ | | | | | | | Multiple UI Improvements | |||||
| * | | Multiple UI Improvements | Asaad Mahmood | 2015-10-14 | 15 | -42/+74 | |
| | | | ||||||
* | | | Merge release branch 'release-1.1.0' | Christopher Speller | 2015-10-14 | 6 | -24/+70 | |
|\ \ \ | |/ / |/| / | |/ | ||||||
| * | Updating dockerfile for release v1.1.0-rc3 | Christopher Speller | 2015-10-14 | 1 | -1/+1 | |
| | | ||||||
| * | Merge pull request #1041 from mattermost/plt-603 | Christopher Speller | 2015-10-14 | 2 | -8/+40 | |
| |\ | | | | | | | RC3 - PLT-603 Fix webhook name not overriding in RHS and update webhook help text. | |||||
| | * | Fix webhook name not overriding in LHS and update webhook help text. | JoramWilander | 2015-10-13 | 2 | -8/+40 | |
| |/ | ||||||
| * | Merge pull request #1040 from mattermost/plt-601 | Christopher Speller | 2015-10-13 | 1 | -10/+10 | |
| |\ | | | | | | | PLT-601 Fixing user settings modal general tab. | |||||
| | * | Merge branch 'release-1.1.0' into plt-601 | Christopher Speller | 2015-10-13 | 2 | -5/+19 | |
| | |\ | | |/ | |/| | ||||||
| * | | Merge pull request #1036 from mattermost/PLT-602 | Christopher Speller | 2015-10-13 | 2 | -5/+19 | |
| |\ \ | | | | | | | | | PLT-602 combining welcome and verify email | |||||
| | * | | PLT-602 combining welcome and verify email | =Corey Hulen | 2015-10-13 | 2 | -5/+19 | |
| |/ / | ||||||
| | * | Fixing user settings dialog so it desn't ask you to check your email unless ↵ | Christopher Speller | 2015-10-13 | 1 | -10/+10 | |
| |/ | | | | | | | you changed it | |||||
* | | Merge pull request #993 from apaatsio/bootstrap-help-block | Christopher Speller | 2015-10-14 | 5 | -9/+8 | |
|\ \ | | | | | | | Use help-block class from Bootstrap | |||||
| * | | Use help-block class from Bootstrap | Antti Ahti | 2015-10-09 | 5 | -9/+8 | |
| | | | | | | | | | | | | | | | | | | Use help-block class provided by Bootstrap instead of using a custom form__hint class. We still override some styles from the Bootstrap class, though. | |||||
* | | | Update SMTP-Email-Setup.md | it33 | 2015-10-13 | 1 | -2/+2 | |
| | | | ||||||
* | | | Merge pull request #1042 from hmhealey/plt322-followup | Joram Wilander | 2015-10-13 | 3 | -6/+17 | |
|\ \ \ | | | | | | | | | PLT-322 Fixed leave direct channel button for users with a long username | |||||
| * | | | Fixed leave direct channel button for users with a long username | hmhealey | 2015-10-13 | 3 | -6/+17 | |
| | | | | ||||||
* | | | | Merge pull request #1017 from stasvovk/PLT-589 | Joram Wilander | 2015-10-13 | 2 | -4/+8 | |
|\ \ \ \ | | | | | | | | | | | PLT-589: changed Admin to Team Admin in Manage Team members | |||||
| * \ \ \ | Merge branch 'master' into PLT-589 | Stas Vovk | 2015-10-13 | 27 | -102/+491 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'PLT-589' of github.com:stasvovk/platform into PLT-589 | Stas Vovk | 2015-10-13 | 6 | -6/+21 | |
| |\ \ \ \ \ | ||||||
| | * \ \ \ \ | Merge branch 'master' into PLT-589 | Stas Vovk | 2015-10-12 | 6 | -6/+21 | |
| | |\ \ \ \ \ | ||||||
| * | | | | | | | replaced constructions like user.roles === 'admin' by ↵ | Stas Vovk | 2015-10-13 | 2 | -4/+4 | |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | Utils.isAdmin(user.roles) in manage members | |||||
| * | | | | | | changed Admin to Team Admin in admin console | Stas Vovk | 2015-10-12 | 1 | -1/+3 | |
| | | | | | | | ||||||
| * | | | | | | Merge remote-tracking branch 'upstream/master' into PLT-589 | Stas Vovk | 2015-10-12 | 10 | -22/+20 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | changed Admin to Team Admin in Manage Team members | Stas Vovk | 2015-10-12 | 1 | -1/+3 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #1038 from asaadmahmoodspin/ui-improvements | Joram Wilander | 2015-10-13 | 7 | -13/+40 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Multiple Ui Improvements | |||||
| * | | | | | | | | Multiple Ui Improvements | Asaad Mahmood | 2015-10-13 | 7 | -13/+40 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #968 from hmhealey/plt322 | Harrison Healey | 2015-10-13 | 17 | -148/+1260 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | PLT-322 Updated Direct Messages menu | |||||
| * | | | | | | | | Made further changes based on feedback | hmhealey | 2015-10-13 | 8 | -54/+56 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Removed Preference.AltId | hmhealey | 2015-10-13 | 15 | -166/+246 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Made structural changes to server-side Preference code based on feedback | hmhealey | 2015-10-13 | 9 | -362/+227 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Rewrote PreferenceStore.SaveOrUpdate to work on Postgres within a transaction | hmhealey | 2015-10-13 | 2 | -8/+57 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Cleaned up JSX errors | hmhealey | 2015-10-13 | 2 | -56/+51 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Fixed edge cases with leaving a direct channel while viewing that channel | hmhealey | 2015-10-13 | 4 | -21/+11 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Removed setting direct channels for a new user at creation time | hmhealey | 2015-10-13 | 2 | -50/+42 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Moved saving multiple user preferences into a database transaction | hmhealey | 2015-10-13 | 5 | -48/+144 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Fixed preference tests | hmhealey | 2015-10-13 | 1 | -18/+7 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Hid the close button when the unread badge is visible and moved it to the ↵ | hmhealey | 2015-10-13 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | right side of the sidebar | |||||
| * | | | | | | | | Added default direct channels for previously existing users | hmhealey | 2015-10-13 | 2 | -29/+45 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Renamed show_hide preference to show | hmhealey | 2015-10-13 | 9 | -26/+34 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Made direct channels visible when receiving a message on one | hmhealey | 2015-10-13 | 1 | -0/+12 | |
| | | | | | | | | |