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

172 Коммитов

Автор SHA1 Сообщение Дата
Corey Hulen
89f67cd11d Merge pull request #1199 from hmhealey/plt600
PLT-600 Renamed channel description to channel header and added channel purpose field
2015-10-28 14:44:02 -07:00
=Corey Hulen
399e9c6f4b PLT-25 fixing stats for postgres 2015-10-27 09:55:19 -07:00
hmhealey
61da22ea32 Added Channel.Purpose on the server 2015-10-27 12:46:31 -04:00
hmhealey
09b38404fa Renamed Channel.Description to Channel.Header on the server 2015-10-27 12:46:30 -04:00
=Corey Hulen
d53de84214 Fixing postgres 2015-10-26 22:46:19 -07:00
=Corey Hulen
aec99ceb9d Merge branch 'master' into PLT-25 2015-10-26 22:11:42 -07:00
Christopher Speller
ee0c732396 Merge pull request #1192 from mattermost/PLT-828
PLT-828 fixing db upgrade code
2015-10-26 16:07:46 -04:00
Corey Hulen
942c9317f4 Merge pull request #1164 from hmhealey/plt778
PLT-778 Changed post searching to allow searching by multiple users/channels
2015-10-26 12:12:18 -07:00
=Corey Hulen
05b16f40df PLT-828 fixing db upgrade code 2015-10-26 11:00:34 -07:00
=Corey Hulen
e750a8fd36 Fixing unit test 2015-10-26 10:26:59 -07:00
hmhealey
663bec8147 Moved logic for searching for posts by multiple users/channels into the sql query 2015-10-26 11:45:09 -04:00
=Corey Hulen
028657b43e Merge branch 'master' into PLT-25 2015-10-23 08:38:15 -07:00
Christopher Speller
c8edad29c1 Merge pull request #1149 from mattermost/plt-808
PLT-808 Fix deleting channels breaking the webhook UI
2015-10-23 08:34:57 -04:00
Joram Wilander
8db383d2e3 Merge pull request #1152 from jlebleu/PLT-797
PLT-797 Update System Table with latest version
2015-10-23 08:16:30 -04:00
Corey Hulen
22d7f0f116 Merge pull request #1143 from mattermost/plt-803
PLT-803 Prevent users from resetting their password when the user is using SSO
2015-10-22 21:38:31 -07:00
Corey Hulen
640176bd4c Merge pull request #1142 from mattermost/plt-414
PLT-414 Fix direct channel creation.
2015-10-22 21:37:41 -07:00
Jean-Yves LEBLEU
f0a31c209d PLT-797 Update System Table with latest version
Update database system table with last version if
coming from a 7.X version
2015-10-23 06:12:49 +02:00
=Corey Hulen
ae5d189803 Adding analytics tab 2015-10-22 18:04:06 -07:00
JoramWilander
a431ba2c22 Delete webhooks when the associated channel gets deleted 2015-10-22 14:27:47 -04:00
JoramWilander
4734912c52 Prevent users from resetting their password when the user is using SSO 2015-10-22 10:53:39 -04:00
Christopher Speller
6cc3bfe7a9 Refactoring direct channel creation to use transaction to avaoid state where channel is created without both users 2015-10-22 09:31:27 -04:00
=Corey Hulen
b9ce4a644d PLT-350 allow ability to disable restricted team names 2015-10-20 17:30:24 -07:00
Christopher Speller
8b4771a6c7 Merge branch 'release-1.1.0' 2015-10-20 14:04:14 -04:00
Joram Wilander
460a82878a Merge pull request #1113 from hmhealey/plt716
PLT-716/717 Added from:, in:, and channel: search filters
2015-10-20 08:00:21 -04:00
=Corey Hulen
437efdaaaa Hotfix to allow .7 to be upgraded to 1.1 2015-10-20 04:49:42 -07:00
hmhealey
995c5a276b Fixed incorrectly escaped * in wildcard search for postgres 2015-10-19 15:30:43 -04:00
hmhealey
06fd374c19 Added from:, in:, and channel: search modifiers 2015-10-19 13:25:19 -04:00
JoramWilander
c7d00de682 Update db index for outgoing webhook 2015-10-19 11:12:40 -04:00
JoramWilander
f24ea30a75 Refactor to hit database less often. 2015-10-19 09:00:30 -04:00
JoramWilander
5574151c85 Fix postgres query and minor UI updates for outgoing webhooks. 2015-10-19 09:00:30 -04:00
JoramWilander
7bf23409b2 Added store tests for outgoing webhooks. 2015-10-19 09:00:30 -04:00
JoramWilander
af6e2c29eb Implement outgoing webhooks. 2015-10-19 09:00:30 -04:00
Christopher Speller
099d853877 Merge pull request #1079 from hmhealey/initprefs
Added an initial call to get all user preferences on page load
2015-10-16 08:16:40 -04:00
hmhealey
218af22936 Changed preference saving to use the master database 2015-10-15 15:39:50 -04:00
hmhealey
327b0b5a21 Added an initial call to get all user preferences on page load 2015-10-15 15:17:07 -04:00
=Corey Hulen
de717aef56 Marking when user ran the unit tests 2015-10-15 11:16:26 -07:00
hmhealey
97b2f6ffe7 Made further changes based on feedback 2015-10-13 15:36:58 -04:00
hmhealey
2a39e8dbfa Removed Preference.AltId 2015-10-13 12:29:31 -04:00
hmhealey
5cecf1afcd Made structural changes to server-side Preference code based on feedback 2015-10-13 09:42:27 -04:00
hmhealey
8a7aa7f66f Rewrote PreferenceStore.SaveOrUpdate to work on Postgres within a transaction 2015-10-13 09:42:26 -04:00
hmhealey
a6cd2a7961 Moved saving multiple user preferences into a database transaction 2015-10-13 09:42:26 -04:00
hmhealey
599644fb2f Renamed show_hide preference to show 2015-10-13 09:42:25 -04:00
hmhealey
da66599fa3 Added Preferences table to store user preferences 2015-10-13 09:42:23 -04:00
=Corey Hulen
61f92517f3 PLT-586 fixing issues with security alert 2015-10-09 12:24:39 -07:00
=Corey Hulen
b7a4b1a418 Fixing db upgrade for 1.1 2015-10-08 10:59:38 -07:00
Christopher Speller
b85b529373 Changing SpinPunch to Mattermost in copyright 2015-10-08 12:27:09 -04:00
Christopher Speller
a6629f95fe Merge pull request #944 from mattermost/PLT-518
PLT-518 check for security bulletins
2015-10-08 09:59:08 -04:00
JoramWilander
8a0d0bfa25 Parse special characters out of search strings and replace with spaces. 2015-10-06 12:38:42 -04:00
=Corey Hulen
e26b77faf1 PLT-518 check for security bulletins 2015-10-05 17:33:45 -07:00
hmhealey
c9a0030551 Moved ChannelMember.NotifyLevel into ChannelMember.NotifyProps 2015-10-01 08:31:17 -04:00