Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-01 03:24:42 +00:00
Code Issues Projects Releases Packages Wiki Activity
22490 commits 3 branches 64 tags 241 MiB
Commit graph

22490 commits

This branch
This branch
All branches
Author SHA1 Message Date
fabrixxm
456b6b17c0 Update CHANGELOG 
fix spelling
 2015-02-08 20:53:30 +01:00
Michael Vogel
7e9ae24511 Moved several settings from .htconfig.php to the admin settings page. 2015-02-08 20:35:40 +01:00
Michael Vogel
10c7ab76a2 Added thread update for central item storage in the update procedure. 2015-02-08 16:03:23 +01:00
Michael Vogel
a97d4383a1 Searching for items now always searches public entries from the central item storage with uid=0. 2015-02-08 15:59:22 +01:00
Tobias Diekershoff
7d2da9be02 Merge pull request #1375 from annando/1502-altpager-default 
"altpager" is now the standard value and can be disabled.
 2015-02-08 13:37:26 +01:00
Michael Vogel
8871591a98 Merge remote-tracking branch 'upstream/develop' into 1502-altpager-default 
Conflicts:
	mod/admin.php
 2015-02-08 13:26:28 +01:00
Tobias Diekershoff
b4dc344f9c Merge pull request #1374 from annando/1502-noscrape-always-active 
Noscrape is now enabled all the time
 2015-02-08 12:48:13 +01:00
Tobias Diekershoff
1418d6bc27 Merge pull request #1373 from annando/1502-bugfix-admin-aside 
Bad HTML in the admin side menu for webfinger and probe
 2015-02-08 12:47:46 +01:00
Michael Vogel
65e4dc93d5 Merge pull request #1372 from tobiasd/20150207fr 
FR update for the strings
 2015-02-08 12:32:03 +01:00
Michael Vogel
1781fbff13 Bad HTML in the admin side menu for webfinger and probe 2015-02-08 12:12:19 +01:00
Michael Vogel
f931eba7f2 Noscrape is now enabled all the time. 2015-02-08 12:07:35 +01:00
Michael Vogel
1d48ab0191 "altpager" is now the standard value and can be disabled. Depending upon the user reactions we can disable it in an upcoming version. 2015-02-08 11:54:42 +01:00
Tobias Diekershoff
cea445de2e FR update for the strings 2015-02-08 10:44:47 +01:00
fabrixxm
fb6521cca2 Update CHANGELOG 2015-02-07 15:50:16 +01:00
fabrixxm
f620834d97 Merge branch 'release-3.3.3' into develop 2015-02-07 12:57:12 +01:00
Tobias Diekershoff
dea2e66cdf Merge pull request #1369 from annando/1502-title-in-diaspora-bookmarklet 
The title in the bookmarklet had several asterisk in the title.
 2015-02-06 22:03:54 +01:00
Tobias Diekershoff
1f346e7c1f Merge pull request #1368 from annando/1502-contact-correction 
Correct the contact data if it was changed although the system don't thinks so
 2015-02-06 22:03:00 +01:00
Michael Vogel
89f260eb6c The title in the bookmarklet had several asterisk in the title. This had no use for friendica. 2015-02-06 21:10:49 +01:00
Michael Vogel
d87ab3cd97 Correct the contact data if it was changed although the system don't thinks so. 2015-02-06 21:02:33 +01:00
fabrixxm
df6188f2c7 Merge pull request #1366 from ddorian1/release-3.3.3 
fix urls for pager
 2015-02-06 17:38:55 +01:00
Johannes Schwab
1114ae4c81 fix urls for pager 2015-02-06 17:04:48 +01:00
fabrixxm
aa720eb277 Merge pull request #1357 from annando/1502-html-poco-2 
html to bbcode convertion in poco - 2nd try
 2015-02-05 11:21:23 +01:00
Tobias Diekershoff
4be63b0a82 Merge pull request #1360 from tobiasd/20150205lng 
CS DE FR: update to the strings
 2015-02-05 11:09:00 +01:00
