clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
15,929 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

1729 Commits

Author SHA1 Message Date
Michael fef0fe2fb9 Issue 3358: The key length should now work on InnoDB and MyISAM 2017-04-21 21:26:05 +00:00
Michael 806f395724 Issue 3351: Check if resource was created 2017-04-18 17:17:15 +00:00
Alexandre Alapetite 62768a1bb4 Bump version to 1219 
https://github.com/friendica/friendica/pull/3321#pullrequestreview-32528437
 2017-04-16 15:23:57 +02:00
Michael 358aa1d7ef Database version updated 2017-04-14 22:34:01 +00:00
Alexandre Alapetite 325d3afe18 Bump DB version 2017-04-12 23:14:33 +02:00
Hypolite Petovan ca7c2bfa00 Ignore Activity Streams delete messages from Mastodon 2017-04-10 22:20:03 -04:00
Michael 47a6f6b726 Issue 3300: The temp path creation couldn't create a subdirectory with the hostname 2017-04-07 21:34:06 +00:00
Hypolite Petovan 1ab28bbe03 Add Text_Highlighter to Composer 
- Fixes critical mistake in boot.php regarding set_include_path
- Fixes minor mistake in text.php regarding strpos order of arguments

Note: This change significantly increases Composer running time because
Text_Highlither is a PEAR package. I'm already planning to replace it
with scrivo/highlight.php.
 2017-04-05 00:31:49 -04:00
Hypolite Petovan 9237b2611a Merge branch 'develop' into rewrites/coding-convention-split2 2017-04-03 06:35:27 -04:00
Michael Vogel d9451ef969 Merge pull request #3279 from Hypolite/improvement/add-composer 
Add Composer
 2017-04-02 14:57:37 +02:00
Roland Häder 49527b70d3 Merge branch 'develop' into rewrites/coding-convention-split2 2017-04-01 22:16:08 +02:00
Roland Haeder 3cea176ef2
added spaces + used x () 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-01 22:12:53 +02:00
Michael f6d7ee2781 Issue 3142: mcrypt is no more (as well as phpseclib) 2017-04-01 08:28:42 +00:00
Hypolite Petovan 806368f151 Move MobileDetect library to vendor 
- Bumped the version to 2.8.25 (from 2.8.11)
 2017-03-31 23:05:07 -04:00
Hypolite Petovan 799e60aa62 Replace existing autoloader with Composer-supplied 
- Move Friendica namespace to `src`
- Move required `ezyang/htmlpurifier` to vendor
- Remove existing static autoloader
- Change boot.php reference to the autoloader
 2017-03-31 23:02:38 -04:00
