Commit graph

4743 commits

Author SHA1 Message Date
Michael 12dd06f726 Merge remote-tracking branch 'upstream/develop' into 1701-top-level 2017-01-11 23:15:23 +00:00
rabuzarus 0e64d462df diaspora - add braces 2017-01-11 13:02:18 +01:00
rabuzarus 2daa0936db diaspora - switch logger for "non subscribed messages" to LOGGER_DEBUG 2017-01-11 12:45:25 +01:00
Michael Vogel 3c51820515 Merge pull request #3076 from Hypolite/issue/#3039-boot-doc-include
Normalize App parameter declaration (doc-include folders, boot)
2017-01-11 09:01:48 +01:00
Michael 84b733e1bf Standards stuff should make Hypolite happy. 2017-01-10 16:11:08 +00:00
Michael 3cf1f5e532 Compare instead of assign ... 2017-01-10 10:23:51 +00:00
Michael c44f859edf We should check for the item, not the parent. 2017-01-10 07:58:17 +00:00
Michael fafeea4382 When commenting too fast, messages weren't delivered to Diaspora 2017-01-10 07:40:57 +00:00
Hypolite Petovan 87eb3d5ef2 Normalize App parameter declaration (doc-include folders, boot) 2017-01-09 23:09:01 +11:00
Michael 16f0221e4c DBClean now has a smaller limit/Query improvements 2017-01-09 09:37:37 +00:00
Michael 28b2e599fb it should be "gid" not "cid" 2017-01-08 20:11:15 +00:00
Michael ed0143c9f0 Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes 2017-01-07 16:13:57 +00:00
Michael 1febf182ad Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes 2017-01-07 14:31:25 +00:00
Michael c2543f918b Last minutes changes 2017-01-07 13:52:30 +00:00
Michael 414c5ddae0 Use Config class/Option to deactivate the count on albums 2017-01-07 09:05:52 +00:00
Roland Häder 4530f4ac9d Merge remote-tracking branch 'upstream/develop' into develop 2017-01-06 17:10:40 +01:00
Michael cb5df4d715 Some corrections 2017-01-06 13:30:12 +00:00
Michael 6976ad4892 Removed some removed indexes 2017-01-06 06:37:27 +00:00
Michael ff3728be47 Cleaning up the stuff 2017-01-05 22:51:31 +00:00
Michael 2deb2b637b Some new indexes and some removed. 2017-01-05 22:23:00 +00:00
Michael 6cdccbe2f6 Will we now find the best index fort the contact? 2017-01-05 17:48:51 +00:00
Michael 7aaf91a620 Removing and adding some indexes 2017-01-05 13:16:27 +00:00
Michael 9c7a2d2f9a Another index 2017-01-05 09:32:16 +00:00
Michael a4e437b56f Contact testing 2017-01-05 09:10:02 +00:00
Michael a92c5f464d Hopefully this it it ... 2017-01-05 08:02:21 +00:00
Michael db1c6c06d6 Finding the best index ... 2017-01-05 07:30:10 +00:00
Michael 00d7835ba6 Some more contact indexes 2017-01-05 07:12:13 +00:00
rabuzarus 686a7dbe01 Bugfix: make some todos usable for doxygen in dfrn.php 2017-01-05 02:23:34 +01:00
Michael cefb36fb67 Some more indexes on the contact table 2017-01-04 23:28:51 +00:00
Michael c221376041 Some notification thingy 2017-01-04 23:12:28 +00:00
Michael 44d966574d Some more indexes and other query improvements 2017-01-04 19:13:50 +00:00
Michael 6b6e3e264f Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes 2017-01-04 13:57:27 +00:00
Roland Häder 42c2e09382 Merge remote-tracking branch 'upstream/develop' into develop 2017-01-04 09:03:00 +01:00
Michael 9a6478b273 Don't be greedy. 2017-01-02 07:00:44 +00:00
Michael 8aaf09f9ee Automatically add a Diaspora mention 2017-01-01 23:18:42 +00:00
Roland Häder 9ca789b952
Merge remote-tracking branch 'upstream/develop' into develop
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-31 17:59:14 +01:00
Michael 4053499c38 Enable caching wirh comments 2016-12-30 23:18:31 +00:00
Michael 66902c7956 We now also transmit Dislikes 2016-12-30 22:40:30 +00:00
Michael 7cf70b64b8 We now send the participation message as well. 2016-12-30 22:31:21 +00:00
Roland Häder d2df464d8c
added curly braces + fixed indenting according to code review by Hypolite
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-30 21:49:08 +01:00
Roland Häder d2280d4120
Merge remote-tracking branch 'upstream/develop' into develop
dbm::is_result() calls needed merge

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-30 21:33:41 +01:00
Michael 4928d00e22 Standard stuff 2016-12-30 10:03:02 +00:00
Michael 55ee80338f Events are now shared with Diaspora. 2016-12-30 03:31:38 +00:00
Michael 5222bd2264 Merge remote-tracking branch 'upstream/develop' into 1612-diaspora 2016-12-29 23:29:01 +00:00
Michael 94977cca18 Events are now done. 2016-12-29 23:27:11 +00:00
Tobias Diekershoff 51155d7716 Merge pull request #3047 from annando/1612-indexlength
New binary data fields to avoid index length problems
2016-12-29 19:11:54 +01:00
Michael 666eb2ddbd Merge branch '1612-diaspora' of github.com:annando/friendica into 1612-diaspora 2016-12-29 17:13:07 +00:00
Michael 9af3f5b0da Improved loggin 2016-12-29 17:11:59 +00:00
Michael 1490f2d3b7 Merge remote-tracking branch 'upstream/develop' into 1612-diaspora 2016-12-29 10:16:10 +00:00
Michael 483f34c4ce We now transmit event data as well 2016-12-29 03:13:57 +00:00