Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2412 from asaadmahmoodspin/ui-improvements | Christopher Speller | 2016-03-12 | 4 | -3/+37 |
|\ | | | | | Adding separators between ldap, username, email, github | ||||
| * | Adding or separator between ldap, username, email, github | Asaad Mahmood | 2016-03-11 | 4 | -3/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 #2416 from rodrigocorsi2/pt_translations | Christopher Speller | 2016-03-11 | 1 | -9/+11 |
|\ \ | |/ |/| | added missing translations pt | ||||
| * | standardized terminology for sign in and sign up | Rodrigo Corsi | 2016-03-10 | 1 | -8/+8 |
| | | |||||
| * | added missing translations | Rodrigo Corsi | 2016-03-10 | 1 | -1/+3 |
| | | |||||
* | | 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 | 2 | -8/+8 |
|\ \ | | | | | | | Fixing blue bar on iOS | ||||
| * | | Fixing blue bar on iOS | =Corey Hulen | 2016-03-10 | 2 | -8/+8 |
| |/ | |||||
* | | Small fix for search loading icon on mobile | Asaad Mahmood | 2016-03-11 | 1 | -2/+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 | 2 | -15/+19 |
|/ | |||||
* | Merge pull request #2404 from asaadmahmoodspin/ui-improvements | Christopher Speller | 2016-03-09 | 2 | -24/+31 |
|\ | | | | | Disabling help stuff and moving preview out of the help text. | ||||
| * | Disabling help stuff and moving preview out of it | Asaad Mahmood | 2016-03-09 | 2 | -24/+31 |
| | | |||||
* | | Fixing minor issue | Christopher Speller | 2016-03-09 | 1 | -0/+25 |
| | | |||||
* | | Add license locs in spanish | Elias Nahum | 2016-03-09 | 2 | -1/+3 |
|/ | |||||
* | Merge pull request #2391 from mattermost/fix-about-modal | Joram Wilander | 2016-03-09 | 4 | -21/+33 |
|\ | | | | | Improving the about dialog for licencing | ||||
| * | Fix spelling | Christopher Speller | 2016-03-08 | 4 | -8/+8 |
| | | |||||
| * | Improving the about dialog for licencing | Christopher Speller | 2016-03-08 | 4 | -22/+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 |
| | | | |||||
* | | | Show filename for license settings, add loc | JoramWilander | 2016-03-09 | 2 | -7/+27 |
| | | | |||||
* | | | 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 | 1 | -4/+17 |
|\ \ \ | | | | | | | | | addded missing translations | ||||
| * | | | Added missing web and server portuguese locs | Rodrigo Corsi | 2016-03-08 | 1 | -0/+6 |
| | | | | |||||
| * | | | addded missing translations | Rodrigo Corsi | 2016-03-08 | 1 | -4/+11 |
| | | | | |||||
* | | | | 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 |
| | |/ / | |/| | | |||||
* | | | | 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 |
| |_|/ |/| | | |||||
* | | | Added missing web and server spanish locs | Elias Nahum | 2016-03-08 | 2 | -5/+11 |
|/ / | |||||
* | | Merge pull request #2370 from mattermost/PLT-1830 | Harrison Healey | 2016-03-08 | 6 | -0/+302 |
|\ \ | | | | | | | PLT-1830 Adding ability to create team with ldap | ||||
| * | | PLT-1830 Adding ability to create team with ldap | =Corey Hulen | 2016-03-07 | 6 | -0/+302 |
| | | | |||||
* | | | 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 |
| | | | |||||
| * | | Multiple UI Improvements | Asaad Mahmood | 2016-03-08 | 35 | -652/+693 |
| | | | |||||
* | | | 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 |
| | | | |