Merge branch 'master' into feature/externalconnection
Description
Description
Details
Details
- Provenance
MBoretto Authored on Mar 23 2016, 7:46 AM - Parents
- R123:546d62acb88a: introducing db external connection
R123:999ee2e7b154: release 0.29 - Branches
- Unknown
- Tags
- Unknown
Event Timeline
Merged Changes
Merged Changes
This commit merges a very large number of changes. Only the first 50 are shown.
- 999ee2e7b154 release 0.29AuthorMBoretto
- c7837b028ea5 new command structure in examplesAuthorMBoretto
- AuthorMarco Boretto
- AuthorMarco Boretto
- AuthorMarco Boretto
- AuthorMBoretto
- 0ae4fd175339 Merge branch 'develop' into feature/smartinterfaceAuthorMBoretto
- AuthorArmando Lüscher
- 60cf8148ed4c change delete in order to avoid integrity constraintAuthorMBoretto
- ca9bff22424d Add conversation tests and a few matching helpers.AuthorArmando Lüscher
- b8e3b4b9a596 Fix exception handling for ConversationDB.AuthorArmando Lüscher
- 7db0a913f623 Fix how the /sendtochannel command is ended.AuthorArmando Lüscher
- AuthorArmando Lüscher
- 88555856dbf4 Remove unused $command_is_provided variable.AuthorArmando Lüscher
- 291b90f741c7 Merge pull request #8 from MBoretto/repairAuthorMarco Boretto
- 33dd4a80250f reintroduced update()AuthorMBoretto
- f302c7342986 introduce noplanman suggestionAuthorMBoretto
- 0567c8cc41c3 Merge pull request #7 from noplanman/fix_typosAuthorMarco Boretto
- bdf46a2d0427 Some typo corrections.AuthorArmando Lüscher
- 3cddf7b3ac9c Merge pull request #115 from MBoretto/structureAuthorArmando Lüscher
- cb4e9be68040 removing null from primary keysAuthorMBoretto
- c917fa7191cc Merge branch 'structure' into feature/smartinterfaceAuthorMBoretto
- 146ddc95800d removing null from primary keyAuthorMBoretto
- 7cc8cfcf39d3 Merge pull request #113 from noplanman/travis_php7AuthorMarco Boretto
- AuthorMBoretto
- 8c359b2afe94 works without updateAuthorMBoretto
- AuthorArmando Lüscher
- AuthorMarco Boretto
- 19258c1345b0 renaming data in notesAuthorMBoretto
- e4483deb21bc introducing conversation notesAuthorMBoretto
- AuthorMarco Boretto
- AuthorArmando Lüscher
- e53b81f0271d Create MySQL database with correct table structure.AuthorArmando Lüscher
- AuthorArmando Lüscher
- AuthorArmando Lüscher
- 61d732cc4928 Update database schema.AuthorArmando Lüscher
- AuthorArmando Lüscher
- 00bcf786c7ce Remove conversation group for now.AuthorArmando Lüscher
- aff6c033afd3 conversation as internal memberAuthorMBoretto
- b5e22037192e Merge pull request #4 from MBoretto/cancel_commandAuthorMarco Boretto
- 93152b3b0c03 no Db is not shownAuthorMBoretto
- AuthorArmando Lüscher
- 408085f58f68 using new REQUEST emptyresponseAuthorMBoretto
- 0a3ee2e50e64 1-line sendtochannel without dbAuthorMBoretto
- f548fa02d421 Merge pull request #105 from MBoretto/empty_responseAuthorArmando Lüscher
- f41e8a522d45 Added code blockAuthorMBoretto
- 521fc1592166 introducing /cancel commandAuthorMBoretto
- a93bf5b5c7e2 sent to channel works without configurationAuthorMBoretto
- 5adfab27eb0d fix bug retipe commandAuthorMBoretto