summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | addded missing translationsRodrigo Corsi2016-03-082-17/+24
| | | |
* | | | Merge pull request #2385 from hmhealey/storeHarrison Healey2016-03-0810-2/+44
|\ \ \ \ | | | | | | | | | | Globally exported all stores when developer mode is enabled
| * | | | Globally exported all stores when developer mode is enabledHarrison Healey2016-03-0810-2/+44
| | |/ / | |/| |
* | | | Merge pull request #2389 from mattermost/2.1-ldap-help-textCorey Hulen2016-03-084-10/+10
|\ \ \ \ | | | | | | | | | | Update BaseDN and Email LDAP settings help text + localization
| * | | | Update BaseDN and Email LDAP settings help text in en.jsonEric Sethna2016-03-081-2/+2
| | | | |
| * | | | Update BaseDN and Email LDAP settings help text in es.jsonEric Sethna2016-03-081-2/+2
| | | | |
| * | | | Update BaseDN and Email LDAP settings help text in pt.jsonEric Sethna2016-03-081-3/+3
| | | | |
| * | | | Update BaseDN and email attribute default textEric Sethna2016-03-081-3/+3
| | |_|/ | |/| |
* | | | Merge pull request #2388 from mattermost/plt-1789Corey Hulen2016-03-083-2/+71
|\ \ \ \ | |/ / / |/| | | PLT-1789 Deleting posts with files now renames the file so that public links t…
| * | | Deleting posts with files now renames the file so that public links to those ↵JoramWilander2016-03-083-2/+71
| |/ / | | | | | | | | | files no longer work
* | | Merge pull request #2384 from ZBoxApp/es-locsCorey Hulen2016-03-084-9/+19
|\ \ \ | |/ / |/| | Added missing web and server spanish locs
| * | Added missing web and server spanish locsElias Nahum2016-03-084-9/+19
|/ /
* | Merge pull request #2370 from mattermost/PLT-1830Harrison Healey2016-03-088-0/+380
|\ \ | | | | | | PLT-1830 Adding ability to create team with ldap
| * | PLT-1830 Adding ability to create team with ldap=Corey Hulen2016-03-078-0/+380
| | |
* | | Merge pull request #2373 from mattermost/PLT-1988Harrison Healey2016-03-082-2/+4
|\ \ \ | | | | | | | | PLT-1988 fixing slash logout
| * | | Fixing unit test=Corey Hulen2016-03-071-1/+2
| | | |
| * | | PLT-1988 fixing slash logout=Corey Hulen2016-03-071-1/+2
| | | |
* | | | Merge pull request #2374 from mattermost/PLT-2040Harrison Healey2016-03-081-10/+19
|\ \ \ \ | | | | | | | | | | PLT-2040 disable executing of commands
| * | | | PLT-2040 disable executing of commands=Corey Hulen2016-03-071-10/+19
| |/ / /
* | | | Merge pull request #2375 from mattermost/PLT-2117Harrison Healey2016-03-082-0/+10
|\ \ \ \ | | | | | | | | | | PLT-2117 chaning multiple rrs
| * | | | PLT-2117 chaning multiple rrs=Corey Hulen2016-03-072-0/+10
| |/ / /
* | | | 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