keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
12565 commits 4 branches 0 tags 179 MiB
Commit graph

12565 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Vogel
4be7e5a581 "Fast lane" mechanism to reserve one queue for priority processes 2016-07-24 11:22:44 +02:00
Michael Vogel
7580c8ed11 Processing of high priority processes 2016-07-23 22:57:22 +02:00
Michael Vogel
0b0b29dc97 Reverted some strange stuff 2016-07-22 18:13:06 +02:00
Michael Vogel
fb447e84ee Some more information about the current queue status of the worker 2016-07-22 18:07:04 +02:00
Michael Vogel
4c5fb5947d Merge remote-tracking branch 'upstream/develop' into develop 2016-07-21 22:49:06 +02:00
Michael Vogel
2e9d233367 Merge remote-tracking branch 'upstream/master' into develop 
Conflicts:
	boot.php
 2016-07-21 22:48:34 +02:00
fabrixxm
2594ad3bb9 Merge pull request #2683 from tobiasd/20160721-demessages 
Update DE translation
 2016-07-21 09:59:33 +02:00
Tobias Diekershoff
cb7de01efe new contributor tu DE translations for the credits.txt 2016-07-21 09:21:51 +02:00
Tobias Diekershoff
0cbc102c93 DE update to the strings 2016-07-21 09:20:21 +02:00
Tobias Diekershoff
0a49b7dc77 Merge pull request #2681 from annando/bugfix-diaspora 
Bugfix: There was an SQL error when adding new entries in the fcontac…
 2016-07-15 17:35:50 +02:00
Michael Vogel
1603aa41ef Bugfix: There was an SQL error when adding new entries in the fcontact table 2016-07-15 17:25:30 +02:00
Michael Vogel
1130f11037 Merge pull request #2680 from fabrixxm/feature-api-update 
API: fix plaintext of reshared attachment
 2016-07-15 16:58:59 +02:00
fabrixxm
ec22b6086a API: fix plaintext of reshared attachment 
When replacing `[attachment]` element, text after it wasn't restored.
`[share]` element can contain `[attachment]`, the closing `[/share]` was elided,
then the `[share]` element was shown in plaintext instead of recycle symbol
 2016-07-15 16:53:30 +02:00
Tobias Diekershoff
334db69d5d Merge pull request #2678 from fabrixxm/feature-api-update 
api updates
 2016-07-15 15:08:55 +02:00
fabrixxm
d68c09e428 API: use diaspora::is_reshare() 2016-07-15 12:22:35 +02:00
fabrixxm
43699646d6 API: use doxygen todo style 2016-07-15 11:46:19 +02:00
fabrixxm
66199c9861 API: rework retweeted_status 
`api_share_as_retweet()` now returns a copy of the item with
fields updated to shared content, instead of modify the item itself.
The new item array is used to build 'retweeted_status'.
 2016-07-14 16:39:40 +02:00
fabrixxm
c7876d0c38 API: add docs to api_item_get_user() 
and remove commented out lines
 2016-07-14 13:36:15 +02:00
fabrixxm
18bd7f5eb7 API: use regex instead of SimpleXMLElement 
It's easier with exotic chars.
And the editor replaced all leading spaces with tabs.
 2016-07-14 13:32:31 +02:00
Tobias Diekershoff
896d8e9af8 Merge pull request #2679 from annando/1607-diaspora 
Diaspora: Link to protocol description added.
 2016-07-14 09:00:07 +02:00
Michael Vogel
2c5fb55725 Diaspora: Link to protocol description added. Support for creation date of comments 2016-07-14 07:20:20 +02:00
Tobias Diekershoff
0ff8b555fd Merge pull request #2677 from annando/1607-worker-cooldown 
Worker: New value for cooldown time after each function call
 2016-07-14 00:26:26 +02:00
fabrixxm
ce2f765d28 API: rework share as retweet 
new shared status xml template.
<retweeted_status> element in xml.
parent status keeps his body and author, 'retweeted_status'
get body, author and plink from share bbcode.
 2016-07-13 22:29:07 +02:00
fabrixxm
d98ab84d76 API: update template for friendica:owner data 
api_user_xml.tpl lost his root element.
Includer templates must provide it.
This allow to use same data structure under different root tag.
 2016-07-13 20:11:18 +02:00