Roland Haeder 5db963a835
fixed parser error 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-31 20:05:40 +02:00
Roland Haeder 16415520e7
it is space-time! ;-) 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-30 21:50:27 +02:00
Roland Haeder 0ac1af7300
spaces added according code convention and CR + fixed tzpo in function name (opps) 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-30 20:22:40 +02:00
Roland Haeder fda99e39c1
used ltrim() for removing (any) trailing space 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 21:22:05 +01:00
Roland Haeder b97561e0c4
added spaces 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 21:20:20 +01:00
Roland Haeder 66f5e104b1
and without self:: ;-( 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 15:13:38 +01:00
Roland Haeder 952f2218ed
there is already $this->backend around, needs renaming 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 15:12:41 +01:00
Roland Haeder 83dec2f815
fixed indending + closed own internal todo: better usage of x() 
removed todo

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 13:37:46 +01:00
Roland Haeder 1514fdaead
rewrote to static approach and if() condition can be simplified. 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 13:00:10 +01:00
Roland Haeder d64dafec63
removed parentheses and indended it for better readability 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 12:55:39 +01:00
Roland Haeder bd4cee8c21
added spaces/curly braces and TODO for better using trim() 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 12:53:48 +01:00
Roland Haeder a70a2381c9
removed old-lost code 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 12:49:17 +01:00
Roland Haeder daa32d49cf
killme() does the same here + added curly braces 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-24 21:19:37 +01:00
Roland Haeder 0e19fdfc71
removed parentheses + added TODO about a small rewrite 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-24 21:05:55 +01:00
Roland Haeder ccd1e2cc6a
fixed parser error 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-24 20:52:26 +01:00
Roland Haeder 843b7a003c
closed internal TODO, merged 2 if() to one + added spaces 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-23 22:17:39 +01:00
Roland Haeder 11d3fd163a
yet another one removed, thanks to @Hypolite for CR 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-23 22:13:28 +01:00
Roland Haeder 480871d371
removed no longer old stuff, let's don't stuff code with commented-out code 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-23 22:11:58 +01:00
Roland Haeder 9521f39ebe
added more spaces #3254 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-23 22:09:15 +01:00
Roland Haeder f85e6d2aac
No parantheses here + no @ (which surpresses warnings and such) #3254 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-23 21:47:51 +01:00
Roland Haeder 47602577f3
Opps, missed one ... 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-23 21:45:00 +01:00
Roland Haeder f5227c016d
replaced some tabs -> spaces + added curly braces #3254 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-23 21:28:32 +01:00
Roland Häder f173322539
added missing spaces/curly braces 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-21 21:52:00 +01:00
Hypolite Petovan 7b352f3f74 Revert "Coding convention applied - part 1" 2017-03-21 12:02:59 -04:00
Roland Haeder 09851331a9
Merge remote-tracking branch 'upstream/develop' into rewrites/coding-convention 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-20 20:51:32 +01:00
Michael 132688d663 Standards, what else? 2017-03-19 08:04:04 +00:00
Roland Häder 15c77beee2
added missing spaces/curly braces 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:41:21 +01:00
Michael 222550e784 From now on we are using 0001-01-01 as lowest date 2017-03-18 11:42:54 +00:00
Michael e301fa0832 Merge remote-tracking branch 'upstream/develop' into 1702-null-date 2017-03-18 08:31:43 +00:00
rabuzarus 3cef98caf6 Merge pull request #3226 from annando/1702-only-worker 
The worker is now the only background processing system
 2017-03-17 13:22:23 +01:00
Michael Vogel 98945eb6fa Merge pull request #3213 from Hypolite/issue/#2792-2 
Like behavior fix/improvements
 2017-03-13 18:35:32 +01:00
Michael 77e8c44016 Merge remote-tracking branch 'upstream/develop' into 1702-only-worker 
Conflicts:
	include/onepoll.php
	include/queue.php
 2017-03-12 21:03:44 +00:00
Michael 1624150db4 Merge remote-tracking branch 'upstream/develop' into 1702-null-date 
Conflicts:
	include/onepoll.php
 2017-03-12 20:54:28 +00:00
Tobias Diekershoff 30d82f4391 mark the develop version in the version string 2017-03-12 14:40:08 +01:00
Tobias Diekershoff 2bfa870c47 Friendica Version 3.5.1 2017-03-12 14:38:01 +01:00
Hypolite Petovan da5bbe8b50 Add public_contact() function 
- Add function to retrieve the public contact id (uid = 0) of the
current logged-in user
 2017-03-06 05:06:05 -05:00
Michael 5c92e97173 Added index for performance issues 2017-03-02 05:46:44 +00:00
Michael 0afb0c2ea4 NULL_DATE is now a constant 2017-02-27 23:37:15 +00:00
Michael 99fb15037b Removed some more unneeded stuff 2017-02-27 06:27:22 +00:00
Michael 46308fa1ef Removed worker config stuff 2017-02-26 23:27:10 +00:00
Michael bd793e5987 New version string for RC 2017-02-24 15:02:16 +00:00
Michael 2bfc40d74c Bugfix for not createable spool path 2017-02-19 08:23:21 +00:00
Michael 90b5cbe71c More analytics to analyze the reason for constantly changing temp paths 2017-02-15 21:46:29 +00:00
Michael 40390cc5ec Diaspora Relay: Only accept postings from anyone when the relay is configured 2017-02-10 20:45:22 +00:00
Tobias Diekershoff adedf18b30 Merge pull request #3146 from annando/1701-pnut 
Preparation to add the social network "pnut"
 2017-02-02 09:10:28 +01:00
Michael 275a1c6574 Preparation to add the social network "pnut" 2017-02-02 06:06:23 +00:00
Michael 8a75a20d26 Bugfix: An index was missing 2017-02-01 21:08:13 +00:00
Michael ae849954cc Bugfix: The SSL policy setting was not respected 2017-01-29 13:50:57 +00:00
Hypolite Petovan c38a5e443d Merge branch 'develop' into issue/#3062 
* develop: (68 commits)
  Added documentation
  update to the translation
  update to the translations
  translation docs now contain basic usage of the Transifex client
  - Replace TinyMCE-enabled filebrowser.tpl by filebrowser_plain.tpl content
  - Remove misc TinyMCE mentions in docs and minifyjs
  - Remove $theme_richtext_editor boot var - Remove "richtext" feature - Remove fix_mce_lf() function - Remove nomce parameter
  - Remove TinyMCE mentions in themes
  - Remove tinyMCE mentions or convert to addeditortext() - Remove $editselect template value
  Remove tinyMCE libraries
  limit the description of the meta tag to 160 characters in /mod/display
  Improved handling of non string values in the config
  Bugfix: Caching of non string cache values now works.
  Reformatted stuff, improved query
  Auto-focus first input field of modal when shown
  Use cache instead of config for storing last proc_run time
  Some added logging
  Bugfix for masses of php warnings
  Rearranged the logging
  Some changed logging
  ...

# Conflicts:
#	view/theme/frost-mobile/js/theme.js
#	view/theme/frost/js/theme.js
 2017-01-27 15:30:21 -05:00
Michael Vogel d61a4a67db Merge pull request #3109 from Hypolite/issue/scrap-tinymce 
Scrap TinyMCE
 2017-01-27 21:08:33 +01:00
Hypolite Petovan 66482c1d9c - Remove $theme_richtext_editor boot var 
- Remove "richtext" feature
- Remove fix_mce_lf() function
- Remove nomce parameter
 2017-01-26 22:57:53 -05:00
Michael be1db7bdb0 Use cache instead of config for storing last proc_run time 2017-01-22 05:20:14 +00:00
Michael 0548099f6c The config class now makes less database reads. 2017-01-18 21:45:32 +00:00
Michael 045e94ccf3 Some more config stuff 2017-01-17 19:33:06 +00:00
Michael 53393233c3 Replace the direct access of config variables 2017-01-17 19:21:46 +00:00
Michael 2cdf87c56a Deactivated the alternative update script by now 2017-01-16 21:35:35 +00:00
Hypolite Petovan b61479ba6e Merge remote-tracking branch 'friendica/develop' into issue/#3062 
# Conflicts:
#	view/theme/duepuntozero/theme.php
#	view/theme/smoothly/theme.php
 2017-01-12 09:19:59 +11:00
Michael Vogel 3c51820515 Merge pull request #3076 from Hypolite/issue/#3039-boot-doc-include 
Normalize App parameter declaration (doc-include folders, boot)
 2017-01-11 09:01:48 +01:00
Hypolite Petovan 87eb3d5ef2 Normalize App parameter declaration (doc-include folders, boot) 2017-01-09 23:09:01 +11:00
Hypolite Petovan 479180ca8e Merge branch 'develop' into issue/#3062 2017-01-08 11:44:45 +11:00
Michael ed0143c9f0 Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes 2017-01-07 16:13:57 +00:00
Hypolite Petovan b50f1f970f Use placeholder attribute for Comment message 
- Remove global aStr.comment
- Remove global window.commentEmptyText
- Remove head.tpl $comment parameter
 2017-01-08 02:13:55 +11:00
Michael 58c229031e Now for the database version 2017-01-05 22:56:49 +00:00
Roland Haeder 9ca789b952
Merge remote-tracking branch 'upstream/develop' into develop 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-31 17:59:14 +01:00
Roland Haeder d2280d4120
Merge remote-tracking branch 'upstream/develop' into develop 
dbm::is_result() calls needed merge

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-30 21:33:41 +01:00
Michael 55ee80338f Events are now shared with Diaspora. 2016-12-30 03:31:38 +00:00
Tobias Diekershoff 51155d7716 Merge pull request #3047 from annando/1612-indexlength 
New binary data fields to avoid index length problems
 2016-12-29 19:11:54 +01:00
Johannes Schwab 8e2fc0f8a9 Fix test for static calls with PHP 7 2016-12-27 15:51:38 +01:00
Michael 38fed9a77b We should increase the database version as well ... 2016-12-26 06:02:14 +00:00
Roland Häder de689583e2 added more curly braces + space between "if" and brace 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	mod/admin.php
 2016-12-20 17:58:34 +01:00
Roland Häder 4b221d216e added more curly braces + space between "if" and brace 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 17:57:40 +01:00
Roland Häder 4f26bee453 Changed $a->get_baseurl() to App::get_baseurl() 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 12:45:36 +01:00
Roland Häder 0e58bf6675 Changed $a->get_baseurl() to App::get_baseurl() 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 12:45:16 +01:00
Roland Häder fb0ed18a43 changed to this: 
---------------------
function bla (App &$a) {
	$a->bla = 'stuff';
}
---------------------

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 10:58:03 +01:00
Roland Häder abff6372dd Coding convention applied: 
- space between "if" and brace
- curly braces on conditional blocks

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

Conflicts:
	include/lock.php
 2016-12-20 10:12:31 +01:00
Roland Häder fb676335db Coding convention applied: 
- space between "if" and brace
- curly braces on conditional blocks

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 10:10:33 +01:00
Roland Häder 582b8db8e8 Maybe no longer needed: converted $a->get_baseurl() to App::get_baseurl(). #3010 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-14 11:55:12 +01:00
Roland Häder 448c5aa694 Cleanup for #3010 - added spaces, thanks to @annando . 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-14 09:42:28 +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 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
Michael c97306e734 Standards ... 2016-12-01 22:50:07 +00:00
Michael c5d571287c Merge branch '1612-spool' of github.com:annando/friendica into 1612-spool 2016-12-01 13:58:47 +00:00
Michael eff4ad2e0a Spool items that couldn't be stored 2016-12-01 13:50:26 +00:00
Michael d49325d177 Disable richtext editor for frio - followup for #2938 2016-11-29 20:04:31 +00:00
Michael e856ab9a09 The worker can now run from the frontend as well 2016-11-27 00:55:05 +00:00