bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity
21714 commits 4 branches 62 tags 178 MiB
Commit graph

1935 commits

Author SHA1 Message Date
Hypolite Petovan e74dbb3693 Improve goaway legibility 2017-12-29 21:55:13 -05:00
Hypolite Petovan 2dc598ed5b Move login() to Login module 
- Move nuke_session to include/security
- Remove mod/login
 2017-12-29 21:55:13 -05:00
Michael 3fdfc2e425 Hopefully this is now clearer 2017-12-22 21:31:32 +00:00
Michael 00c6261dae Only include the update.php, when really needed 2017-12-22 14:56:40 +00:00
Michael 2e2a2b8040 Corrected wrong handling of the return value 2017-12-22 14:51:50 +00:00
Michael 1e7e83510a Old stuff had been removed from the update routine 2017-12-22 14:48:29 +00:00
Hypolite Petovan 57d888f3e7
Merge pull request #4106 from annando/registered-users 
We now fetch the number of registered users
 2017-12-19 07:31:21 -05:00
Hypolite Petovan b6f60c45aa Fix double login issue 
- Removed session existence check in killme
- Changed returned value in session_write for empty data
 2017-12-18 23:43:15 -05:00
Michael dab83c8b40 We now fetch the number of registered users 2017-12-18 23:58:18 +00:00
Hypolite Petovan 916236ce2f Fix docblocks types 2017-12-17 15:27:50 -05:00
Hypolite Petovan 6dbd68e0cb Remove redundant index 
- Increase UPDATE_VERSION and DB_UPDATE_VERSION
 2017-12-15 11:36:06 -05:00
Michael 2d7cd2daf4 "update" is enough 2017-12-14 22:18:53 +00:00
Michael 15d42de647 Class moved, changes applied 2017-12-14 21:13:02 +00:00
Michael 0457bd995f "system_unavailable.php" is unavailable now 2017-12-13 21:55:19 +00:00
Hypolite Petovan a42595a30c Move Object\Contact to Model\Contact 2017-12-07 23:56:12 -05:00
Michael Vogel 5747cfc79c
Revert "Move Objects to Model" 2017-12-08 05:21:51 +01:00
Hypolite Petovan 18d93cddf6 Move Object\Contact to Model\Contact 2017-12-07 09:04:24 -05:00
Michael 0608efc38a We've got no mood anymore 2017-12-07 07:01:55 +00:00
Adam Magness cadfef63c4 Update false evaluations 
=== false and !== false to is_null where appropriate.
 2017-12-06 14:57:06 -05:00
Michael 9ffde01fc1 DBClean now works with the conversation table as well 2017-12-05 21:30:38 +00:00
Adam Magness 2f0da29c75 Features to src 
Move Features to class in Friendica\Content namespace. Update function calls and references.
 2017-12-04 08:33:49 -05:00
Michael df89e0384d Added description to networks, renaming some network names 2017-12-03 13:26:52 +00:00
Michael 6f7510550d NETWORK_MAIL2 was never finished, so remove it as well 2017-12-03 09:19:58 +00:00
Hypolite Petovan b85c94a60d
Merge branch 'develop' into issue/3878-move-Contact-to-src 2017-11-19 18:09:14 -05:00
Hypolite Petovan ec02af593d Change called method names 
- Add GlobalContact::getRandomUrl
- Rename Contact::getIdForURL
- Rename Diaspora::sendUnshare
- Remove unused parameter $self in Contact::terminateFriendship
 2017-11-19 17:03:39 -05:00
Hypolite Petovan b92fc24ff0 Add Contact Object 
- Add Profile Object
- Add User Model
- Add use statements
 2017-11-19 16:55:28 -05:00
Michael 920160cb28 The poller is now the worker 2017-11-19 21:47:21 +00:00
Michael cabfcfc904 We now are having a "scripts" folder 2017-11-19 21:21:54 +00:00
Michael 01362461cf poller.php is cleaned up, unneeded stuff has been removed 2017-11-18 11:01:01 +00:00
Michael 13f899542d dbupdate now moved as well 2017-11-18 07:31:33 +00:00
Michael 731ec347b1 Removed old template parser 2017-11-11 09:26:23 +00:00
Adam Magness 06c3af9b60 Move Cache to src 
relocate the cache class to Friendica\Core namespace
 2017-11-09 11:05:18 -05:00
Adam Magness 4ca68c7af0 Class file relocations 
Issue #3878
 2017-11-08 08:37:03 -05:00
Michael 737cc6f101 Missing "use" in boot.php 2017-11-08 13:03:41 +00:00
Adam Magness 8522c47353 Remove Includes 
Removed references to include/config.php and include/probe.php and deleted the respective files.
 2017-11-07 12:14:03 -05:00