fabrixxm
3cd2ed54eb api: item owner and activities details 
return new fileld for items 'friendica_owner'.
'user' is always the author of the item.
Items activitites now returns array of contacts details: {'name','url'}
 2016-07-13 19:58:38 +02:00
Michael Vogel
4b29937a74 Worker: New value for cooldown time after each function call 2016-07-13 19:43:16 +02:00
fabrixxm
95b7de6313 API: Fix api_array_to_xml() 2016-07-13 19:11:10 +02:00
fabrixxm
eb1ba8934c Merge pull request #2676 from tobiasd/20160713-lighttpdconfig 
added configuration reg. curl and lighttpd with error code 417
 2016-07-13 10:17:19 +02:00
Tobias Diekershoff
263c9f30a1 added configuration reg. curl and lighttpd with error code 417 2016-07-13 09:33:28 +02:00
Tobias Diekershoff
57762a8038 Merge pull request #2674 from annando/1607-warning-theme-info 
Bugfix: Avoid a warning if "theme_info" isn't an array
 2016-07-12 16:16:19 +02:00
Michael Vogel
fdd679636b Bugfix: Avoid a warning if "theme_info" isn't an array 2016-07-12 12:59:34 +02:00
rabuzarus
4e4580f326 Merge pull request #2669 from annando/1607-new-probe 
New probing mechanism
 2016-07-11 21:42:48 +02:00
rabuzarus
566f237f4a Merge pull request #2673 from annando/1607-mail-avatar 
Bugfix: Avatar pictures of mail contacts weren't displayed correctly
 2016-07-11 21:41:23 +02:00
Michael Vogel
a64db18731 Merge remote-tracking branch 'upstream/develop' into 1607-new-probe 2016-07-11 20:45:56 +02:00
Michael Vogel
0a46a3d10e Bugfix: Avatar pictures of mail contacts weren't displayed correctly 2016-07-11 20:42:18 +02:00
Michael Vogel
ee7f10f130 Some more little documentation 2016-07-11 19:48:37 +02:00
Michael Vogel
2a088d27d0 Merge pull request #2672 from rabuzarus/1007-page_template 
add possibility to load custom page templates + none.php pagetemplate…
 2016-07-11 15:20:10 +02:00
rabuzarus
15471f3835 add possibility to load custom page templates + none.php pagetemplate is part of core now 2016-07-11 10:33:39 +02:00
Michael Vogel
aad3fb2d32 Some more documentation 2016-07-10 18:44:48 +02:00
Michael Vogel
19d820a9c4 Added fcontact doc 2016-07-10 14:08:27 +02:00
Michael Vogel
230bfcebea Merge remote-tracking branch 'upstream/develop' into 1607-new-probe 2016-07-10 14:03:10 +02:00
Tobias Diekershoff
26098fa263 Merge pull request #2671 from annando/1607-diaspora-soapbox-connect 
Bugfix: Diaspora connect requests to soapbox account work now
 2016-07-10 13:55:56 +02:00
Michael Vogel
9ac26802ce Diaspora: Send the profile data after a successful connect 2016-07-10 13:11:09 +02:00
Michael Vogel
19377f2a9c Just make the bugfix a little bit simpler 2016-07-10 12:18:10 +02:00
Michael Vogel
84aa01b377 Bugfix: Diaspora connects to a Soapbox account weren't established correctly 2016-07-10 12:09:58 +02:00
Michael Vogel
8a11a60932 Small text correction 2016-07-10 09:29:43 +02:00
Michael Vogel
3cb38a8fff Merge pull request #2670 from tobiasd/20160709-credits 
regen credits.txt
 2016-07-10 09:28:41 +02:00
Michael Vogel
b9da831138 Fallback for empty names 2016-07-10 09:27:40 +02:00
Tobias Diekershoff
fd105609a4 Merge pull request #2668 from annando/1607-diaspora-retraction 
Diaspora: Relayed retraction hadn't worked.
 2016-07-10 08:15:56 +02:00
Michael Vogel
94478bc366 Merge pull request #2667 from tobiasd/20160709-messages 
regen messages.po
 2016-07-09 20:39:03 +02:00