Michael Vogel
|
4659a09b53
|
Merge remote-tracking branch 'upstream/develop' into 1508-poco-ostatus
|
2015-08-24 19:22:05 +02:00 |
|
 Tobias Diekershoff
|
c41b87f47d
|
Merge pull request #1852 from annando/1408-vier-register
Vier: The "register" page now looks better.
|
2015-08-24 19:16:17 +02:00 |
|
|
Michael Vogel
|
d1647222d3
|
Vier: The "register" page now looks better.
|
2015-08-24 19:03:03 +02:00 |
|
|
Michael Vogel
|
2fe6156d54
|
Delete the alternate OStatus profile url if present.
|
2015-08-24 18:36:13 +02:00 |
|
|
Michael Vogel
|
9ae4528d8b
|
Merge remote-tracking branch 'upstream/develop' into 1508-poco-ostatus
|
2015-08-24 18:16:14 +02:00 |
|
|
Tobias Diekershoff
|
4ecc81d9b7
|
Merge pull request #1851 from annando/1508-caching
Now you can define the duration of the cache entries
|
2015-08-24 18:05:06 +02:00 |
|
|
Michael Vogel
|
b52bc71c6c
|
Now you can define the duration of the cache entries.
|
2015-08-24 17:24:14 +02:00 |
|
|
Michael Vogel
|
98cd37438f
|
Delete the old OStatus entries
|
2015-08-24 16:35:05 +02:00 |
|
|
Tobias Diekershoff
|
cc145f0e25
|
Merge pull request #1850 from tobiasd/20150824-de
DE updated translation
|
2015-08-24 14:27:13 +02:00 |
|
|
Tobias Diekershoff
|
26c5c7991a
|
Merge pull request #1849 from fabrixxm/issue-1841
filebrowser: link image to original picture, show error messages
|
2015-08-24 14:26:09 +02:00 |
|
|
Michael Vogel
|
2d589a7d0c
|
Movew the alternate OStatus profile link into the regular one
|
2015-08-24 14:23:30 +02:00 |
|
|
Tobias Diekershoff
|
489e90281a
|
DE updated translation
|
2015-08-24 14:21:22 +02:00 |
|
fabrixxm
|
cbabac298d
|
filebrowser: link image to original picture, show error messages
|
2015-08-24 13:54:41 +02:00 |
|
|
Tobias Diekershoff
|
ccc5533069
|
Merge pull request #1848 from annando/1508-search-options
Visible search options
|
2015-08-24 12:35:04 +02:00 |
|
|
Michael Vogel
|
3bca2db11b
|
Don't show search options in side bar.
|
2015-08-24 12:12:14 +02:00 |
|
|
Michael Vogel
|
3ff196f00d
|
Now you can set search options so that searching for contacts or forums isn't occult science anymore.
|
2015-08-24 11:55:29 +02:00 |
|
|
Tobias Diekershoff
|
109620ae99
|
Merge pull request #1847 from annando/1508-nodeinfo2
The nodeinfo is changed to the new specifications
|
2015-08-24 08:22:12 +02:00 |
|
|
Michael Vogel
|
cf5fce855e
|
Bugfix: Don't show "appnet" in "inbound" when only "buffer" is enabled.
|
2015-08-24 08:18:17 +02:00 |
|
|
Michael Vogel
|
3e08024839
|
Moved the rss/atom part to the protocols.
|
2015-08-24 08:15:34 +02:00 |
|
|
Michael Vogel
|
157c64cac2
|
The rss/atom feed is added to the inofficial "services" section.
|
2015-08-24 08:02:46 +02:00 |
|
|
Tobias Diekershoff
|
9b87914a50
|
Merge pull request #1846 from tobiasd/20150824-messagespo
update to the master messagespo
|
2015-08-24 07:53:02 +02:00 |
|
|
Tobias Diekershoff
|
7eb2ad0b1d
|
update to the master messagespo
|
2015-08-24 07:50:47 +02:00 |
|
|
Michael Vogel
|
2a676ee312
|
The nodeinfo is changed to the new specifications
|
2015-08-24 07:47:42 +02:00 |
|
|
Tobias Diekershoff
|
59bc08ce31
|
Merge pull request #1845 from annando/1508-follow-ostatus-friends
Auto adding friends of legacy OStatus accounts as new contacts
|
2015-08-24 07:20:16 +02:00 |
|
|
Tobias Diekershoff
|
8513c421e7
|
Merge pull request #1844 from annando/1508-htconfig
Add the value for the global directory in htconfig.php
|
2015-08-24 07:16:36 +02:00 |
|
|
Michael Vogel
|
b0ddde22c0
|
By entering a GNU Social account name, the friends of this contact will be added to the friendica account
|
2015-08-23 22:21:15 +02:00 |
|
|
Michael Vogel
|
e07119e2d9
|
Add the value for the global directory in htconfig.php
|
2015-08-23 20:29:45 +02:00 |
|
|
Tobias Diekershoff
|
fc18123082
|
Merge pull request #1837 from fabrixxm/feature-1796
add support for oneline,in-text code tag
|
2015-08-23 17:27:45 +02:00 |
|
|
Tobias Diekershoff
|
d7a79caab2
|
Merge pull request #1843 from tobiasd/20150823-messagespo
regenerated the master messages.po file
|
2015-08-23 17:15:42 +02:00 |
|
|
Tobias Diekershoff
|
99fcf6c3e8
|
regenerated the master messages.po file
|
2015-08-23 17:10:10 +02:00 |
|
|
Tobias Diekershoff
|
37ab7ee052
|
Merge pull request #1842 from annando/1508-directory-configurable
Make the hardcoded path to dir.friendica.com configurable
|
2015-08-23 15:10:34 +02:00 |
|
|
Michael Vogel
|
123ad84689
|
Make the hardcoded path to dir.friendica.com configurable
|
2015-08-23 11:05:10 +02:00 |
|
|
Tobias Diekershoff
|
501a676180
|
Merge pull request #1836 from fabrixxm/feature-reload-plugins
add 'reload active plugins' button in admin/plugins
|
2015-08-20 19:48:16 +02:00 |
|
|
fabrixxm
|
2d75e1f422
|
add support for oneline,in-text code tag
|
2015-08-20 15:08:55 +02:00 |
|
|
fabrixxm
|
81d1dfc006
|
add 'reload active plugins' button in admin/plugins
|
2015-08-20 15:01:15 +02:00 |
|
|
Michael Vogel
|
491f786a83
|
Merge pull request #1835 from tobiasd/20150819-issue1814
clarification for the needed permissions
|
2015-08-19 10:08:46 +02:00 |
|
|
Tobias Diekershoff
|
0e6289e192
|
clarification for the needed permissions (issue #1814)
|
2015-08-19 09:31:13 +02:00 |
|
|
Tobias Diekershoff
|
470920dbed
|
Merge pull request #1834 from annando/issue-1793
frost-mobile has now a link to the original post
|
2015-08-18 20:50:26 +02:00 |
|
|
Michael Vogel
|
e6b85c822d
|
frost-mobile has now a link to the original post. See issue 1793
|
2015-08-18 20:30:01 +02:00 |
|
|
Michael Vogel
|
23bf91dd02
|
Merge pull request #1833 from tobiasd/doc-themes
documentation
|
2015-08-18 19:45:29 +02:00 |
|
|
Tobias Diekershoff
|
faf970523a
|
what happens when an event is clicked?
|
2015-08-18 18:17:16 +02:00 |
|
|
Tobias Diekershoff
|
319b8225f4
|
a doc file for the event page
|
2015-08-18 18:07:59 +02:00 |
|
|
Tobias Diekershoff
|
977b7f6a87
|
added description of the [map] tag to the DE bbcode docs
|
2015-08-18 12:39:38 +02:00 |
|
|
Tobias Diekershoff
|
eb895274a7
|
3rd iteration over the theme docs
|
2015-08-18 10:02:33 +02:00 |
|
|
Tobias Diekershoff
|
115156e8d2
|
added [spoiler] to the BBCode documentation
|
2015-08-18 09:33:03 +02:00 |
|
|
Tobias Diekershoff
|
613857ecf1
|
Merge pull request #1832 from annando/1508-purifier
Relocated the "require_once" for the htmlpurifier
|
2015-08-18 08:50:54 +02:00 |
|
|
Michael Vogel
|
37f4a79462
|
Relocated the "require_once" for the htmlpurifier
|
2015-08-18 08:38:42 +02:00 |
|
|
Tobias Diekershoff
|
033f89c6fa
|
Merge pull request #1831 from annando/1508-twidere-crash
New versions of Twidere crashed during posting.
|
2015-08-18 07:17:30 +02:00 |
|
|
Michael Vogel
|
57ebb00a1f
|
New versions of Twidere crashed during posting.
|
2015-08-17 22:38:05 +02:00 |
|
|
Michael Vogel
|
6ae34f4802
|
Merge pull request #1828 from tobiasd/20150816-fix1621
add the profile url to the settings pages as alternative to the webfi…
|
2015-08-17 21:51:03 +02:00 |
|