summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Collapse)AuthorAgeFilesLines
* Removing static test. Adding start-docker as a dep for run-server.Christopher Speller2016-03-221-1/+2
|
* Merge pull request #2462 from mattermost/plt-2340Christopher Speller2016-03-171-4/+12
|\ | | | | PLT-2340 Webpack optimizations and fixes
| * Webpack optimizations and fixesChristopher Speller2016-03-171-4/+12
| |
* | Fix bad scss mergeChristopher Speller2016-03-171-0/+0
|/
* Removing package.jsonAsaad Mahmood2016-03-171-56/+0
|
* Updating asss lint stuff with other scss improvementsAsaad Mahmood2016-03-172-0/+56
|
* Converting to Webpack. Stage 1.Christopher Speller2016-03-164822-1927826/+8
|
* Merge pull request #2431 from mattermost/fix-segChristopher Speller2016-03-151-1/+1
|\ | | | | Fixing segment tracking
| * Fixing segment tracking=Corey Hulen2016-03-141-1/+1
| |
* | Updating pages to routesAsaad Mahmood2016-03-1512-1/+1
| |
* | Updating character in post.scssAsaad Mahmood2016-03-151-1/+1
| |
* | PLT-963 - Improving scss structureAsaad Mahmood2016-03-14110-5012/+5462
|/
* Merge branch 'release-2.1'Christopher Speller2016-03-1410-43/+88
|\
| * Merge pull request #2412 from asaadmahmoodspin/ui-improvementsChristopher Speller2016-03-124-3/+37
| |\ | | | | | | Adding separators between ldap, username, email, github
| | * Adding or separator between ldap, username, email, githubAsaad Mahmood2016-03-114-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_translationsChristopher Speller2016-03-111-9/+11
| |\ \ | | |/ | |/| added missing translations pt
| | * standardized terminology for sign in and sign upRodrigo Corsi2016-03-101-8/+8
| | |
| | * added missing translationsRodrigo Corsi2016-03-101-1/+3
| | |
| * | Merge pull request #2417 from hmhealey/plt2264Christopher Speller2016-03-111-6/+14
| |\ \ | | | | | | | | PLT-2264 Disabled embed toggle when it's disabled in user settings
| | * | Disabled embed toggle when it's disabled in user settingsHarrison Healey2016-03-101-6/+14
| | |/
| * | Merge pull request #2414 from mattermost/bluebar-fixChristopher Speller2016-03-112-8/+8
| |\ \ | | | | | | | | Fixing blue bar on iOS
| | * | Fixing blue bar on iOS=Corey Hulen2016-03-102-8/+8
| | |/
| * | Small fix for search loading icon on mobileAsaad Mahmood2016-03-111-2/+1
| | |
| * | Fixing padding issueAsaad Mahmood2016-03-101-1/+0
| | |
| * | Removing consoleAsaad Mahmood2016-03-101-1/+0
| | |
| * | PLT-2138 - Fixing theme sharing boxAsaad Mahmood2016-03-102-15/+19
| |/
* / Convering client to react-router.Christopher Speller2016-03-14134-4545/+2527
|/
* Merge pull request #2404 from asaadmahmoodspin/ui-improvementsChristopher Speller2016-03-092-24/+31
|\ | | | | Disabling help stuff and moving preview out of the help text.
| * Disabling help stuff and moving preview out of itAsaad Mahmood2016-03-092-24/+31
| |
* | Fixing minor issueChristopher Speller2016-03-091-0/+25
| |
* | Add license locs in spanishElias Nahum2016-03-092-1/+3
|/
* Merge pull request #2391 from mattermost/fix-about-modalJoram Wilander2016-03-094-21/+33
|\ | | | | Improving the about dialog for licencing
| * Fix spellingChristopher Speller2016-03-084-8/+8
| |
| * Improving the about dialog for licencingChristopher Speller2016-03-084-22/+34
| |
* | Merge pull request #2397 from mattermost/plt-2185Christopher Speller2016-03-094-10/+10
|\ \ | | | | | | PLT-2185 Fix ... for usernames on first page load
| * | Fix ... for usernames on first page loadJoramWilander2016-03-094-10/+10
| | |
* | | Show filename for license settings, add locJoramWilander2016-03-092-7/+27
| | |
* | | Updating button classAsaad Mahmood2016-03-091-1/+1
| | |
* | | Improvements to license pageAsaad Mahmood2016-03-092-13/+31
|/ /
* | Merge pull request #2392 from hmhealey/plt1960Christopher Speller2016-03-081-0/+1
|\ \ | | | | | | PLT-1960 Added proper click handler to search result text
| * | Added proper click handler to search result textHarrison Healey2016-03-081-0/+1
| | |
* | | Merge pull request #2390 from hmhealey/plt2259Christopher Speller2016-03-082-0/+3
|\ \ \ | |/ / |/| | PLT-2259 Added target='_blank' to all attachment download links
| * | Added target='_blank' to all attachment download linksHarrison Healey2016-03-082-0/+3
| | |
* | | Merge pull request #2383 from rodrigocorsi2/pt_translationsHarrison Healey2016-03-081-4/+17
|\ \ \ | | | | | | | | addded missing translations
| * | | Added missing web and server portuguese locsRodrigo Corsi2016-03-081-0/+6
| | | |
| * | | addded missing translationsRodrigo Corsi2016-03-081-4/+11
| | | |
* | | | 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
| | |/ / | |/| |
* | | | 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
| | | |