summaryrefslogtreecommitdiffstats
path: root/web/static
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release-2.1'Christopher Speller2016-03-143-9/+11
|\
| * Merge pull request #2412 from asaadmahmoodspin/ui-improvementsChristopher Speller2016-03-122-0/+0
| |\ | | | | | | Adding separators between ldap, username, email, github
| | * Adding or separator between ldap, username, email, githubAsaad Mahmood2016-03-112-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 upRodrigo Corsi2016-03-101-8/+8
| | |
| * | added missing translationsRodrigo Corsi2016-03-101-1/+3
| |/
* / Convering client to react-router.Christopher Speller2016-03-145-95/+25
|/
* Add license locs in spanishElias Nahum2016-03-092-1/+3
|
* Merge pull request #2391 from mattermost/fix-about-modalJoram Wilander2016-03-093-6/+9
|\ | | | | Improving the about dialog for licencing
| * Fix spellingChristopher Speller2016-03-083-6/+6
| |
| * Improving the about dialog for licencingChristopher Speller2016-03-083-7/+10
| |
* | Show filename for license settings, add locJoramWilander2016-03-091-0/+2
| |
* | 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
| | |
* | | 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
| | |
* | | Update BaseDN and Email LDAP settings help text in pt.jsonEric Sethna2016-03-081-3/+3
| |/ |/|
* | Added missing web and server spanish locsElias Nahum2016-03-082-5/+11
| |
* | Merge pull request #2370 from mattermost/PLT-1830Harrison Healey2016-03-081-0/+6
|\ \ | |/ |/| PLT-1830 Adding ability to create team with ldap
| * PLT-1830 Adding ability to create team with ldap=Corey Hulen2016-03-071-0/+6
| |
* | Add missing web localesElias Nahum2016-03-072-1/+8
| | | | | | | | - Sort locale files by id
* | Merge pull request #2350 from hmhealey/plt1930Christopher Speller2016-03-072-2/+1
|\ \ | | | | | | PLT-1930 Fixed Private Channels header in SearchSuggestionList
| * | Fixed Private Channels header in the SearchSuggestionList to actually say ↵Harrison Healey2016-03-072-4/+3
| |/ | | | | | | Private instead of Public
* | Merge pull request #2348 from hmhealey/memberChristopher Speller2016-03-073-6/+4
|\ \ | | | | | | Updated Channel Members modal UI
| * | Changed 'Remove Member' to 'Remove' in Channel Members modalHarrison Healey2016-03-073-6/+4
| |/
* | Merge pull request #2340 from rodrigocorsi2/PLT-2076Harrison Healey2016-03-072-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 typingrodrigo2016-03-062-0/+12
| |
* | Fix for PLT-2218 & PLT-2222Elias Nahum2016-03-063-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-1Corey Hulen2016-03-043-3/+1
|\ | | | | Update get team invite link help text
| * Update pt.jsonEric Sethna2016-03-011-1/+0
| |
| * Update es.jsonEric Sethna2016-03-011-1/+0
| |
| * Update en.jsonEric Sethna2016-03-011-1/+1
| |
* | Merge pull request #2307 from ZBoxApp/PLT-2112Joram Wilander2016-03-042-0/+6
|\ \ | | | | | | PLT-2112: Allow CORS
| * | Allow CORSElias Nahum2016-03-012-0/+6
| | |
* | | Merge pull request #2318 from hmhealey/plt1090Christopher Speller2016-03-033-58/+54
|\ \ \ | | | | | | | | PLT-1090 Refactored modals that display users
| * | | Fixed localization issues with ChannelMembersModalhmhealey2016-03-033-6/+3
| | | |
| * | | Fixed '0 of X users' in FilteredUserList and cleaned up pluralization of ↵hmhealey2016-03-033-6/+6
| | | | | | | | | | | | | | | | 'member'
| * | | Moved localized strings for PLT-1090hmhealey2016-03-033-59/+58
| | | |
* | | | Changed submit button of ManageLanguage to match other settingsHarrison Healey2016-03-033-4/+1
|/ / /
* | | Merge pull request #2321 from ZBoxApp/plt-1796-esHarrison Healey2016-03-032-49/+56
|\ \ \ | | | | | | | | Add missing es loc strings to server and frontend
| * | | Add missing es loc strings to server and frontendElias Nahum2016-03-022-49/+56
| | | | | | | | | | | | | | | | - Sort files contents by id
* | | | Revised and added some translations in ptRodrigo Corsi2016-03-031-17/+31
|/ / /
* | | Merge pull request #2258 from mattermost/plt-1796Corey Hulen2016-03-023-51/+67
|\ \ \ | |_|/ |/| | PLT-1796 Refactor and modularize analytics on the client
| * | Update pt.json for localizationJoramWilander2016-03-011-17/+20
| | |
| * | Refactor and modularize analytics on the clientJoramWilander2016-03-012-34/+47
| |/
* | Merge pull request #2302 from ZBoxApp/member_list-esChristopher Speller2016-03-011-0/+3
|\ \ | | | | | | channel_headers errors and member_list locs
| * | channel_headers errors and member_list locsElias Nahum2016-03-011-0/+3
| |/
* | Merge pull request #2293 from mattermost/esethna-patch-2Joram Wilander2016-03-013-3/+3
|\ \ | |/ |/| Update sys console GitLab set up help text
| * Update pt.jsonEric Sethna2016-02-261-2/+2
| |
| * Update es.jsonEric Sethna2016-02-261-1/+1
| |