Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-16 11:33:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
15616 commits 3 branches 64 tags 247 MiB
Commit graph

15616 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roland Häder
a8dc8b288c import dbm here to avoid adding everywhere the namespace (if later changed, 
only here it needs change, cool ha? ;-)

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-13 15:24:44 +01:00
Roland Häder
797de5bfe0 Nope, get_basepath() should be static, then also mark it as static (in signature). 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-13 14:53:57 +01:00
Roland Häder
63610c7b73 Merge branch 'rewrites/dbm_is_result' of github.com:Quix0r/friendica into rewrites/dbm_is_result 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/Photo.php
	include/api.php
	include/cache.php
	include/dbstructure.php
	include/enotify.php
	include/items.php
	include/onepoll.php
	include/queue_fn.php
	include/session.php
	include/text.php
	mod/contacts.php
	mod/dfrn_request.php
	mod/display.php
	mod/events.php
	mod/item.php
	mod/message.php
	mod/msearch.php
	mod/photos.php
	mod/poco.php
	mod/profile.php
	mod/proxy.php
	mod/videos.php
	update.php
	view/theme/diabook/theme.php
	view/theme/vier/theme.php
 2016-12-13 11:00:44 +01:00
Roland Häder
6a8a36f12d More usage of dbm::is_result($r) instead of count($r): 
- count() returns very different results and never a boolean (not even false on
  error condition).
- therefore you should NOT use it in boolean expressions. This still *can* be
  done in PHP because of its lazyness. But it is discouraged if it comes to
  more clean code.

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-13 10:44:13 +01:00
Roland Häder
293436e5fd Some rewrites: 
- max_proccesses_reach() and maxload_reached() (why no _ behind max?) are called
  both way, static and with object reference.
- this is strongly discouraged and should be avoided as its support (in PHP) may
  be dropped in future releases.
- used $a = get_app(); to encapsulate code (even when the function does
  currently the same, it may be changed later)

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-13 10:16:36 +01:00
Roland Häder
47c60aa486 Opps, no need for this. 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-13 10:01:56 +01:00
Roland Häder
d489ba1510 Merge remote-tracking branch 'upstream/develop' into develop 
Also removed <<<<< as this interfers (a bit) with searching for merge conflicts
with a more simplier editor.

Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	mod/ping.php
	view/lang/fr/messages.po
	view/lang/fr/strings.php
 2016-12-13 09:59:43 +01:00
Tobias Diekershoff
789f13dd00 some issues closed 2016-12-12 09:26:46 +01:00
Tobias Diekershoff
29bc27fa6a Merge pull request #3009 from annando/issue-2999 
Issue 2999: Better Mastodon handling
 2016-12-12 07:54:59 +01:00
Michael
73e330abbe Restore empty line 2016-12-12 06:51:08 +00:00
Michael
17f15e793f Issue 2999: Better Mastodon handling 2016-12-12 06:46:02 +00:00
Tobias Diekershoff
352b168e2d Merge pull request #3007 from annando/1607-performance 
Some more performance stuff
 2016-12-12 07:04:16 +01:00
rabuzarus
68bcb99d3a Merge pull request #3008 from annando/1612-probe-logging 
Issue 2835: Some logging to detect possible problems with the probing
 2016-12-11 20:01:09 +01:00
Michael
0c99cee092 Some logging to detect possible problems with the probing 2016-12-11 18:39:39 +00:00
Michael
5c04402448 String is no integer 2016-12-11 17:37:12 +00:00
Michael
23a97465e5 Avoid SQL errors 2016-12-11 07:09:48 +00:00
Michael Vogel
28cb2857eb Merge pull request #3006 from rabuzarus/20161210_-_frio_submit_fix 
frio: delete unneeded button attributes in search forms
 2016-12-11 00:22:20 +01:00
rabuzarus
7dcf44aa96 frio: delete unneeded button attributes in search forms 2016-12-10 21:25:40 +01:00
Michael
c666c98559 Code bautification 2016-12-10 12:28:49 +00:00
Michael
00c74a7d6d Some more ... 2016-12-10 12:21:16 +00:00
Michael
5572bd0cf9 Redo the index changes for testing purposes 2016-12-10 12:19:57 +00:00
Michael
fc3c1601b1 Merge remote-tracking branch 'upstream/develop' into 1607-performance 2016-12-10 12:18:11 +00:00
Michael Vogel
b43691cc4b Merge pull request #3004 from tobiasd/20161210-2932followup 
add allowed protocols during installation
 2016-12-10 08:02:19 +01:00
