Commit graph

2509 commits

Author SHA1 Message Date
Michael Vogel
419a3ab2d3 Better behaviour when contact wasn't found. 2015-06-08 01:19:40 +02:00
Michael Vogel
a3c497190d Complete new OStatus import. 2015-06-07 23:18:02 +02:00
Michael Vogel
ba36910343 Removed bad plink detection. 2015-06-03 21:03:46 +02:00
Michael Vogel
c416ce4893 Improved tagging 2015-06-03 11:27:56 +02:00
Michael Vogel
b60677ef1b OStatus: New fields in OStatus export/ Auto-tagging of replyed authors. 2015-06-03 01:26:46 +02:00
Michael Vogel
39d4856abb Merge remote-tracking branch 'upstream/develop' into 1506-tag-users 2015-06-02 23:19:00 +02:00
Tobias Diekershoff
7305a27392 Merge pull request #1647 from annando/1506-performance
Performance improvements when searching for existing GUIDs
2015-06-02 22:46:07 +02:00
Michael Vogel
b5129a3e11 Store the GUID from here as well. 2015-06-02 22:10:28 +02:00
Michael Vogel
1a26d464dd Always add the addressed contacts in a post to the tags. 2015-06-02 20:36:10 +02:00
fabrixxm
a36014fb0f Merge pull request #1619 from rabuzarus/block-local-dir
block local directory for public access
2015-06-02 17:53:19 +02:00
fabrixxm
46052740be Merge pull request #1632 from annando/1505-ostatus2
Send a hubsub notification for every comment
2015-06-01 09:00:17 +02:00
fabrixxm
c12a647f13 Merge pull request #1639 from rabuzarus/albums_widget
fix photo_albums upload
2015-06-01 08:34:18 +02:00
rabuzarus
8257e7e1e5 block poco if block_local_dir is true 2015-06-01 01:50:27 +02:00
rabuzarus
a674e782b2 fix Issue #1638 2015-06-01 01:36:37 +02:00
Michael Vogel
fae3592c79 Bugfix: You wasn't able to add an OStatus contact when you are following the same contact via Statusnet connector. 2015-05-31 13:28:16 +02:00
fabrixxm
18e44001e5 Merge pull request #1630 from annando/1505-ostatus
OStatus communication improvements
2015-05-31 10:08:24 +02:00
fabrixxm
1cf3e778e8 Merge pull request #1622 from rabuzarus/albums_widget
move html to photo_albums.tpl
2015-05-31 10:07:43 +02:00
Michael Vogel
d732d9d1a8 OStatus replies should now work even if the thread starter isn't in the mentions. 2015-05-31 00:26:11 +02:00
Michael Vogel
788d3cf1ab Ostatus: The automatical adding of @-replies now uses the correct contact. 2015-05-30 21:45:43 +02:00
rabuzarus
74267310d6 html to section_title.tpl 2015-05-30 02:21:30 +02:00
rabuzarus
b61e39a1cb cleaning after local merge 2015-05-29 16:30:42 +02:00
rabuzarus
553a152345 Merge photo-template into develop 2015-05-29 16:24:58 +02:00
rabuzarus
a7d417abb2 remove whitespace 2015-05-29 16:18:30 +02:00
rabuzarus
5cbb5b140c css work 2015-05-29 16:08:17 +02:00
Tobias Diekershoff
9a22b4818e Merge pull request #1618 from rabuzarus/vcard
remove html and make use of vcard-widget.tpl
2015-05-29 08:52:27 +02:00
rabuzarus
3e0635992f change the conditions 2015-05-29 04:05:41 +02:00
rabuzarus
a2a8afa583 block local directory for public access 2015-05-28 19:54:23 +02:00
rabuzarus
5990d62b06 use z_root 2015-05-28 16:15:48 +02:00
rabuzarus
415a606a59 better solution to exclude Contact Photos and include count of Photos 2015-05-28 15:54:53 +02:00
rabuzarus
1067718018 little revision 2015-05-27 12:44:40 +02:00
fabrixxm
b3992e1c65 Merge pull request #1599 from fabrixxm/issue-1574
Issue #1574
2015-05-27 11:07:30 +02:00
fabrixxm
50b3e49b5d Merge pull request #1601 from rabuzarus/event-warning
event can not end before it has started warning
2015-05-27 11:06:47 +02:00
rabuzarus
15499ff1aa first step to get html code from photos.php removed 2015-05-27 03:35:29 +02:00
rabuzarus
46338f5e87 using sprintf 2015-05-26 14:49:53 +02:00
rabuzarus
f309f3a681 remove html and use vcard-widget.tpl 2015-05-26 14:32:40 +02:00
rabuzarus
3ad674fa67 better space handling 2015-05-25 16:49:57 +02:00
rabuzarus
e040b60f67 make the heading of the search result translatable 2015-05-24 20:46:40 +02:00
rabuzarus
b754a79968 event can not end before it has started. 2015-05-24 13:33:07 +02:00
Michael Vogel
c6e605992b Events: Query improvement 2015-05-24 11:46:20 +02:00
fabrixxm
b29b01fad4 Merge branch 'develop' into issue-1574 2015-05-24 10:26:21 +02:00
fabrixxm
3a71978b0d Merge pull request #1598 from rabuzarus/datepicker
new datetimepicker for event creation
2015-05-24 10:16:29 +02:00
fabrixxm
83697cf3e5 Delete attachments on item deletion
Delete video from videos page
2015-05-23 22:35:02 +02:00
Michael Vogel
ab67788b4e SQL speed increase for query and search. 2015-05-23 01:23:31 +02:00
rabuzarus
2ad8fdc40b port of red matrix datepicker implementation 2015-05-22 18:53:18 +02:00
Tobias Diekershoff
72e3ffbb4d Merge pull request #1563 from annando/1505-no-intelligent-shortening
Disable intelligent shortening - issue 1540
2015-05-16 12:04:28 +02:00
Michael Vogel
472a6f1380 Added explanation for shortening. 2015-05-15 21:09:00 +02:00
Michael Vogel
d995fc3994 The intelligent shortening for social media systems like Twitter, GNU Social and App.net can now be disabled. 2015-05-15 20:56:05 +02:00
rabuzarus
de197405d0 port of red's event editing preview 2015-05-14 13:20:58 +02:00
Tobias Diekershoff
9244e8727d dbesc and normalise_link 2015-05-10 09:10:27 +02:00
Tobias Diekershoff
0b8b1fdef3 add procy_url around the profile images 2015-05-06 16:14:27 +02:00