Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'release-2.1' | Christopher Speller | 2016-03-14 | 3 | -9/+11 |
|\ | |||||
| * | Merge pull request #2412 from asaadmahmoodspin/ui-improvements | Christopher Speller | 2016-03-12 | 2 | -0/+0 |
| |\ | | | | | | | Adding separators between ldap, username, email, github | ||||
| | * | Adding or separator between ldap, username, email, github | Asaad Mahmood | 2016-03-11 | 2 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | 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 |
| |/ | |||||
* / | Convering client to react-router. | Christopher Speller | 2016-03-14 | 5 | -95/+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 | 3 | -6/+9 |
|\ | | | | | Improving the about dialog for licencing | ||||
| * | Fix spelling | Christopher Speller | 2016-03-08 | 3 | -6/+6 |
| | | |||||
| * | Improving the about dialog for licencing | Christopher Speller | 2016-03-08 | 3 | -7/+10 |
| | | |||||
* | | Show filename for license settings, add loc | JoramWilander | 2016-03-09 | 1 | -0/+2 |
| | | |||||
* | | 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 |
| | | | |||||
* | | | 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 |
| |/ |/| | |||||
* | | 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 | 1 | -0/+6 |
|\ \ | |/ |/| | PLT-1830 Adding ability to create team with ldap | ||||
| * | PLT-1830 Adding ability to create team with ldap | =Corey Hulen | 2016-03-07 | 1 | -0/+6 |
| | | |||||
* | | Add missing web locales | Elias Nahum | 2016-03-07 | 2 | -1/+8 |
| | | | | | | | | - Sort locale files by id | ||||
* | | Merge pull request #2350 from hmhealey/plt1930 | Christopher Speller | 2016-03-07 | 2 | -2/+1 |
|\ \ | | | | | | | PLT-1930 Fixed Private Channels header in SearchSuggestionList | ||||
| * | | Fixed Private Channels header in the SearchSuggestionList to actually say ↵ | Harrison Healey | 2016-03-07 | 2 | -4/+3 |
| |/ | | | | | | | Private instead of Public | ||||
* | | Merge pull request #2348 from hmhealey/member | Christopher Speller | 2016-03-07 | 3 | -6/+4 |
|\ \ | | | | | | | Updated Channel Members modal UI | ||||
| * | | Changed 'Remove Member' to 'Remove' in Channel Members modal | Harrison Healey | 2016-03-07 | 3 | -6/+4 |
| |/ | |||||
* | | Merge pull request #2340 from rodrigocorsi2/PLT-2076 | Harrison Healey | 2016-03-07 | 2 | -0/+12 |
|\ \ | |/ |/| | PLT-2076: Add help text below the input box when a user starts typing | ||||
| * | Add help text below the input box when a user starts typing | rodrigo | 2016-03-06 | 2 | -0/+12 |
| | | |||||
* | | Fix for PLT-2218 & PLT-2222 | Elias Nahum | 2016-03-06 | 3 | -51/+52 |
|/ | | | | | - Also includes missing loc strings for frontend es.json - Sort web [locale].json by id | ||||
* | Merge pull request #2306 from mattermost/esethna-patch-1 | Corey Hulen | 2016-03-04 | 3 | -3/+1 |
|\ | | | | | Update get team invite link help text | ||||
| * | Update pt.json | Eric Sethna | 2016-03-01 | 1 | -1/+0 |
| | | |||||
| * | Update es.json | Eric Sethna | 2016-03-01 | 1 | -1/+0 |
| | | |||||
| * | Update en.json | Eric Sethna | 2016-03-01 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #2307 from ZBoxApp/PLT-2112 | Joram Wilander | 2016-03-04 | 2 | -0/+6 |
|\ \ | | | | | | | PLT-2112: Allow CORS | ||||
| * | | Allow CORS | Elias Nahum | 2016-03-01 | 2 | -0/+6 |
| | | | |||||
* | | | Merge pull request #2318 from hmhealey/plt1090 | Christopher Speller | 2016-03-03 | 3 | -58/+54 |
|\ \ \ | | | | | | | | | PLT-1090 Refactored modals that display users | ||||
| * | | | Fixed localization issues with ChannelMembersModal | hmhealey | 2016-03-03 | 3 | -6/+3 |
| | | | | |||||
| * | | | Fixed '0 of X users' in FilteredUserList and cleaned up pluralization of ↵ | hmhealey | 2016-03-03 | 3 | -6/+6 |
| | | | | | | | | | | | | | | | | 'member' | ||||
| * | | | Moved localized strings for PLT-1090 | hmhealey | 2016-03-03 | 3 | -59/+58 |
| | | | | |||||
* | | | | Changed submit button of ManageLanguage to match other settings | Harrison Healey | 2016-03-03 | 3 | -4/+1 |
|/ / / | |||||
* | | | Merge pull request #2321 from ZBoxApp/plt-1796-es | Harrison Healey | 2016-03-03 | 2 | -49/+56 |
|\ \ \ | | | | | | | | | Add missing es loc strings to server and frontend | ||||
| * | | | Add missing es loc strings to server and frontend | Elias Nahum | 2016-03-02 | 2 | -49/+56 |
| | | | | | | | | | | | | | | | | - Sort files contents by id | ||||
* | | | | Revised and added some translations in pt | Rodrigo Corsi | 2016-03-03 | 1 | -17/+31 |
|/ / / | |||||
* | | | Merge pull request #2258 from mattermost/plt-1796 | Corey Hulen | 2016-03-02 | 3 | -51/+67 |
|\ \ \ | |_|/ |/| | | PLT-1796 Refactor and modularize analytics on the client | ||||
| * | | Update pt.json for localization | JoramWilander | 2016-03-01 | 1 | -17/+20 |
| | | | |||||
| * | | Refactor and modularize analytics on the client | JoramWilander | 2016-03-01 | 2 | -34/+47 |
| |/ | |||||
* | | Merge pull request #2302 from ZBoxApp/member_list-es | Christopher Speller | 2016-03-01 | 1 | -0/+3 |
|\ \ | | | | | | | channel_headers errors and member_list locs | ||||
| * | | channel_headers errors and member_list locs | Elias Nahum | 2016-03-01 | 1 | -0/+3 |
| |/ | |||||
* | | Merge pull request #2293 from mattermost/esethna-patch-2 | Joram Wilander | 2016-03-01 | 3 | -3/+3 |
|\ \ | |/ |/| | Update sys console GitLab set up help text | ||||
| * | Update pt.json | Eric Sethna | 2016-02-26 | 1 | -2/+2 |
| | | |||||
| * | Update es.json | Eric Sethna | 2016-02-26 | 1 | -1/+1 |
| | |