Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix bad scss merge | Christopher Speller | 2016-03-17 | 1 | -0/+0 |
* | Merge pull request #2424 from hmhealey/escape | Harrison Healey | 2016-03-17 | 1 | -0/+5 |
|\ | |||||
| * | Changed mention parser to ignore empty string mentions | Harrison Healey | 2016-03-17 | 1 | -0/+5 |
|/ | |||||
* | Merge pull request #2459 from ZBoxApp/server-es-locs | Christopher Speller | 2016-03-17 | 2 | -4/+8 |
|\ | |||||
| * | Added Missing es server locs and sort by id | Elias Nahum | 2016-03-17 | 2 | -4/+8 |
* | | Merge pull request #2448 from asaadmahmoodspin/ui-improvements | Christopher Speller | 2016-03-17 | 57 | -1294/+1641 |
|\ \ | |/ |/| | |||||
| * | Removing package.json | Asaad Mahmood | 2016-03-17 | 1 | -56/+0 |
| * | Reordering styles.scss file | Asaad Mahmood | 2016-03-17 | 1 | -1/+1 |
| * | 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 #2436 from rodrigocorsi2/pt_translations | Corey Hulen | 2016-03-16 | 2 | -23/+21 |
|\ \ | |||||
| * | | added missing translations in pt | Rodrigo Corsi | 2016-03-16 | 2 | -23/+21 |
| |/ | |||||
* | | Merge pull request #2427 from ZBoxApp/PLT-2342 | Corey Hulen | 2016-03-16 | 1 | -18/+24 |
|\ \ | |||||
| * | | PLT-2342: Incorrect formatting of last password update string in all languages | Elias Nahum | 2016-03-16 | 1 | -18/+24 |
| |/ | |||||
* | | Merge pull request #2426 from ZBoxApp/es-locs | Corey Hulen | 2016-03-16 | 4 | -7/+18 |
|\ \ | |/ |/| | |||||
| * | Add missing spanish locale strings | Elias Nahum | 2016-03-16 | 4 | -7/+18 |
|/ | |||||
* | Merge pull request #2451 from mattermost/PLT-2344 | Joram Wilander | 2016-03-16 | 2 | -15/+22 |
|\ | |||||
| * | 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 |
|\ \ | |||||
| * | | Auto-create account if team allows sign-up from login page and oauth account ... | JoramWilander | 2016-03-11 | 5 | -10/+25 |
* | | | Merge pull request #2430 from mattermost/changelog-to-docs | Christopher Speller | 2016-03-16 | 1 | -1299/+1 |
|\ \ \ | |||||
| * | | | 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 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | 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 | =Corey Hulen | 2016-03-14 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #2429 from asaadmahmoodspin/ui-improvements | Christopher Speller | 2016-03-15 | 111 | -5013/+5463 |
|\ \ \ | |/ / |/| | | |||||
| * | | 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 or separator between ldap, username, email, github | Asaad Mahmood | 2016-03-11 | 5 | -4/+38 |
| * | | | Merge pull request #2416 from rodrigocorsi2/pt_translations | Christopher Speller | 2016-03-11 | 2 | -18/+36 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | 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 |
| |\ \ \ | |||||
| | * | | | 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 | =Corey Hulen | 2016-03-10 | 2 | -8/+8 |
| * | | | | | Merge pull request #2413 from asaadmahmoodspin/themeFix | Christopher Speller | 2016-03-11 | 3 | -17/+18 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | 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 |
|\ \ \ |