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

11142 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Vogel
01e20cded3 Merge pull request #2233 from fabrixxm/issue_api 
API: fix item activities count
 2016-01-03 00:38:57 +01:00
fabrixxm
20809cf725 API: fix itemactivities count 
api_format_items_likes() has now uses builtin_activity_puller() to correctly count activities
 2016-01-02 12:54:57 +01:00
fabrixxm
5758302f21 small doxigen comment fix 2016-01-02 12:53:42 +01:00
Tobias Diekershoff
0f615fdcd7 Merge pull request #2232 from annando/1601-bugfix-request 
Bugfix: The request process from DFRN hadn't worked anymore
 2016-01-02 10:03:48 +01:00
fabrixxm
d090dc19a7 Merge pull request #2231 from annando/1601-dont-send-to-archive 
Don't send messages to contacts that are archived
 2016-01-01 17:59:02 +01:00
Michael Vogel
2ed3ae1aab Bugfix: The request process from DFRN hadn't worked anymore since the last pull request 2016-01-01 17:49:07 +01:00
Michael Vogel
38ee2def5d Don't send messages to contacts that are archived 2016-01-01 13:05:05 +01:00
Tobias Diekershoff
9d4d29ad9e Merge pull request #2228 from fabrixxm/issue_api 
Fix small bug in api
 2015-12-31 09:49:28 +01:00
Tobias Diekershoff
8a5fada863 Merge pull request #2138 from fabrixxm/dbstructure_multicolumn_primarykey 
Allow multicolumn primary keys in dbstructure
 2015-12-31 09:49:00 +01:00
fabrixxm
2a9affe818 Fix small bug in api 2015-12-31 09:46:59 +01:00
fabrixxm
907d20940a Merge pull request #2221 from rabuzarus/2812_vier_mobile_icons 
vier: make TopNavBar mobile friendly
 2015-12-31 09:38:27 +01:00
fabrixxm
6a8f5f9204 Merge pull request #2226 from rabuzarus/3012_colorbox 
colorbox: update library to 1.6.3
 2015-12-31 09:18:39 +01:00
fabrixxm
a3448e4156 Merge pull request #2227 from tobiasd/20151231-DE 
DE update to the strings
 2015-12-31 09:17:59 +01:00
Tobias Diekershoff
ab5d0aa5e6 DE update to the strings 2015-12-31 07:32:15 +01:00
rabuzarus
466968952c colorbox: update library to 1.6.3 2015-12-30 14:53:02 +01:00
Michael Vogel
077dd6a6b5 Merge pull request #2225 from tobiasd/20151230-FR 
FR update to the strings
 2015-12-30 11:44:05 +01:00
Tobias Diekershoff
6961fa636a FR update to the strings 2015-12-30 08:55:59 +01:00
rabuzarus
89c0a8f8a8 vier: remove double available accesskeys 2015-12-30 00:48:11 +01:00
Michael Vogel
b41ab85feb Merge pull request #2220 from rabuzarus/2812_notify_menu 
vier: some visual work on the notification menu
 2015-12-29 14:31:41 +01:00
Michael Vogel
4e47b26e17 Merge pull request #2222 from rabuzarus/2912_vier_clear_widget 
vier: add missing clear divs to right aside
 2015-12-29 14:24:45 +01:00
rabuzarus
871fb609d4 vier: add missing clear divs to right aside 2015-12-29 02:01:17 +01:00
rabuzarus
51a8864519 vier: make TopNavBar mobile friendly 2015-12-29 00:23:59 +01:00
rabuzarus
43d35315db vier nav-notification-menu: further polishing 2015-12-28 22:04:54 +01:00
rabuzarus
c7d2d95705 vier nav-notification-menu: small cleanup 2015-12-28 20:52:11 +01:00
rabuzarus
093a3e6742 some work on vier nav-notification-menu 2015-12-28 20:40:04 +01:00
Tobias Diekershoff
99861b9fa6 Merge pull request #2216 from fabrixxm/feature-api-like 
Works on API and a small refractor, updated docs
 2015-12-28 18:39:21 +01:00
