IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity
3,277 Commits 845 Branches 1,202 Tags
8291d0285ec07eb6acb253b619d5dd1b286f06bc
Commit Graph

155 Commits

Author SHA1 Message Date
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
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
hmhealey
c16b9de8dc Replaced ChannelMember.MarkUnreadLevel with ChannelMember.NotifyProps 2015-10-01 08:31:11 -04:00
hmhealey
9995c7ccfc Added additional test cases and fixed existing ones for ChannelMember.MarkUnreadLevel 2015-09-30 09:59:58 -04:00
hmhealey
7c319f0524 Removed UI for quiet mode and added UI to set when a channel will be marked unread in the sidebar 2015-09-30 09:59:58 -04:00
=Corey Hulen
8fadea44de PLT-404 adding basic error checking to config file. 2015-09-29 14:17:16 -07:00
=Corey Hulen
00112cae51 Assiging first user system_admin role 2015-09-23 15:52:59 -07:00
=Corey Hulen
7f3bfdbe0c Fixing merge 2015-09-23 14:38:34 -07:00
=Corey Hulen
2b5b8f95ed Merge branch 'master' into PLT-11-email 2015-09-23 12:55:58 -07:00
=Corey Hulen
1626a6de6f PLT-349 adding team mgt to admin console 2015-09-23 12:49:28 -07:00
JoramWilander
e4a15076f4 Implement UI theme colors. 2015-09-23 10:12:40 -04:00
=Corey Hulen
6e60768abe Fixing merge conflict 2015-09-22 13:18:42 -07:00
Joram Wilander
ac7918c554 Merge pull request #715 from mattermost/plt-27 
PLT-27 Implement incoming webhooks.
 2015-09-22 15:47:57 -04:00
=Corey Hulen
08a3acbb44 Adding team settings to admin console 2015-09-22 01:15:41 -07:00
=Corey Hulen
f05a2c03d5 Adding SQL settings to admin console 2015-09-22 00:00:19 -07:00
JoramWilander
98186e5018 Implement incoming webhooks. 2015-09-21 14:22:23 -04:00
it33
e989b839d5 Renaming "Handle" to "Channel URL" or "URL" 2015-09-20 21:17:58 -07:00
=Corey Hulen
b8b3ba864d GIT-721 Removing sql ping log 2015-09-19 19:42:54 -07:00
Joram Wilander
5a436fd447 Merge pull request #699 from mattermost/PLT-92 
PLT-92 Adding server side versioning to the binary
 2015-09-18 12:22:57 -04:00