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

5939 Коммитов

Автор SHA1 Сообщение Дата
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
Christopher Speller
45eee993ea Merge pull request #2430 from mattermost/changelog-to-docs
Moving CHANGELOG to docs
2016-03-16 18:20:19 -04:00
Christopher Speller
4a4859351a Merge pull request #2453 from mattermost/plt-2340
PLT-2340 Converting to Webpack. Stage 1.
2016-03-16 18:16:11 -04:00
Christopher Speller
12896bd23e Converting to Webpack. Stage 1. 2016-03-16 18:02:55 -04:00
=Corey Hulen
64f9b7ec08 PLT-2344 support 3 versions back 2016-03-16 09:38:35 -07:00
=Corey Hulen
e101b2cf7c Fixing unit tests 2016-03-15 19:54:04 -07:00
=Corey Hulen
ae2e80148e Fixing config file 2016-03-15 18:30:41 -07:00
=Corey Hulen
36b17bf99d PLT-2115 Adding compliance 2016-03-15 18:27:45 -07:00
Churchill Lee
811a86d6ec Path in docker differs for CD
Running docker will fail because it can't CD into the mattermost directory
2016-03-16 09:12:29 +08:00
Christopher Speller
29fe6a3d13 Merge pull request #2431 from mattermost/fix-seg
Fixing segment tracking
2016-03-15 14:22:27 -04:00
Christopher Speller
3745204097 Merge pull request #2429 from asaadmahmoodspin/ui-improvements
PLT-963 - Improving scss structure
2016-03-15 14:05:05 -04:00
Asaad Mahmood
7d79a916dd Updating pages to routes 2016-03-15 22:24:01 +05:00
Asaad Mahmood
9bff9be5e7 Updating character in post.scss 2016-03-15 18:21:58 +05:00
=Corey Hulen
e5fbdc3ced Fixing segment tracking 2016-03-14 11:03:56 -07:00
it33
8c35e049ce Moving CHANGELOG to docs 2016-03-14 10:46:37 -07:00
Asaad Mahmood
595ca0efca Reverting changes for core files 2016-03-14 22:39:45 +05:00
Asaad Mahmood
e214aae719 PLT-963 - Improving scss structure 2016-03-14 22:39:44 +05:00
=Corey Hulen
ea3f25924e Merge branch 'master' into PLT-2115 2016-03-14 10:23:51 -07:00