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

5906 Коммитов

Автор SHA1 Сообщение Дата
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
Corey Hulen
8d571ee498 Merge pull request #2456 from chengweiv5/fix-build
Makefile: fix for non-enterprise build
2016-03-17 11:05:29 -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
Harrison Healey
1fe2f7301a Merge pull request #2463 from mattermost/fix-merge
Fix bad scss merge
2016-03-17 11:59:44 -04:00
Corey Hulen
18fa0596ab Merge pull request #2441 from FeliciousX/patch-1
Path in docker differs for CD
2016-03-17 08:57:54 -07: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
b874934acb Fix bad scss merge 2016-03-17 11:44:24 -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
d42459729c Merge pull request #2424 from hmhealey/escape
Changed mention parser to ignore empty string mentions
2016-03-17 10:33:28 -04:00
Harrison Healey
f8ac97fb22 Changed mention parser to ignore empty string mentions 2016-03-17 10:33:06 -04:00
Christopher Speller
927c2dbfec Merge pull request #2459 from ZBoxApp/server-es-locs
Added Missing es server locs and sort by id
2016-03-17 08:37:11 -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
64321f88f3 Removing package.json 2016-03-17 17:25:39 +05:00
Elias Nahum
226e31fd7b Added Missing es server locs and sort by id 2016-03-17 09:05:05 -03:00
Chengwei Yang
6eaede4486 Makefile: fix for non-enterprise build
Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com>
2016-03-17 12:02:00 +08: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
a85f74eac8 skipping version.go file 2016-03-16 18:36:37 -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
Corey Hulen
dd13f0bc66 Merge pull request #2426 from ZBoxApp/es-locs
Add missing spanish locale strings
2016-03-16 18:08:23 -07:00
Nicolas Clerc
c94b7b9d4f toggle incompatible settings views 2016-03-17 01:58:16 +01:00
Nicolas Clerc
61328383e4 wording + localization 2016-03-17 01:58:16 +01:00
Nicolas Clerc
81366cd5e5 use pre-released features 2016-03-17 01:58:16 +01:00
Nicolas Clerc
7cb817d5a7 fix TestListCommands 2016-03-17 01:45:37 +01:00
Nicolas Clerc
49eda73749 eslint error: validate suggestion_box channelId prop 2016-03-17 01:45:37 +01:00
Nicolas Clerc
55a054ab0a fix eslint errors 2016-03-17 01:45:37 +01:00
Nicolas Clerc
5e2596598f add external slashcommands management 2016-03-17 01:45:37 +01:00
Asaad Mahmood
f600b1dc2b Updating asss lint stuff with other scss improvements 2016-03-17 05:42:38 +05:00
Rodrigo Corsi
76b138b3bd added missing translations in pt 2016-03-16 21:00:32 -03:00
Elias Nahum
17fecd89f5 PLT-2342: Incorrect formatting of last password update string in all languages 2016-03-16 20:44:51 -03:00
Elias Nahum
200810b089 Add missing spanish locale strings 2016-03-16 20:42:33 -03:00
Joram Wilander
809779a87f Merge pull request #2451 from mattermost/PLT-2344
PLT-2344 support 3 versions back
2016-03-16 18:25:13 -04:00
Christopher Speller
08a12ac4f4 Merge pull request #2419 from mattermost/plt-2044
PLT-2044 Auto-create account if team allows sign-up from login page and oauth …
2016-03-16 18:22:50 -04:00