Commit graph

5889 commits

Author SHA1 Message Date
JoramWilander
de2f7f4e52 Fix oauth routes and link issues 2016-03-24 19:32:25 -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
Christopher Speller
f82d150f8c Merge pull request #2528 from hmhealey/plt2351
Re-added Github emoji images
2016-03-24 14:36:43 -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
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
Harrison Healey
c6e14fc380 Fixed tutorial step preferences to be saved as strings 2016-03-23 16:01:49 -04:00
JoramWilander
934c7c7a7c Fix imports and change ldap function name 2016-03-23 15:59:58 -04:00
JoramWilander
463fd8c20b Add the ability to switch from email to ldap and back 2016-03-23 15:59:58 -04:00
Christopher Speller
169f9080d2 Moving search store to memory 2016-03-23 15:58:31 -04:00
Christopher Speller
c3aa84a883 Fixing browser store issue. 2016-03-23 15:35:38 -04:00
Joram Wilander
7af2e6f87a Merge pull request #2516 from hmhealey/disableautolinker
Disabled autolinker
2016-03-23 14:22:54 -04:00
Joram Wilander
6275ad2ae4 Merge pull request #2515 from hmhealey/prefs
Changed PreferenceStore to store data in memory
2016-03-23 14:22:30 -04:00
Harrison Healey
c16fcbbfaf Disabled autolinker 2016-03-23 13:13:15 -04:00
Harrison Healey
1f46cca65c Changed PreferenceStore to store data in memory 2016-03-23 13:03:12 -04:00
Corey Hulen
aed690c589 Merge pull request #2512 from mattermost/plt-2473
PLT-2473, PLT-2310 Fixing websocket issues.
2016-03-23 08:00:46 -07:00
Christopher Speller
9239a7353a Fixing websocket connection issue. Refactoring websockets into an action creator. 2016-03-23 10:38:35 -04:00
Corey Hulen
c7dbffec4d Merge pull request #2508 from mattermost/mf-fixes
Removing static test. Adding start-docker as a dep for run-server.
2016-03-23 07:37:29 -07:00
Asaad Mahmood
e60f6f3b13 Multiple UI improvements 2016-03-23 18:16:41 +05:00
Christopher Speller
18b8ae5298 Merge pull request #2507 from stupied4ever/patch-1
Fix typo
2016-03-23 08:20:32 -04:00
Christopher Speller
be30d74c20 Removing static test. Adding start-docker as a dep for run-server. 2016-03-22 13:28:58 -04:00
Corey Hulen
6568e15023 Merge pull request #2498 from hmhealey/plt2285
PLT-2285 Adding spinner after clicking invite channel member button
2016-03-22 08:08:46 -07:00
Rafael da Silva Almeida
04a64883f6 Fix typo
The word maximum was with a typo (maxmium).
2016-03-22 11:59:21 -03:00
Harrison Healey
4e3eb2bb18 Added SpinnerButton component to handle buttons that are also spinners 2016-03-22 10:03:17 -04:00
Harrison Healey
8376ff6233 Adding loading indicator after clicking invite channel member button 2016-03-22 09:29:02 -04:00
Christopher Speller
bb212949f9 Merge pull request #2496 from mattermost/fix-postgres-bug
Removing old schema upgrades affecting postgres
2016-03-22 08:29:28 -04:00
Joram Wilander
1b6b70c805 Merge pull request #2495 from hmhealey/plt2317a
PLT-2317 Changed RhsRootPost and RhsComment to receive current user through props
2016-03-22 08:09:29 -04:00
Joram Wilander
aac95a7e2a Merge pull request #2499 from hmhealey/plt2284
PLT-2284 Re-added ChannelMembersModal on mobile
2016-03-22 08:02:02 -04:00
Corey Hulen
3194d284fd Merge pull request #2500 from ZBoxApp/es-locs
Add admin support es locs
2016-03-21 15:14:55 -07:00