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

11379 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rabuzarus 00e319faa2 rework autocomplete: add bbcode autocompletion to editor 2016-02-01 18:22:26 +01:00
rabuzarus aee94b38c1 rework autocomplete: add class dir and static function 2016-02-01 18:21:29 +01:00
rabuzarus 5f7c5e6ab6 rework autocomplete: Access list of smilies over JSON 2016-02-01 17:43:12 +01:00
rabuzarus 162f754e2d Merge develop into 1901_autocomplete 2016-01-30 16:57:54 +01:00
rabuzarus 9fba5041a0 rework autocomplete: update query-textcomplete 2016-01-30 16:42:46 +01:00
Tobias Diekershoff 748d0e576c Merge pull request #2304 from rabuzarus/3001_event_map_fix 
event_form: use [map] tag to embedd a map
 2016-01-30 06:59:30 +01:00
rabuzarus 088b075bba event_form: use [map] tag to embedd a map 2016-01-30 05:12:27 +01:00
Michael Vogel 4cac6a744f Merge pull request #2303 from rabuzarus/2901-vier-mobile 
vier: some fixes for mobile view
 2016-01-30 03:21:28 +01:00
rabuzarus 8e0f04026c vier: some fixes for mobile view 2016-01-30 01:53:21 +01:00
Tobias Diekershoff cb34e86aec Merge pull request #2302 from annando/1601-profile-data 
Profile data from the gcontact table should only be taken if there is content
 2016-01-29 18:02:45 +01:00
Michael Vogel 596416defe Profile data from the gcontact should only be taken if there is content 2016-01-29 12:14:04 +01:00
fabrixxm 863d49ccd0 Merge pull request #2300 from annando/1601-gcontact-guessing 
gcontact-id now depends on the owner, not the author of a post
 2016-01-29 05:27:58 +01:00
fabrixxm fdb864157d Merge pull request #2299 from annando/1601-contact-photos 
Improved avatar storage in contacts
 2016-01-29 05:26:26 +01:00
fabrixxm a8e2d143e2 Merge pull request #2301 from annando/1601-notifications 
There is now a central function for item notifications
 2016-01-29 05:24:03 +01:00
Michael Vogel 4d33441c2e DB Version was forgotten ... 2016-01-29 03:51:12 +01:00
Michael Vogel 56687f5bc8 Check the body for notifications as well 2016-01-29 03:46:43 +01:00
Michael Vogel e4c4b8e13e It's better to ask the connectors for their profile data 2016-01-29 03:02:15 +01:00
Michael Vogel 8767ea5f52 Improved check against profile 2016-01-29 01:18:18 +01:00
Michael Vogel b3e86f4e6b There is now a central function for item notifications 2016-01-28 22:58:05 +01:00
Michael Vogel a93d35bfda gcontact-id now depends on the owner, not the author of a post 2016-01-28 18:06:17 +01:00
Michael Vogel 410ebb4cbf Added documentation 2016-01-28 12:35:07 +01:00
Michael Vogel 845a769dc2 Only check size if needed - should speed up the uploading. 2016-01-28 12:28:04 +01:00
Michael Vogel eba9f15daa Removed some more work 2016-01-28 11:18:57 +01:00
Michael Vogel 04725d1283 Reverted some work ... 2016-01-28 11:14:13 +01:00
Michael Vogel 78e79de7c9 New central function to store avatar data in contacts 2016-01-28 11:09:08 +01:00
Michael Vogel 6f662b8c74 New avatar picture fields to better cope with changing avatars 2016-01-28 01:26:19 +01:00
Tobias Diekershoff d6c1889a20 Merge pull request #2298 from annando/1601-contact-posts 
Show contact posts by searching for "contact-id" - not "gcontact-id"
 2016-01-27 12:39:43 +01:00
Michael Vogel d3bf80a1f3 Show contact posts by searching for "contact-id" - not "gcontact-id" 2016-01-27 11:16:56 +01:00
fabrixxm bcc9588732 Merge pull request #2297 from annando/1601-ostatus 
OStatus: Do not notify on "likes" - update only OStatus contacts
 2016-01-27 11:06:51 +01:00
Michael Vogel 828cec27dd Do not notify on "likes" - update only OStatus contacts 2016-01-27 10:44:15 +01:00
fabrixxm f18679053b Merge pull request #2286 from annando/1601-dfrn 
Complete rewrite of DFRN generation
 2016-01-27 09:42:03 +01:00
Michael Vogel 45a5f63d35 The object-type is now transmitted as well 2016-01-27 02:38:52 +01:00
Michael Vogel c0eb7b10a3 Some new fields for the protocol 2016-01-26 12:18:57 +01:00
Michael Vogel 4208acf4b6 Merge remote-tracking branch 'upstream/develop' into 1601-dfrn 2016-01-25 23:51:11 +01:00
fabrixxm 7ea3923429 Merge pull request #2296 from annando/1601-api-repeat 
API: Only allow repeating of public items
 2016-01-25 22:46:02 +01:00
Michael Vogel 9b2582e066 API: Only allow repeating of public items 2016-01-25 22:35:18 +01:00
Michael Vogel f5a4037d4b Merge pull request #2285 from tobiasd/20160124-docs 
groups vs forums and mentioning those
 2016-01-25 22:14:05 +01:00
Michael Vogel 778d9250c6 Still some more documentation 2016-01-25 22:10:26 +01:00
Michael Vogel 62de6be495 Switched to static methods for DFRN 2016-01-25 15:20:58 +01:00
Michael Vogel a5cd7a9487 Merge pull request #2295 from mexon/mat/pullrequest5 
Note the final URL used to retrieve content after all redirects
 2016-01-25 12:29:40 +01:00
Matthew Exon 4ff8c9e3a1 Document new redirect_url return value 2016-01-25 11:38:36 +01:00
Matthew Exon cfd40896de Remove global state for redirect_url 2016-01-25 11:06:10 +01:00
Matthew Exon 930da0aa44 Return redirect_url as part of the return array from z_fetch_url instead of via global state 2016-01-25 11:05:17 +01:00
Matthew Exon 50d4d37609 Merge remote branch 'upstream/develop' into mat/pullrequest5 2016-01-25 10:58:18 +01:00
fabrixxm 0e6f3e6122 Merge pull request #2293 from mexon/mat/pullrequest4 
Use more cookies to allow processing of the NYT feed
 2016-01-25 10:52:48 +01:00
Michael Vogel 77c6020dc2 Removed useless get_app function call 2016-01-25 10:38:38 +01:00
Matthew Exon 0ae83e41a2 Use get_temppath() instead of hard-coded '/tmp' to store cookiejar 2016-01-25 10:38:30 +01:00
Michael Vogel ab317b8e83 Merge pull request #2289 from mexon/mat/pullrequests 
Only proxy URLs using HTTP or HTTPS
 2016-01-25 10:24:57 +01:00
Tobias Diekershoff c7691ce68d OStatus clarification 2016-01-25 09:58:58 +01:00
fabrixxm d4bb150b49 Merge pull request #2294 from tobiasd/20160125-de 
DE update to the strings
 2016-01-25 09:27:33 +01:00