Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #151 from asaadmahmoodspin/master | Joram Wilander | 2015-07-09 | 9 | -94/+138 |
|\ | | | | | MM-1469 - Loading message in more channel modal | ||||
| * | Updating font size and margins for loading animation | Asaad Mahmood | 2015-07-09 | 1 | -1/+2 |
| | | |||||
| * | Updating Ui for posts | Asaad Mahmood | 2015-07-09 | 3 | -67/+92 |
| | | |||||
| * | Merge branch 'master' of https://github.com/mattermost/platform | Asaad Mahmood | 2015-07-09 | 21 | -232/+342 |
| |\ | |/ |/| | |||||
* | | Merge pull request #145 from ralder/fix-tabIndex-channel_invite_modal | Joram Wilander | 2015-07-09 | 2 | -93/+66 |
|\ \ | | | | | | | [webui] add missing tabIndex for channel members modal | ||||
| * | | add missing tabIndex for channel members modal | ralder | 2015-07-07 | 2 | -93/+66 |
| | | | |||||
* | | | Merge pull request #149 from rgarmsen2295/mm-1260 | Christopher Speller | 2015-07-08 | 2 | -1/+15 |
|\ \ \ | | | | | | | | | MM-1260 Member Invites can no longer be sent to emails already used to signup | ||||
| * | | | Small tweaks and cleanup | Reed Garmsen | 2015-07-07 | 2 | -12/+3 |
| | | | | |||||
| * | | | Added a server side check to see if members who are trying to be invited ↵ | Reed Garmsen | 2015-07-07 | 2 | -2/+25 |
| | | | | | | | | | | | | | | | | have already been invited by checking the email. Client handles it as if it was an email error. | ||||
* | | | | Merge pull request #150 from mattermost/mm-895 | Joram Wilander | 2015-07-08 | 16 | -124/+234 |
|\ \ \ \ | | | | | | | | | | | MM-895 Reorganization of browser storage. | ||||
| * | | | | Adding comments to change versions in sync | Christopher Speller | 2015-07-08 | 2 | -0/+3 |
| | | | | | |||||
| * | | | | Finishing centralization of BrowserStore | Christopher Speller | 2015-07-08 | 6 | -31/+46 |
| | | | | | |||||
| * | | | | Modifying all storage to use session storage. Also adding an abstraction ↵ | Christopher Speller | 2015-07-08 | 11 | -100/+192 |
| | |/ / | |/| | | | | | | | | | | layer to add current user id as a prefix to most keys. | ||||
* | | | | Merge pull request #146 from nickago/MM-1284 | Joram Wilander | 2015-07-08 | 2 | -14/+27 |
|\ \ \ \ | | | | | | | | | | | MM-1284 Fixed auto-linking (for good hopefully) | ||||
| * \ \ \ | Merge branch 'MM-1284' of https://github.com/nickago/platform into MM-1284 | nickago | 2015-07-08 | 0 | -0/+0 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | merge conflics | ||||
| | * | | | | Add ALL the semicolons | nickago | 2015-07-08 | 1 | -3/+3 |
| | | | | | | |||||
| | * | | | | Changed linkify to autolinker and wrote gap-bridging code | nickago | 2015-07-07 | 2 | -12/+25 |
| | |/ / / | |||||
| * | | | | Semicolons and a bug fix | nickago | 2015-07-08 | 1 | -5/+5 |
| | | | | | |||||
| * | | | | Changed linkify to autolinker and wrote gap-bridging code | nickago | 2015-07-08 | 2 | -12/+25 |
| | | | | | |||||
| | | | * | MM-1444 - Fixing text selection issue | Asaad Mahmood | 2015-07-09 | 1 | -2/+1 |
| | | | | | |||||
| | | | * | MM-1469 - Loading message in more channel modal | Asaad Mahmood | 2015-07-08 | 4 | -63/+12 |
| | | | | | |||||
| | | | * | Merge branch 'master' of https://github.com/asaadmahmoodspin/platform | Asaad Mahmood | 2015-07-08 | 4 | -21/+91 |
| |_|_|/| |/| | | | | |||||
| | | | * | Merge pull request #1 from rgarmsen2295/mm-1469 | asaadmahmoodspin | 2015-07-08 | 5 | -22/+92 |
| | | | |\ | | | | | | | | | | | | | MM-1469 Added loading animation logic to the "Get More Channels Menu" ("More...") | ||||
| | | | | * | Small changes and code clean-up | Reed Garmsen | 2015-07-07 | 2 | -4/+2 |
| | | | | | | |||||
| | | | | * | Changed loading logic for retrieving more channels to allow for loading ↵ | Reed Garmsen | 2015-07-07 | 5 | -22/+94 |
| | | | | | | | | | | | | | | | | | | | | | | | | animation to be inserted into the More... menu that allows you to join more channels while waiting for the list of channels to load | ||||
* | | | | | | Merge pull request #130 from hmhealey/staticjs | Corey Hulen | 2015-07-08 | 17 | -6/+42313 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | MM-1427 Copied required Javascript libraries and resources into repository | ||||
| * | | | | | Use correctly minified and unminified js libraries for JQuery, Bootstrap, ↵ | hmhealey | 2015-07-08 | 5 | -4/+1473 |
| | | | | | | | | | | | | | | | | | | | | | | | | and Perfect Scrollbar | ||||
| * | | | | | Copied Bootstrap, jQuery and React libraries and resources into repository | hmhealey | 2015-07-08 | 13 | -4/+40842 |
| | | | | | | |||||
| * | | | | | Moved minified javascript out of min directory | hmhealey | 2015-07-08 | 2 | -1/+1 |
| | | | | | | |||||
* | | | | | | Corrected release numbering in README.md | it33 | 2015-07-08 | 1 | -3/+3 |
|/ / / / / | |||||
* | | | | | Merge pull request #136 from mattermost/code-review | Joram Wilander | 2015-07-08 | 4 | -8/+10 |
|\ \ \ \ \ | | | | | | | | | | | | | team code review | ||||
| * | | | | | team code review | =Corey Hulen | 2015-07-06 | 4 | -8/+10 |
| | | | | | | |||||
* | | | | | | Merge pull request #148 from hmhealey/mm1488 | Christopher Speller | 2015-07-08 | 1 | -2/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | MM-1488 Changed code to dismiss mention list to not trigger when you click on the list itself | ||||
| * | | | | | | Changed code to dismiss mention list to not trigger when you click on the ↵ | hmhealey | 2015-07-07 | 1 | -2/+3 |
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | list itself | ||||
* | | | | | | Merge pull request #147 from rgarmsen2295/mm-934 | Corey Hulen | 2015-07-07 | 3 | -3/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | MM-934 Users can no longer "click n' drag" text boxes to resize them | ||||
| * | | | | | | Changed textarea resizeability from being a blanket statement to everything ↵ | Reed Garmsen | 2015-07-07 | 4 | -4/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | to only the ones with issues | ||||
| * | | | | | | Prevent text areas from being resizeable | Reed Garmsen | 2015-07-07 | 1 | -0/+1 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #143 from rgarmsen2295/mm-1416 | Corey Hulen | 2015-07-07 | 2 | -2/+23 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | MM-1416 Changed error message when adding a previously deleted channel to be better suited | ||||
| * | | | | | | | Added new error message when trying to add a channel that was previously ↵ | Reed Garmsen | 2015-07-06 | 2 | -2/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deleted as well as a corresponding unit test | ||||
* | | | | | | | | Merge pull request #137 from nickago/MM-1417 | Corey Hulen | 2015-07-07 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | MM-1417 redirected channel name 404's to town square | ||||
| * | | | | | | | redirected channel name 404's to town square | nickago | 2015-07-06 | 1 | -1/+4 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #142 from asaadmahmoodspin/master | Joram Wilander | 2015-07-07 | 4 | -31/+23 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | / | |_|_|_|_|_|/ |/| | | | | | | Minor UI upgrades | ||||
| * | | | | | | MM-1221 - Fixing scrolling issue in the RHS | Asaad Mahmood | 2015-07-07 | 1 | -1/+2 |
| | | | | | | | |||||
| * | | | | | | Updating background | Asaad Mahmood | 2015-07-07 | 2 | -24/+12 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' of https://github.com/mattermost/platform | Asaad Mahmood | 2015-07-07 | 3 | -8/+15 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| * | | | | | | Merge branch 'master' of https://github.com/mattermost/platform | Asaad Mahmood | 2015-07-07 | 2 | -1/+9 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | Fixing code error in css | Asaad Mahmood | 2015-07-07 | 1 | -1/+0 |
| | | | | | | | |||||
| * | | | | | | Fixing before after hover for date/new separator | Asaad Mahmood | 2015-07-07 | 1 | -2/+6 |
| | | | | | | | |||||
| * | | | | | | Files img files | Asaad Mahmood | 2015-07-07 | 1 | -2/+5 |
| | | | | | | | |||||
| * | | | | | | Fixing background hovers | Asaad Mahmood | 2015-07-07 | 2 | -11/+8 |
| | |_|_|/ / | |/| | | | |