Adam Magness 0dfa57948f Issue-#3873 
Replace deprecated functions with new syntax.
 2017-11-07 06:24:39 -05:00
Michael 1607527447 And some more 2017-11-06 15:40:27 +00:00
Michael 70c08dee1d Some more improvements 2017-11-05 15:28:55 +00:00
Michael 9039e60a06 proc_run is not needed anymore 2017-11-05 12:32:35 +00:00
Michael 478e363967 proc_run was replaced 2017-11-05 12:15:53 +00:00
Michael da212a28a2 New worker class that does all the work 2017-11-05 10:33:46 +00:00
Michael 7566464a58 Avoid warning "Failed to write session data" 2017-10-31 16:03:01 +00:00
Michael 6d1ba768ef Reverted some test 2017-10-25 04:47:04 +00:00
Michael 6396f92d9b Bugfix for "Index column size too large" 2017-10-25 04:44:45 +00:00
Tobias Diekershoff 576cc383b9 Version 3.6-dev for develop again 2017-10-16 10:31:37 +02:00
Tobias Diekershoff f4632319c0 Version 3.5.4 2017-10-16 10:27:24 +02:00
Tobias Diekershoff 1441abd15a Version 3.5.4-rc 2017-10-13 18:49:37 +02:00
Michael 225eea2ca6 Avoid undefined class variables 2017-10-11 14:52:08 +00:00
Tobias Diekershoff 54e1585c22 set version to 3.6-dev 2017-10-05 10:07:21 +02:00
Tobias Diekershoff 12b37ac596 Friendica Version 3.5.3 2017-10-05 10:05:01 +02:00
Michael 3354f01ed5 Doxygen and bugfix 2017-09-30 17:42:03 +00:00
Michael 2971501f63 The direct structure call is now only executed when called via the poller.php 2017-09-30 17:12:27 +00:00
Michael d691c2e621 Database structure call is now executed directly when it cannot be called via proc_run 2017-09-30 16:45:35 +00:00
Michael bd88179419 Add additional checks for the worker 2017-09-30 11:19:46 +00:00
Tobias Diekershoff 1e8fd425bd Version 3.5.3-rc 2017-09-20 17:42:45 +02:00
Michael 8d4736c942 OStatus: We can now process delete messages / better account detection 2017-09-17 08:01:22 +00:00
Michael 8e17be7225 Store conversation data 2017-09-10 21:56:05 +00:00
Michael 637eb0bfb4 Bugfix: Mails weren't sent 2017-09-08 15:14:33 +00:00
Michael 21d27c2124 Bugfix: You cannot be local and remote at the same time 2017-08-28 04:46:04 +00:00
Michael 5adfeb0bd5 App::get_baseurl is now replaced with System::baseUrl 2017-08-26 07:32:10 +00:00
Michael 3c24bed412 New class "System" 2017-08-26 06:04:21 +00:00
Michael b3e20b1685 New database version 2017-08-14 05:49:49 +00:00
Michael 1d8c91c478 Restructured "dba::exists" function 2017-08-12 08:55:50 +00:00
Michael 79fe249c54 Better use a wrapper 2017-07-22 06:43:04 +00:00
Michael 5d7e1e1a15 Use the realpath for the handling with (temporary) paths 2017-07-22 05:50:25 +00:00
Michael 2bad626be6 Bugfix: Signatures for likes hadn't been stored 2017-07-15 04:03:50 +00:00
Thomas Willingham 11c5f471af Fix/workaround weird load order issue. 2017-07-08 16:25:13 +01:00
Michael 526db18f5c Hopefully a fix for semaphore warnings and for the missing field in the workerqueue 2017-06-28 18:31:33 +00:00
Michael 4515c36f69 Semaphore based locking and hopefully the fix for the workerqueue 2017-06-28 04:53:11 +00:00
Michael ceaa191d8c Recurring had been executed only once - and then never again 2017-06-19 18:20:19 +00:00
Michael cf179188b6 Some more worker fine tuning 2017-06-17 13:58:18 +00:00
Michael 1932a6d634 Replaced "table lock" - it is not so good, it seems 2017-06-12 14:19:47 +00:00
Michael 2372ef7fd5 Locking seems to be better here 2017-06-12 12:28:48 +00:00
Michael 8be52424f5 Only check for stale processes every 5 minutes 2017-06-12 09:44:46 +00:00
Michael 06815f1a38 Merge remote-tracking branch 'upstream/develop' into 1706-worker-even-faster 
Conflicts:
	include/poller.php
 2017-06-11 07:49:34 +00:00
