Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Adding or separator between ldap, username, email, github | Asaad Mahmood | 2016-03-11 | 5 | -4/+38 |
| | | | | | | | | | | | | 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 | 2 | -8/+8 |
|\ \ | | | | | | | Fixing blue bar on iOS | ||||
| * | | Fixing blue bar on iOS | =Corey Hulen | 2016-03-10 | 2 | -8/+8 |
| | | | |||||
* | | | Merge pull request #2413 from asaadmahmoodspin/themeFix | Christopher Speller | 2016-03-11 | 3 | -17/+18 |
|\ \ \ | |/ / |/| | | PLT-2138 - Fixing theme sharing box | ||||
| * | | 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 |
|/ / | |||||
* / | Fixing docker automation issue | Christopher Speller | 2016-03-10 | 1 | -1/+1 |
|/ | |||||
* | Bumping version to: 2.1.0-rc1 | Mattermost Build | 2016-03-09 | 1 | -0/+1 |
| | |||||
* | Docker updates for 2.1.0-rc1 | Mattermost Build | 2016-03-09 | 8 | -3/+8 |
| | |||||
* | 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 |
| | | |||||
* | | Merge pull request #2405 from mattermost/changelog-2.1 | Christopher Speller | 2016-03-09 | 1 | -0/+139 |
|\ \ | | | | | | | Update Changelog.md for v2.1 | ||||
| * | | Update Changelog.md for v2.1 | Eric Sethna | 2016-03-09 | 1 | -0/+139 |
| |/ | |||||
* | | Fixing minor issue | Christopher Speller | 2016-03-09 | 1 | -0/+25 |
| | | |||||
* | | Merge pull request #2403 from ZBoxApp/license-es-loc | Christopher Speller | 2016-03-09 | 2 | -1/+3 |
|\ \ | |/ |/| | Add license locs in spanish | ||||
| * | 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 #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 |