clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
13,077 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

13077 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Vogel 5e81c105e0 We now work with the "priority" field - that's better 2016-07-24 20:25:11 +02:00
Michael Vogel 747dc934f7 Avoid warning because $a isn't called by reference 2016-07-24 13:53:26 +02:00
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
Michael Vogel 0e7ff6b4db Removed (now) unused templates 2016-07-19 08:46:41 +02:00
Michael Vogel 8bf7db06db New indexes for the API 2016-07-19 08:43:57 +02:00
Michael Vogel 4f07dfb35a Optimized queries 2016-07-18 15:25:42 +02:00
Michael Vogel 838f976715 Some more improvements to xml.php, code cleanup 2016-07-17 23:59:35 +02:00
Michael Vogel d7f093cb2e Enhanced XML creation, and so on. 2016-07-17 19:42:30 +02:00
Michael Vogel bc2c565060 Work in progress: API XML output without templates 2016-07-16 12:32:08 +02:00
Michael Vogel de6f48365b Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml 2016-07-15 20:12:46 +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 a64b7704d8 Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml 2016-07-15 17:19:16 +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
Michael Vogel 4e25d08a77 Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml 2016-07-15 16:15:20 +02:00
Michael Vogel 6ebfbc5993 API: Use a generic function to create the XML 2016-07-15 15:37:51 +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