nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
14011 commits 2 branches 55 tags 148 MiB
Commit graph

14011 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael 3af099298c Some more caching 2017-01-13 17:31:10 +00:00
Michael 844fefc9c4 Caching the events. 2017-01-13 13:04:37 +00:00
Michael a9833a395f The relay query now uses a better index 2017-01-13 10:37:39 +00:00
Michael fd5f151a72 New function to detect heavily used indexes 2017-01-13 07:46:47 +00:00
Tobias Diekershoff b067a11146 Merge pull request #3088 from beardyunixer/patch-1 
Update FAQ.md
 2017-01-12 16:32:38 +01:00
beardyunixer 9183ef4385 Update FAQ.md 
Grammar - a few sentences that are technically correct, but don't sound quite right to a native speaker.
 2017-01-12 12:13:13 +00:00
rabuzarus b1120f5238 Merge pull request #3080 from annando/1701-curl-range 
Download limit for fetching data via "z_fetch_url"
 2017-01-12 12:15:58 +01:00
Michael e67133ef56 Merge remote-tracking branch 'upstream/develop' into 1701-curl-range 
Conflicts:
	mod/oexchange.php
	mod/uimport.php
 2017-01-12 07:25:44 +00:00
rabuzarus 63e2695d22 Merge pull request #3074 from annando/1701-diaspora-ostatus-mentions 
Bugfix: Answers to OStatus posts should never reach Diaspora
 2017-01-12 02:12:25 +01:00
rabuzarus 4a8cff74f2 Merge pull request #3081 from annando/1701-top-level 
When commenting too fast, messages weren't delivered to Diaspora
 2017-01-12 02:11:43 +01:00
rabuzarus 3f655ee7c4 Merge pull request #3085 from annando/1701-poll-contacts 
Correction of commit a96eb3428d
 2017-01-12 00:36:54 +01:00
Michael fcd0b198f5 Correction of commit a96eb3428d 2017-01-11 23:18:51 +00:00
Michael 12dd06f726 Merge remote-tracking branch 'upstream/develop' into 1701-top-level 2017-01-11 23:15:23 +00:00
Michael Vogel 5eaa5951a1 Merge pull request #3078 from Hypolite/issue/#3039-mod-2of3 
Normalize App parameter declaration (mod folder, 2 out of 3)
 2017-01-11 22:49:01 +01:00
Michael Vogel 05a2989ecb Merge pull request #3079 from Hypolite/issue/#3039-mod-3of3 
Normalize App parameter declaration (mod folder, 3 out of 3)
 2017-01-11 22:33:41 +01:00
Michael Vogel c02e697442 Merge pull request #3083 from rabuzarus/20170111_-_diaspora_logger_debug 
diaspora - switch logger for "non subscribed messages" to LOGGER_DEBUG
 2017-01-11 14:32:25 +01: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 Vogel 6c9b9dabcc Merge pull request #3082 from tobiasd/20170111-newyear 
happy 2017
 2017-01-11 08:59:43 +01:00
Hypolite Petovan 160d462d3f Fix typo in doc 2017-01-11 18:42:49 +11:00
Tobias Diekershoff a9e66a285e happy 2017 2017-01-11 08:09:13 +01:00
Michael Vogel 38a41eefd2 Merge pull request #3075 from Hypolite/issue/#3039-theme 
Normalize App parameter declaration (view folder)
 2017-01-11 07:50:49 +01:00
Hypolite Petovan 30a77cc10a Merge branch 'develop' of https://github.com/friendica/friendica into issue/#3039-theme 
# Conflicts:
#	view/theme/frio/theme.php
 2017-01-11 09:39:38 +11:00
Michael Vogel df8b522f6b Merge pull request #3077 from Hypolite/issue/#3039-mod-1of3 
Normalize App parameter declaration (mod folder, 1 out of 3)
 2017-01-10 17:28:21 +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
Michael a2debaa68a Download limit for fetching data via "z_fetch_url" 2017-01-09 23:10:32 +00:00
rabuzarus f880fb9a42 Merge pull request #3069 from annando/1612-unused-indexes 
Index improvements
 2017-01-09 22:30:46 +01:00
Hypolite Petovan a7ce601580 Normalize App parameter declaration (mod folder, 3 out of 3) 2017-01-09 23:14:55 +11:00
Hypolite Petovan f92918f471 Normalize App parameter declaration (mod folder, 2 out of 3) 2017-01-09 23:14:25 +11:00
Hypolite Petovan 8a197055e3 Normalize App parameter declaration (mod folder, 1 out of 3) 2017-01-09 23:12:54 +11:00
Hypolite Petovan 87eb3d5ef2 Normalize App parameter declaration (doc-include folders, boot) 2017-01-09 23:09:01 +11:00
Hypolite Petovan 623479a346 Normalize App parameter declaration (view folder) 2017-01-09 23:06:08 +11:00
Michael 16f0221e4c DBClean now has a smaller limit/Query improvements 2017-01-09 09:37:37 +00:00
Michael 65226778fe More standards 2017-01-09 06:40:56 +00:00
Michael fc60e7f5dd Making Hypolite smile 2017-01-08 22:29:55 +00:00
Michael 906c7d528b Bugfix: Answers to OStatus posts should never reach Diaspora 2017-01-08 20:35:41 +00:00
Michael 28b2e599fb it should be "gid" not "cid" 2017-01-08 20:11:15 +00:00
Michael f14cd2920a database.sql was updated 2017-01-07 22:04:57 +00:00
Michael ed0143c9f0 Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes 2017-01-07 16:13:57 +00:00
Michael Vogel ee39aba490 Merge pull request #3043 from Quix0r/rewrites/dbm_is_result 
More usage of dbm::is_result + coding convention applied
 2017-01-07 17:09:23 +01:00
Michael Vogel b7d675dbb0 Merge pull request #3071 from Hypolite/issue/#1034-2 
Updated SSL english docs
 2017-01-07 15:40:24 +01: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
Hypolite Petovan 3caf3bccd9 Updated SSL english docs 
Fixes #1034
 2017-01-07 23:27:50 +11:00
Hypolite Petovan 8d195dc499 Merge remote-tracking branch 'friendica/develop' into develop 2017-01-07 23:23:50 +11:00
Michael 1b48799f08 Don't do queries if not needed 2017-01-07 11:28:18 +00:00