=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
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
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
=Corey Hulen
397ebec88c
PLT-2115 adding compliance
2016-03-14 10:22:36 -07:00
Christopher Speller
bf7ae07117
Merge branch 'release-2.1'
2016-03-14 07:17:31 -04:00
Christopher Speller
975159b52a
Merge pull request #2331 from mattermost/plt-1680
...
PLT-1680 Converting client to react-router. Stage 1
2016-03-14 00:56:37 -04:00
Christopher Speller
d7cdcf082f
Convering client to react-router.
2016-03-14 00:38:25 -04:00
Christopher Speller
72ed22d742
Merge pull request #2412 from asaadmahmoodspin/ui-improvements
...
Adding separators between ldap, username, email, github
2016-03-12 14:28:46 -05:00
it33
160e1a8bea
Removing items not in T0
2016-03-11 21:06:49 -08:00
=Corey Hulen
013f27ff1a
Updating interface
2016-03-11 16:58:01 -08:00
=Corey Hulen
6fa6ea0af5
PLT-2115 adding compliance interfaces
2016-03-11 16:53:32 -08:00
Christopher Speller
f06db338a3
Merge pull request #2416 from rodrigocorsi2/pt_translations
...
added missing translations pt
2016-03-11 13:06:50 -05:00
JoramWilander
fb9a6c7611
Auto-create account if team allows sign-up from login page and oauth account doesn't exist
2016-03-11 10:48:43 -05:00
Asaad Mahmood
e4fed928d9
Adding or separator between ldap, username, email, github
...
Updating code theme name
Updating conditions for login page
updated the 2.0 Dockerfile to include the proper location of mm gzip
Fixing search loading icon on mobile
Adding or separator between ldap, username, email and github
2016-03-11 19:26:58 +05:00
Christopher Speller
7d72602737
Merge pull request #2417 from hmhealey/plt2264
...
PLT-2264 Disabled embed toggle when it's disabled in user settings
2016-03-11 08:53:25 -05:00
Christopher Speller
19f28e896d
Merge pull request #2414 from mattermost/bluebar-fix
...
Fixing blue bar on iOS
2016-03-11 08:50:27 -05:00
Christopher Speller
8b6b02143d
Merge pull request #2413 from asaadmahmoodspin/themeFix
...
PLT-2138 - Fixing theme sharing box
2016-03-11 08:49:27 -05:00
Asaad Mahmood
601c4cd72d
Small fix for search loading icon on mobile
2016-03-11 18:04:07 +05:00
Rodrigo Corsi
5e9f707cb3
standardized terminology for sign in and sign up
2016-03-10 17:01:41 -03:00
Harrison Healey
521530a7f2
Disabled embed toggle when it's disabled in user settings
2016-03-10 14:51:18 -05:00
Asaad Mahmood
060cc2c825
Fixing padding issue
2016-03-10 23:19:36 +05:00
Asaad Mahmood
b9f468623c
Removing console
2016-03-10 23:03:06 +05:00
=Corey Hulen
3ee2d21813
Fixing blue bar on iOS
2016-03-10 09:56:43 -08:00
Asaad Mahmood
461e8532a7
PLT-2138 - Fixing theme sharing box
2016-03-10 22:55:16 +05:00
=Corey Hulen
6d21a339dc
PLT-2115 adding compliance feature to enterprise
2016-03-10 09:39:05 -08:00
Christopher Speller
f7156fdb3a
Merge pull request #2411 from peasead/master
...
updated the 2.0 Dockerfile to include the proper location of mm gzip
2016-03-10 11:42:15 -05:00
Christopher Speller
12434f8963
Fixing docker automation issue
2016-03-10 11:14:40 -05:00
peasead
26ad6d2c76
updated the 2.0 Dockerfile to include the proper location of mm gzip
2016-03-10 10:09:16 -06:00
