Fabrixxm
|
511c2d2c91
|
rino: settings in admin, choose lowest common on notify
|
2015-06-23 17:36:26 +02:00 |
|
Fabrixxm
|
6fbb02fb93
|
RINO 2 based on php-encryption
reenable RINO 1 functions, add a deprecation note.
use by default RINO 2 , with crypto from php-encryption
fallback to RINO 1 for old nodes.
|
2015-06-23 16:13:09 +02:00 |
|
Fabrixxm
|
7d83a19fd4
|
Disable RINO
Comment out functions for RINO crypt and disable RINO request and response.
|
2015-06-23 12:02:35 +02:00 |
|
|
|
24c91a4fed
|
Merge pull request #1679 from fabrixxm/smallfixestothemes
use fields template in photo edit form
|
2015-06-23 09:12:25 +02:00 |
|
Michael Vogel
|
a7cf3639f0
|
Just some more fixing for issue 1642
|
2015-06-22 23:47:08 +02:00 |
|
fabrixxm
|
35e9fc3b02
|
use fields template in photo edit form
|
2015-06-22 20:07:19 +02:00 |
|
Michael Vogel
|
df7b907bc4
|
Display: Look for the network name when fetching the contact (important because of the statusnet connector)
|
2015-06-21 01:34:57 +02:00 |
|
|
|
78321c2a43
|
Merge pull request #1670 from annando/setup-rewrite-check
The installation prozess has a problem with self signed certificates
|
2015-06-15 13:25:54 +02:00 |
|
Michael Vogel
|
7feda0120f
|
This is working fix for issue 1642
|
2015-06-15 01:20:04 +02:00 |
|
Michael Vogel
|
0e157b1288
|
Merge remote-tracking branch 'upstream/develop' into setup-rewrite-check
|
2015-06-15 00:55:05 +02:00 |
|
fabrixxm
|
42f4f3fce9
|
Merge pull request #1668 from annando/issue-1642
Better detection for the mobile client to avoid "{0}" in notifications
|
2015-06-14 15:58:52 +02:00 |
|
Michael Vogel
|
abc84f96ab
|
The installation prozess has a problem with self signed certificates.
|
2015-06-13 21:58:40 +02:00 |
|
Michael Vogel
|
c89c0916e2
|
Better detection for the mobile client to avoid "{0}" in notifications.
|
2015-06-13 20:23:26 +02:00 |
|
Michael Vogel
|
66058c6cf4
|
Remote subscribe from a GNU Social site is now possible
|
2015-06-13 19:51:45 +02:00 |
|
|
|
e02546880f
|
Merge pull request #1662 from annando/issue-1628
The values for "sitename" and "register_text" was nedlessly encoded
|
2015-06-11 06:33:38 +02:00 |
|
Michael Vogel
|
5907c62851
|
The values for "sitename" and "register_text" was nedlessly encoded with "htmlentities"
|
2015-06-11 00:12:16 +02:00 |
|
Michael Vogel
|
df3b38679f
|
This fixes issue 1657
|
2015-06-10 22:54:41 +02:00 |
|
Michael Vogel
|
cb0351dba0
|
Send a salmon notification to every mentioned person.
|
2015-06-09 08:27:04 +02:00 |
|
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 |
|
|
|
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 |
|
|
|
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 |
|
