Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2394 from ZBoxApp/es-locs | Joram Wilander | 2016-03-09 | 2 | -18/+34 |
|\ | | | | | Add missing server spanish locs | ||||
| * | Add missing server spanish locs | Elias Nahum | 2016-03-08 | 2 | -18/+34 |
| | | |||||
* | | Merge pull request #2397 from mattermost/plt-2185 | Christopher Speller | 2016-03-09 | 4 | -10/+10 |
|\ \ | | | | | | | PLT-2185 Fix ... for usernames on first page load | ||||
| * | | Fix ... for usernames on first page load | JoramWilander | 2016-03-09 | 4 | -10/+10 |
| | | | |||||
* | | | Merge pull request #2399 from mattermost/test-search | Christopher Speller | 2016-03-09 | 1 | -1/+2 |
|\ \ \ | | | | | | | | | Update test-search.md with more markdown hashtags | ||||
| * | | | Update test-search.md with more markdown hashtags | Eric Sethna | 2016-03-09 | 1 | -1/+2 |
| |/ / | |||||
* | | | Merge pull request #2400 from mattermost/license-upload-ui | Christopher Speller | 2016-03-09 | 4 | -26/+63 |
|\ \ \ | |/ / |/| | | Update license upload UI | ||||
| * | | Show filename for license settings, add loc | JoramWilander | 2016-03-09 | 3 | -15/+34 |
| | | | |||||
| * | | Updating button class | Asaad Mahmood | 2016-03-09 | 1 | -1/+1 |
| | | | |||||
| * | | Improvements to license page | Asaad Mahmood | 2016-03-09 | 2 | -13/+31 |
|/ / | |||||
* | | Merge pull request #2392 from hmhealey/plt1960 | Christopher Speller | 2016-03-08 | 1 | -0/+1 |
|\ \ | | | | | | | PLT-1960 Added proper click handler to search result text | ||||
| * | | Added proper click handler to search result text | Harrison Healey | 2016-03-08 | 1 | -0/+1 |
| |/ | |||||
* | | Merge pull request #2390 from hmhealey/plt2259 | Christopher Speller | 2016-03-08 | 2 | -0/+3 |
|\ \ | |/ |/| | PLT-2259 Added target='_blank' to all attachment download links | ||||
| * | Added target='_blank' to all attachment download links | Harrison Healey | 2016-03-08 | 2 | -0/+3 |
| | | |||||
* | | Merge pull request #2383 from rodrigocorsi2/pt_translations | Harrison Healey | 2016-03-08 | 2 | -17/+34 |
|\ \ | | | | | | | addded missing translations | ||||
| * | | Added missing web and server portuguese locs | Rodrigo Corsi | 2016-03-08 | 2 | -0/+10 |
| | | | |||||
| * | | addded missing translations | Rodrigo Corsi | 2016-03-08 | 2 | -17/+24 |
| | | | |||||
* | | | Merge pull request #2385 from hmhealey/store | Harrison Healey | 2016-03-08 | 10 | -2/+44 |
|\ \ \ | | | | | | | | | Globally exported all stores when developer mode is enabled | ||||
| * | | | Globally exported all stores when developer mode is enabled | Harrison Healey | 2016-03-08 | 10 | -2/+44 |
| | |/ | |/| | |||||
* | | | Merge pull request #2389 from mattermost/2.1-ldap-help-text | Corey Hulen | 2016-03-08 | 4 | -10/+10 |
|\ \ \ | | | | | | | | | Update BaseDN and Email LDAP settings help text + localization | ||||
| * | | | Update BaseDN and Email LDAP settings help text in en.json | Eric Sethna | 2016-03-08 | 1 | -2/+2 |
| | | | | |||||
| * | | | Update BaseDN and Email LDAP settings help text in es.json | Eric Sethna | 2016-03-08 | 1 | -2/+2 |
| | | | | |||||
| * | | | Update BaseDN and Email LDAP settings help text in pt.json | Eric Sethna | 2016-03-08 | 1 | -3/+3 |
| | | | | |||||
| * | | | Update BaseDN and email attribute default text | Eric Sethna | 2016-03-08 | 1 | -3/+3 |
| | | | | |||||
* | | | | Merge pull request #2388 from mattermost/plt-1789 | Corey Hulen | 2016-03-08 | 3 | -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 ↵ | JoramWilander | 2016-03-08 | 3 | -2/+71 |
| |/ / | | | | | | | | | | files no longer work | ||||
* | | | Merge pull request #2384 from ZBoxApp/es-locs | Corey Hulen | 2016-03-08 | 4 | -9/+19 |
|\ \ \ | |/ / |/| | | Added missing web and server spanish locs | ||||
| * | | Added missing web and server spanish locs | Elias Nahum | 2016-03-08 | 4 | -9/+19 |
|/ / | |||||
* | | Merge pull request #2370 from mattermost/PLT-1830 | Harrison Healey | 2016-03-08 | 8 | -0/+380 |
|\ \ | | | | | | | PLT-1830 Adding ability to create team with ldap | ||||
| * | | PLT-1830 Adding ability to create team with ldap | =Corey Hulen | 2016-03-07 | 8 | -0/+380 |
| | | | |||||
* | | | Merge pull request #2373 from mattermost/PLT-1988 | Harrison Healey | 2016-03-08 | 2 | -2/+4 |
|\ \ \ | | | | | | | | | PLT-1988 fixing slash logout | ||||
| * | | | Fixing unit test | =Corey Hulen | 2016-03-07 | 1 | -1/+2 |
| | | | | |||||
| * | | | PLT-1988 fixing slash logout | =Corey Hulen | 2016-03-07 | 1 | -1/+2 |
| | | | | |||||
* | | | | Merge pull request #2374 from mattermost/PLT-2040 | Harrison Healey | 2016-03-08 | 1 | -10/+19 |
|\ \ \ \ | | | | | | | | | | | PLT-2040 disable executing of commands | ||||
| * | | | | PLT-2040 disable executing of commands | =Corey Hulen | 2016-03-07 | 1 | -10/+19 |
| |/ / / | |||||
* | | | | Merge pull request #2375 from mattermost/PLT-2117 | Harrison Healey | 2016-03-08 | 2 | -0/+10 |
|\ \ \ \ | | | | | | | | | | | PLT-2117 chaning multiple rrs | ||||
| * | | | | PLT-2117 chaning multiple rrs | =Corey Hulen | 2016-03-07 | 2 | -0/+10 |
| |/ / / | |||||
* | | | | Merge pull request #2376 from asaadmahmoodspin/ui-improvements | Harrison Healey | 2016-03-08 | 22 | -450/+523 |
|\ \ \ \ | |_|_|/ |/| | | | Multiple UI improvements | ||||
| * | | | Multiple UI Improvements | Asaad Mahmood | 2016-03-08 | 2 | -4/+4 |
| | | | | |||||
| * | | | Merge branch 'master' of https://github.com/mattermost/platform into ↵ | Asaad Mahmood | 2016-03-08 | 0 | -0/+0 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ui-improvements Conflicts: web/react/components/textbox.jsx web/sass-files/sass/partials/_post.scss | ||||
| * | | | | Multiple UI Improvements | Asaad Mahmood | 2016-03-08 | 41 | -661/+710 |
| | | | | | |||||
* | | | | | Merge pull request #2371 from ZBoxApp/locs | Christopher Speller | 2016-03-08 | 2 | -1/+8 |
|\ \ \ \ \ | | | | | | | | | | | | | Add missing web locales | ||||
| * | | | | | Add missing web locales | Elias Nahum | 2016-03-07 | 2 | -1/+8 |
| | |_|/ / | |/| | | | | | | | | | | | | | - Sort locale files by id | ||||
* | | | | | Merge pull request #2347 from hmhealey/morechannels | Christopher Speller | 2016-03-08 | 3 | -57/+79 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Fixed positioning of elements in MoreChannels modal | ||||
| * | | | | Fixed indentation in MoreChannels modal | Harrison Healey | 2016-03-07 | 1 | -12/+12 |
| | | | | | |||||
| * | | | | Re-added max height to MoreChannels modal | Harrison Healey | 2016-03-04 | 1 | -4/+12 |
| | | | | | |||||
| * | | | | Moved Join button to right side of MoreChannels modal | Harrison Healey | 2016-03-04 | 3 | -41/+55 |
| | | | | | |||||
* | | | | | Merge pull request #2372 from mattermost/PLT-2039 | Christopher Speller | 2016-03-07 | 1 | -4/+7 |
|\ \ \ \ \ | |_|/ / / |/| | | | | PLT-2039 fixing slash builtin cmds showing as webhook | ||||
| * | | | | PLT-2039 fixing slash builtin cmds showing as webhook | =Corey Hulen | 2016-03-07 | 1 | -4/+7 |
|/ / / / | |||||
* | | | | Merge pull request #2368 from hmhealey/plt2227 | Christopher Speller | 2016-03-07 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | PLT-2227 Properly cleared the post draft after a command is entered |