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

6844 Commits

Author SHA1 Message Date
Hypolite Petovan 481b0ac138 Fix notices in include/enotify 2018-10-15 23:13:00 -04:00
Hypolite Petovan f2bde919e5 Fix ignored show_in_notification_page parameter in notification() 2018-10-14 11:30:39 -04:00
Jonny Tischbein bfa05156ca change links from /contacts to /contact 2018-10-13 13:29:56 +02:00
Philipp Holzer 7c73e8634c
Curl Response Refactoring 
- refactored Network::post()
- replaced every Network::post() execution with the new Curl container
 2018-10-10 21:15:26 +02:00
Philipp Holzer 5a02e39a65
Rename App Methods 
- renamed a lot of App methods to CamelCase
- replaced direct public variables with get-/set-Methods
 2018-10-10 00:16:06 +02:00
Jonny Tischbein 29033bdf05 goaway to network if deleted item + remove goaway for filerm 2018-10-09 20:44:30 +02:00
Jonny Tischbein d18421f760 Return to item if not owned by user or canceld 2018-10-09 20:40:25 +02:00
Jonny Tischbein d8780b1640 Replace goaway location SESSION var return_url with page as string value 2018-10-09 20:10:34 +02:00
Michael 9fbaaa1481 We now can show "Friendica (AP)" as network name 2018-10-05 19:26:20 +00:00
Michael 3ab837f3c7 Functionality is now split 2018-10-03 09:15:38 +00:00
Hypolite Petovan 505350c9fb
Merge pull request #5794 from annando/ap1 
ActivityPub support
 2018-10-02 11:24:04 -04:00
Michael 54c7ca58d8 Repeated posts from OStatus, ActitivyPub and Twitter are now shown as is 2018-10-02 03:41:38 +00:00
Michael b746ddec64 Issue 5797: Retweets are now displayed again via API 2018-10-01 18:16:19 +00:00
Michael e3a4a9c407 Issue 5798: We had displayed the author as owner 2018-10-01 17:36:23 +00:00
Michael Vogel 103535d620
Merge pull request #5773 from MrPetovan/task/rewrite-js-hooks 
Rewrite JS hooks
 2018-10-01 17:10:30 +00:00
Hypolite Petovan 3dfb0c2e7c
Merge pull request #5762 from JonnyTischbein/2018.08-rc 
Add api_friendships_destroy() like mod/unfollow.php
 2018-10-01 12:51:46 -04:00
Michael cb9be8a7ab UUID is now createUUID 2018-09-27 11:52:15 +00:00
Michael 60b0759b50 UUID instead of GUID 2018-09-26 20:03:46 +00:00
Michael c083ae047c Merge remote-tracking branch 'upstream/2018.08-rc' into ap1 2018-09-22 15:18:53 +00:00
Michael c6268ca0b7 Issue 5760: Avoid a non numeric value for "tt" 2018-09-22 14:17:14 +00:00
Hypolite Petovan 1eaa523e61 Remove unused App->page['end'] 
- Remove unused empty templates
 2018-09-20 21:02:28 -04:00
Jonny Tischbein 9821f173a4 fix response 2018-09-16 19:36:25 +02:00
Hypolite Petovan ba4f368b45 Remove references to pear/Text_Highlighter 2018-09-16 09:05:00 -04:00
Jonny Tischbein a0942963c9 api_friendships_detroy uid - api_user instead of local_uer, empty check for 2018-09-15 11:06:55 +02:00
Jonny Tischbein b7e15e8b38 api_friendships_destroy finally function header + NotFoundException typo 2018-09-14 19:35:24 +02:00
Michael 61e2c7d20d Added AP to many network conditions / enabling inbox processing 2018-09-14 16:51:32 +00:00
Jonny Tischbein 2c3a58d44e api_friendhips_destroy function header 2018-09-14 10:06:26 +02:00
Jonny Tischbein 3eb539aefd api_friendships_destroy idents, DBA::selectFirst, Excepions and LogMessages 2018-09-14 09:28:14 +02:00
root a89f9cf7d5 api_friendships_destroy cleanup 2018-09-13 23:32:26 +02:00
root 3f85fee7e3 Add api_friendships_destroy() like mod/unfollow.php 2018-09-13 23:23:53 +02:00
Tobias Diekershoff d5a3b0bd5e
Merge pull request #5710 from annando/fix-api 
Fix for timeout issues when posting to the API
 2018-09-02 14:52:09 +02:00
