Michael Vogel
|
39d4856abb
|
Merge remote-tracking branch 'upstream/develop' into 1506-tag-users
|
2015-06-02 23:19:00 +02:00 |
|
|
|
209e957de4
|
Merge pull request #1645 from annando/1506-api
Small change in the API (some new Twitter fields - but without function)
|
2015-06-02 22:47:41 +02:00 |
|
|
|
6e5ba7bb9b
|
Merge pull request #1646 from annando/1506-no-url-cleaning
BBCode: In [url] the removing of unknown protocols is disabled
|
2015-06-02 22:46:37 +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
|
bea70296bf
|
Fixes slow performance after one of the last pull requests.
|
2015-06-02 22:07:39 +02:00 |
|
Michael Vogel
|
1a26d464dd
|
Always add the addressed contacts in a post to the tags.
|
2015-06-02 20:36:10 +02:00 |
|
Michael Vogel
|
dd06912493
|
Avoiding performance problems.
|
2015-06-02 20:34:48 +02:00 |
|
|
|
941c784fa2
|
Merge pull request #1643 from fabrixxm/issue-1612
close correctly `span` tag in `oembed_format_object()`
|
2015-06-02 19:38:42 +02:00 |
|
|
|
f9994554a7
|
Merge pull request #1644 from fabrixxm/issue-1514
mask '#' in `[url]` url
|
2015-06-02 19:38:03 +02:00 |
|
fabrixxm
|
20b14b053a
|
mask '#' in [url] url
fix #1514
|
2015-06-02 18:59:46 +02:00 |
|
fabrixxm
|
e028263ca8
|
close correctly span tag in oembed_format_object()
fix issue #1612
|
2015-06-02 18:38:16 +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 |
|
Michael Vogel
|
896cb6ebf0
|
Small change in the API (some new Twitter fields - but without function)
|
2015-06-02 16:19:40 +02:00 |
|
Michael Vogel
|
939e5abfee
|
BBCode: In [url] the removing of unknown protocols is disabled
|
2015-06-02 16:16:40 +02:00 |
|
fabrixxm
|
620455c4de
|
Merge pull request #1641 from tobiasd/20150601-navinfo_hook
nav_info hook and documentation in en and de
|
2015-06-01 14:01:47 +02:00 |
|
|
|
ec7f70e9aa
|
nav_info hook and documentation in en and de
|
2015-06-01 12:00:00 +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
|
a2ae4ccc9b
|
Merge pull request #1636 from rabuzarus/albums_widget
make use of global.css
|
2015-05-31 18:04:40 +02:00 |
|
rabuzarus
|
afd1e0e6d0
|
make use of global.css
|
2015-05-31 13:55:21 +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 |
|
Michael Vogel
|
2856042824
|
Send a hubsub notification for every comment
|
2015-05-31 10:38:00 +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
|
2550e02399
|
Merge pull request #1627 from rabuzarus/section-title
move html of h2 headings to section_title.tpl
|
2015-05-31 09:52:46 +02:00 |
|
Michael Vogel
|
b778467121
|
Merge pull request #1620 from tobiasd/20150529-de
DE update to the strings
|
2015-05-31 01:05:11 +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 |
|
Michael Vogel
|
a3118e0a6e
|
Cleaning the code from several tests.
|
2015-05-30 21:08:24 +02:00 |
|
Michael Vogel
|
4750775752
|
Cleaning the code.
|
2015-05-30 21:00:38 +02:00 |
|
Michael Vogel
|
e66489d67f
|
PuSH: Publishing moved to a new process. OStatus comments are now published to all subscribers.
|
2015-05-30 20:47:53 +02:00 |
|
rabuzarus
|
74267310d6
|
html to section_title.tpl
|
2015-05-30 02:21:30 +02:00 |
|
rabuzarus
|
47a15f6a00
|
section_title
|
2015-05-30 02:16:43 +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 |
|
Michael Vogel
|
594f3e2815
|
Merge remote-tracking branch 'upstream/develop' into 1505-ostatus
|
2015-05-29 10:55:07 +02:00 |
|
Michael Vogel
|
b763c810fb
|
OStatus: Trying to deliver a comment to all contacts - not only the thread owner. (Not working by now)
|
2015-05-29 10:35:13 +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 |
|
|
|
ffefc512d3
|
DE update to the strings
|
2015-05-29 08:46:40 +02:00 |
|
fabrixxm
|
f12430a285
|
Merge pull request #1617 from annando/1505-diaspora-objecttype
OStatus and Diaspora improvements
|
2015-05-29 08:40:58 +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 |
|
Michael Vogel
|
487d57df45
|
Fetch the author url and not the id.
|
2015-05-28 08:02:34 +02:00 |
|