Tobias Diekershoff
132477990d move that option up, as the admin panel has no control over it ATM 2016-12-10 07:16:16 +01:00
Tobias Diekershoff
89caa18fe0 add the kickstart allowed protocols to htconfig.tpl. 2932 follow-up 2016-12-10 07:05:35 +01:00
Tobias Diekershoff
ef29e03491 make vier also the default from the emergency htconfig file 2016-12-10 07:04:39 +01:00
Michael Vogel
5065def530 Merge pull request #3000 from tobiasd/20161208-convert 
only convert tables in friendica DB
 2016-12-09 18:13:27 +01:00
Tobias Diekershoff
6f3e91d4c0 Michael may keep the typo 2016-12-09 18:11:27 +01:00
Tobias Diekershoff
acae70b85f long tweets 2016-12-09 16:46:37 +01:00
Tobias Diekershoff
a564e31451 use %placeholder% instead of Friendica 2016-12-09 16:43:40 +01:00
Michael Vogel
af42e5e481 Merge pull request #2932 from Hypolite/issue/missing-private-image-src 
Fix Friendica private image URL replacing
 2016-12-09 15:54:11 +01:00
Michael Vogel
b010a7db0d Merge pull request #3003 from tobiasd/20161209-lang 
DE, ES update to the translation
 2016-12-09 15:53:20 +01:00
rabuzarus
e88e030c28 Merge pull request #3002 from tobiasd/20161209-docissues 
in docs there was a wrong link to the issue tracker
 2016-12-09 13:43:21 +01:00
Tobias Diekershoff
3512c87e64 DE, ES update to the translation 2016-12-09 12:36:28 +01:00
Tobias Diekershoff
8659a09e17 Merge pull request #3001 from annando/1612-store-gcontact 
The gcontact-id and the object field can now be stored with item_post
 2016-12-09 11:42:28 +01:00
Tobias Diekershoff
52b8474be7 in docs there was a wrong link to the issue tracker 2016-12-09 11:38:08 +01:00
Michael
e12227c000 The gcontact-id and the object field can now be stored with item_post 2016-12-09 09:57:02 +00:00
Tobias Diekershoff
4059e58bbf Merge pull request #2990 from Hypolite/fix-diaspora-medium-link 
Improve diaspora2bb autolinker
 2016-12-08 21:11:47 +01:00
Tobias Diekershoff
f9b0beff8d only convert tables in friendica DB 2016-12-08 20:29:06 +01:00
Hypolite Petovan
cd354d3a57 Adding default protocols on missing config value for backward compatibility 2016-12-07 23:18:10 -05:00
Hypolite Petovan
88e336b3bc Merge remote-tracking branch 'refs/remotes/origin/develop' into issue/missing-private-image-src 
# Conflicts:
#	doc/htconfig.md
 2016-12-07 23:15:46 -05:00
Hypolite Petovan
e29023dc8c Standards 2016-12-07 23:11:53 -05:00
Tobias Diekershoff
a4959626ad Merge pull request #2996 from rabuzarus/20161206_-_help_doc_move_content 
docu docs: some polishing
 2016-12-06 22:05:08 +01:00
Michael Vogel
9457d30751 Merge pull request #2994 from tobiasd/20161206-frontendworker 
add frontend worker to the admin panel and regen master messages.po file
 2016-12-06 22:01:29 +01:00
Tobias Diekershoff
71cfe6db94 show some of the worker options only when the worker process is active 2016-12-06 21:47:37 +01:00
Tobias Diekershoff
7eb1743945 Revert "show some of the worker options only when the worker process is active" 
This reverts commit 339708463e.
 2016-12-06 21:45:06 +01:00
Tobias Diekershoff
339708463e show some of the worker options only when the worker process is active 2016-12-06 21:44:18 +01:00
rabuzarus
b65433c823 docu docs: some polishing 2016-12-06 15:03:57 +01:00
Tobias Diekershoff
26e771d913 Merge pull request #2995 from rabuzarus/20161206_-_frio_nav_bar_link_change 
frio: change some link behavior of user menu in the nav bar
 2016-12-06 14:19:00 +01:00
rabuzarus
11507440ae frio: change some link behavior of user menu in the nav bar 2016-12-06 14:11:22 +01:00