Tobias Diekershoff
03000beac6 Merge pull request #2219 from fabrixxm/quattro 
Fix video oembed appearance
 2015-12-28 18:39:03 +01:00
fabrixxm
9a307a4e2b Merge pull request #2218 from annando/1512-mail-participiants 
Bugfix: The participants on the mail page were displayed wrong
 2015-12-28 18:31:54 +01:00
fabrixxm
c2d1016014 remove linebreak in doc/api.md 2015-12-28 18:30:28 +01:00
fabrixxm
a1c1a6cae8 workaround for media.ccc.de oembed with size 0 2015-12-28 18:28:02 +01:00
fabrixxm
7965f72c8c don't resize iframe if we can't find a final size greater than 0 2015-12-28 18:27:24 +01:00
Michael Vogel
2f13506180 Bugfix: The participants on the mail page were displayed wrong 2015-12-28 18:13:03 +01:00
fabrixxm
6da04d16bd get rid of unwanted <br>s in items with oembed 
fix video thumbnail in quattro, vier, duepuntozero themes
 2015-12-28 18:07:31 +01:00
fabrixxm
0896f3a4f5 Merge pull request #2217 from annando/1512-key-hcard 
Diaspora: Scrape the public key from the hcard
 2015-12-28 17:26:39 +01:00
Michael Vogel
4c08b0ceb6 code cleanup 2015-12-28 17:09:22 +01:00
Michael Vogel
3476e21b28 Scrape the public key from the hcard if not present in webfinger 2015-12-28 16:49:19 +01:00
Michael Vogel
9d83892151 Merge pull request #2215 from rabuzarus/2812_vier_mobile_fix 
vier: fix for 2205
 2015-12-28 10:41:39 +01:00
fabrixxm
f579b2af55 Fix TOC links href, no TOC in home 2015-12-28 10:24:47 +01:00
fabrixxm
1776b19dbf Add table of content in aside of help pages 2015-12-28 10:24:47 +01:00
fabrixxm
e752d41389 Update API docs 2015-12-28 10:23:06 +01:00
fabrixxm
696fe53d8f sizes links in xml output of api/frienidca/photo is an array 2015-12-28 10:23:06 +01:00
fabrixxm
79c32105fc datasize not meaningful when all size are returned in api/friendica/photo 2015-12-28 10:23:06 +01:00
fabrixxm
0664ace260 Fix ignore doxigen output in .gitignore 2015-12-28 10:23:06 +01:00
fabrixxm
6b60560ea2 Changes in api 
- Api functions can define an HTTP method to use to call them. "405 Method Not Allowed" is returned on error
- Api function that modify data accepts only POST as method.
- A list of HTTP return code related exception is added
- Api functions throw HTTP exceptions instead of return false or die()
- api_call() catches HTTP exceptions and return error message with corret HTTP response code
- api_format_items() returns also item activities count (# of like/dislike etc)
- api/friendica/photos/list return more info about photos. xml format added.
- api/friendica/photo/detail return more info, links to all sizes, no data except if 'size' parameter is passed. xml format added.
- new api api/friendica/activity/<verb> and api/friendica/activity/un<verb> to add or remove like/dislike/attend status
 2015-12-28 10:23:06 +01:00
fabrixxm
835ad28d83 do_like() return false if verb is invalid 2015-12-28 10:23:06 +01:00
fabrixxm
f27fad7b47 Move Like/Dislike/Attend add/remove code to include/like.php 2015-12-28 10:23:06 +01:00
fabrixxm
cf86162a08 Merge pull request #2214 from rabuzarus/2612_db_docu 
add db documentation to the help pages
 2015-12-28 10:22:33 +01:00
Tobias Diekershoff
497175c56e Merge pull request #2213 from annando/1512-dfrn-request 
Support for remote subscription in Diaspora
 2015-12-28 05:25:50 +01:00
Tobias Diekershoff
b09fd2c39e Merge pull request #2212 from annando/1512-xrd 
XRD now should react more like an OStatus server
 2015-12-28 05:24:36 +01:00
Tobias Diekershoff
3dd08094ca Merge pull request #2210 from annando/1512-diaspora-p 
Diaspora: The /p/ only should return top level posts - not comments
 2015-12-28 05:23:00 +01:00