Michael Vogel
|
f1af0fe360
|
Obly use the profile data in shares if there is data
|
2016-07-02 17:51:16 +02:00 |
|
Michael Vogel
|
c7f10bacb5
|
Merge remote-tracking branch 'upstream/develop' into 1607-is-result2
|
2016-07-02 14:01:52 +02:00 |
|
Michael Vogel
|
e4c6cfd2d8
|
Moves the function "is_result" from dba to dbm.
|
2016-07-02 14:00:42 +02:00 |
|
|
|
b580a338f6
|
Merge pull request #2654 from annando/1607-thumb-micro
use thumb avatar size instead of micro size in the contact list
|
2016-07-02 13:53:35 +02:00 |
|
Michael Vogel
|
7d531afd00
|
Merge branch 'rewrites/is_filled_array_introduced' of git://github.com/Quix0r/friendica into Quix0r-rewrites/is_filled_array_introduced
Conflicts:
boot.php
|
2016-07-02 13:38:23 +02:00 |
|
Michael Vogel
|
e67554924a
|
use thumb avatar size instead of micro size in the contact list
|
2016-07-02 09:32:42 +02:00 |
|
Michael Vogel
|
c549ae939c
|
Added the new function to the poller.
|
2016-07-02 09:31:28 +02:00 |
|
Michael Vogel
|
c1ce7059b6
|
If it doesn't work with the new method, try the old one
|
2016-06-30 22:58:56 +02:00 |
|
Michael Vogel
|
e5dd67121f
|
Some logging added.
|
2016-06-30 22:42:46 +02:00 |
|
Michael Vogel
|
97abbe83f4
|
Diaspora: Support for reading the /fetch/post/ functionality
|
2016-06-30 22:18:48 +02:00 |
|
Michael Vogel
|
24e0fffa2e
|
Small bugfix
|
2016-06-30 07:56:06 +02:00 |
|
Michael Vogel
|
d125939888
|
Just some more centralised functionality
|
2016-06-30 07:46:00 +02:00 |
|
Michael Vogel
|
99f0746660
|
Cleaned up the code
|
2016-06-30 07:32:07 +02:00 |
|
Michael Vogel
|
2c7fd1cb3c
|
It should be now valid
|
2016-06-30 01:18:44 +02:00 |
|
Michael Vogel
|
2d72e2d932
|
Diaspora: Support for new fetch functionality (replacement for /p/)
|
2016-06-29 22:50:30 +02:00 |
|
Michael Vogel
|
230a645307
|
Diaspora: Another Bugfix for the new protocol
|
2016-06-29 20:37:04 +02:00 |
|
Michael Vogel
|
152efdaec5
|
Diaspora: Incompatibilities with signature check solved
|
2016-06-29 10:33:43 +02:00 |
|
|
|
773517a734
|
Merge pull request #2638 from annando/1606-avatar-handling
Imrpoved avatar handling when storing them/partly use of "micro"
|
2016-06-25 19:51:00 +02:00 |
|
rabuzarus
|
fd72f36ffe
|
move html from function micropro() to own templates
|
2016-06-25 18:46:47 +02:00 |
|
Michael Vogel
|
ad6b3f8815
|
Merge pull request #2636 from rabuzarus/2506_frio_strings
add missing strings for frio
|
2016-06-25 14:03:34 +02:00 |
|
Michael Vogel
|
0b1188b7fe
|
Imrpoved avatar handling when storing them/partly use of "micro"
|
2016-06-25 13:56:55 +02:00 |
|
rabuzarus
|
073f520cee
|
add missing strings for frio
|
2016-06-25 12:21:13 +02:00 |
|
Michael Vogel
|
e2023b6667
|
Store the guid value as well.
|
2016-06-25 11:52:52 +02:00 |
|
Michael Vogel
|
ec5b3109e4
|
Support for the case when the guid and public key will vanish from webfinger
|
2016-06-25 00:38:47 +02:00 |
|
|
|
f8a20a15d3
|
Merge pull request #2633 from annando/1606-author-id-update
author-id/owner-id: Post update function/added database documentation
|
2016-06-24 07:03:46 +02:00 |
|
Michael Vogel
|
eabf8734a8
|
Merge pull request #2631 from rabuzarus/1906-event-test
cal export && public calendar - fix permissions
|
2016-06-23 23:24:27 +02:00 |
|
Michael Vogel
|
c7373dcec4
|
author-id/owner-id: Post update function/added database documentation
|
2016-06-23 21:15:54 +02:00 |
|
rabuzarus
|
e352458ef0
|
pub calendar - permission clean up and docu
|
2016-06-23 10:07:13 +02:00 |
|
rabuzarus
|
cd92a0dc34
|
Merge pull request #2624 from annando/1606-contact-id
Item: New fields for author id and owner id - avatar improvement with relocation
|
2016-06-22 14:26:39 +02:00 |
|
rabuzarus
|
2cac69ca86
|
cal export && public calendar - even better permissions testing
|
2016-06-22 13:50:47 +02:00 |
|
rabuzarus
|
8cc5dd35e8
|
cal export && public calendar - fix permissions
|
2016-06-22 00:39:52 +02:00 |
|
Michael Vogel
|
49c19a3c00
|
Merge pull request #2628 from rabuzarus/1906-event-test
move the cal addon (exporting calendars) to core
|
2016-06-21 22:48:31 +02:00 |
|
Michael Vogel
|
266fea3874
|
Merge remote-tracking branch 'upstream/develop' into 1606-contact-id
|
2016-06-21 00:10:24 +02:00 |
|
rabuzarus
|
71c9f562ae
|
move the cal addon (exporting calendars) to core
|
2016-06-20 23:31:49 +02:00 |
|
Michael Vogel
|
a657377616
|
Diaspora: Try to fetch the uri if we already received the message
|
2016-06-20 22:48:55 +02:00 |
|
Michael Vogel
|
40a44f1571
|
Some manual revert ...
|
2016-06-20 22:48:09 +02:00 |
|
Michael Vogel
|
467176fa65
|
Diaspora: Ensure that we always store the correct URI
|
2016-06-20 22:43:14 +02:00 |
|
Michael Vogel
|
65b541413f
|
Merge remote-tracking branch 'upstream/develop' into 1606-contact-id
|
2016-06-20 07:28:47 +02:00 |
|
rabuzarus
|
7495a34b32
|
implement a public calendar for vistors of someones profile page
|
2016-06-19 22:04:34 +02:00 |
|
Michael Vogel
|
0adff6f6b8
|
Fix for author-thumb/owner-thumb - DFRN: Relocate stuff
|
2016-06-19 20:01:25 +02:00 |
|
Michael Vogel
|
91db7a549c
|
Optimised the amount of function for the item query
|
2016-06-19 08:32:38 +02:00 |
|
Michael Vogel
|
c3ed6f7d01
|
Improved default value handling
|
2016-06-19 01:22:32 +02:00 |
|
Michael Vogel
|
e512a83ecc
|
Massively updated avatar handling
|
2016-06-19 01:07:20 +02:00 |
|
Michael Vogel
|
bf2e23c205
|
Merge pull request #2616 from rabuzarus/1206-events-template
use standard templates in events + frio templates for events
|
2016-06-18 15:01:00 +02:00 |
|
rabuzarus
|
b977efc95c
|
code highlight - some spacing for readability
|
2016-06-17 15:29:01 +02:00 |
|
rabuzarus
|
7dc5fc8b9f
|
Merge develop into 1206-events-template
Conflicts:
view/theme/frio/css/style.css
|
2016-06-17 14:33:08 +02:00 |
|
rabuzarus
|
4313982e02
|
frio - event - code clean up + docu
|
2016-06-17 14:27:33 +02:00 |
|
rabuzarus
|
8b4c416713
|
frio: events - split event form in different sections
|
2016-06-16 20:16:16 +02:00 |
|
rabuzarus
|
0167a2bd61
|
port of Hubzillas code highlight feature
|
2016-06-16 11:38:12 +02:00 |
|
Michael Vogel
|
8762fb671f
|
Merge remote-tracking branch 'upstream/develop' into 1606-contact-id
|
2016-06-16 10:48:52 +02:00 |
|
Michael Vogel
|
3c9a80a31c
|
dfrn relocate: addr field added, gcontact update added
|
2016-06-15 21:23:22 +02:00 |
|
Michael Vogel
|
0e35427dfc
|
New fields "author-id" and "owner-id" in the item table
|
2016-06-15 21:20:55 +02:00 |
|
Michael Vogel
|
7f5a2d5c23
|
Categories were missing
|
2016-06-14 09:50:17 +02:00 |
|
Michael Vogel
|
a05f0c39a6
|
Merge remote-tracking branch 'upstream/develop' into 1606-time-travel
|
2016-06-13 22:32:40 +02:00 |
|
Michael Vogel
|
81395fe385
|
Avoid time travel in posts (received before created)
|
2016-06-13 22:21:33 +02:00 |
|
Michael Vogel
|
2815173a52
|
Bugfix: Items weren't sorted correctly
|
2016-06-13 22:20:09 +02:00 |
|
Fabrixxm
|
6e28cdf2ee
|
Fix Config and PConfig ::get() on new keys
|
2016-06-13 10:28:40 +02:00 |
|
rabuzarus
|
5e98f27fcd
|
frio: events - work on event_form.tpl + datetime.php
|
2016-06-13 10:19:38 +02:00 |
|
rabuzarus
|
869a439466
|
Merge pull request #2595 from annando/1606-contact-priority
Priority for native networks when searching by contact url
|
2016-06-13 09:28:54 +02:00 |
|
Michael Vogel
|
125d80292b
|
Some cleanup
|
2016-06-12 23:06:48 +02:00 |
|
Michael Vogel
|
c68f28bc77
|
Merge remote-tracking branch 'upstream/develop' into 1606-item-query-cleanup
|
2016-06-12 21:07:45 +02:00 |
|
Michael Vogel
|
c05898c57d
|
The queries for items are unified (a little bit)
|
2016-06-12 21:04:55 +02:00 |
|
rabuzarus
|
64753f474c
|
fix config & pconfig
|
2016-06-12 18:55:20 +02:00 |
|
Michael Vogel
|
6d50d18242
|
Merge pull request #2584 from rabuzarus/0906-profiles
some restructure in profiles.php + frio template for profiles settings
|
2016-06-12 14:20:42 +02:00 |
|
Michael Vogel
|
09fbcbc685
|
Just some added todo
|
2016-06-12 12:06:15 +02:00 |
|
Michael Vogel
|
aac9caab2d
|
Priority for native networks when searching by contact url
|
2016-06-12 10:46:15 +02:00 |
|
Fabrixxm
|
136ae34245
|
Add $default_value parameter to Config::get() and PConfig::get()
|
2016-06-10 12:00:34 +02:00 |
|
Fabrixxm
|
6c346b1ab6
|
Move Config and PConfig classes in \Friendica\Core namespace
|
2016-06-10 11:52:01 +02:00 |
|
Fabrixxm
|
f2e79e976d
|
set include/ folder base for 'Friendica' PSR4 namespace
|
2016-06-10 11:50:52 +02:00 |
|
rabuzarus
|
3a9a9e6a1c
|
frio + core: some restructure in profiles.php + frio template for profiles settings
|
2016-06-10 11:24:38 +02:00 |
|
fabrixxm
|
60c1172e7e
|
Merge pull request #2576 from rabuzarus/0806-PConfig
move config to its own class (with legacy support)
|
2016-06-10 11:13:08 +02:00 |
|
Michael Vogel
|
098a8ac6c2
|
Bugfix: In threads the contact data from users weren't taken.
|
2016-06-08 22:50:57 +02:00 |
|
rabuzarus
|
023c43fa4a
|
config && pconfig: return NULL if config is unset
|
2016-06-08 21:52:10 +02:00 |
|
rabuzarus
|
7e8ea1cb87
|
move config to its own class (with legacy support)
|
2016-06-08 11:02:18 +02:00 |
|
Michael Vogel
|
aad00ddc04
|
Renamed template
|
2016-06-08 07:11:16 +02:00 |
|
Michael Vogel
|
f59b21d4a8
|
Merge remote-tracking branch 'upstream/develop' into 1606-shared-template
|
2016-06-07 22:40:29 +02:00 |
|
Michael Vogel
|
e2e32eecac
|
New template for shared content instead of hardcoded stuff in source
|
2016-06-07 22:29:50 +02:00 |
|
rabuzarus
|
3a368214c0
|
frio: saved_searches_aside & searchbox template
|
2016-06-07 15:29:38 +02:00 |
|
Michael Vogel
|
fc66a86dc5
|
Some optimized sql queries
|
2016-06-06 22:57:27 +02:00 |
|
|
|
9d72c3d170
|
Merge pull request #2565 from rabuzarus/0606-confic-docu
move pconfig to its own class
|
2016-06-06 18:31:37 +02:00 |
|
rabuzarus
|
fa02d0f2f8
|
rename PConfig::del to PConfig:delete
|
2016-06-06 10:46:33 +02:00 |
|
rabuzarus
|
f10011c282
|
move pconfig to it's own class PConfig
|
2016-06-06 10:22:14 +02:00 |
|
rabuzarus
|
5f081cc47b
|
add doxygen to config functions
|
2016-06-06 10:01:14 +02:00 |
|
Michael Vogel
|
3d27ebcb34
|
Added documentation
|
2016-06-06 06:29:03 +02:00 |
|
Michael Vogel
|
a25d58b2ee
|
Merge remote-tracking branch 'upstream/develop' into 1606-dbm
|
2016-06-06 06:21:36 +02:00 |
|
Michael Vogel
|
3e7e866e13
|
Baseurl removed
|
2016-06-05 21:22:14 +02:00 |
|
Michael Vogel
|
4b640dbd97
|
Fetching of profile data improved
|
2016-06-05 21:17:55 +02:00 |
|
Michael Vogel
|
ea3a6ec6eb
|
Some more cleanup and code removal.
|
2016-06-05 20:01:38 +02:00 |
|
Michael Vogel
|
98272fe386
|
Some better handling of "bd" and "birthday"
|
2016-06-05 15:09:40 +02:00 |
|
Michael Vogel
|
572402224f
|
"bd" now always shows the upcoming birthday
|
2016-06-05 15:03:04 +02:00 |
|
Michael Vogel
|
71d3274841
|
Unified contact data handling
|
2016-06-05 13:57:11 +02:00 |
|
Michael Vogel
|
0518f004c2
|
removed duplicated functions
|
2016-06-04 12:20:09 +02:00 |
|
Michael Vogel
|
b45772ba6e
|
Configurable amount of maximum processes
|
2016-06-04 11:04:26 +02:00 |
|
Michael Vogel
|
140225b1a8
|
Merge remote-tracking branch 'upstream/develop' into 1606-dbm
|
2016-06-04 10:18:43 +02:00 |
|
rabuzarus
|
33f7513ff3
|
Merge pull request #2554 from annando/1606-mention-class
Mentions are now having an own class
|
2016-06-04 09:45:42 +02:00 |
|
Michael Vogel
|
df337e57d1
|
Quit when processlist is too long
|
2016-06-03 23:10:23 +02:00 |
|
Michael Vogel
|
4914e8826b
|
Merge remote-tracking branch 'upstream/develop' into 1606-dbm
|
2016-06-02 07:37:37 +02:00 |
|
Michael Vogel
|
46659f15d3
|
One div too much
|
2016-06-01 21:58:50 +02:00 |
|
Michael Vogel
|
09e63e616a
|
Shared content now has a surrounding div
|
2016-06-01 21:57:08 +02:00 |
|
Michael Vogel
|
85a9c7d96e
|
The poller now has the logging for processes as well.
|
2016-06-01 21:54:02 +02:00 |
|
Michael Vogel
|
0b766b86ba
|
By setting the "userinfo" class the hovercard in frio works with mentions
|
2016-06-01 17:10:43 +02:00 |
|
Michael Vogel
|
85f42ad26d
|
Tags are now supported as well
|
2016-06-01 16:19:53 +02:00 |
|
Michael Vogel
|
5090ec1500
|
Mentions are now having an own class
|
2016-06-01 16:04:31 +02:00 |
|
Michael Vogel
|
395e83fa06
|
Merge remote-tracking branch 'upstream/develop' into 1606-dbm
|
2016-06-01 10:55:13 +02:00 |
|
rabuzarus
|
4e1c515004
|
Merge pull request #2550 from annando/1605-frio-github-markread
Frio: Removed github link, changed notification description
|
2016-06-01 09:21:58 +02:00 |
|
Michael Vogel
|
e2c0f04eeb
|
Added short description to "mark as seen"
|
2016-06-01 07:05:44 +02:00 |
|
Michael Vogel
|
f07c96ee5f
|
New class "dbm" for the database management
|
2016-06-01 07:04:31 +02:00 |
|
Michael Vogel
|
4c53f76c22
|
OStatus: repeated items in OStatus had a wrong "edited" date
|
2016-05-31 21:18:14 +02:00 |
|
Michael Vogel
|
d22d36be7d
|
Now with correct url
|
2016-05-29 22:13:08 +02:00 |
|
Michael Vogel
|
e4ec867df3
|
Better detection for remote user
|
2016-05-29 22:02:31 +02:00 |
|
Michael Vogel
|
0a617da044
|
Wall message can now redirect to your own page if you are connected.
|
2016-05-29 21:29:26 +02:00 |
|
Michael Vogel
|
5580c0d708
|
Bugfix: Sometimes uploaded pictures weren't posted correctly to other networks
|
2016-05-29 10:59:06 +02:00 |
|
Michael Vogel
|
4a388e84af
|
Frio: Adopt changes to search_item.tpl as well.
|
2016-05-28 13:08:43 +02:00 |
|
Michael Vogel
|
eca1b1ff58
|
Bugfix: Some more encoding problems with attachments fixed
|
2016-05-26 23:22:30 +02:00 |
|
|
|
c013ca9d36
|
Merge pull request #2529 from annando/1605-events
Issue 2277: Events can now be edited and deleted
|
2016-05-23 18:06:09 +02:00 |
|
Michael Vogel
|
39ce023158
|
Merge remote-tracking branch 'upstream/develop' into 1605-bugfix-notificatoon
|
2016-05-23 06:49:31 +02:00 |
|
Michael Vogel
|
b9e702742c
|
Remove some test logging
|
2016-05-22 18:22:05 +02:00 |
|
Michael Vogel
|
b7f2858486
|
Issue 2277: changes to events are now distributed.
|
2016-05-22 18:16:47 +02:00 |
|
Michael Vogel
|
06998f13b6
|
Events: Now with guid.
|
2016-05-22 18:05:01 +02:00 |
|
Michael Vogel
|
36063b47ab
|
Bugfix: The url in attachments had problems with entities
|
2016-05-22 13:46:05 +02:00 |
|
Michael Vogel
|
a1691664f3
|
Bugfix: Under certain circumstances notifications were send
|
2016-05-21 13:19:30 +02:00 |
|
Michael Vogel
|
8daa49b233
|
Bugfix: Feeds weren't detected correctly
|
2016-05-18 22:50:15 +02:00 |
|
|
|
01a491c783
|
Merge pull request #2513 from annando/1605-diaspora-relay
Support for comments for the Diaspora relay system
|
2016-05-16 07:57:16 +02:00 |
|
|
|
12e3c9ca59
|
Merge pull request #2514 from annando/1605-plaintext
Bugfix for shares in the plaintext function
|
2016-05-16 07:56:42 +02:00 |
|
Michael Vogel
|
247f866655
|
There were undecoded entities in the title
|
2016-05-15 10:36:56 +02:00 |
|
rabuzarus
|
7be1c83b0c
|
photo.php: correct misspelling of an array key
|
2016-05-15 02:37:18 +02:00 |
|
Michael Vogel
|
1b2f67906b
|
Bugfix for shares in the plaintext function
|
2016-05-13 22:23:46 +02:00 |
|
Michael Vogel
|
6434b5d8ce
|
Support for comments for the Diaspora relay system
|
2016-05-13 22:19:31 +02:00 |
|
Michael Vogel
|
4d105111a7
|
Added documentation
|
2016-05-06 18:30:34 +02:00 |
|
Michael Vogel
|
b7c14803b2
|
The feed header is now displayed even with "hidewall" activated
|
2016-05-06 18:27:19 +02:00 |
|
Michael Vogel
|
6f72bc8d3a
|
Better implementation of "hidewall"
|
2016-05-06 11:04:21 +02:00 |
|
Michael Vogel
|
ea78f63eac
|
Diaspora: Reshares of non native reshares now look better
|
2016-05-06 08:22:27 +02:00 |
|
|
|
480c35fb86
|
Merge pull request #2503 from annando/1605-hide-profile
Better handling of hidden profiles
|
2016-05-06 07:45:44 +02:00 |
|
Michael Vogel
|
1aa3aa21b3
|
Avoid warning messages at "strstr"
|
2016-05-05 20:36:23 +02:00 |
|
Michael Vogel
|
bd1030b246
|
Update the global contact entries for local users on a regular base
|
2016-05-05 15:38:28 +02:00 |
|
Michael Vogel
|
de431e185e
|
New function to update the global contact for the user id.
|
2016-05-05 15:08:05 +02:00 |
|
Michael Vogel
|
3df235e5bd
|
The global contact for server users is now stored directly
|
2016-05-05 12:02:51 +02:00 |
|
Michael Vogel
|
90155da59a
|
The "hide" element is included in the feed as well.
|
2016-05-05 06:46:23 +02:00 |
|
Michael Vogel
|
683cdcc19e
|
Changed check for searchability
|
2016-05-05 00:29:54 +02:00 |
|
Michael Vogel
|
ed485b9d61
|
Set "hide" in noscrape
|
2016-05-04 23:50:31 +02:00 |
|
Michael Vogel
|
fbc5404522
|
DFRN: "Hidewall" is now transmitted, "hide" is respected in dfrn and ostatus.
|
2016-05-04 23:21:30 +02:00 |
|
Michael Vogel
|
8992577bb6
|
Better handling of hidden profiles
|
2016-05-04 09:30:55 +02:00 |
|
|
|
167a8998d6
|
Merge pull request #2502 from annando/1605-diaspora-share
Shared links to Diaspora should look better now
|
2016-05-04 07:20:22 +02:00 |
|
Michael Vogel
|
bed4799728
|
Some more beautification.
|
2016-05-03 21:57:08 +02:00 |
|
Michael Vogel
|
a7aaf7cc98
|
Shared links to Diaspora should look better now
|
2016-05-03 20:12:13 +02:00 |
|
Michael Vogel
|
26e1c4d458
|
Avoid SQL errors because of existing entries
|
2016-05-03 19:20:58 +02:00 |
|
rabuzarus
|
3dad86f0e0
|
add a hook call to acl_lookup()
|
2016-04-28 22:15:55 +02:00 |
|
Michael Vogel
|
af22007481
|
Bugfix for XML function
|
2016-04-28 08:30:15 +02:00 |
|
|
|
1644919880
|
Merge pull request #2489 from annando/1604-unseen
Check before doing the database update
|
2016-04-28 07:18:35 +02:00 |
|
Michael Vogel
|
5e4a2badb2
|
Check before doing the database update
|
2016-04-28 06:56:55 +02:00 |
|