Michael 4f70682f7a Inherit the creation date 2017-06-11 07:41:38 +00:00
Hypolite Petovan ad4cdf2a9d Replace lowercase operators 2017-06-08 21:03:44 -04:00
Hypolite Petovan 9c0d2c31e8 Replace AND and OR in PHP conditions by && and || 2017-06-07 22:00:59 -04:00
Michael 504ceb2d43 We should increase the database version number 2017-06-07 20:24:44 +00:00
Tobias Diekershoff 66458d7313 Merge pull request #3522 from annando/1706-lock 
Some more poller speed and lock functionality
 2017-06-07 09:29:54 +02:00
Tobias Diekershoff 36630daca6 added missing dash in version 2017-06-07 07:36:04 +02:00
Michael Vogel f4652d6e50 Merge branch 'develop' into 1706-lock 2017-06-06 14:16:00 +02:00
Michael 8d13751d40 Increased database version 2017-06-06 12:07:27 +00:00
Tobias Diekershoff 7fb4b1be12 Friendica version 3.5.3dev 2017-06-06 12:22:06 +02:00
Tobias Diekershoff e3f60fe706 Friendica version 3.5.2 2017-06-06 12:18:29 +02:00
Michael 8db079c65e Don't always fork the poller. 2017-06-05 06:08:26 +00:00
Michael 945d3cc048 The constant CURLE_OPERATION_TIMEDOUT isn't defined on older PHP versions 2017-06-03 19:46:19 +00:00
Tobias Diekershoff ec5a3c3440 Merge pull request #3514 from annando/worker-locking 
Fixed locking behaviour for the worker
 2017-06-03 11:02:50 +02:00
Michael 21eb9a4b2e Fixed locking behaviour for the worker 2017-06-03 07:25:01 +00:00
Hypolite Petovan cbd3edbc05 Update remaining "dir.friendi.ca" instances 2017-06-02 22:15:43 -04:00
Michael 696404739b Bugfix Diaspora: We exited with the wrong return values and the guid for messages was too short 2017-05-17 19:25:30 +00:00
Tobias Diekershoff 925b803ae8 set version to 3.5.2rc 2017-05-14 09:16:55 +02:00
Michael b907ad9dd8 dba is now used for writing the workerqueue as well 2017-05-12 16:25:44 +00:00
Hypolite Petovan 86cae070f2 Merge branch 'develop' into improvement/move-app-to-src-2 2017-05-07 12:58:11 -04:00
Michael 7a3bdbfc15 Wrong parameter for delete command 2017-05-07 08:12:36 +00:00
Michael 6a594ca8a9 Some useful unique indexes 2017-05-05 21:55:19 +00:00
Hypolite Petovan 4d12f1b014 Fix overzealous space addition 2017-05-03 22:41:59 -04:00
Hypolite Petovan 3437e73ae4 Yet more standards 2017-05-02 23:37:50 -04:00
Hypolite Petovan 20043914e6 Move App to src 
- Add `use Friendica\App;` wherever needed
 2017-05-02 22:59:36 -04:00
Hypolite Petovan 56ee734b00 Cleanup /format pre-move 2017-05-02 22:59:24 -04:00
Michael b9b43e30e6 Delete queries are now split into chunks. 2017-05-01 17:42:37 +00:00
Michael 9d9909cf10 Some more places were we check now 2017-04-29 17:45:09 +00:00
Michael 715e15cbe1 There is now a memory limit for the poller 2017-04-29 17:36:46 +00:00
Michael 15355850f7 Set the database version 2017-04-27 20:47:52 +00:00
Michael 35dc56c9c2 Salmons with Mastodon seem to work now 2017-04-27 20:38:46 +00:00
Michael c0784f7301 New tables for conversations 2017-04-22 20:46:40 +00:00
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 Häder 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 Häder 5db963a835
fixed parser error 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-31 20:05:40 +02:00
Roland Häder 16415520e7
it is space-time! ;-) 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-30 21:50:27 +02:00
Roland Häder 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 Häder 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 Häder b97561e0c4
added spaces 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 21:20:20 +01:00
Roland Häder 66f5e104b1
and without self:: ;-( 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 15:13:38 +01:00
Roland Häder 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 Häder 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 Häder 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 Häder 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 Häder 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 Häder a70a2381c9
removed old-lost code 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 12:49:17 +01:00
Roland Häder 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 Häder 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 Häder ccd1e2cc6a
fixed parser error 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-24 20:52:26 +01:00
Roland Häder 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 Häder 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 Häder 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 Häder 9521f39ebe
added more spaces #3254 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-23 22:09:15 +01:00
Roland Häder 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 Häder 47602577f3
Opps, missed one ... 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-23 21:45:00 +01:00
Roland Häder 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 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
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