Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-01 04:04:41 +00:00
Code Issues Projects Releases Packages Wiki Activity
33575 commits 3 branches 64 tags 241 MiB
Commit graph

33575 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Vogel
1e83261a88
Merge pull request #5509 from friendica/revert-5506-fixes/portable-contact 
Revert "Possible fix for #5470 and empty() usage"
 2018-07-27 08:04:19 +02:00
Michael Vogel
82e3163e5e Revert "Possible fix for #5470: (#5506)" 
This reverts commit 1e20fd84f7.
 2018-07-27 08:02:41 +02:00
Michael Vogel
41f3ce7f2d Revert "Continued: (#5508)" 
This reverts commit 592190892c.
 2018-07-27 08:02:41 +02:00
Roland Häder
592190892c Continued: (#5508) 
- `App` is now "imported" to avoid having \Friendica\App::* everywhere
 2018-07-26 22:27:28 -04:00
Roland Häder
1e20fd84f7 Possible fix for #5470: (#5506) 
- $data is not an object like stdClass but an array
- newer PHP versions doesn't allow cross-access like following:

  $object['foo'] = 123;
  $array->foo = 123;

- added type-hints for private methods for above cases
- used `if (empty($foo)) instead of just `if ($foo)` preventing some nasty
  E_NOTICE
- added some empty lines for better readability
 2018-07-26 18:27:12 -04:00
Andreas Neustifter
7e761fa514 [frio] Fix wrongly removed content wrapper and fix CSS instead. (#5496) (#5505) 2018-07-26 11:42:26 -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
Andreas Neustifter
830b2edc35 [frio] Remove frame around recent photos. (#5496) (#5499) 
Also layout file properly.
 2018-07-25 16:21:43 -04:00
Andreas Neustifter
e8effeb3ae [frio] Fix layout of profile aside. (#5497) (#5498) 
See issue (#5497)[https://github.com/friendica/friendica/issues/5497] for details.
 2018-07-25 16:12:30 -04:00
Michael Vogel
32a8702bd7 Bugfix: Session handling hadn't been initialized (#5493) 2018-07-25 10:25:40 -04:00
Michael Vogel
3e5f8ee70a
Merge pull request #5491 from tobiasd/20180725-issue1391 
Make profile settings available in the user settings
 2018-07-25 11:18:01 +02:00
Tobias Diekershoff
27ee5b61a4 add accesskey to the docs 2018-07-25 09:39:26 +02:00
Tobias Diekershoff
5738774530 Make profile settings available in the user settings 2018-07-25 09:37:08 +02:00
Roland Häder
1213fce8e5 Fixes/rewrites on videos.php (#5489) 
* Fixes/rewrites:
- use empty()/isset() instead of deprecated x()
- merged 2 nested if() blocks into one
- avoided nested if() block inside else block by rewriting it to elseif()
- $contact_id is an integer, let's test on > 0 here
- added a lot spaces and some empty lines for better readability

* CR request:
- removed stray spaces
- added some where they improve readability
 2018-07-24 22:54:00 -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
Roland Häder
cff90e20f2 Removal of x() and added missing columns of contact (#5479) 
* Fixes:
- got rid of x() in whole mod/item.php file
- added missing 'prv' and 'forum' columns, maybe one day, let's rewrite this
  again. it is kinda a maintenance nightmare, keeping up with column renames and
  such. Well, for now it should be okay.

* Should be DBA::isResult()
 2018-07-24 17:48:47 -04:00
Michael Vogel
69af69d1a0 Fallback to Diaspora if DFRN transmission fails (#5487) 2018-07-24 14:12:09 -04:00
Michael Vogel
5a8654194a
Merge pull request #5452 from MrPetovan/bug/5443-fix-worker-notices 
Fix notices in OEmbed et al.
 2018-07-24 17:11:53 +02:00
Hypolite Petovan
6771522167 Reduce cache time for OEmbed error 2018-07-24 11:05:09 -04:00
Andreas Neustifter
b6c254eede [frio] Fix profile edit links. [#5474] (#5475) 2018-07-24 10:20:16 -04:00
Michael Vogel
be8b68aaaf Store guid and plink with event (#5485) 
* Store guid and plink with event

* One space too much
 2018-07-24 10:01:31 -04:00
Hypolite Petovan
b6e3da8443 Move addLanguageToItemArray call when body is ensured 2018-07-24 08:52:25 -04:00
Jeroen De Meerleer
a44eeda463 Added bootstrap tables to queues (#5484) 
* Added bootstrap tables to queues

* Changed to double quotes
 2018-07-24 08:10:20 -04:00
Hypolite Petovan
df917251ff Fix undefined oembed properties 
- Add Object\OEmbed class
 2018-07-24 07:56:27 -04:00
Hypolite Petovan
adc47fc8ea Fix Undefined index: nurl in Protocol\PortableContact 2018-07-24 07:55:42 -04:00
Hypolite Petovan
41fd5bef13 Fix by reference notice in Protocol\PortableContact 2018-07-24 07:54:12 -04:00
Hypolite Petovan
4e9ba728c4 Fix undefined index body in Model\Item 2018-07-24 07:54:12 -04:00
Hypolite Petovan
d09ab35816 Fix getimagesizefromstring() read errors 2018-07-24 07:54:12 -04:00
Michael Vogel
ca2c316de0 Some removed notices when viewing events (#5483) 2018-07-24 07:51:50 -04:00
Roland Häder
a38a842e86 Fixes for E_NOTICE in editpost.php (#5480) 
* Added missing columns 'wall' and 'post-type'.

* Convention:
- curly brace after a a method/function declaration belongs to next line
- added space for better readability
 2018-07-24 07:47:25 -04:00
Tobias Diekershoff
876081af82
Merge pull request #5482 from annando/issue-5467a 
Issue 5467: Cron jobs hadn't been executed
 2018-07-24 08:57:28 +02:00
Michael
432eec770b Issue 5467: Cron jobs hadn't been executed 2018-07-24 06:15:58 +00:00
Tobias Diekershoff
f2b97f9320
Merge pull request #5481 from annando/issue-5467 
Issue 5467: Fix worker and daemon
 2018-07-24 06:27:05 +02:00
Michael
716b959e33 Some code cleanup 2018-07-24 04:15:19 +00:00
Michael
de984cdaa1 Issue 5467: Fix worker and daemon 2018-07-24 03:42:44 +00:00
Michael Vogel
0e719f5398
Merge pull request #5478 from MrPetovan/task/5410-add-missing-use-statements 
Add missing use statements after dbesc conversion
 2018-07-24 03:57:20 +02:00
Roland Häder
00595de6a3 Fixes: (#5477) 
- use DBA::isResult() and not count()
- fixed 4 E_NOTICE when POST fields are not set
 2018-07-23 18:52:48 -04:00
Roland Häder
14a4d5eb59 Avoid no needed call on parse2str() when there is nothing to parse (#5476) 2018-07-23 18:52:07 -04:00
Hypolite Petovan
30fff2077c Ad missing use statements after dbesc conversion 2018-07-23 18:44:05 -04:00
Michael Vogel
413424064c
Merge pull request #5439 from MrPetovan/task/5410-remove-dbesc 
Move DBA to src/ part 4.1: Remove dbesc()
 2018-07-23 21:51:49 +02:00
Jeroen De Meerleer
d57449623b Added true to json_decode (#5471) 2018-07-23 15:51:08 -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
d3a598f589 Update DBA::escape to match dbesc() 2018-07-23 15:13:42 -04:00
Michael Vogel
cfa68c52b9
Merge pull request #5438 from MrPetovan/task/5410-remove-dbm-class 
Move DBA to src/ part 3.2: Remove DBM class
 2018-07-23 21:05:32 +02:00
Hypolite Petovan
538b81d10d Delete Database\DBM class file 2018-07-23 11:04:15 -04:00
Hypolite Petovan
aa26943f92 Rename DBA::esc_array to DBA::escapeArray 
- Rename internal method DBA::esc_array_callback to
DBA::escapeArrayCallback
 2018-07-23 11:04:15 -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
8ddb94ef06 Use DateTimeFormat::utc() instead of DBM::date() 2018-07-23 10:57:47 -04:00