Commit graph

1642 commits

Author SHA1 Message Date
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 Häder 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 Häder 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 Häder 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