Commit graph

11185 commits

Author SHA1 Message Date
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
Michael Vogel
72c8fff909 Improved register link and open-id input. 2015-08-15 07:08:32 +02:00
Michael Vogel
efec7e973e This hopefully will solve issue 1348 2015-08-14 23:32:10 +02:00
Tobias Diekershoff
6836b976fb Merge pull request #1822 from tobiasd/20150814-de
DE update to the strings
2015-08-14 13:09:28 +02:00
Tobias Diekershoff
aedee2f422 Merge pull request #1821 from annando/1508-link-description
The new link description should be better.
2015-08-14 13:08:44 +02:00
Tobias Diekershoff
bb4e339d8f DE update to the strings 2015-08-14 13:03:55 +02:00
Michael Vogel
fe8f8ade69 The new link description should be better. 2015-08-14 12:48:54 +02:00
Tobias Diekershoff
e224e12cb9 Merge pull request #1820 from annando/1508-random-becomes-guid
Use a guid instead of random bytes for unique data
2015-08-14 09:02:00 +02:00
Michael Vogel
bacd71e1c6 Replace random strings with guids where appropriate. 2015-08-14 07:48:28 +02:00
Michael Vogel
43fda0d626 Merge remote-tracking branch 'upstream/develop' into 1508-random-becomes-guid 2015-08-14 07:19:11 +02:00
Tobias Diekershoff
cdfc7187e5 Merge pull request #1819 from annando/1508-subdomain
Bugfix: There were problems with Friendica installed in subdirectories
2015-08-14 05:29:49 +02:00
Tobias Diekershoff
59843c2683 Merge pull request #1818 from annando/1508-diaspora-messages
Bugfix: Conversations with Diaspora now work reliable
2015-08-14 05:29:40 +02:00
Michael Vogel
a2d742ec91 For unique values we should use our guid function - not the random function 2015-08-14 00:40:36 +02:00
Michael Vogel
0e9b2c132a Bugfix: There are some problems with Friendica installed in subdirectories 2015-08-14 00:13:23 +02:00
Michael Vogel
887372a0d7 Bugfix: Conversations with Diaspora now work reliable 2015-08-13 22:49:57 +02:00
Tobias Diekershoff
55ad7f9199 Merge pull request #1816 from tobiasd/messages_20150813
base messages.po updated
2015-08-13 12:11:32 +02:00
Tobias Diekershoff
bb197eee2d base messages.po updated 2015-08-13 11:58:41 +02:00
Michael Vogel
4663df5b2b Merge pull request #1812 from tobiasd/20150812-adminqueue
queue inspector
2015-08-13 08:05:00 +02:00
Tobias Diekershoff
645dc13455 Merge pull request #1813 from annando/1508-newguid
Diaspora now uses a 32 digit guid.
2015-08-13 06:22:19 +02:00
Michael Vogel
bb7ec55f1f Diaspora now uses a 32 digit guid. 2015-08-12 23:37:50 +02:00
Tobias Diekershoff
5013e5daf1 use to link to queue inspector 2015-08-12 19:58:53 +02:00
Tobias Diekershoff
f8afddef0f Merge pull request #1811 from annando/1508-real-contacts
Only show real contacts (Friendica, Diaspora, OStatus) on profile page
2015-08-12 18:02:28 +02:00
Michael Vogel
d5ba3b3b54 Only show real contacts (Friendica, Diaspora, OStatus) on profile page (no Twitter, Facebook, ...) 2015-08-12 17:48:06 +02:00
Tobias Diekershoff
f439ac47c4 admin panel: inspect queue 2015-08-12 15:44:59 +02:00
Tobias Diekershoff
6b93325f70 make Inspect Queue link visible in admin adide menu 2015-08-12 15:44:03 +02:00