Граф коммитов

5912 Коммитов

Автор SHA1 Сообщение Дата
Joram Wilander
c819330c57 Merge pull request #2546 from ZBoxApp/open-invite
fix register account for teams with open invites
2016-03-28 09:04:45 -04:00
Joram Wilander
60f71afb6e Merge pull request #2545 from ryoon/no-travis
Mattermost does not appears to use travis ci anymore
2016-03-28 08:45:37 -04:00
Christopher Speller
1db912df8d Merge pull request #2538 from mattermost/websocket-fix
Fix websocket trying to reconnect after a logout
2016-03-28 07:54:57 -04:00
Christopher Speller
8362d3ac0b Merge pull request #2537 from mattermost/oauth-fix
Fix OAuth routes and link issues
2016-03-28 07:54:02 -04:00
Christopher Speller
84f9c018e5 Merge pull request #2532 from mattermost/ldap-switch-fix
Minor fix to let Sign-in Method settings show up when ldap is enabled
2016-03-28 07:53:34 -04:00
Christopher Speller
7a25f2a78b Merge pull request #2547 from ZBoxApp/notifications-fix
Fix HTML Notifications not showing
2016-03-26 20:32:40 -04:00
Elias Nahum
0f56be785a Fix HTML Notifications not showing
- fix filename typo
2016-03-26 14:02:45 -03:00
Elias Nahum
269355ebb7 fix register account for teams with open invites 2016-03-26 13:22:36 -03:00
Ryo ONODERA
a451700b87 Mattermost does not appears to use travis ci anymore
Remove travis ci status.
2016-03-26 13:12:11 +09:00
Christopher Speller
4807cddb17 Merge pull request #2544 from ZBoxApp/loc-fix
Fix default Browser locale
2016-03-25 23:00:47 -04:00
Elias Nahum
29363680e8 Fix default Browser locale 2016-03-25 23:54:49 -03:00
Christopher Speller
ad6a835712 Merge pull request #2543 from hmhealey/safariFix
Fixed typo safarifix -> safariFix
2016-03-25 22:42:32 -04:00
hmhealey
e236180139 Fixed typo safarifix -> safariFix 2016-03-25 22:36:55 -04:00
Corey Hulen
f4e5fb711f Merge pull request #2533 from ZBoxApp/PLT-2358
PLT-2358: Detect user localization using client headers
2016-03-24 21:46:07 -07:00
Corey Hulen
fb9adbfe5b Merge pull request #2534 from hmhealey/plt2184
PLT-2184 Moved theme reset code to componentWillUnmount
2016-03-24 21:45:23 -07:00
Corey Hulen
1147c7ff29 Merge pull request #2535 from hmhealey/plt2446
PLT-2446 Imported React into SearchSuggestionList
2016-03-24 21:45:05 -07:00
JoramWilander
6516e9bf68 Fix websocket trying to reconnect after a logout 2016-03-24 20:12:36 -04:00
JoramWilander
de2f7f4e52 Fix oauth routes and link issues 2016-03-24 19:32:25 -04:00
JoramWilander
105333412e Remove loc change 2016-03-24 18:57:16 -04:00
Joram Wilander
8f5b90fe78 Merge pull request #2536 from numericube/master
Added FR translation
2016-03-24 18:07:33 -04:00
Pierre-Julien Grizel
f9e92812d3 Added FR translation / thanks to @jblobel and @tbolon for their help 2016-03-24 20:17:46 +01:00
Harrison Healey
04b7344ea1 Imported React into SearchSuggestionList 2016-03-24 15:14:07 -04:00
Harrison Healey
e02921f344 Moved theme reset code to componentWillUnmount 2016-03-24 15:13:45 -04:00
Elias Nahum
b14a87c3bc PLT-2358: Detect user localization using client headers 2016-03-24 15:41:08 -03:00
Christopher Speller
f82d150f8c Merge pull request #2528 from hmhealey/plt2351
Re-added Github emoji images
2016-03-24 14:36:43 -04:00
JoramWilander
be2c883883 Fix chrome autocompleting using hidden input 2016-03-24 13:59:46 -04:00
Harrison Healey
5163b8a82c Merge pull request #2531 from mattermost/websocket-fix
Removing extranious this in websockets.
2016-03-24 12:49:39 -04:00
Harrison Healey
c64b12e27a Merge pull request #2529 from mattermost/plt-2383
PLT-2383 Fixed system console login page flash.
2016-03-24 12:45:12 -04:00
JoramWilander
629fc3d306 Minor fix to let Sign-in Method settings show up when ldap is enabled 2016-03-24 12:44:31 -04:00
Christopher Speller
998ce12133 Merge pull request #2530 from mattermost/i18n-consolidation
Consolidating i18n into i18n.jsx
2016-03-24 12:28:08 -04:00
Christopher Speller
8f0caf8dbf Removing extranious this 2016-03-24 12:26:50 -04:00
Christopher Speller
d36d977a01 Consolidating i18n stuff into i18n.jsx 2016-03-24 12:08:28 -04:00
Christopher Speller
d6a6668a39 Modifying login not to display until it has finished checking. Caused admin console to redirect to town-square. Will be changed after user model flip. 2016-03-24 11:27:05 -04:00
Harrison Healey
cc3d6b159c Re-added Github emoji images 2016-03-24 11:11:58 -04:00
Christopher Speller
b62e29ba9c Moving all links and redirects to react-router 2016-03-24 11:05:13 -04:00
Joram Wilander
e5c2915e87 Merge pull request #2523 from hmhealey/plt2351
PLT-2351 Switch to Apple emoji set
2016-03-24 10:36:42 -04:00
Harrison Healey
1ce18f7a9a Merge pull request #2526 from asaadmahmoodspin/ui-improvements
Multiple UI Improvements
2016-03-24 09:53:13 -04:00
Christopher Speller
68dad8c734 Merge pull request #2522 from ZBoxApp/es-locs
Add claim LDAP locs in spanish
2016-03-24 09:33:09 -04:00
Harrison Healey
5cfae469a5 Fixed ESLint errors 2016-03-24 09:22:58 -04:00
Asaad Mahmood
d64c75ae4a Multiple UI Improvements 2016-03-24 18:12:57 +05:00
Harrison Healey
5689bb7398 Replaced EmojiOne emoji with Apple emoji 2016-03-23 18:10:09 -04:00
Harrison Healey
016c179f01 Change emoticon rendering code to use image files with unicode names 2016-03-23 17:49:15 -04:00
Harrison Healey
c24a5c5a9a Fixed unicode emoji not having a consistent size 2016-03-23 17:49:14 -04:00
Elias Nahum
886fe4e3c1 Add claim LDAP locs in spanish 2016-03-23 18:25:39 -03:00
Christopher Speller
0abd7116c5 Merge pull request #2519 from mattermost/search-store-fix
Moving search store to memory
2016-03-23 16:36:23 -04:00
Christopher Speller
13b967b2b5 Merge pull request #2520 from hmhealey/prefs
Fixed tutorial step preferences to be saved as strings
2016-03-23 16:31:12 -04:00
Christopher Speller
07bf7c498d Merge pull request #2465 from mattermost/plt-2260
PLT-2260 Add the ability to switch from email to ldap and back
2016-03-23 16:26:37 -04:00
Christopher Speller
6285ec44bb Merge pull request #2494 from hmhealey/plt2190
PLT-2190 Switched Textbox to use a TextareaAutosize and removed custom resizing code
2016-03-23 16:21:27 -04:00
Joram Wilander
826529f048 Merge pull request #2517 from mattermost/plt-2379
PLT-2379, PLT-2432 Fixing browser store issue.
2016-03-23 16:06:53 -04:00
Joram Wilander
6ccef5caf5 Merge pull request #2509 from asaadmahmoodspin/ui-improvements
Multiple UI improvements
2016-03-23 16:02:36 -04:00