Commit graph

10209 commits

Author SHA1 Message Date
Tobias Diekershoff 7eb2ad0b1d update to the master messagespo 2015-08-24 07:50:47 +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
Tobias Diekershoff 2d18e307a5 Merge pull request #1830 from tobiasd/20150817-DE
DE update to the strings
2015-08-17 12:05:02 +02:00
Tobias Diekershoff b67adebd9c DE update to the strings 2015-08-17 12:02:03 +02:00
Tobias Diekershoff 3002124896 Merge pull request #1829 from tobiasd/messagespo-20150817
updated master messages.po file
2015-08-17 09:56:33 +02:00
Tobias Diekershoff 42134fedb2 updated master messages.po file 2015-08-17 09:53:03 +02:00
Tobias Diekershoff 125021903c updated the Home.md files for EN and DE 2015-08-17 09:23:11 +02:00
Tobias Diekershoff fbbb260dbb 2nd iteration of the theming docs 2015-08-17 09:17:36 +02:00
Tobias Diekershoff 86f6532c61 adding the subdir 2015-08-17 08:20:19 +02:00
Tobias Diekershoff 03e81b06d5 we dont need the or anymore 2015-08-17 07:24:48 +02:00
Tobias Diekershoff 621dec1606 reconstruct the description for more flexible translations 2015-08-17 07:20:50 +02:00
Tobias Diekershoff eea258f74c add the profile url to the settings pages as alternative to the webfinger. See issue 1621 2015-08-16 22:39:08 +02:00
Tobias Diekershoff 0f505b92f6 Merge pull request #1827 from annando/1508-only-real-contacts
In the contact search only suppress the "follow" link if you really d…
2015-08-16 22:25:32 +02:00
Tobias Diekershoff 864df75146 Merge pull request #1826 from annando/1508-statistics
The addon "statistics_json" becomes the system setting "nodeinfo"
2015-08-16 22:23:16 +02:00
Michael Vogel 32e080933f Improved the settings description 2015-08-16 22:17:36 +02:00
Michael Vogel c2a1cf958d The addon "statistics_json" becomes the system setting "nodeinfo" 2015-08-16 21:45:51 +02:00
Tobias Diekershoff 11dff64bc9 typo 2015-08-16 18:18:01 +02:00
Tobias Diekershoff 3855648c3d 0th iteration of the theming documentation 2015-08-16 18:08:46 +02:00
Michael Vogel 46ec2638fa In the contact search only suppress the "follow" link if you really don't follow the contact 2015-08-16 15:48:26 +02:00
Tobias Diekershoff 7ed5632f9c Merge pull request #1825 from annando/issue-1478
Removed Facebook from the documentation. Renamed Statusnet to GNU Social
2015-08-15 10:00:55 +02:00
Michael Vogel 5b25a012c8 Removed Facebook from the documentation. Renamed Statusnet to GNU Social 2015-08-15 09:32:26 +02:00
Tobias Diekershoff 0900d42fea Merge pull request #1824 from annando/issue-1805
The document has been reworked to fit to the current version
2015-08-15 09:01:21 +02:00
Michael Vogel 78f3c88ee3 The document has been reworked to fit to the current version 2015-08-15 08:48:16 +02:00
Tobias Diekershoff 4ca515ab33 Merge pull request #1823 from annando/issue-1348
The login form in the aside section should look now better
2015-08-15 07:19:05 +02:00