Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge pull request #1211 from mattermost/PLT-340 | Joram Wilander | 2015-10-30 | 3 | -1/+168 | |
|\ | | | | | PLT-340 allow team directory and open invites | |||||
| * | PLT-340 allow team directory and open invites | =Corey Hulen | 2015-10-27 | 1 | -1/+7 | |
| | | ||||||
| * | PLT-340 | =Corey Hulen | 2015-10-27 | 3 | -1/+159 | |
| | | ||||||
| * | Adding upgrade calls for db | =Corey Hulen | 2015-10-27 | 1 | -0/+3 | |
| | | ||||||
* | | Merge pull request #1199 from hmhealey/plt600 | Corey Hulen | 2015-10-28 | 2 | -19/+24 | |
|\ \ | |/ |/| | PLT-600 Renamed channel description to channel header and added channel purpose field | |||||
| * | Added Channel.Purpose on the server | hmhealey | 2015-10-27 | 1 | -0/+2 | |
| | | ||||||
| * | Renamed Channel.Description to Channel.Header on the server | hmhealey | 2015-10-27 | 2 | -19/+22 | |
| | | ||||||
* | | PLT-25 fixing stats for postgres | =Corey Hulen | 2015-10-27 | 2 | -39/+42 | |
| | | ||||||
* | | Fixing postgres | =Corey Hulen | 2015-10-26 | 1 | -8/+49 | |
| | | ||||||
* | | Merge branch 'master' into PLT-25 | =Corey Hulen | 2015-10-26 | 5 | -18/+54 | |
|\| | ||||||
| * | Merge pull request #1192 from mattermost/PLT-828 | Christopher Speller | 2015-10-26 | 4 | -8/+12 | |
| |\ | | | | | | | PLT-828 fixing db upgrade code | |||||
| | * | PLT-828 fixing db upgrade code | =Corey Hulen | 2015-10-26 | 4 | -8/+12 | |
| | | | ||||||
| * | | Merge pull request #1164 from hmhealey/plt778 | Corey Hulen | 2015-10-26 | 1 | -10/+42 | |
| |\ \ | | |/ | |/| | PLT-778 Changed post searching to allow searching by multiple users/channels | |||||
| | * | Moved logic for searching for posts by multiple users/channels into the sql ↵ | hmhealey | 2015-10-26 | 1 | -10/+42 | |
| | | | | | | | | | | | | query | |||||
* | | | Fixing unit test | =Corey Hulen | 2015-10-26 | 1 | -18/+25 | |
| | | | ||||||
* | | | Merge branch 'master' into PLT-25 | =Corey Hulen | 2015-10-23 | 6 | -57/+267 | |
|\| | | ||||||
| * | | Merge pull request #1149 from mattermost/plt-808 | Christopher Speller | 2015-10-23 | 2 | -0/+22 | |
| |\ \ | | | | | | | | | PLT-808 Fix deleting channels breaking the webhook UI | |||||
| | * | | Delete webhooks when the associated channel gets deleted | JoramWilander | 2015-10-22 | 2 | -0/+22 | |
| | |/ | ||||||
| * | | Merge pull request #1152 from jlebleu/PLT-797 | Joram Wilander | 2015-10-23 | 1 | -2/+2 | |
| |\ \ | | | | | | | | | PLT-797 Update System Table with latest version | |||||
| | * | | PLT-797 Update System Table with latest version | Jean-Yves LEBLEU | 2015-10-23 | 1 | -2/+2 | |
| | |/ | | | | | | | | | | | | | Update database system table with last version if coming from a 7.X version | |||||
| * | | Merge pull request #1143 from mattermost/plt-803 | Corey Hulen | 2015-10-22 | 1 | -1/+2 | |
| |\ \ | | | | | | | | | PLT-803 Prevent users from resetting their password when the user is using SSO | |||||
| | * | | Prevent users from resetting their password when the user is using SSO | JoramWilander | 2015-10-22 | 1 | -1/+2 | |
| | |/ | ||||||
| * | | Merge pull request #1142 from mattermost/plt-414 | Corey Hulen | 2015-10-22 | 3 | -54/+241 | |
| |\ \ | | |/ | |/| | PLT-414 Fix direct channel creation. | |||||
| | * | Refactoring direct channel creation to use transaction to avaoid state where ↵ | Christopher Speller | 2015-10-22 | 3 | -54/+241 | |
| | | | | | | | | | | | | channel is created without both users | |||||
* | | | Adding analytics tab | =Corey Hulen | 2015-10-22 | 5 | -0/+280 | |
|/ / | ||||||
* / | PLT-350 allow ability to disable restricted team names | =Corey Hulen | 2015-10-20 | 1 | -2/+3 | |
|/ | ||||||
* | Merge branch 'release-1.1.0' | Christopher Speller | 2015-10-20 | 3 | -1/+19 | |
|\ | ||||||
| * | Hotfix to allow .7 to be upgraded to 1.1 | =Corey Hulen | 2015-10-20 | 3 | -1/+19 | |
| | | ||||||
* | | Merge pull request #1113 from hmhealey/plt716 | Joram Wilander | 2015-10-20 | 3 | -61/+91 | |
|\ \ | | | | | | | PLT-716/717 Added from:, in:, and channel: search filters | |||||
| * | | Fixed incorrectly escaped * in wildcard search for postgres | hmhealey | 2015-10-19 | 1 | -1/+1 | |
| | | | ||||||
| * | | Added from:, in:, and channel: search modifiers | hmhealey | 2015-10-19 | 3 | -61/+91 | |
| | | | ||||||
* | | | Update db index for outgoing webhook | JoramWilander | 2015-10-19 | 1 | -1/+1 | |
| | | | ||||||
* | | | Refactor to hit database less often. | JoramWilander | 2015-10-19 | 4 | -78/+9 | |
| | | | ||||||
* | | | Fix postgres query and minor UI updates for outgoing webhooks. | JoramWilander | 2015-10-19 | 1 | -1/+1 | |
| | | | ||||||
* | | | Added store tests for outgoing webhooks. | JoramWilander | 2015-10-19 | 2 | -5/+222 | |
| | | | ||||||
* | | | Implement outgoing webhooks. | JoramWilander | 2015-10-19 | 3 | -7/+238 | |
|/ / | ||||||
* | | Merge pull request #1079 from hmhealey/initprefs | Christopher Speller | 2015-10-16 | 3 | -0/+76 | |
|\ \ | | | | | | | Added an initial call to get all user preferences on page load | |||||
| * | | Added an initial call to get all user preferences on page load | hmhealey | 2015-10-15 | 3 | -0/+76 | |
| | | | ||||||
* | | | Changed preference saving to use the master database | hmhealey | 2015-10-15 | 1 | -1/+1 | |
|/ / | ||||||
* | | Marking when user ran the unit tests | =Corey Hulen | 2015-10-15 | 3 | -7/+23 | |
| | | ||||||
* | | Made further changes based on feedback | hmhealey | 2015-10-13 | 2 | -7/+19 | |
| | | ||||||
* | | Removed Preference.AltId | hmhealey | 2015-10-13 | 3 | -40/+89 | |
| | | ||||||
* | | Made structural changes to server-side Preference code based on feedback | hmhealey | 2015-10-13 | 4 | -294/+149 | |
| | | ||||||
* | | Rewrote PreferenceStore.SaveOrUpdate to work on Postgres within a transaction | hmhealey | 2015-10-13 | 2 | -8/+57 | |
| | | ||||||
* | | Moved saving multiple user preferences into a database transaction | hmhealey | 2015-10-13 | 4 | -39/+139 | |
| | | ||||||
* | | Renamed show_hide preference to show | hmhealey | 2015-10-13 | 1 | -7/+7 | |
| | | ||||||
* | | Added Preferences table to store user preferences | hmhealey | 2015-10-13 | 4 | -11/+321 | |
|/ | ||||||
* | PLT-586 fixing issues with security alert | =Corey Hulen | 2015-10-09 | 3 | -1/+41 | |
| | ||||||
* | Fixing db upgrade for 1.1 | =Corey Hulen | 2015-10-08 | 4 | -9/+3 | |
| | ||||||
* | Changing SpinPunch to Mattermost in copyright | Christopher Speller | 2015-10-08 | 21 | -21/+21 | |
| |