Silke Meyer
|
ac0d93ed58
|
Merge branch 'vagrant2' of https://github.com/silke/friendica into develop
|
2017-09-06 21:44:09 +02:00 |
|
|
|
02ff6b77bc
|
php xml package is required and sometimes not installed by default
|
2017-09-06 21:05:10 +02:00 |
|
|
|
29b0e5d71c
|
Merge pull request #3686 from annando/remote-self
"remote self" should work now
|
2017-09-06 19:37:37 +02:00 |
|
|
|
d25670a4e6
|
"remote self" should work now
|
2017-09-06 16:20:14 +00:00 |
|
Silke Meyer
|
50cec46d1f
|
Vagrant only for Xenial, more RAM for debugging, no poller
|
2017-09-06 10:00:06 +02:00 |
|
|
|
26a223c746
|
Merge pull request #3683 from annando/remote-self-addon
"remote-self" hadn't worked well with addons
|
2017-09-06 08:18:02 +02:00 |
|
|
|
c35a43bcb8
|
"remote-self" hadn't worked well with addons
|
2017-09-06 06:02:26 +00:00 |
|
|
|
692d7e356a
|
Merge pull request #3682 from annando/independent-links
Support for server independant Diaspora style links
|
2017-09-06 07:24:47 +02:00 |
|
|
|
cb8581b29a
|
Support for server independant Diaspora style links
|
2017-09-06 04:55:36 +00:00 |
|
Michael Vogel
|
0c7b3174c0
|
Merge pull request #3681 from tobiasd/20170905-de
update DE translation
|
2017-09-05 23:16:04 +02:00 |
|
|
|
7ac56ed0bc
|
update DE translation
|
2017-09-05 18:19:52 +02:00 |
|
|
|
8215b9da87
|
Merge pull request #3679 from annando/json-webfinger
We are now probing differently for webfinger data
|
2017-09-04 21:34:31 +02:00 |
|
|
|
78d4386332
|
We are now probing differently for webfinger data
|
2017-09-04 19:13:33 +00:00 |
|
Michael Vogel
|
28ea280279
|
Merge pull request #3678 from tobiasd/20170904-langdet
updated language detection library
|
2017-09-04 20:26:21 +02:00 |
|
Silke Meyer
|
663b6e9300
|
do not import test sql for the moment
|
2017-09-04 12:35:22 +02:00 |
|
|
|
c86840c4b9
|
updated pear LangDetect to version 1.0.0
|
2017-09-04 09:52:14 +02:00 |
|
rabuzarus
|
2bf6b15833
|
Merge pull request #3675 from annando/mail-profile
Links to profiles in mails now show the profile address as title
|
2017-09-03 11:54:21 +02:00 |
|
Michael Vogel
|
bfe9040113
|
Merge pull request #3677 from rabuzarus/20170902_-_fix_oembed_video
fix some optical glitches with oembedded links and videos
|
2017-09-02 21:49:35 +02:00 |
|
Michael Vogel
|
6fe7944036
|
Merge pull request #3676 from rabuzarus/20170831_-_frio_register_template
Frio: add register template
|
2017-09-02 21:48:51 +02:00 |
|
rabuzarus
|
4602a46585
|
fix some optical glitches with oembedded links and videos
|
2017-09-02 18:56:22 +02:00 |
|
rabuzarus
|
94f03efde0
|
Frio: add register template
|
2017-09-02 17:49:55 +02:00 |
|
|
|
b1668ffdda
|
Address instead of url
|
2017-09-01 19:32:12 +00:00 |
|
|
|
88fb02db8d
|
Small correction
|
2017-08-31 12:10:17 +00:00 |
|
|
|
0e8104b172
|
Links to profiles in mails mow show the profile address and "redir" always works
|
2017-08-31 12:01:44 +00:00 |
|
|
|
a62e8b7c05
|
Merge pull request #3674 from annando/display
Display hadn't shown public items that weren't known to the user
|
2017-08-30 22:34:51 +02:00 |
|
|
|
65f1bcb780
|
Merge pull request #3673 from annando/contact-updating
Better updating of contacts
|
2017-08-30 22:34:01 +02:00 |
|
|
|
5f356fa5e3
|
Merge pull request #3672 from annando/api-repeat
Bugfix: Repeating of posts generated a SQL error
|
2017-08-30 22:32:06 +02:00 |
|
|
|
5f33f28b9e
|
Display hadn't shown public items that weren't known to the user
|
2017-08-30 20:20:01 +00:00 |
|
|
|
1cc50a80f4
|
Only update if there is a change
|
2017-08-30 19:33:16 +00:00 |
|
|
|
0083c16e87
|
Better updating of contacts
|
2017-08-30 18:05:41 +00:00 |
|
|
|
dbaed91a75
|
Bugfix: Repeating of posts generated a SQL error
|
2017-08-30 17:55:23 +00:00 |
|
|
|
0fa84d01b0
|
Merge pull request #3670 from annando/json-webfinger
Support for JSON based webfinger
|
2017-08-30 08:31:30 +02:00 |
|
|
|
157473e4f6
|
Merge remote-tracking branch 'upstream/develop' into json-webfinger
|
2017-08-30 06:22:02 +00:00 |
|
|
|
5ab697e726
|
Removed unused template variable
|
2017-08-30 06:20:01 +00:00 |
|
|
|
02179e9419
|
Some missing tab
|
2017-08-30 06:16:31 +00:00 |
|
|
|
04f286dca2
|
Support for JSON based webfinger
|
2017-08-30 05:34:37 +00:00 |
|
|
|
51a070ecf3
|
Merge pull request #3669 from annando/pleroma
Pleroma servers are now detected and displayed in the statistics
|
2017-08-29 22:49:17 +02:00 |
|
|
|
1893c3df16
|
Pleroma-Servers are now detected and displayed in the statistics
|
2017-08-29 16:40:08 +00:00 |
|
|
|
c948e4cdc3
|
Merge pull request #3668 from annando/frio-register
Only show register link when "register" is allowed
|
2017-08-29 08:02:18 +02:00 |
|
|
|
3a3f3d933e
|
Only show register link when "register" is allowed
|
2017-08-29 05:12:49 +00:00 |
|
|
|
b6d265de79
|
Merge pull request #3667 from annando/probe-warning
Avoid warnings from probe
|
2017-08-29 07:07:21 +02:00 |
|
|
|
4bc2076763
|
Avoid warnings from probe
|
2017-08-29 04:51:02 +00:00 |
|
Michael Vogel
|
2cb17b8320
|
Merge pull request #3666 from rabuzarus/20170828_-_frio_photo_controls
Frio: provide single photo view template
|
2017-08-28 15:13:13 +02:00 |
|
rabuzarus
|
be6aa3cbf9
|
Frio: provide single photo view template
|
2017-08-28 14:29:11 +02:00 |
|
|
|
0c1c39b679
|
Merge pull request #3665 from annando/local-remote-user
Bugfix: You cannot be local and remote at the same time
|
2017-08-28 06:55:22 +02:00 |
|
|
|
f27a731676
|
Merge pull request #3664 from annando/acl-mentions
ACL automentions are now in the new format
|
2017-08-28 06:53:47 +02:00 |
|
|
|
21d27c2124
|
Bugfix: You cannot be local and remote at the same time
|
2017-08-28 04:46:04 +00:00 |
|
|
|
1190863e1e
|
ACL automentions are now in the new format
|
2017-08-27 20:39:15 +00:00 |
|
|
|
ccb54f3ee4
|
Merge pull request #3663 from annando/no-redir
Don't add "redir" links on mentions
|
2017-08-27 12:48:40 +02:00 |
|
|
|
83ce42172b
|
Don't add "redir" links on mentions
|
2017-08-27 09:56:41 +00:00 |
|
