Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-25 04:00:16 +00:00
Code Issues Projects Releases Packages Wiki Activity
14288 commits 3 branches 64 tags 237 MiB
Commit graph

14288 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael
79866f620a OOpppss ... 2017-01-16 22:15:04 +00:00
Michael
6972faa3a8 Redo some work 2017-01-16 22:11:35 +00:00
Michael
ef31127430 Added documentation 2017-01-16 22:00:58 +00:00
Michael
6e1986a0f2 Removed commented text 2017-01-16 21:48:35 +00:00
Michael
1dcd355e47 Changed database version 2017-01-16 21:45:27 +00:00
Michael
2cdf87c56a Deactivated the alternative update script by now 2017-01-16 21:35:35 +00:00
Michael
d6ca6f24a7 Merge remote-tracking branch 'upstream/develop' into 1701-index-again 2017-01-16 21:06:43 +00:00
Michael
0c310db23d Bugfix for failed events page and api 2017-01-16 20:59:16 +00:00
Tobias Diekershoff
b81a1fde09 Merge pull request #3093 from annando/issue-3011 
Issue 2364: OStatus: Don't fetch liked contents
 2017-01-16 07:31:53 +01:00
Tobias Diekershoff
e7966171dd Merge pull request #3094 from annando/1701-hubzilla-probe 
Fixing avatar problems when probing Hubzilla contacts
 2017-01-16 07:27:03 +01:00
Michael
ced7cb6828 Smarter way to create unique indexes 2017-01-15 23:30:43 +00:00
Michael
e63e241f8f Hubzilla doesn't send a width attribute in the avatar picure in the hcard 2017-01-15 19:46:04 +00:00
Michael
47d04416b1 As well here ... 2017-01-15 15:18:31 +00:00
Michael
99e9791d1f We fetched a little bit too much ... 2017-01-15 15:06:32 +00:00
Michael
7e846ba7ac Hide the calculation for "previous" and "next" behind a setting 2017-01-15 14:50:26 +00:00
Michael
021a4fad71 Some more database stuff 2017-01-15 12:36:06 +00:00
Michael
2362e78c8f Issue 3011 (and others): OStatus: Don't fetch liked contents 2017-01-15 09:07:57 +00:00
Michael
e16afc0450 Some more changed indexes and improved queries 2017-01-14 21:36:34 +00:00
Michael
85397f3bb9 Some removed indexes 2017-01-14 00:49:41 +00:00
Michael
29ef8d29ce Better usage of text and mediumtext. 2017-01-13 22:13:52 +00:00
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
Hypolite Petovan
b61479ba6e Merge remote-tracking branch 'friendica/develop' into issue/#3062 
# Conflicts:
#	view/theme/duepuntozero/theme.php
#	view/theme/smoothly/theme.php
 2017-01-12 09:19:59 +11: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