Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Updating sidebar | Asaad Mahmood | 2016-03-17 | 1 | -1/+0 |
| | |||||
* | Updating asss lint stuff with other scss improvements | Asaad Mahmood | 2016-03-17 | 57 | -1293/+1697 |
| | |||||
* | Merge pull request #2451 from mattermost/PLT-2344 | Joram Wilander | 2016-03-16 | 2 | -15/+22 |
|\ | | | | | PLT-2344 support 3 versions back | ||||
| * | PLT-2344 support 3 versions back | =Corey Hulen | 2016-03-16 | 2 | -15/+22 |
| | | |||||
* | | Merge pull request #2419 from mattermost/plt-2044 | Christopher Speller | 2016-03-16 | 5 | -10/+25 |
|\ \ | | | | | | | PLT-2044 Auto-create account if team allows sign-up from login page and oauth … | ||||
| * | | Auto-create account if team allows sign-up from login page and oauth account ↵ | JoramWilander | 2016-03-11 | 5 | -10/+25 |
| | | | | | | | | | | | | doesn't exist | ||||
* | | | Merge pull request #2430 from mattermost/changelog-to-docs | Christopher Speller | 2016-03-16 | 1 | -1299/+1 |
|\ \ \ | | | | | | | | | Moving CHANGELOG to docs | ||||
| * | | | Moving CHANGELOG to docs | it33 | 2016-03-14 | 1 | -1299/+1 |
| | | | | |||||
* | | | | Merge pull request #2453 from mattermost/plt-2340 | Christopher Speller | 2016-03-16 | 5165 | -1655065/+61125 |
|\ \ \ \ | |_|_|/ |/| | | | PLT-2340 Converting to Webpack. Stage 1. | ||||
| * | | | Converting to Webpack. Stage 1. | Christopher Speller | 2016-03-16 | 5165 | -1655065/+61125 |
|/ / / | |||||
* | | | Merge pull request #2431 from mattermost/fix-seg | Christopher Speller | 2016-03-15 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fixing segment tracking | ||||
| * | | | Fixing segment tracking | =Corey Hulen | 2016-03-14 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #2429 from asaadmahmoodspin/ui-improvements | Christopher Speller | 2016-03-15 | 111 | -5013/+5463 |
|\ \ \ | |/ / |/| | | PLT-963 - Improving scss structure | ||||
| * | | Updating pages to routes | Asaad Mahmood | 2016-03-15 | 12 | -1/+1 |
| | | | |||||
| * | | Updating character in post.scss | Asaad Mahmood | 2016-03-15 | 1 | -1/+1 |
| | | | |||||
| * | | Reverting changes for core files | Asaad Mahmood | 2016-03-14 | 2 | -30/+5 |
| | | | |||||
| * | | PLT-963 - Improving scss structure | Asaad Mahmood | 2016-03-14 | 113 | -5018/+5493 |
|/ / | |||||
* | | Merge branch 'release-2.1' | Christopher Speller | 2016-03-14 | 20 | -55/+122 |
|\ \ | |||||
| * \ | Merge pull request #2412 from asaadmahmoodspin/ui-improvements | Christopher Speller | 2016-03-12 | 5 | -4/+38 |
| |\ \ | | | | | | | | | Adding separators between ldap, username, email, github | ||||
| | * | | 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 #2416 from rodrigocorsi2/pt_translations | Christopher Speller | 2016-03-11 | 2 | -18/+36 |
| |\ \ \ | | |/ / | |/| | | added missing translations pt | ||||
| | * | | standardized terminology for sign in and sign up | Rodrigo Corsi | 2016-03-10 | 2 | -15/+15 |
| | | | | |||||
| | * | | added missing translations | Rodrigo Corsi | 2016-03-10 | 2 | -3/+21 |
| | | | | |||||
| * | | | 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 #2331 from mattermost/plt-1680 | Christopher Speller | 2016-03-14 | 183 | -5084/+3426 |
|\ \ \ | | | | | | | | | PLT-1680 Converting client to react-router. Stage 1 | ||||
| * | | | Convering client to react-router. | Christopher Speller | 2016-03-14 | 183 | -5084/+3426 |
| |/ / | |||||
* | / | Removing items not in T0 | it33 | 2016-03-11 | 1 | -14/+0 |
| |/ |/| | |||||
* | | Merge pull request #2411 from peasead/master | Christopher Speller | 2016-03-10 | 1 | -1/+1 |
|\ \ | |/ |/| | updated the 2.0 Dockerfile to include the proper location of mm gzip | ||||
| * | updated the 2.0 Dockerfile to include the proper location of mm gzip | peasead | 2016-03-10 | 1 | -1/+1 |
|/ | |||||
* | 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 |
| | |