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

11353 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tobias Diekershoff 2b5366ce15 Merge pull request #2235 from annando/1601-bugfix-sql-api 
Bugfix: The table name was wrong
 2016-01-03 08:37:39 +01:00
Michael Vogel ba9054d8a3 Bugfix: The table name was wrong 2016-01-03 08:12:00 +01:00
Tobias Diekershoff 9015b081ee Merge pull request #2234 from annando/1601-bugfix-duplicate-like 
Bugfix: Duplicate check for likes wasn't reliable
 2016-01-03 07:51:41 +01:00
Michael Vogel 01e20cded3 Merge pull request #2233 from fabrixxm/issue_api 
API: fix item activities count
 2016-01-03 00:38:57 +01:00
Michael Vogel fba08409b4 Some more places that need to be adjusted 2016-01-03 00:28:11 +01:00
Michael Vogel 6c3d0f82c2 Bugfix: The duplicate check for likes wasn't reliable 2016-01-03 00:17:28 +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 77a230342f perfect-scrollbar: added Source link to the lib 2015-12-30 16:26:57 +01:00
rabuzarus 466968952c colorbox: update library to 1.6.3 2015-12-30 14:53:02 +01:00
rabuzarus 8a51e470e7 perfect scrollbars: added README 2015-12-30 14:22:13 +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 f8256fc53b make perfect scrollbars work with quattro 2015-12-30 03:12:52 +01:00
rabuzarus 89c0a8f8a8 vier: remove double available accesskeys 2015-12-30 00:48:11 +01:00
rabuzarus 3366e530cd photo aside widget: little polish 2015-12-30 00:37:24 +01:00
rabuzarus 20fbf670db photo aside widget for profile page 2015-12-30 00:26:50 +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 e93156427e use perfect-scrollbars for nav-notifications-menu (and in vier aside) 2015-12-28 23:16:34 +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