Tobias Diekershoff
5aba3abfc1 CS DE FR: update to the strings 2015-02-05 11:06:23 +01:00
Tobias Diekershoff
be40d9d265 Merge pull request #1359 from annando/1502-more-detailled-location 
More details in the location field for poco
 2015-02-05 08:31:15 +01:00
Tobias Diekershoff
f3b8950ab1 Merge pull request #1358 from annando/1502-relocate-set-nurl 
The relocate message hadn't changed the "nurl" value.
 2015-02-04 20:39:31 +01:00
Michael Vogel
9641436996 The relocate message hadn't changed the "nurl" value. 2015-02-04 20:22:05 +01:00
Michael Vogel
742a6dcf6e Due to some git problems, just the same stuff again (html to bbcode conversation in poco) 2015-02-04 19:49:43 +01:00
Silke Meyer
cdd3089444 Help text sounded too complicated 2015-02-04 16:43:31 +01:00
Silke Meyer
6bccf0be79 Added help text as requested in #1349. 2015-02-04 16:13:07 +01:00
Tobias Diekershoff
60eae0b2bc Merge pull request #1355 from tobiasd/20150204_fr 
FR: some more updates to the strings
 2015-02-04 11:55:26 +01:00
Tobias Diekershoff
485432e734 FR: some more updates to the strings 2015-02-04 11:54:13 +01:00
Tobias Diekershoff
0f4decf74e Merge pull request #1354 from tobiasd/20150204_defr 
DE FR: update to the strings
 2015-02-04 11:42:39 +01:00
Tobias Diekershoff
14dec94d33 DE FR: update to the strings 2015-02-04 11:41:06 +01:00
Tobias Diekershoff
49eadbdad9 Merge pull request #1353 from tobiasd/20150205_typo 
typo in side panel link
 2015-02-04 11:39:20 +01:00
Tobias Diekershoff
8a55e20143 regenerated master message.po 2015-02-04 11:38:34 +01:00
Tobias Diekershoff
ed280df383 typo in side panel link 2015-02-04 11:27:54 +01:00
Michael Vogel
29f732e811 More details in the location field for poco. 2015-02-04 10:43:30 +01:00
fabrixxm
fd2a4c731e Merge pull request #1352 from tobiasd/20150204_red 
adopting red matrix iconography for red#
 2015-02-04 09:01:17 +01:00
Tobias Diekershoff
710bd08c30 adopting red matrix iconography for red# 2015-02-04 08:47:57 +01:00
Fabrixxm
2c4c8a6b21 Merge remote-tracking branch 'friendica/release-3.3.3' into develop 2015-02-04 08:32:44 +01:00
fabrixxm
04f91aafac Merge pull request #1337 from annando/1501-html-in-poco 
Bugfix: The portable contacts send data as html
 2015-02-04 08:29:21 +01:00
Tobias Diekershoff
f39e2803f8 Merge pull request #1351 from annando/1501-central-item-storage 
Diaspora: Storing of original posts of reshared posts
 2015-02-03 20:38:25 +01:00
Michael Vogel
b27d6f1a82 Merge remote-tracking branch 'upstream/develop' into 1501-central-item-storage 2015-02-03 20:08:47 +01:00
Tobias Diekershoff
11fd20fdc2 Merge pull request #1346 from tobiasd/20150202-strings 
updated master string file
 2015-02-03 20:05:11 +01:00
Tobias Diekershoff
524e2102cf Merge pull request #1350 from annando/1502-diabook-disable-features 
Some diabook features can dramatically slow down the system.
 2015-02-03 20:05:01 +01:00
Tobias Diekershoff
4e637ae89d Merge pull request #1347 from silke/vagrant 
Vagrant
 2015-02-03 20:04:27 +01:00
Michael Vogel
f5ec5a4349 Some diabook features can dramatically slow down the system. There is a new switch to disable this. 2015-02-03 19:59:47 +01:00
Michael Vogel
226b551c85 Only some code beautification. 2015-02-03 07:00:01 +01:00
Michael Vogel
9851965090 Merge remote-tracking branch 'upstream/develop' into 1501-central-item-storage 2015-02-03 00:30:37 +01:00