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

12912 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Vogel 5432acca20 Merge pull request #2736 from tobiasd/20160814-doc 
DOCs we have a new developer forum
 2016-08-14 21:23:19 +02:00
Michael Vogel dfac110887 Merge pull request #2729 from gerhard6380/develop 
new API calls for private messages in Win10 App
 2016-08-14 21:21:58 +02:00
Michael Vogel 67b16507f1 Performance improvements for the poller 2016-08-14 21:02:29 +02:00
Tobias Diekershoff f79a9f67f1 DOCs we have a new developer forum 2016-08-14 09:34:50 +02:00
Tobias Diekershoff 2d7c8c79cf Merge pull request #2735 from rabuzarus/1308-frio-event-strings 
frio: fix missing events string
 2016-08-14 09:18:48 +02:00
rabuzarus efdb98de6d frio: fix - add string to template 2016-08-13 18:59:59 +02:00
rabuzarus 2d0c503bf1 frio: fix - permissions string was missing 2016-08-13 18:58:49 +02:00
gerhard6380 30ecd7cf38 adapted documentation 
removed reference to Windows 10 app
 2016-08-13 16:14:12 +02:00
Michael Vogel 5069d5f94e Merge pull request #2734 from rabuzarus/1308-cal-export-perms 
fix: own calendar is now always exportable for local_user()
 2016-08-13 15:20:59 +02:00
rabuzarus 826a13eb23 fix: own calendar is now always exportable for local_user() 2016-08-13 13:59:55 +02:00
gerhard6380 e5874aa34c updated api documentation to reflect changes on direct_messages 
added direct_messages/destroy, friendica/direct_messages_setseen
 2016-08-13 13:19:53 +02:00
gerhard6380 23393c05ee improved sql statements for direct_messages calls 2016-08-13 13:08:16 +02:00
rabuzarus 21ce7cff3b Merge pull request #2733 from tobiasd/20160819-doc 
DOCS: clarify Settings also discusses the Admin Panel
 2016-08-13 12:26:06 +02:00
Tobias Diekershoff 11e3c3bfad DOCS: clarify Settings also discusses the Admin Panel 2016-08-13 12:11:27 +02:00
gerhard6380 3b8db28a43 Implement api/direct_messages/destroy 
Twitter compliant call replaces api/friendica/direct_messages_delete;
JSON return expected by Twitter API and parameter include_entities not
yet implemented
 2016-08-12 18:15:03 +02:00
gerhard6380 41c1f71d4d remove api_friendica_direct_messages_all 
instead included 'friendica_verbose' parameter into standard function
api_direct_messages_box()
 2016-08-12 15:40:22 +02:00
gerhard6380 fb087ce89e Removing api_friendica_direct_messages_conversations 
due to implementing 'seen' and 'parent-uri' into standard
api_format_messages() this call is not needed anymore. Adapting comment
blocks.
 2016-08-11 23:53:00 +02:00
Tobias Diekershoff 9988a5b7c4 Merge pull request #2731 from annando/1608-notifications-format 
HTML entities in notifications aren't a problem anymore
 2016-08-11 21:08:07 +02:00
Michael Vogel 1c31526d6e HTML entities in Notifications aren't a problem anymore 2016-08-11 19:59:07 +02:00
gerhard6380 db6fb8efe2 remove api_format_messages_win and include new fields in api_format_messages 2016-08-11 17:34:33 +02:00
Tobias Diekershoff 2b062214dc Merge pull request #2730 from annando/1608-missing-parameter-ping 
Bugfix: A parameter in xml::from_array was missing.
 2016-08-11 08:52:18 +02:00
Michael Vogel b6dec53ec1 Bugfix: A parameter in xml::from_array was missing. 2016-08-11 08:44:03 +02:00
Tobias Diekershoff 103f70215a Merge pull request #2728 from annando/1608-ping 
Ping is now using a standard routine to generate the XML
 2016-08-11 07:53:51 +02:00
