Commit Graph

5927 Commits

Author SHA1 Message Date
Christopher Speller
15dd9641e4 Fixing Link warning 2016-03-29 11:45:49 -04:00
Corey Hulen
d921c112de Merge pull request #2558 from mattermost/center-panel-refactor
PLT-2382, PLT-2386, PLT-2455 Channel/permalink view cleanup and fixes.
2016-03-29 08:08:25 -07:00
Joram Wilander
4a6edbfd08 Merge pull request #2560 from mattermost/plt-2464
PLT-2464 Fixing js error with notifications.
2016-03-29 10:47:30 -04:00
Christopher Speller
b7a2658644 Spelling 2016-03-29 10:14:34 -04:00
Christopher Speller
5ce1a4368b Refactoring center panel away. Moving tutorial to a route. Fixing a
bunch of bugs.
2016-03-29 09:54:55 -04:00
Joram Wilander
bf636404d2 Merge pull request #2553 from hmhealey/actions
Added a warning message when AppDispatcher tries to dispatch without an action type
2016-03-29 07:53:30 -04:00
Harrison Healey
8678888710 Merge pull request #2551 from asaadmahmoodspin/ui-improvements
Multiple UI Improvements
2016-03-28 15:20:41 -04:00
Harrison Healey
4d302a0ed0 Added a warning message when AppDispatcher tries to dispatch without an action type 2016-03-28 14:49:48 -04:00
Asaad Mahmood
31750305aa Multiple UI Improvements 2016-03-28 22:03:18 +05:00
Harrison Healey
dbd503138f Merge pull request #2539 from ryoon/gnu-make-as-gmake
Replace 'make' with '$(MAKE)'
2016-03-28 09:20:05 -04:00
Harrison Healey
5d8f27b9cd Merge pull request #2548 from rodrigocorsi2/pt-translations
LDAP translations pt
2016-03-28 09:18:45 -04:00
Harrison Healey
27ac5b1ae7 Merge pull request #2550 from mattermost/plt-2452
PLT-2452 Fixing Link being imported incorrectly. Fixes team creation.
2016-03-28 09:18:27 -04:00
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
31b37b518e Fixing Link being imported incorrectly. Fixes team creation. 2016-03-28 08:25:04 -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
Rodrigo Corsi
ebd9b54a70 LDAP translations pt 2016-03-27 20:07:32 -03: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
Ryo ONODERA
23d2d08229 Replace 'make' with '$(MAKE)'
Fix the build under the platform that GNU make is installed as gmake.
2016-03-25 13:44:58 +09: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