Michael 703c668a37 More notices ... 2018-09-02 08:01:13 +00:00
Michael 394526db74 Typo corrected / use the thread table instead 2018-09-02 07:35:12 +00:00
Michael 4bb45f611f Fix for timeout issues when posting to the API 2018-09-02 07:20:04 +00:00
Michael 38fd21019b Invalid pictures could lead to notices, this is removed now 2018-08-31 07:48:44 +00:00
Michael Vogel 601851f3d0 Removed notice - pokes do now work mostly (#5693) 2018-08-29 09:00:01 -04:00
Michael Vogel 99b8f85624 Poke is fixed (#5689) 
* Fix: Poke hasn't worked. It does work now partially

* Poke are now displayed good again

* removed code
 2018-08-28 15:38:28 -04:00
Michael Vogel edcd0a3744 Issue 4960: Ignoring and blocking of contacts should work again (#5657) 
* Issue 4960: Ignoring and blocking of contacts should work again

* Renamed functions

* This function should be renamed as well.

* We now have a frontend to block and ignore public contacts

* Hide some parts for public contacts

* Removed notices, public contact is now accessible from dirfind as well

* We now show contact conversations and contact posts

* We now use a new conversation mode

* The update functionality is disabled until it will work completely

* Fixing tabs chaos

* Update after posts on the contacts page will now work

* Show connect link
 2018-08-25 09:48:00 -04:00
Michael 82d097879b Oh no ... there are still some notices that want to be removed ... 2018-08-24 11:09:58 +00:00
fabrixxm 93ba393559 API: add private value (bool) to item results (#5647) 
* API: add private value (bool) to item results

friendica:private for xml
friendica_privarte for json

* API Docs: add a section about custom value returned in status data
 2018-08-23 10:09:50 -04:00
Michael Vogel dc3d2d5988 "dba" is now "DBA". This hadn't been respected at some places (#5655) 
* "dba" is now "DBA". This hadn't been respected at some places

* Cleaning up unneeded stuff
 2018-08-23 09:51:58 -04:00
Michael Vogel d29cb1acaf Fix: Mail notifications arrive again (#5654) 
* Fix: Mail notifications arrive again

* Ensure that user data is always there
 2018-08-23 10:00:25 +02:00
Tobias Diekershoff 578549df13
Merge pull request #5646 from annando/notes 
The notes are now fetching their content from a central function
 2018-08-21 17:36:15 +02:00
Michael Vogel 54aee2aaa7 Removed notices that revealed themselfes over night ... (#5645) 
* Removed notices that revealed themselfes over night ...

* And more notices removed that occured over night

* One more ..

* Some more notices of the day ...
 2018-08-21 17:35:09 +02:00
Michael 1fb5925073 The notes are now fetching their content from a central function 2018-08-21 07:35:22 +00:00
Michael Vogel d9b44153da The content generation for the display page is now using a centralized function (#5642) 
* The content generation for the display page is now using a centralized function

* Small correction to avoid notices
 2018-08-20 16:32:55 -04:00
Michael Vogel 16a081871c Improved profile page, improved "limit" handling (#5639) 
* Improved profile page, improved "limit" handling

* Update will now work again

* Update will work now
 2018-08-20 06:26:05 +02:00
Michael Vogel c1da44b7dc We now use a central function to fetch the importer (#5636) 2018-08-19 13:37:56 +00:00
Michael Vogel 7f3fb34c24 Some easy to replace "q" calls have been replaced by "DBA" calls (#5632) 
* Some easy to replace "q" calls have been replaced by "DBA" calls

* Simplified the GUID creation

* And one in the API ...

* And OStatus has got some DBA calls more

* Just some more replaced database calls

* The event query is now simplified

* Events are now shown again

* subthread is now using the DBA calls as well

* Some more replaced database calls

* And some more replaced database calls and prevented notices

* Better use gravity

* Some more replaced database stuff

* Some more replaced database calls in DFRN.php

* The gcontact class now has got the new DBA functions as well

* The Contact class is now changed to new database functions as well

* Small correction

* We can now delete without cascade

* One more functionality is safe for future changes
 2018-08-19 12:46:10 +00:00
Michael Vogel dfe4413463 Avoid blocks with invalid entries in superblock (#5635) 2018-08-19 12:14:12 +02:00
Tobias Diekershoff d5c2c41b02
Merge pull request #5626 from annando/notices-oh-yeah 
Removed notices, will it ever end?
 2018-08-17 09:33:02 +02:00
Michael 0342f9e084 Removed notices, will it ever end? 2018-08-17 03:19:42 +00:00
fabrixxm 66b4730a70 api: fix friendica/notification/seen api call 
Fix return item related to notification when notification is set as seen
 2018-08-16 11:46:53 +02:00
Michael 56443b53cb Fix: We now are notified again when a new post had been created 2018-08-12 04:34:56 +00:00
Roland Häder e06fc2aa69 Stopped using deprecated constants NETWORK_* (#5537) 
* Rewrite:
- stopped using deprecated NETWORK_* constants, now Protocol::* should be used
- still left them intact for slow/lazy developers ...

* Removed deprecated NETWORK_* constants as per code reviewer's request.
 2018-08-11 22:40:44 +02:00
Michael a8016e4187 Issue 4507: Superblock does now work on comments as well 2018-08-10 04:27:52 +00:00
Michael Vogel 276abfaba6 Issue 5158: Ignore all threads, even public ones (#5588) 
* Issue 5158: Ignore all threads, even public ones

* Remove some notice

* Now it really should work

* Using "defaults"
 2018-08-08 22:32:11 +02:00
Michael Vogel c72c64a6d8 Notices again (#5543) 
* And again notices

* Notices in the directory

* Much more places

* Fix some double $

* Notice in ping

* Missing field

* Fix: We now remove deleted users from the directory

* Some more stuff

* Notices when removing users

* Added logging

* More logging

* Two more
 2018-08-02 07:21:01 +02:00
Michael Vogel 9d0f18c0b3 Yeah, and again notices ... (#5536) 
* Yeah, and again notices ...

* And some more

* Block access without given user name

* Reformatting
 2018-08-01 07:29:58 +02:00
Michael Vogel 71b1638d9a Once again, notices ... (#5535) 2018-07-31 18:39:23 +02:00
Roland Häder 2c0ad47dfc Fixed fatal error: (#5532) 
* Fixed fatal error:
````
PHP Fatal error:  Uncaught TypeError: Argument 1 passed to add_page_info_data()
must be of the type array, boolean given, called in
/var/www/../include/items.php on line 153 and defined in
/var/www/../include/items.php:27
````

Fix for type-hint array when query_page_info() returned a non-array, this may
happen when the instance/node/pod owner decided to shutdown server and replace
all URLs with a replacement message.

* Fixed parser error, ops.
 2018-07-30 22:24:32 -04:00
Roland Häder 4d39164c1e [WIP] Rewrite to Proxy class: (#5507) 
* Rewrite to Proxy class:
- introduced new Friendica\Network\Proxy class for in exchange of proxy_*()
  functions
- moved also all PROXY_* constants there as Proxy::*
- removed now no longer needed mod/proxy.php loading as composer's auto-load
  will do this for us
- renamed those proxy_*() functions to better names:
  + proxy_init()           -> Proxy::init()         (public)
  + proxy_url()            -> Proxy::proxifyUrl()   (public)
  + proxy_parse_html()     -> Proxy::proxifyHtml()  (public)
  + proxy_is_local_image() -> Proxy::isLocalImage() (private)
  + proxy_parse_query()    -> Proxy::parseQuery()   (private)
  + proxy_img_cb()         -> Proxy::replaceUrl()   (private)

* Ops, need to set $a here ...

* CR request:
- moved Proxy class to Friendica\Module
- extended BaseModule

* Ops, no need for own instance of $a when self::getApp() is around.

* Proxy-rewrite:
- proxy_url() and proxy_parse_html() are both non-module functions (now
  methods)
- so they must be splitted into a seperate class
- also the SIZE_* and DEFAULT_TIME constants are both not relevant to module

* No instances from utility classes

* Fixed error:
- proxify*() is now located in `Friendica\Util\ProxyUtils`

* Moved back to original place, ops? How did they move here? Well, it was not
intended by me.

* Removed duplicate (left-over from split) constants and static array. Thank to
MrPetovan finding it.

* Renamed ProxyUtils -> Proxy and aliased it back to ProxyUtils.
 2018-07-30 22:06:22 -04:00
Roland Häder 3da1b9f319 Cleaned up include/items.php (#5523) 
* Cleaned up include/items.php
- added type-hint for array where suitable
- moved opening curly brace to new line after function
- used BaseObject::getApp() instead of get_app()
- used empty() instead of is_array(), maybe avoids E_NOTICE

* Changed 'AS' to 'as', keywords in PHP are all lower-case.
 2018-07-30 21:02:34 -04:00
Roland Häder 4a22710b3b Moved global PAGE_* to Profile class (#5500) 
* Rewrites:
- moved PAGE_* to Friendica\Model\Profile class

* Fixed more rewrites from plain (global namespace) PAGE_* to Friendica\Models\Profile class

* CR request:
- moved all PAGE_* constants to Friendica\Model\Contact class
- fixed all references of both classes

* CR request:
- moved ACCOUNT_TYPE_* constants from boot.php to Contact::ACCOUNT_TYPE_*

* Just copy-pasted this code from boot.php, needs to be changed to `const ACCOUNT_TYPE_FOO = x;`

* Ops, melting brain cells here ... :-/
 2018-07-27 19:25:57 -04:00
Michael Vogel 986106a8f7 Item storage: Permissions aren't stored in the items anymore (#5495) 
* The permission set is now used for item permissions

* Check for allow_cid, ... is superfluous. Checking for "private" is enough

* We query the permissionset

* Permissions are displayed correctly

* Changed index

* We don't store the permissions in the item table anymore

* Permission fields are now deprecated

* Reversed ...
 2018-07-25 19:14:55 -04:00
Roland Häder 37253656e3 Moved CONTACT_* constants to Friendica\Model\Contact class, lesser in global namespace (#5490) 
* Rewrite:
- moved all CONTACT_* constants from boot.php to Contact class

* CR request:
- renamed Contact::CONTACT_IS_* -> Contact::* ;-)
 2018-07-24 22:53:46 -04:00
Hypolite Petovan 6141023640 Remove dbesc() and dba_timer() function declarations 2018-07-23 15:30:54 -04:00
Hypolite Petovan a6fb3568f9 Rename dbesc to DBA::escape 2018-07-23 15:30:54 -04:00
Hypolite Petovan ecea7425f8 Rename DBA::is_result to DBA::isResult 2018-07-23 11:04:14 -04:00
Hypolite Petovan 0ec44f3e8a Rename DBM method calls to DBA method calls 2018-07-23 11:02:24 -04:00
Hypolite Petovan 4db98eb43d Rename DBA::inArray to DBA::toArray 2018-07-22 19:27:35 -04:00
Hypolite Petovan abbaaf5aa5 Rename DBA::clean_query to DBA::cleanQuery 2018-07-22 19:27:34 -04:00
Hypolite Petovan 910e832dc2 Rename DBA::any_value_fallback to DBA::anyValueFallback 2018-07-22 19:27:34 -04:00
Roland Häder c17adaf333 Uncommon logger levels in Friendica (#5453) 
* "normal" is an uncommon logger level:
- changed LOGGER_NORMAL -> LOGGER_INFO
- added LOGGER_WARNING (a common logger level)

* Used constants instead of values (MrPetovan)
 2018-07-22 14:07:44 -04:00
Hypolite Petovan af6dbc654f Rename Friendica\Database\dba to Friendica\Database\DBA 2018-07-20 08:19:26 -04:00
Hypolite Petovan 72f32f90d1 Remove class \dba from include/dba 2018-07-19 22:15:57 -04:00
Hypolite Petovan daa1177e3a Update use statement lists with new Friendica\Database\dba class 
- Remove unused use statement
- Remove superfluous use statements (classes in the same namespace)
- Add missing use statements
 2018-07-19 22:15:21 -04:00
Michael Vogel ece4d3f4fb Issue 5407: Workers didn't start anymore (#5409) 2018-07-19 11:05:17 -04:00
Michael Vogel 5af9596dde New item field "Post-type" and new table "permissionset" (#5408) 
* "post-type" replaces "bookmark" and "type"

* Removed some more type

* Added index to permission set

* The permission set is now stored

* The permission set is now removed upon expiry

* Post update now stores the permission set

* New file

* Permissions are now sorted

* Changed documentation
 2018-07-19 09:52:05 -04:00
Roland Häder 0b38f1c58b Fixes applied: (#5399) 
- $_SESSION['remember_user'] did only exist here and no where else
- it seems to be accient old-lost code, so I fixed it to $a->user['nickname']
  instead
- used multi-line comment for multiple lines of on-line comments

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-07-19 07:11:03 -04:00
Hypolite Petovan 67dc08d120 Enforce systen.register_policy value type 2018-07-16 19:38:19 -04:00
Hypolite Petovan c207f6d597 Remove remaining references to Config::get in include/dba 2018-07-16 19:38:18 -04:00
Hypolite Petovan 820afa2284 Replace global $a with BaseObject::getApp() 2018-07-16 19:38:17 -04:00
Hypolite Petovan adacf421a6 Remove deprecated functions in include/text 2018-07-16 19:38:17 -04:00
Hypolite Petovan 5906c7e013 Remove api test pconfig debug 2018-07-16 19:38:17 -04:00
Hypolite Petovan 224765cdf5 Wrong table name 2018-07-16 19:38:16 -04:00
Hypolite Petovan f8a90f3425 Add more api test debug 2018-07-16 19:38:16 -04:00
Hypolite Petovan de0afd3b32 Add api test debug 2018-07-16 19:38:16 -04:00
Hypolite Petovan 9396b05659 Revert using Config class in dba 2018-07-16 19:38:16 -04:00
Hypolite Petovan 9be9741562 Fix uses in include/dba 2018-07-16 19:38:16 -04:00
Hypolite Petovan 762a786611 Replace direct accesses to App->config by Config::get/set calls 2018-07-16 19:38:16 -04:00
Hypolite Petovan cd9b864045 Rework App modes 
- Replace App mode constants with capability-based flags
- Add App->isInstallMode()
- Add file config fallback in (P)Config abstraction
- Removed logger disabling code
 2018-07-16 19:38:15 -04:00
Hypolite Petovan 7d8c45dde8 Remove dependency to App in dba::connect 
- Remove timing (can be done centrally)
- Add charset parameter to dba::connect and dba::reconnect
 2018-07-16 19:38:13 -04:00
Michael 0e8fa34156 Fix for displaying public items 2018-07-16 04:00:57 +00:00
Hypolite Petovan a6eae9adec Add new put_item_in_cache hook in include/text 2018-07-15 08:03:12 -04:00
Roland Häder 6b5d90333f Fixes for some E_NOTICE and type-hints added (#5358) 
* Fixed http://github to https://github

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

* Fixes for #4965:
- updated messages.po file

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

* Fixed E_NOTICE where isset()/empty() was absent.

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

* Fixed missing variable $sql_order causing E_NOTICE.

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

* Continued:
- added array type-hint where known (some)

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

* Fixes:
- in Profile::load() $user is now only one-dimensional
- $a->get_hostname is no property, it is a method

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

* reverted changes that are unintended

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

* Continued:
- removed leading \ (uncommon, okay)
- removed entire if() block (CR by Hypolite)

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

* Removed if() block

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-07-13 15:47:14 -04:00
Michael Vogel 0360f7197a Several more warnings ... (#5340) 
* Some more warnings removed

* Even more warnings ...

* Will it ever end? ;-)

* Avoid warning in dbstructure

* Origin and OStatus ...

* There are more warnings solved ... yeah!

* And again ...

* We are not done yet

* And more ...

* And some new places ...

* And more in the feeds

* Avoid some more

* And some backend stuff

* Notifications cleared

* Some more stuff

* and again ...

* It's getting fewer ...

* Some warnings had been hidden in the notifications

* Fix the fix

* And another missing one ...

* We need the owner here, not the user

* Forgotten user

* And more ...

* And some more warnings disappeared ...

* Some more frontend warnings

* Some backend warnings removed

* Fixed sidebar for "vier"

* And more ...

* Some more ...

* And something for "remote self"

* Am I stuck in an endless loop?

* Fix: Clear tag and file field on update

* Preset page content
 2018-07-10 08:27:56 -04:00
Philipp Holzer c829e43725
moved get_guid to System::createGUID 2018-07-09 21:38:16 +02:00
Michael 675a6adf35 Added comment 2018-07-08 13:52:11 +00:00
Michael 8a2230bc4c Avoid warnings in addons 2018-07-08 12:01:36 +00:00
Michael 3e797547a3 Warnings fixed 2018-07-08 09:37:05 +00:00
Michael 69db696ab1 Improve test behaviour 2018-07-08 05:29:06 +00:00
Michael Vogel ff5ee74ecf
Merge branch 'develop' into item-activities 2018-07-08 06:35:50 +02:00
Michael 4d35e228c4 More item abstraction / making remote deletion work again 2018-07-07 18:14:16 +00:00
Philipp Holzer 1ffe0cfd81
Added Lock Unittests & Bugfixings 
Added Redis Lock Unittests
Added Memcached Lock Unittests

Fixed a bug in dba
Fixed a bug in RedisLock
 2018-07-07 16:15:03 +02:00
Hypolite Petovan e44111e935 Revert renaming lang to language in api 
- Normalize some quotes
- Put "Empty user-agent" log message in a else statement
 2018-07-04 17:33:09 -04:00
Hypolite Petovan 43688c04b1 Add NotFoundException for recipients in api_direct_messages_new() 2018-07-02 07:48:59 -04:00
Hypolite Petovan cb7176ee70 Fix Config use in api_statusnet_config() 2018-07-02 07:48:53 -04:00
Hypolite Petovan 757fd357f6 Fix yet more undefined variable/index notice in api 2018-07-02 07:48:48 -04:00
Hypolite Petovan dde61a77a4 Fix root element containing only text in api_create_xml() 2018-07-02 07:48:42 -04:00
Hypolite Petovan 62eba48679 Fix yet more undefined variable/index messages in api_statuses_show 2018-07-02 07:48:38 -04:00
Hypolite Petovan 0ee153e1bd Fix Array to String conversion message for IN conditions 2018-07-02 07:47:47 -04:00
Hypolite Petovan a380bcd1c1 Fix more undefined variable/index notice in tests 2018-07-02 07:45:25 -04:00
Hypolite Petovan a329ce5b50 Fix $called_api expecting at least 2 elements in tests 2018-07-02 07:45:11 -04:00
Hypolite Petovan 6776c4e3f9 Fix some undefined variable/index notices in tests 2018-07-02 07:44:55 -04:00
Michael 717ca0b7eb Use already fetched data for magiclink 2018-07-02 05:41:55 +00:00
Michael 0ab9f2e265 Preparations to not store the tags in the item table anymore 2018-06-30 13:54:01 +00:00
Michael 028c9f4da5 We now store the verb in the item-content as well 2018-06-27 19:37:13 +00:00
Michael 76dab3b2d7 Use gravity instead of verb 2018-06-27 18:09:33 +00:00
Michael b03db4643f The fetch function now centrally controls the content 2018-06-24 10:48:29 +00:00
Hypolite Petovan 98a5749b45
Merge pull request #5277 from annando/native-pdo 
We now are using the native pdo mode
 2018-06-22 16:04:50 -04:00
Michael 6e64091fc7 We now are using the native pdo mode 2018-06-22 19:35:42 +00:00
miqrogroove c37a8cc661
Update dba.php 2018-06-22 07:34:27 -04:00
miqrogroove 150989ba99
Ensure IN() Conditions Never Mix Data Types 2018-06-21 23:56:19 -04:00
Hypolite Petovan 47ab72352e
Merge pull request #5269 from annando/non-unique-values 
This fixes the problem with mixed variables in queries
 2018-06-21 22:12:07 -04:00
Michael e1e28ba7c3 Better float detection 2018-06-21 21:55:43 +00:00
miqrogroove c600ccad5c
Correct dba::close() To Match dba::p() 2018-06-21 17:27:12 -04:00
Michael 1b85b75563 Currently removed, needs more testing 2018-06-21 20:42:58 +00:00
Michael 261d7435c0 Check for floats and enable native prepares 2018-06-21 20:33:27 +00:00
Michael 5656c0564a We don't need to look $is_int there 2018-06-21 19:52:28 +00:00
Michael c1059875bc This fixes the problem with mixed variables in queries 2018-06-21 19:48:25 +00:00
Michael Vogel 4b0cf8d60f
Merge pull request #5267 from miqrogroove/patch-2 
Allow for Integer Literals in PDO Database Driver
 2018-06-21 18:51:01 +02:00
miqrogroove 759dfe6bb1
Allow for Integer Literals in PDO Database Driver 
This should fix things like "LIMIT ?"
 2018-06-21 11:42:43 -04:00
Michael d643e00d33 Standards and a new function to fetch content 2018-06-21 15:14:01 +00:00
Michael 70af2cecf2 Some of the last direct SQL calls to the item table had been changed 2018-06-21 06:21:51 +00:00
Roland Häder 1567eb0791
fixed another left-over ... 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-06-20 22:02:16 +02:00
Roland Häder 852ef4021b
more spaces + some curly spaces added 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-06-20 22:02:16 +02:00
Roland Häder f2f12d6f50
Minor improvements: 
- added spaces and curly braces
- added more TODOs as there really more to be done
- removed redundant braces from "return" keyword (no function)
- merged 2 nested if() into one single

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-06-20 22:02:15 +02:00
Michael 962fbc9166 Many "fetch_first" had been replaced 2018-06-19 21:33:07 +00:00
Michael ab5669e091 Some more direct SQL calls had been replaced 2018-06-19 19:06:17 +00:00
Hypolite Petovan 82d55f120f
Merge pull request #5238 from annando/more-abstraction 
Even more replaced item calls ...
 2018-06-19 14:02:43 -04:00
Michael e4adaa9900 Standards and variable renaming 2018-06-19 17:11:59 +00:00
rabuzarus 0a97a3f822 Bugfix: hide savedsearch butten and subthread button for non local_users 2018-06-19 18:27:54 +02:00
Michael a5ca724fd3 Merge remote-tracking branch 'upstream/develop' into more-abstraction 2018-06-19 13:48:19 +00:00
Michael 4714cb746b Use the item functions at many more places 2018-06-18 20:36:34 +00:00
Michael Vogel f828350ba2
Merge pull request #5234 from fabrixxm/fix/api 
API: fix sender/recipient of PMs
 2018-06-18 12:03:53 +02:00
fabrixxm e3ee9ee501 API: fix sender/recipient of PMs: check api_user before get user info. 
To throw ForbiddenException and pass tests
 2018-06-18 11:55:02 +02:00
Michael 507956818d Use the item classes where possible 2018-06-18 05:19:28 +00:00
fabrixxm c015bb1b77 API: fix sender/recipient of PMs 2018-06-17 19:57:32 +02:00
Michael 6e10de9284 New function to fetch item data especially for users 2018-06-17 17:05:17 +00:00
Michael 0280a46ab4 Use predefined field lists 2018-06-17 06:27:52 +00:00
Michael abef0cd46c Don't use the author-link anymore - just author-id 2018-06-16 15:35:30 +00:00
Michael 14cb128264 New function for generating item URI 2018-06-16 06:44:19 +00:00
Michael bb79b8f4ac More item calls have been replaced with the new functions 2018-06-15 22:30:49 +00:00
Hypolite Petovan 7469de29f1 Fix corrupt registration emails 
- Use double quotes for line break-containing translation string
- Simplify HTML/plaintext email body conversion
 2018-06-14 23:42:08 -04:00
Hypolite Petovan d46cac7905 Wrap content filter around entire post including attachments 2018-06-12 21:54:36 -04:00
Michael 738644a006 Quit if database connection was lost during "e" 2018-06-11 03:56:19 +00:00
Michael 8584e09e12 Store the database credentials for reconnect 2018-06-11 03:45:45 +00:00
Michael b02cdc8a7f Merge remote-tracking branch 'upstream/develop' into quit-on-error 2018-06-11 03:15:59 +00:00
Michael aa3f8ec09d Force a database reconnection in the daemon to prevent lost connections 2018-06-10 22:04:09 +00:00
Michael 5d9083c369 Bugfix in notifications / network and display are using the new functions now 2018-06-10 07:26:37 +00:00
Michael defd3d15b6 Possibly fixed test 2018-06-09 20:39:40 +00:00
Michael b6c344a80a $r was still in use 2018-06-09 20:08:15 +00:00
Michael 50dfc7d36e Small query corrections 2018-06-09 19:27:44 +00:00
Michael 446a45003d Added documentation, some indention fixes 2018-06-09 19:12:13 +00:00
Michael baf316e898 The central item fetch does work now and the API now uses these functions 2018-06-09 16:56:37 +00:00
Michael 4874e589f1 New class function to fetch items 2018-06-07 06:03:12 +00:00
Michael e632be763c Corrected variable 2018-06-05 05:44:04 +00:00
Michael 18a77a1b45 Removed some quick and dirty hack to upload pictures 2018-06-05 05:42:26 +00:00
Hypolite Petovan 0a13ab6b9f
Merge pull request #5166 from annando/unsed-item-fields 
Remove unused, unneeded or redundant item fields
 2018-06-03 12:19:50 -04:00
Hypolite Petovan 973ece09c5
Merge pull request #5157 from annando/daemon 
Workers can now be started exclusively from the daemon and other workers
 2018-06-03 12:18:47 -04:00
Michael 443d828ba7 We don't need to look for the uid 2018-06-03 10:29:42 +00:00
Michael 6985ad4fb5 Improved error message 2018-06-03 09:55:41 +00:00
Michael b654af28fa We need "global" 2018-06-03 09:40:32 +00:00
Michael ea498ff283 And a second SQL error fixed 2018-06-03 09:21:48 +00:00
Michael d76fb6d0b9 Fixed SQL error 2018-06-03 09:19:27 +00:00
Michael 3f07d01dd1 Get rid of unneeded or redundant fields 2018-06-03 07:42:56 +00:00
Michael a720c4f501 Removed unneeded fields from the API 2018-06-03 07:22:01 +00:00
Michael 723b5ae803 Use MagicLinkbyId when possible 2018-06-02 08:28:01 +00:00
Michael 8a34895a23 Use magicLink whenever possible 2018-06-02 08:05:06 +00:00
Michael 28f8beebfc Workers can now be started exclusively from the daemon and other workers 2018-06-01 22:09:27 +00:00
Michael b5b172500d Merge remote-tracking branch 'upstream/develop' into public-redir 2018-06-01 12:32:51 +00:00
Hypolite Petovan 93daf7883e Merge branch 'master' into develop 
- Updated new develop version label
- Incremented database build number
 2018-06-01 07:30:04 -04:00
Michael ae8d7267a0 "redir" is now centralized and works with the public contact 2018-06-01 06:46:34 +00:00
Michael 8329705eba New function to delete items for users 2018-05-29 05:22:57 +00:00
Michael c5a22f86c7 Merge remote-tracking branch 'upstream/2018.05-rc' into deleted-item 2018-05-27 10:38:49 +00:00
Pascal Deklerck 334aa40292 Fix autoname output length 2018-05-27 10:20:27 +02:00
Michael 54136f3a74 Added the new parameter to the delete function. 2018-05-26 21:38:45 +00:00
Michael 4c36109f02 Some more places to add the user id 2018-05-26 20:03:30 +00:00
Michael bdbc51229a Fix for not being able to delete items 2018-05-26 18:07:27 +00:00
Michael de609e49f0 Improved logging 2018-05-24 22:00:54 +00:00
Michael f8230badba Avoid problems with better variable naming 2018-05-24 21:46:57 +00:00
Michael 1bce39120d Reconnect after the connection had been lost. 2018-05-24 21:19:59 +00:00
Hypolite Petovan b0155fe37b Remove obsolete DNS test from include/dba 2018-05-24 01:31:03 -04:00
Michael 87b5e26063 Do a hard exit when the SQL connection went down 2018-05-24 04:07:39 +00:00
Michael 3fe07cca57 Issue 2880: Editing post doesn't destroy mentions or hashtags anymore 2018-05-19 14:55:27 +00:00
Alexandre Alapetite e7d2d27938 sizeof bug 
sizeof cannot be used to test existance.

Fixes: Got error 'PHP message: PHP Warning:  sizeof(): Parameter must be
an array or an object that implements Countable in
/.../include/items.php on line 66\n':  1 Time(s)

PHP 7.2.5 / Ubuntu 17.04 LTS
 2018-05-17 07:37:50 +02:00
Hypolite Petovan ce75177d4e
Merge pull request #5022 from Rudloff/feature/test_api 
Add API tests
 2018-05-16 08:25:11 -04:00
Michael c9f55f6b3d Show "Remove from your screen" or "delete" depending of the impact of the deletion 2018-05-15 21:06:34 +00:00
Roland Häder f34d72c143
Fixes: 
- used empty() instead of x()
- removed superflous count()

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:50:22 +02:00
Roland Häder d0c7ba5257
Fixed parser error 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:50:21 +02:00
Roland Häder debcdea82a
Continued: 
- merged 2 if() into one with &&
- added TODO for possible rewrite (avoid "complex" code)

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:50:05 +02:00
Roland Häder bacb7b70f6
Cleanups: 
- added empty lines
- removed old-lost commented out line

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:50:05 +02:00
Roland Häder 94a02f8572
Continued: 
- return is a keyword, not a function, so don't add braces here

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:50:05 +02:00
Roland Häder 57e668d9e0
Continued: 
- avoided else() block which reduces code complexibility
- used more x()
- added curly braces
- added known type-hints

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:50:05 +02:00
Roland Häder e0a07d5f27
Continued: 
- used x() to make sure the array key is there, else an E_NOTICE is triggered
- added type-hints where it is safe

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:50:04 +02:00
Roland Häder 47f95855c0
added spaces + some curly braces + some usage of dbm::is_result() 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:50:01 +02:00
Roland Häder de50d62b81
more spaces + some curly spaces added 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:50:01 +02:00
Roland Häder 35ada99954
Opps, added missing curly brace. 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:49:58 +02:00
Roland Häder 78ffd5b80f
fixed parser error 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:49:58 +02:00
Roland Häder 1c9dc6526f
Continued: 
- added more curly braces
- replaced if (blaFoo()) { return true; } return false; with return blaFoo();
- added spaces

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:49:58 +02:00
Roland Haeder 337824f649
Continued: 
- added curly braces/spaces
- added TODOs (type-hints, old-lost code)
- more usage of dbm::is_result()
- combined some if() return stuff into a simple return statement

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2018-05-14 22:49:58 +02:00
Roland Haeder c3c9a53364
added spaces + curly braces and TODOs for upcoming type-hint rewrite. Please 
note that PHP5 allows 'array' as type-hint already (+ interface/class name).

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2018-05-14 22:49:58 +02:00
Roland Haeder 61fdc32d2f
Continued a bit: 
- more spaces added
- more curly braces added
- let's use x($_FOO, 'bar') and not isset($_FOOT['bar'])

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2018-05-14 22:49:57 +02:00
Roland Häder 09384119b1
added spaces + some curly braces + some usage of dbm::is_result() 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:49:55 +02:00
Roland Häder c7e256f9de
more spaces + some curly spaces added 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:49:55 +02:00
Roland Häder 1a61cee5a7
added spaces + some curly braces 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:49:55 +02:00
Roland Häder f7ceea7a85
added spaces + some curly braces 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:49:55 +02:00
Roland Häder 5b56f189ae
more spaces + some curly spaces added 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:49:54 +02:00
Roland Häder bc259cdc44
added spaces + some curly braces 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:49:54 +02:00
Michael 914a4e2e0a Fix: Public items werent visible under certain circumstances 2018-05-10 22:06:34 +00:00
Pierre Rudloff 3195d6e125 Add API tests 2018-05-10 19:12:00 +02:00
Michael df019eb5bd Issue 4772: Display posts with uid=0 as well 2018-05-10 10:13:48 +00:00
Michael 6c792588fd Ensure to mostly fetch the item with an non zero user id 2018-05-08 22:26:49 +00:00
Michael 8d513d74be Reverted SQL sorting 2018-05-08 22:08:25 +00:00
Michael 14833edb2d Issue 4990: Fixes missing posts on network page 2018-05-08 22:00:32 +00:00
Pierre Rudloff 9bb11ccfa5 $attachments should aways be an array 
In order to avoid a PHP 7.2 error when using count()
 2018-05-08 12:16:48 +02:00
Pierre Rudloff 23371880e8 $called_api should always be an array 
In order to avoid a PHP 7.2 error when using count()
 2018-05-08 12:16:48 +02:00
Hypolite Petovan 3a3a4807a8
Merge pull request #4978 from annando/dba-2 
Diaspora: Fix person/contact retraction
 2018-05-04 18:04:38 -04:00
Michael 7cd7b1a9bf Some more replaced queries 2018-05-04 21:43:29 +00:00
Michael 125afb4ae5 Suppress blocked contacts from being displayed 2018-05-04 21:27:20 +00:00
Michael a83970bc0e Some more dba stuff 2018-05-04 06:33:36 +00:00
Michael 4ad655ab80 Replace old database queries with the new ones 2018-05-02 19:26:15 +00:00
Philipp Holzer b4f5311e7f Add Install Mode 
- merge `friendica/develop` to `nupplaphil/install_mode`
 2018-04-29 20:15:12 +02:00
Michael Vogel bd0ba24518
Merge pull request #4951 from MrPetovan/bug/4946-move-current-theme-to-app 
Move current_theme() to App
 2018-04-29 19:11:49 +02:00
Michael 78f563407a Fix PR 4942: Fixed item query 2018-04-29 16:32:46 +00:00
Hypolite Petovan 20289393da Fix own post check for content filter 2018-04-28 19:11:11 -04:00
Hypolite Petovan fde3d6f870 Replace current_theme() and current_theme_url() calls 2018-04-28 18:37:25 -04:00
Hypolite Petovan 9edff6cc5c Add exception for self-contact in item_joins() 2018-04-28 11:38:01 -04:00
Philipp Holzer 1ab965c944 Add Install Mode 
- merged `friendica/develop` to `nupplaPhil/install_mode`
- content merged `mod/install.php` to `src/Class/`
 2018-04-28 15:11:01 +02:00
Hypolite Petovan c417f779c4 Add missing readonly check for displaying items in item_joins 2018-04-28 07:47:02 -04:00
Philipp Holzer a97ad9dc42 Add Install Mode (Part 2) 
- Added constants to class `App`
- Added global App-Mode to `dba:connect()` instead parameter `$install`
 2018-04-28 12:36:40 +02:00
Philipp Holzer d5b68cd146 Add a App-Mode with defined constants 
- Normal Mode = 0
- Install Mode = 1
- Maintenance Mode = 2

Moved Install-Mode check to class `App`

Replaced all maintenance and install checks with $a->mode checks
 2018-04-27 21:07:04 +02:00
Philipp Holzer 6973aaefc2 Add Install Mode 
- Added $install_mode in Class App instead
- Extracted the install business logic to a new Class Install
- Replaced all $a->module == 'install' with $a->install_mode
 2018-04-23 22:56:59 +02:00
Hypolite Petovan a84477ed2d Fix count() warning in include/dba.php 2018-04-23 00:00:06 -04:00
Hypolite Petovan 48122733b8 Move content filter HTML in a template 2018-04-22 18:02:00 -04:00
Hypolite Petovan 4cfb12e9d9 Add one-line content filter when there's only one reason 2018-04-22 14:28:34 -04:00
Hypolite Petovan 273dde508b Add default value doc for options.cascade in dba::delete 2018-04-22 11:34:41 -04:00
Hypolite Petovan 0a026515bd Add documentation for $options parameter in dba::delete 2018-04-22 11:33:20 -04:00
Hypolite Petovan ba3f721524 Prevent side effect with cascade => false in dba::delete 2018-04-22 04:46:46 -04:00
Hypolite Petovan 18078ce7a4 Prevent infinite loop when a dbstructure_definition hook is orphan 
- Add cascade option to dba::delete
- use cascade = false for orphan hook deletion
 2018-04-21 20:34:07 -04:00
Hypolite Petovan 98f64ed824 Replace duplicate behaviors by Model\Term::populateTagsFromItem 
- Replaced in include/conversation
- Replaced in include/text
 2018-04-16 22:22:58 -04:00
Hypolite Petovan 54b75026fc Add header support for security token check 2018-04-16 22:22:58 -04:00
Tobias Diekershoff d149541dba notify admin when user deletes account 2018-04-15 11:39:05 +02:00
Marcus Müller 3761797e5f
Merge branch 'develop' into patch-1 2018-04-13 09:41:24 +02:00
Marcus Müller 89ba3b78ff
[BUGFIX] DB: Remove host DNS_PTR check 
DNS_PTR checks fail on some domains and result in the return value `false`, even if the domain is valid and reachable.
 2018-04-12 19:32:04 +02:00
Marcus Müller e382dfcfbd
[BUGFIX] DB: Don't check DNS on IPs 
Fixes https://github.com/friendica/friendica/issues/4786
 2018-04-12 19:14:53 +02:00
Pierre Rudloff f3d98b2864 api_get_user() should not return false right away if the number in the URL is not a valid user 2018-04-10 10:46:10 +02:00
Pierre Rudloff 7d953d952e Various small fixes (#4795) 
* Use strict comparison to avoid 0 == false
* Avoid unecessary loop
* Avoid undefined variable
* Fix wrong variable name
* Don't try to use the $status_info variable if it does not exist
* Avoid undefined variable
* Check that variable is defined before trying to use it
* Don't cast $data array to boolean
* Fix undefined array
* $reactivate_group variable is not always defined
* Variable $found is not always defined
* Remove unused return statement
* Fix undefined array
* api_unique_id_to_nurl() requires an integer as argument
* Don't try to use $uinfo if it is false
* Don't use the same variable names in inner loop
* Throw an exception if $fileext is not defined
 2018-04-09 15:34:53 -04:00
Pierre Rudloff 773591a6ba Add some missing return types 2018-04-09 19:53:02 +02:00
Pierre Rudloff 4b36f3ad05 api_format_data() seems to never return an object 2018-04-09 19:34:09 +02:00
Pierre Rudloff 9cde7881ee Throw a ForbiddenException if api_get_user() returns false 2018-04-09 18:52:38 +02:00
Pierre Rudloff d0591dd882 The first argument for api_format_items() must be an array 2018-04-08 01:06:40 +02:00
Pierre Rudloff 9c351bad68 Fix wrong use of empty() 2018-04-08 00:55:05 +02:00
Pierre Rudloff bef3799942 Use empty() instead of !x() 2018-04-07 23:21:51 +02:00
Pierre Rudloff 333eb5f9dd Add missing variable 2018-04-07 23:20:30 +02:00
Pierre Rudloff b775cba8c2 Remove confusing comment 2018-04-07 22:39:38 +02:00
Pierre Rudloff 036803d8c7 Typo 2018-04-07 22:37:57 +02:00
Pierre Rudloff 5d8d62015c Make list_id parameter mandatory in api/lists/statuses 2018-04-07 22:36:54 +02:00
Pierre Rudloff 6401eb988b Use dba to access database in api_lists_statuses() 2018-04-07 22:35:19 +02:00
Pierre Rudloff fea7ec2482 We don't need type casting for dba::select() arguments 2018-04-07 22:18:39 +02:00
Pierre Rudloff c5aaa61d11 Rename api_list_create() to api_lists_create() for consistency 2018-04-07 22:15:35 +02:00
Pierre Rudloff c4edad212b Use dba to access the database in list API functions 2018-04-07 19:55:41 +02:00
Pierre Rudloff 929440417c We don't really need the unsen bit in api_lists_statuses() 2018-04-07 19:52:47 +02:00
Pierre Rudloff b3235c2d02 Implement parts of the list API: 
lists/statuses
lists/destroy
lists/update
lists/create
lists/ownerships
 2018-04-07 19:16:47 +02:00
Pierre Rudloff 78a979ee58 Add profile_image_url_profile_size and profile_image_url_large properties to user object returned by API (fixes #4695) 
This allows some clients to display a bigger avatar on profiles.
 2018-04-07 13:31:17 +02:00
Hypolite Petovan 32ca95a1b0 Use App->getSenderEmailAddress in include/enotify 2018-04-06 21:47:42 -04:00
Michael 0ccb29c4df Only compare the HTML when we forcefully ignore the cache 2018-04-06 16:52:01 +00:00
Michael 297784880e Update the cached rendered html when it changed 2018-04-06 14:01:52 +00:00
Michael Vogel 05cff59f70
Merge pull request #4722 from MrPetovan/task/add-content_filter-hook 
Add content_filter hook
 2018-04-06 06:42:52 +02:00
Michael 3792012723 Improved accessibility for "Frio" 2018-04-05 21:50:34 +00:00
Hypolite Petovan 34fd442821 Rename social.disable_cw pconfig to system.disable_cw 2018-04-04 23:08:48 -04:00
Hypolite Petovan 41db5f0912 Display content warning as title if collapsing is deactivated 2018-04-04 23:08:48 -04:00
Hypolite Petovan 296f561878 Rename hook to "prepare_body_content_filter" 2018-04-04 23:08:48 -04:00
Hypolite Petovan d38b86dabf Fix disabled content filter for own posts 2018-04-04 23:08:48 -04:00
Hypolite Petovan f26c99d17b Disable content filter for preview and own posts 2018-04-04 23:08:48 -04:00
Hypolite Petovan d603bf062d Add CSS classes to content-filter wrapper 2018-04-04 23:08:48 -04:00
Hypolite Petovan b755e808df Add new content_filter hook in prepare_body 
- Add content warning processing to prepare_body with use of disable_cw
setting
- Add filter_reasons params to prepare_body hook
 2018-04-04 23:08:48 -04:00
Hypolite Petovan bec46d7b01 Remove content warning processing in put_item_in_cache 2018-04-04 23:08:48 -04:00
Hypolite Petovan 586b0b6e57 Add bash to text_highlight language list 2018-03-29 19:29:09 -04:00
Hypolite Petovan daffc27061 Move suppress_tags config to template 
- Add new item.suppress_tags template variable
- Fix template formatting
 2018-03-25 00:38:23 -04:00
Hypolite Petovan 4eaf0d76b0 Remove include/event 2018-03-23 06:32:34 -04:00
Hypolite Petovan 6e7c6ab0fa Remove references to include/event 2018-03-23 06:32:34 -04:00
Hypolite Petovan f7e2071117 Replace include/event function with method calls 
- Updated scope of Model\Event methods
- Updated use list
 2018-03-23 06:32:34 -04:00
Hypolite Petovan 5aecc758f9 Replace include/event function content by method calls 2018-03-23 06:32:34 -04:00
Hypolite Petovan 27d94023ee Merge branch 'master' into develop 2018-03-23 06:15:55 -04:00
Michael e74f186b34 Event: Prevent SQL errors with events without end 2018-03-21 20:16:43 +00:00
Michael 73efdb99e3 Fix for incorrect datetime values 2018-03-21 05:20:55 +00:00
Tobias Diekershoff f082f0da4f
Merge pull request #4636 from annando/event-diaspora 
Fix: Events on Diaspora now should look fine
 2018-03-20 08:48:37 +01:00
Michael f4ba5d9799 Fix: Events on Diaspora now should look fine 2018-03-20 06:32:17 +00:00