friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity
10,303 Commits 2 Branches 63 Tags 237 MiB
Commit Graph

10303 Commits

Author SHA1 Message Date
Michael Vogel 1dad181acb See issue 1864. Bugfix for the Oembed handling. 2015-08-28 11:39:52 +02:00
Michael Vogel 319df2ed66 The menu bar isn't clickable anymore 2015-08-28 11:36:43 +02:00
Tobias Diekershoff 50dce314b2 Merge pull request #1863 from tobiasd/20150826-lang 
DE update to the strings
 2015-08-27 09:51:39 +02:00
Tobias Diekershoff 6d9d34ab54 Merge pull request #1862 from tobiasd/20150827-littlelessdebug 
commented out a debugging call that produced a bit too much noise in t…
 2015-08-27 09:21:56 +02:00
Tobias Diekershoff 257a600e2a commented out a debuggin call that produced a bit too much noise in the logs 2015-08-27 09:17:28 +02:00
Michael Vogel 14af9cd2e8 Remove the unneeded menu buttons- 2015-08-27 00:50:04 +02:00
Michael Vogel 92fbf1bcbd Vier: Use CSS for popup menu 2015-08-27 00:02:06 +02:00
Tobias Diekershoff 5b78353fff Merge pull request #1861 from annando/1508-deactivated-ostatus-contacts 
There seems to be a problem with the function to add all friends of a GNU Social account.
 2015-08-26 22:51:55 +02:00
Michael Vogel 86f2eb005f There seems to be a problem with the function to add all friends of a GNU Social account. So it is deactivated by now. 2015-08-26 22:46:59 +02:00
Tobias Diekershoff 1436054ba0 Merge pull request #1860 from fabrixxm/smallfix 
fix warning in /dfrn_request
 2015-08-26 19:33:14 +02:00
fabrixxm b988aa7cb4 fix warning in /dfrn_request 2015-08-26 19:17:41 +02:00
Tobias Diekershoff 7da830c9f6 DE update to the strings 2015-08-26 16:40:31 +02:00
fabrixxm 2e09ce6847 Merge pull request #1859 from annando/1508-updated-sql 
The database.sql now contains the latest changes.
 2015-08-26 14:33:34 +02:00
Michael Vogel f8ba1b6fae The database.sql now contains the latest changes. 2015-08-26 14:31:56 +02:00
Tobias Diekershoff 9f8d406b41 Merge pull request #1857 from tobiasd/20150826-messagespo 
updated master messages.po file
 2015-08-26 07:56:30 +02:00
Tobias Diekershoff 4c0d843b6c updates master messages.po file 2015-08-26 07:54:29 +02:00
Tobias Diekershoff 4b5730515b Merge pull request #1856 from annando/1508-embedly 
Oohembed is removed
 2015-08-25 21:39:26 +02:00
Michael Vogel 6942b16ef5 See issue 1855. OOhembed is removed. 2015-08-25 19:50:23 +02:00
Tobias Diekershoff 445dcd3051 Merge pull request #1853 from annando/1508-search-forum 
Only offer forum search in local mode
 2015-08-25 07:10:54 +02:00
Tobias Diekershoff 607224b74e Merge pull request #1854 from annando/1508-poco-ostatus 
Don't use alternate GNU Social profile syntax in global contacts
 2015-08-25 07:10:19 +02:00
Michael Vogel b1dddd2936 Only offer forum search in local mode. 2015-08-25 05:54:50 +02:00
Michael Vogel 5c084b754a Don't show the alternate url syntax in searches 2015-08-25 05:31:21 +02:00
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