gerhard6380 d7d698bef4 new API calls for private messsages in Win10 app 
new API calls used for Windows 10 app (similar calls to existing but
extended to include seen id and parent-uri)
 2016-08-10 23:56:17 +02:00
gerhard6380 b8af78d877 Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop 2016-08-10 23:54:54 +02:00
Michael Vogel 0ea9af3d7d Ping is now using a standard routine to generate the xml. 2016-08-10 22:51:03 +02:00
Tobias Diekershoff dbab4db754 Merge pull request #2727 from rabuzarus/1008-item-highlight 
frio: highlight - test if the item is available in the dom
 2016-08-10 14:49:27 +02:00
rabuzarus 83e95a5841 frio: highlight - test if the item is available in the dom 2016-08-10 14:42:57 +02:00
Tobias Diekershoff 2a79b8c235 Merge pull request #2726 from rabuzarus/1008-item-highlight 
Frio: fix auto jump to the item position in /display
 2016-08-10 14:42:11 +02:00
rabuzarus 31deaaf0a8 Merge pull request #2725 from tobiasd/20160810-de 
DE translation
 2016-08-10 14:27:28 +02:00
rabuzarus 5e440e5359 frio: highlight - wait until the whole page is loaded 2016-08-10 14:26:16 +02:00
rabuzarus cf23a81c33 frio: highlight - use offset() instead of postion() 2016-08-10 14:14:58 +02:00
rabuzarus 531cba5ce5 frio: fix - I used the wrong variable 2016-08-10 13:33:49 +02:00
rabuzarus 7e65d84577 frio: fix for display auto position scroll + some cleanup 2016-08-10 13:07:13 +02:00
Tobias Diekershoff 42b7c9cd74 DE translation 2016-08-10 12:31:54 +02:00
rabuzarus c7eb7ba73f Merge pull request #2724 from tobiasd/20160809-msgs 
regenerated messages.po file for new strings in Frio theme
 2016-08-09 18:42:10 +02:00
Tobias Diekershoff afdb8af5a4 regenerated messages.po file for new strings in Frio theme 2016-08-09 18:18:09 +02:00
Tobias Diekershoff 0e007679e1 Merge pull request #2723 from rabuzarus/0908-Frio_Guest_Nav 
frio: Remote is now called Guest
 2016-08-09 18:08:59 +02:00
gerhard6380 0f2e5a4684 Merge pull request #1 from friendica/develop 
Develop
 2016-08-09 16:48:18 +02:00
rabuzarus 40b0a8e30c frio: Remote is now called Guest 2016-08-09 14:39:18 +02:00
Tobias Diekershoff 35a8f641a8 Merge pull request #2722 from rabuzarus/0808-frio-backgrounds 
frio: add some missing page backgrounds
 2016-08-09 07:54:56 +02:00
rabuzarus 5e4eaa433b Merge pull request #2720 from annando/1608-kill-stale-worker 
Process timeouts are now priority depending
 2016-08-08 22:34:45 +02:00
rabuzarus f52a06d013 frio: correct spelling 2016-08-08 22:25:54 +02:00
rabuzarus 4adc758adb frio: add some missing page background 2016-08-08 22:16:32 +02:00
Michael Vogel 5dff8db751 Redefined the priority constants (to have space for future expansions) 2016-08-08 22:11:24 +02:00
rabuzarus 62b23b0631 frio: background for people search 2016-08-08 21:54:34 +02:00
Michael Vogel fe5e775b00 Merge pull request #2718 from rabuzarus/0808-frio_notifications_css 
frio: unify size of notif-images + background color for unseen notifs
 2016-08-08 21:31:00 +02:00
Michael Vogel d138b11868 Use a 10 minute timeout for high priority processes. This may be better. 2016-08-08 21:28:44 +02:00
Michael Vogel 0bcd3b972c Merge pull request #2719 from rabuzarus/0808-frio_toggle_aside 
frio: fix duplicated ID's in aside section
 2016-08-08 21:26:57 +02:00
Michael Vogel 29168de677 Process timeouts are now priority depending 2016-08-08 19:20:40 +02:00