summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #2376 from asaadmahmoodspin/ui-improvementsHarrison Healey2016-03-0822-450/+523
|\ \ \ \ | |_|_|/ |/| | | Multiple UI improvements
| * | | Multiple UI ImprovementsAsaad Mahmood2016-03-082-4/+4
| | | |
| * | | Merge branch 'master' of https://github.com/mattermost/platform into ↵Asaad Mahmood2016-03-080-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ui-improvements Conflicts: web/react/components/textbox.jsx web/sass-files/sass/partials/_post.scss
| * | | | Multiple UI ImprovementsAsaad Mahmood2016-03-0841-661/+710
| | | | |
* | | | | Merge pull request #2371 from ZBoxApp/locsChristopher Speller2016-03-082-1/+8
|\ \ \ \ \ | | | | | | | | | | | | Add missing web locales
| * | | | | Add missing web localesElias Nahum2016-03-072-1/+8
| | |_|/ / | |/| | | | | | | | | | | | | - Sort locale files by id
* | | | | Merge pull request #2347 from hmhealey/morechannelsChristopher Speller2016-03-083-57/+79
|\ \ \ \ \ | |_|_|/ / |/| | | | Fixed positioning of elements in MoreChannels modal
| * | | | Fixed indentation in MoreChannels modalHarrison Healey2016-03-071-12/+12
| | | | |
| * | | | Re-added max height to MoreChannels modalHarrison Healey2016-03-041-4/+12
| | | | |
| * | | | Moved Join button to right side of MoreChannels modalHarrison Healey2016-03-043-41/+55
| | | | |
* | | | | Merge pull request #2372 from mattermost/PLT-2039Christopher Speller2016-03-071-4/+7
|\ \ \ \ \ | |_|/ / / |/| | | | PLT-2039 fixing slash builtin cmds showing as webhook
| * | | | PLT-2039 fixing slash builtin cmds showing as webhook=Corey Hulen2016-03-071-4/+7
|/ / / /
* | | | Merge pull request #2368 from hmhealey/plt2227Christopher Speller2016-03-071-1/+1
|\ \ \ \ | | | | | | | | | | PLT-2227 Properly cleared the post draft after a command is entered
| * | | | Fixed clearing post draft after a command is enteredHarrison Healey2016-03-071-1/+1
| | | | |
* | | | | Merge pull request #2366 from hmhealey/plt2016Christopher Speller2016-03-071-1/+1
|\ \ \ \ \ | | | | | | | | | | | | PLT-2016/PLT-2013 Fixed file attachment download link to properly trigger a download
| * | | | | Fixed file attachment download link to properly trigger a download on ↵Harrison Healey2016-03-071-1/+1
| |/ / / / | | | | | | | | | | | | | | | IE11/Edge/Safari
* | | | | Merge pull request #2364 from hmhealey/confirmChristopher Speller2016-03-071-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Renamed confirm_button to confirmButton in InviteMemberModal
| * | | | | Renamed confirm_button to confirmButton in InviteMemberModalHarrison Healey2016-03-071-2/+2
| | |_|_|/ | |/| | |
* | | | | Merge pull request #2362 from ZBoxApp/PLT-2239Christopher Speller2016-03-071-1/+1
|\ \ \ \ \ | | | | | | | | | | | | PLT-2239: Fix Discard changes modal button text not showing
| * | | | | PLT-2239: Fix Discard changes modal button text not showingElias Nahum2016-03-071-1/+1
| |/ / / /
* | | | | Merge pull request #2360 from hmhealey/plt1993Christopher Speller2016-03-072-9/+9
|\ \ \ \ \ | | | | | | | | | | | | PLT-1993/PLT-1994 Stopped calling uploadFiles multiple times for a single upload
| * | | | | Stopped calling uploadFiles multiple times for a single uploadHarrison Healey2016-03-072-9/+9
| |/ / / /
* | | | | Merge pull request #2352 from hmhealey/plt2139Christopher Speller2016-03-071-7/+6
|\ \ \ \ \ | | | | | | | | | | | | PLT-2139 Stopped removing extra punctuation after @mentions
| * | | | | Stopped removing extra punctuation after @mentionsHarrison Healey2016-03-071-7/+6
| |/ / / /
* | | | | Merge pull request #2350 from hmhealey/plt1930Christopher Speller2016-03-073-3/+2
|\ \ \ \ \ | | | | | | | | | | | | PLT-1930 Fixed Private Channels header in SearchSuggestionList
| * | | | | Fixed Private Channels header in the SearchSuggestionList to actually say ↵Harrison Healey2016-03-073-5/+4
| |/ / / / | | | | | | | | | | | | | | | Private instead of Public
* | | | | Merge pull request #2349 from hmhealey/plt2008Christopher Speller2016-03-071-102/+8
|\ \ \ \ \ | | | | | | | | | | | | PLT-2008 Removed gif playing code from the FileAttachment component
| * | | | | Removed gif playing code from the FileAttachment componentHarrison Healey2016-03-071-102/+8
| |/ / / /
* | | | | Merge pull request #2348 from hmhealey/memberChristopher Speller2016-03-075-12/+10
|\ \ \ \ \ | | | | | | | | | | | | Updated Channel Members modal UI
| * | | | | Changed Channel Members modal to list full user objects with all fields ↵Harrison Healey2016-03-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | populated
| * | | | | Added @ before username in UserList when a Full Name or Nickname is presentHarrison Healey2016-03-071-2/+2
| | | | | |
| * | | | | Changed 'Remove Member' to 'Remove' in Channel Members modalHarrison Healey2016-03-074-8/+6
| |/ / / /
* | | | | Merge pull request #2365 from hmhealey/plt2142Corey Hulen2016-03-071-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | PLT-2142 Increased the maximum size of image uploads to 24 megapixels
| * | | | Increased the maximum size of image uploads to 24 megapixelsHarrison Healey2016-03-071-1/+1
|/ / / /
* | | | Merge pull request #2340 from rodrigocorsi2/PLT-2076Harrison Healey2016-03-074-7/+80
|\ \ \ \ | |/ / / |/| | | PLT-2076: Add help text below the input box when a user starts typing
| * | | Fix camel caseRodrigo Corsi2016-03-071-4/+4
| | | |
| * | | Add help text below the input box when a user starts typingrodrigo2016-03-064-7/+80
| | |/ | |/|
* | | Merge pull request #2339 from ZBoxApp/PLT-2218Joram Wilander2016-03-075-58/+56
|\ \ \ | | | | | | | | PLT-2218: Notification email footer is translated based on the sender's language
| * | | Fix for PLT-2218 & PLT-2222Elias Nahum2016-03-065-58/+56
| |/ / | | | | | | | | | | | | - Also includes missing loc strings for frontend es.json - Sort web [locale].json by id
* | | Merge pull request #2333 from hmhealey/plt2194Joram Wilander2016-03-072-15/+10
|\ \ \ | | | | | | | | PLT-2194 Removed Get Team Invite Link link when user creation is disabled
| * | | Removed Get Team Invite Link link when user creation is disabledHarrison Healey2016-03-032-15/+10
| | | |
* | | | Merge pull request #2332 from hmhealey/plt2014Joram Wilander2016-03-073-2/+7
|\ \ \ \ | |_|/ / |/| | | PLT-2014 Stopped removing *s from the end of search phrases
| * | | Stopped removing *s from the end of search phrasesHarrison Healey2016-03-043-2/+7
| | |/ | |/|
* | | Merge pull request #2334 from mattermost/esethna-patch-2Corey Hulen2016-03-041-0/+33
|\ \ \ | | | | | | | | Update NOTICE.txt with fastclick
| * | | Update NOTICE.txtEric Sethna2016-03-031-0/+33
| | |/ | |/|
* | | Merge pull request #2306 from mattermost/esethna-patch-1Corey Hulen2016-03-044-5/+3
|\ \ \ | |_|/ |/| | Update get team invite link help text
| * | Update get_team_invite_link_modal.jsxEric Sethna2016-03-031-1/+1
| | |
| * | Update pt.jsonEric Sethna2016-03-011-1/+0
| | |
| * | Update es.jsonEric Sethna2016-03-011-1/+0
| | |
| * | Update en.jsonEric Sethna2016-03-011-1/+1
| | |