summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Collapse)AuthorAgeFilesLines
* Sorted the channel members popover lexigraphicallynickago2015-06-291-1/+6
|
* rebase touch-upsJoramWilander2015-06-293-2/+3
|
* fixed CSS indentingJoramWilander2015-06-291-11/+11
|
* make channel notifications modal visible in mobile modeJoramWilander2015-06-292-1/+5
|
* fixes mm-1316 improves channel notifications UI and updates channellist etagJoramWilander2015-06-292-73/+165
|
* Merge pull request #93 from rgarmsen2295/mm-1317Joram Wilander2015-06-291-1/+1
|\ | | | | MM-1317 Fixed typo in team domain look-up page
| * Removed test codeReed Garmsen2015-06-281-2/+2
| |
| * Fixed typo in team domain look-up pageReed Garmsen2015-06-282-3/+3
| |
* | Merge pull request #87 from asaadmahmoodspin/settings-uiJoram Wilander2015-06-292-16/+16
|\ \ | | | | | | Updating settings UI
| * | Updating settings UIAsaad Mahmood2015-06-282-16/+16
| | |
* | | Merge pull request #79 from asaadmahmoodspin/masterJoram Wilander2015-06-293-19/+43
|\ \ \ | |_|/ |/| | Improving image preview modal and channel info modal
| * | Removing relative from spanAsaad Mahmood2015-06-271-2/+1
| | |
| * | mm-1256 - Improving view modal and close modal buttonAsaad Mahmood2015-06-263-12/+37
| | |
| * | MM-1184 - Updating image previewAsaad Mahmood2015-06-262-7/+7
| |/
* | Merge pull request #83 from ralder/fix-broken-mailto-user-popoverCorey Hulen2015-06-271-6/+4
|\ \ | | | | | | gui: Fix broken mailto link in user-popover
| * | gui: fix broken mailto link in user-popoverralder2015-06-261-6/+4
| |/
* / gui: fix mentions dropdowntest2015-06-262-13/+16
|/
* Merge pull request #46 from mattermost/mm-1318Joram Wilander2015-06-254-32/+49
|\ | | | | fixes mm-1318 only allow 5 files to be uploaded at a time
| * fixes mm-1318 only allow 5 files to be uploaded at a timeJoramWilander2015-06-224-32/+49
| |
* | Merge pull request #45 from rgarmsen2295/mm-1309Corey Hulen2015-06-251-2/+7
|\ \ | | | | | | MM-1309
| * | Made it so the team creator can no longer use the same email used at signup ↵Reed Garmsen2015-06-191-2/+7
| |/ | | | | | | to send an invitation to
| * fixes mm-1315 adds confirmation dialog when closing invite dialog with typed ↵JoramWilander2015-06-192-38/+113
| | | | | | | | in emails
* | Merge pull request #43 from rgarmsen2295/mm-1202Corey Hulen2015-06-252-2/+3
|\ \ | | | | | | MM-1202
| * | Readded error checking for for first and last names but made the requirement ↵Reed Garmsen2015-06-192-2/+20
| | | | | | | | | | | | a config toggle instead of always required
| * | Removed checking for first and last name in invite member form, should not ↵Reed Garmsen2015-06-191-19/+2
| |/ | | | | | | be required even if they are allowed
| * fixes br tags causing new linesJoramWilander2015-06-182-7/+2
| |
* | Merge pull request #41 from asaadmahmoodspin/masterCorey Hulen2015-06-252-44/+54
|\ \ | | | | | | MM-1253 - Fixing new message and date separator corner case
| * | MM-1253 - Fixing new message and date separator corner caseAsaad Mahmood2015-06-282-38/+52
| | |
| * | Removed extraneous post control from within new message separatorReed Garmsen2015-06-181-3/+1
| | |
| * | Merge pull request #9 from rgarmsen2295/masterReed Garmsen2015-06-186-9/+23
| |\ \ | | | | | | | | to me
| * | | Removed extraneous codeReed Garmsen2015-06-181-1/+1
| | | |
| * | | Changed the new messages separator location in the markup to be at the same ↵Reed Garmsen2015-06-182-8/+6
| | | | | | | | | | | | | | | | level as the date seperator
* | | | Merge pull request #34 from rgarmsen2295/mm-1288Corey Hulen2015-06-251-5/+5
|\ \ \ \ | | | | | | | | | | MM-1288
| * | | | Removed extraneous conditionalReed Garmsen2015-06-181-2/+0
| | | | |
| * | | | Fixed ability to be able to delete a specific invite field within the invite ↵Reed Garmsen2015-06-181-1/+1
| | | | | | | | | | | | | | | | | | | | new member form instead of just removing the bottom one every time
| * | | | Merge pull request #13 from rgarmsen2295/masterReed Garmsen2015-06-184-11/+23
| |\ \ \ \ | | | |_|/ | | |/| | Remerge
| * | | | Added ability to remove the first entry of a Invite New Members list (or ↵Reed Garmsen2015-06-171-3/+5
| | |_|/ | |/| | | | | | | | | | clear it if there's only one entry
* | | | Merge pull request #32 from rgarmsen2295/mm-1282Corey Hulen2015-06-253-1/+40
|\ \ \ \ | | | | | | | | | | MM-1282
| * | | | Added a util function that checks that local/session storage is enabled. ↵Reed Garmsen2015-06-183-1/+40
| | |/ / | |/| | | | | | | | | | Also added tests using this function to report an error to the user if it is not enabled
| * | | Merge pull request #30 from mattermost/dockerhostJoram Wilander2015-06-182-2/+12
| |\ \ \ | | | | | | | | | | fix for dockerhost HELIUM
| | * | | fix for dockerhost HELIUM=Corey Hulen2015-06-182-2/+12
| | | | |
| * | | | fixes mm-1297 can now scroll through more than 5 imagesJoramWilander2015-06-181-7/+9
| |/ / /
| * | | Changed "Theme Color Option" to "Theme Color"it332015-06-181-2/+2
| | | |
| * | | Update "Theme" to "Theme Color Options" it332015-06-181-2/+2
| |/ / | | | | | | Needed to make marketing screen look nice.
* | | Merge pull request #28 from rgarmsen2295/mm-1290Corey Hulen2015-06-252-4/+7
|\ \ \ | | | | | | | | MM-1290
| * | | Added logic to clear error messages that are not relevant to the current ↵Reed Garmsen2015-06-182-4/+7
| |/ / | | | | | | | | | error (or to remove error messagesthat no longer apply) for user creation
* | | Merge pull request #27 from mattermost/mm-1240Corey Hulen2015-06-2514-18/+419
|\ \ \ | | | | | | | | fixes mm-1240 adds ability to turn valet feature on
| * | | fix command comparator and team storeJoramWilander2015-06-182-26/+22
| | | |
| * | | added team store, team settings menu, and the ability to turn on valet ↵JoramWilander2015-06-1814-18/+423
| | | | | | | | | | | | | | | | feature from client
* | | | Merge pull request #26 from rgarmsen2295/mm-454Corey Hulen2015-06-252-2/+2
|\ \ \ \ | | | | | | | | | | MM-454