Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'release-2.1' | Christopher Speller | 2016-03-14 | 4 | -7/+51 |
|\ | |||||
| * | Adding or separator between ldap, username, email, github | Asaad Mahmood | 2016-03-11 | 1 | -0/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | Updating code theme name Updating conditions for login page updated the 2.0 Dockerfile to include the proper location of mm gzip Fixing search loading icon on mobile Adding or separator between ldap, username, email and github | ||||
| * | Merge pull request #2417 from hmhealey/plt2264 | Christopher Speller | 2016-03-11 | 1 | -6/+14 |
| |\ | | | | | | | PLT-2264 Disabled embed toggle when it's disabled in user settings | ||||
| | * | Disabled embed toggle when it's disabled in user settings | Harrison Healey | 2016-03-10 | 1 | -6/+14 |
| | | | |||||
| * | | Merge pull request #2414 from mattermost/bluebar-fix | Christopher Speller | 2016-03-11 | 1 | -1/+1 |
| |\ \ | | | | | | | | | Fixing blue bar on iOS | ||||
| | * | | Fixing blue bar on iOS | =Corey Hulen | 2016-03-10 | 1 | -1/+1 |
| | |/ | |||||
| * | | Fixing padding issue | Asaad Mahmood | 2016-03-10 | 1 | -1/+0 |
| | | | |||||
| * | | Removing console | Asaad Mahmood | 2016-03-10 | 1 | -1/+0 |
| | | | |||||
| * | | PLT-2138 - Fixing theme sharing box | Asaad Mahmood | 2016-03-10 | 1 | -0/+4 |
| |/ | |||||
* / | Convering client to react-router. | Christopher Speller | 2016-03-14 | 77 | -1597/+1867 |
|/ | |||||
* | Disabling help stuff and moving preview out of it | Asaad Mahmood | 2016-03-09 | 1 | -11/+13 |
| | |||||
* | Merge pull request #2391 from mattermost/fix-about-modal | Joram Wilander | 2016-03-09 | 1 | -15/+24 |
|\ | | | | | Improving the about dialog for licencing | ||||
| * | Fix spelling | Christopher Speller | 2016-03-08 | 1 | -2/+2 |
| | | |||||
| * | Improving the about dialog for licencing | Christopher Speller | 2016-03-08 | 1 | -15/+24 |
| | | |||||
* | | 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 |
| | | | |||||
* | | | Show filename for license settings, add loc | JoramWilander | 2016-03-09 | 1 | -7/+25 |
| | | | |||||
* | | | Updating button class | Asaad Mahmood | 2016-03-09 | 1 | -1/+1 |
| | | | |||||
* | | | Improvements to license page | Asaad Mahmood | 2016-03-09 | 1 | -11/+14 |
|/ / | |||||
* | | 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 |
| |/ | |||||
* / | Update BaseDN and email attribute default text | Eric Sethna | 2016-03-08 | 1 | -3/+3 |
|/ | |||||
* | Merge pull request #2370 from mattermost/PLT-1830 | Harrison Healey | 2016-03-08 | 3 | -0/+272 |
|\ | | | | | PLT-1830 Adding ability to create team with ldap | ||||
| * | PLT-1830 Adding ability to create team with ldap | =Corey Hulen | 2016-03-07 | 3 | -0/+272 |
| | | |||||
* | | Merge pull request #2376 from asaadmahmoodspin/ui-improvements | Harrison Healey | 2016-03-08 | 15 | -41/+55 |
|\ \ | | | | | | | Multiple UI improvements | ||||
| * | | Multiple UI Improvements | Asaad Mahmood | 2016-03-08 | 2 | -4/+4 |
| | | | |||||
| * | | Multiple UI Improvements | Asaad Mahmood | 2016-03-08 | 24 | -184/+141 |
| | | | |||||
* | | | Merge pull request #2347 from hmhealey/morechannels | Christopher Speller | 2016-03-08 | 2 | -53/+63 |
|\ \ \ | | | | | | | | | 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 | 2 | -37/+39 |
| | | | | |||||
* | | | | 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 | ||||
| * | | | | Fixed clearing post draft after a command is entered | Harrison Healey | 2016-03-07 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #2366 from hmhealey/plt2016 | Christopher Speller | 2016-03-07 | 1 | -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 Healey | 2016-03-07 | 1 | -1/+1 |
| |/ / / / | | | | | | | | | | | | | | | | IE11/Edge/Safari | ||||
* | | | | | Merge pull request #2364 from hmhealey/confirm | Christopher Speller | 2016-03-07 | 1 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Renamed confirm_button to confirmButton in InviteMemberModal | ||||
| * | | | | | Renamed confirm_button to confirmButton in InviteMemberModal | Harrison Healey | 2016-03-07 | 1 | -2/+2 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #2362 from ZBoxApp/PLT-2239 | Christopher Speller | 2016-03-07 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-2239: Fix Discard changes modal button text not showing | ||||
| * | | | | | PLT-2239: Fix Discard changes modal button text not showing | Elias Nahum | 2016-03-07 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge pull request #2360 from hmhealey/plt1993 | Christopher Speller | 2016-03-07 | 2 | -9/+9 |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-1993/PLT-1994 Stopped calling uploadFiles multiple times for a single upload | ||||
| * | | | | | Stopped calling uploadFiles multiple times for a single upload | Harrison Healey | 2016-03-07 | 2 | -9/+9 |
| |/ / / / | |||||
* | | | | | Merge pull request #2350 from hmhealey/plt1930 | Christopher Speller | 2016-03-07 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-1930 Fixed Private Channels header in SearchSuggestionList | ||||
| * | | | | | Fixed Private Channels header in the SearchSuggestionList to actually say ↵ | Harrison Healey | 2016-03-07 | 1 | -1/+1 |
| |/ / / / | | | | | | | | | | | | | | | | Private instead of Public | ||||
* | | | | | Merge pull request #2349 from hmhealey/plt2008 | Christopher Speller | 2016-03-07 | 1 | -102/+8 |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-2008 Removed gif playing code from the FileAttachment component | ||||
| * | | | | | Removed gif playing code from the FileAttachment component | Harrison Healey | 2016-03-07 | 1 | -102/+8 |
| |/ / / / | |||||
* | | | | | Merge pull request #2348 from hmhealey/member | Christopher Speller | 2016-03-07 | 2 | -6/+6 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Updated Channel Members modal UI | ||||
| * | | | | Changed Channel Members modal to list full user objects with all fields ↵ | Harrison Healey | 2016-03-07 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | populated | ||||
| * | | | | Added @ before username in UserList when a Full Name or Nickname is present | Harrison Healey | 2016-03-07 | 1 | -2/+2 |
| | | | | |