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

60 Коммитов

Автор SHA1 Сообщение Дата
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
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
Elias Nahum
0467528a4f Add admin support es locs 2016-03-21 17:08:39 -03:00
Harrison Healey
4bac6fc7ec Re-added ChannelMembersModal on mobile 2016-03-21 15:36:26 -04:00
Christopher Speller
d7b19dd50f Fixing intl on Safari 2016-03-21 14:32:37 -04:00
Harrison Healey
21bbd6bae5 Changed RhsComment to receive the current user through props 2016-03-21 13:11:03 -04:00
Joram Wilander
0db6994e08 Merge pull request #2491 from rodrigocorsi2/compliance_pt_loc
Translation compliance and others in pt
2016-03-21 12:41:52 -04:00
Harrison Healey
bb16a71d6e Passed currentUser into RhsRootPost 2016-03-21 10:30:17 -04:00
Christopher Speller
a3872e5f5e Merge release branch commits 2016-03-21 10:20:35 -04:00
Rodrigo Corsi
042b7c2153 Translation compliance and others pt 2016-03-21 09:16:08 -03:00
Christopher Speller
6f747b8b18 Merge pull request #2481 from khoa-le/PLT-2018
PLT-2018 After clicking "Use a different address" hitting enter should submit …
2016-03-21 07:30:25 -04:00
Khoa, Le Ngoc
5ed7c3baa5 System Console > Legal and Support Settings: If a link does not include http or https, it does not open properly 2016-03-19 20:11:48 +07:00
Khoa, Le Ngoc
51ef060a36 After clicking "Use a different address" hitting enter should submit the "Use this instead" button 2016-03-19 19:57:57 +07:00
Corey Hulen
3d54935842 Merge pull request #2473 from ZBoxApp/compliance-es
Add spanish translations for compliance
2016-03-18 10:26:30 -07:00
Christopher Speller
35320efe1a Revert "PLT-2183 Slash command auto-complete" 2016-03-18 13:16:51 -04:00
Elias Nahum
db11d72cf5 Add spanish translations for compliance 2016-03-18 13:05:55 -03:00
Christopher Speller
6d586c7309 Merge pull request #2472 from ZBoxApp/PLT-2392
PLT-2392: Fix for Notification sound broken
2016-03-18 11:39:18 -04:00
Elias Nahum
f5a8703b38 PLT-2392: Fix for Notification sound broken 2016-03-18 12:29:04 -03:00
Elias Nahum
5a4945c4d5 PLT-2368: Fix for Date of last profile picture update is showing [object][object] 2016-03-18 12:18:45 -03:00
Joram Wilander
5b824cb855 Merge pull request #2470 from mattermost/plt-2380
PLT-2380 Improvements to webpack build system + watch mode
2016-03-18 10:47:08 -04:00
Christopher Speller
77ffdc6990 Creating sepearate dev and prod webpack builds. Enabled webpack watch mode. Updated to latest master webpack to fix bug in watch mode 2016-03-18 10:06:39 -04:00
Corey Hulen
53d7718e57 Merge pull request #2442 from mattermost/PLT-2115
PLT-2115 adding compliance feature
2016-03-17 13:16:10 -07:00
=Corey Hulen
2e5cc29738 Fixing localization stuff 2016-03-17 11:23:27 -07:00
=Corey Hulen
3ca32ee1e5 Fixing localization stuff 2016-03-17 11:21:08 -07:00
Christopher Speller
bd225dca73 Merge pull request #2418 from ZBoxApp/PLT-2053
PLT-2053: Option to enable full snippets in push notifications
2016-03-17 12:57:52 -04:00
Christopher Speller
876ef15ac1 Fxing make clean 2016-03-17 12:54:59 -04:00
=Corey Hulen
5273559ca1 Fixing merge 2016-03-17 09:51:45 -07:00
Christopher Speller
128204b47a Fixing style issue caused by build changes 2016-03-17 12:42:03 -04:00
Elias Nahum
919fb8274b Fix ESLint for code_preview.jsx 2016-03-17 13:40:03 -03:00
Elias Nahum
1f5c8c4e4e Option to enable full snippets in push notifications 2016-03-17 13:20:17 -03:00
Christopher Speller
d383ed2f8d Merge pull request #2380 from rodrigocorsi2/code_preview
Created component CodePreview
2016-03-17 12:09:04 -04:00
Christopher Speller
2cd006474e Merge pull request #2461 from hmhealey/teamdefault
Changed 'show username' display text to be more accurate
2016-03-17 12:05:17 -04:00
Christopher Speller
a6a9dd7691 Merge pull request #2462 from mattermost/plt-2340
PLT-2340 Webpack optimizations and fixes
2016-03-17 12:04:51 -04:00
Rodrigo Corsi
529513606b Created component CodePreview 2016-03-17 12:47:07 -03:00
Christopher Speller
6b9d895224 Merge pull request #2169 from kernicPanel/external-slashcommands-management
PLT-2183 Slash command auto-complete
2016-03-17 11:45:42 -04:00
Christopher Speller
fdc3207724 Webpack optimizations and fixes 2016-03-17 11:32:06 -04:00
Harrison Healey
93101331bf Changed 'show username' display text to be more accurate 2016-03-17 10:43:08 -04:00
Harrison Healey
f8ac97fb22 Changed mention parser to ignore empty string mentions 2016-03-17 10:33:06 -04:00
Christopher Speller
be07d63464 Merge pull request #2448 from asaadmahmoodspin/ui-improvements
Updating sass lint stuff with other scss improvements
2016-03-17 08:36:53 -04:00
Asaad Mahmood
5d233a008d Reordering styles.scss file 2016-03-17 08:43:11 +05:00
Asaad Mahmood
1139bfe4b5 Updating sidebar 2016-03-17 07:36:53 +05:00
=Corey Hulen
074f15f761 Fixing webpack 2016-03-16 18:52:46 -07:00
=Corey Hulen
5982bd490b Fixing merge 2016-03-16 18:35:53 -07:00
=Corey Hulen
b9d5b4e5dc merging files 2016-03-16 18:13:16 -07:00
Corey Hulen
cba59d4eb6 Merge pull request #2436 from rodrigocorsi2/pt_translations
added missing translations in pt
2016-03-16 18:09:09 -07:00
Corey Hulen
59b5f162e4 Merge pull request #2427 from ZBoxApp/PLT-2342
PLT-2342: Incorrect formatting of last password update string in all …
2016-03-16 18:08:46 -07:00
Nicolas Clerc
c94b7b9d4f toggle incompatible settings views 2016-03-17 01:58:16 +01:00