summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #151 from asaadmahmoodspin/masterJoram Wilander2015-07-099-94/+138
|\ | | | | MM-1469 - Loading message in more channel modal
| * Updating font size and margins for loading animationAsaad Mahmood2015-07-091-1/+2
| |
| * Updating Ui for postsAsaad Mahmood2015-07-093-67/+92
| |
| * Merge branch 'master' of https://github.com/mattermost/platformAsaad Mahmood2015-07-0921-232/+342
| |\ | |/ |/|
* | Merge pull request #145 from ralder/fix-tabIndex-channel_invite_modalJoram Wilander2015-07-092-93/+66
|\ \ | | | | | | [webui] add missing tabIndex for channel members modal
| * | add missing tabIndex for channel members modalralder2015-07-072-93/+66
| | |
* | | Merge pull request #149 from rgarmsen2295/mm-1260Christopher Speller2015-07-082-1/+15
|\ \ \ | | | | | | | | MM-1260 Member Invites can no longer be sent to emails already used to signup
| * | | Small tweaks and cleanupReed Garmsen2015-07-072-12/+3
| | | |
| * | | Added a server side check to see if members who are trying to be invited ↵Reed Garmsen2015-07-072-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-895Joram Wilander2015-07-0816-124/+234
|\ \ \ \ | | | | | | | | | | MM-895 Reorganization of browser storage.
| * | | | Adding comments to change versions in syncChristopher Speller2015-07-082-0/+3
| | | | |
| * | | | Finishing centralization of BrowserStoreChristopher Speller2015-07-086-31/+46
| | | | |
| * | | | Modifying all storage to use session storage. Also adding an abstraction ↵Christopher Speller2015-07-0811-100/+192
| | |/ / | |/| | | | | | | | | | layer to add current user id as a prefix to most keys.
* | | | Merge pull request #146 from nickago/MM-1284Joram Wilander2015-07-082-14/+27
|\ \ \ \ | | | | | | | | | | MM-1284 Fixed auto-linking (for good hopefully)
| * \ \ \ Merge branch 'MM-1284' of https://github.com/nickago/platform into MM-1284nickago2015-07-080-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | merge conflics
| | * | | | Add ALL the semicolonsnickago2015-07-081-3/+3
| | | | | |
| | * | | | Changed linkify to autolinker and wrote gap-bridging codenickago2015-07-072-12/+25
| | |/ / /
| * | | | Semicolons and a bug fixnickago2015-07-081-5/+5
| | | | |
| * | | | Changed linkify to autolinker and wrote gap-bridging codenickago2015-07-082-12/+25
| | | | |
| | | | * MM-1444 - Fixing text selection issueAsaad Mahmood2015-07-091-2/+1
| | | | |
| | | | * MM-1469 - Loading message in more channel modalAsaad Mahmood2015-07-084-63/+12
| | | | |
| | | | * Merge branch 'master' of https://github.com/asaadmahmoodspin/platformAsaad Mahmood2015-07-084-21/+91
| |_|_|/| |/| | | |
| | | | * Merge pull request #1 from rgarmsen2295/mm-1469asaadmahmoodspin2015-07-085-22/+92
| | | | |\ | | | | | | | | | | | | MM-1469 Added loading animation logic to the "Get More Channels Menu" ("More...")
| | | | | * Small changes and code clean-upReed Garmsen2015-07-072-4/+2
| | | | | |
| | | | | * Changed loading logic for retrieving more channels to allow for loading ↵Reed Garmsen2015-07-075-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/staticjsCorey Hulen2015-07-0817-6/+42313
|\ \ \ \ \ \ | |/ / / / / |/| | | | | MM-1427 Copied required Javascript libraries and resources into repository
| * | | | | Use correctly minified and unminified js libraries for JQuery, Bootstrap, ↵hmhealey2015-07-085-4/+1473
| | | | | | | | | | | | | | | | | | | | | | | | and Perfect Scrollbar
| * | | | | Copied Bootstrap, jQuery and React libraries and resources into repositoryhmhealey2015-07-0813-4/+40842
| | | | | |
| * | | | | Moved minified javascript out of min directoryhmhealey2015-07-082-1/+1
| | | | | |
* | | | | | Corrected release numbering in README.mdit332015-07-081-3/+3
|/ / / / /
* | | | | Merge pull request #136 from mattermost/code-reviewJoram Wilander2015-07-084-8/+10
|\ \ \ \ \ | | | | | | | | | | | | team code review
| * | | | | team code review=Corey Hulen2015-07-064-8/+10
| | | | | |
* | | | | | Merge pull request #148 from hmhealey/mm1488Christopher Speller2015-07-081-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 ↵hmhealey2015-07-071-2/+3
| | |_|/ / / | |/| | | | | | | | | | | | | | | | list itself
* | | | | | Merge pull request #147 from rgarmsen2295/mm-934Corey Hulen2015-07-073-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 Garmsen2015-07-074-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | to only the ones with issues
| * | | | | | Prevent text areas from being resizeableReed Garmsen2015-07-071-0/+1
| | | | | | |
* | | | | | | Merge pull request #143 from rgarmsen2295/mm-1416Corey Hulen2015-07-072-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 Garmsen2015-07-062-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deleted as well as a corresponding unit test
* | | | | | | | Merge pull request #137 from nickago/MM-1417Corey Hulen2015-07-071-1/+4
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | MM-1417 redirected channel name 404's to town square
| * | | | | | | redirected channel name 404's to town squarenickago2015-07-061-1/+4
| | | | | | | |
* | | | | | | | Merge pull request #142 from asaadmahmoodspin/masterJoram Wilander2015-07-074-31/+23
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | / | |_|_|_|_|_|/ |/| | | | | | Minor UI upgrades
| * | | | | | MM-1221 - Fixing scrolling issue in the RHSAsaad Mahmood2015-07-071-1/+2
| | | | | | |
| * | | | | | Updating backgroundAsaad Mahmood2015-07-072-24/+12
| | | | | | |
| * | | | | | Merge branch 'master' of https://github.com/mattermost/platformAsaad Mahmood2015-07-073-8/+15
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch 'master' of https://github.com/mattermost/platformAsaad Mahmood2015-07-072-1/+9
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Fixing code error in cssAsaad Mahmood2015-07-071-1/+0
| | | | | | |
| * | | | | | Fixing before after hover for date/new separatorAsaad Mahmood2015-07-071-2/+6
| | | | | | |
| * | | | | | Files img filesAsaad Mahmood2015-07-071-2/+5
| | | | | | |
| * | | | | | Fixing background hoversAsaad Mahmood2015-07-072-11/+8
| | |_|_|/ / | |/| | | |
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-30 07:53:24 +0000