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

24212 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philipp e557457158
Merge pull request #7201 from annando/mail-db-error 
Fix Issue 7196
 2019-05-28 20:02:39 +02:00
Philipp 32b8c6f65e
Merge pull request #7200 from annando/tag-process 
Process incoming tag add requests
 2019-05-28 19:43:23 +02:00
Michael ae940755c7 Fix Issue 7196 2019-05-28 17:39:26 +00:00
Philipp bae4a5e406
Merge pull request #7187 from MrPetovan/bug/7023-emailer-hooks 
Enable addon using emailer hooks to skip default call to mail()
 2019-05-28 08:02:48 +02:00
Philipp be3d7759f0
Merge pull request #7198 from MrPetovan/task/6861-to-plaintext 
Simplify BBCode::toPlaintext and HTML::toPlaintext
 2019-05-28 07:49:25 +02:00
Hypolite Petovan ed768c71ee Remove "f=&" nonsense from network module 
- Fixes wrong redirect when using the sidebar filters
 2019-05-27 17:45:27 -04:00
Hypolite Petovan cd05d15b04 Replace build_querystring() by http_build_query() introduced in PHP 5 2019-05-27 17:40:12 -04:00
Hypolite Petovan 0fadc7730c Replace deprecated string-bases Model\FileTag calls with array-based ones 2019-05-27 17:40:08 -04:00
Hypolite Petovan 6de3449cae Add new fileToArray and arrayToFile methods to Module\FileTag 2019-05-27 17:38:36 -04:00
Hypolite Petovan 96402e306a Fix formatting of Model\FileTag 
- Normalize indent style
- Remove extraneous new lines after ifs/foreachs
 2019-05-27 17:38:32 -04:00
Philipp fee72bbb50
Merge pull request #7197 from MrPetovan/bug/6861-api-user-show 
[API] Convert user description to plain text
 2019-05-27 22:12:08 +02:00
Hypolite Petovan 5d2bf73517 Add Babel result screen for compact HTML::toPlaintext 2019-05-27 12:02:28 -04:00
Hypolite Petovan 5f9fb1f14f Simplify BBCode::toPlaintext 
- Keep white spaces after tags
 2019-05-27 12:02:12 -04:00
Hypolite Petovan 596b5b0982 Simplify HTML::toPlaintext 
- Keep new lines in plain text output
 2019-05-27 12:01:48 -04:00
Hypolite Petovan 0e5b9514ef [API] Convert user description to plain text 2019-05-27 11:58:02 -04:00
Hypolite Petovan 661aca0f88 [API] Ensures user_show includes a status the user actually authored 2019-05-27 11:01:13 -04:00
Hypolite Petovan 3c7e4b474b
Merge pull request #7193 from nupplaphil/bug/uimport_datetime 
Fix NULL datetime for uimport/uexport
 2019-05-27 09:13:01 -04:00
Philipp 745ebee154
Merge pull request #7195 from MrPetovan/task/7190-remove-defaults-1 
Remove defaults() from $_SESSION
 2019-05-27 07:11:48 +02:00
Hypolite Petovan 4e207ef786 Enable addon using emailer hooks to skip default call to mail() 2019-05-26 21:36:09 -04:00
Hypolite Petovan c8dd290f18 Deprecate defaults() function in favor of native coalesce operator 2019-05-26 21:28:34 -04:00
Hypolite Petovan 01e71254d9 Replace defaults() calls on $_SESSION by Core\Session calls 
- Replace direct calls to $_SESSION by Core\Session calls in Module\Login
 2019-05-26 21:26:59 -04:00
Hypolite Petovan f225752f8a
Merge pull request #7194 from nupplaphil/bug/hover 
frio: Fix hovercard vanish
 2019-05-26 21:20:21 -04:00
Philipp Holzer 57ec7daaa4
moved composer-line 2019-05-26 22:02:38 +02:00
Philipp Holzer 26d4214c19
added suggestions 2019-05-26 21:53:24 +02:00
Philipp Holzer 78a20e5acb
Fix hovercard vanish 2019-05-26 21:42:49 +02:00
Hypolite Petovan 1610848e65
Merge pull request #7192 from nupplaphil/bug/edit_images 
Make edits of images possible again
 2019-05-26 15:21:10 -04:00
Hypolite Petovan e99e8096bf
Merge pull request #7191 from nupplaphil/bug/logfile_permission 
Fixing logfile permission denied exceptions
 2019-05-26 15:19:26 -04:00
Philipp Holzer 220f8f0862
friendica-6950 uimport doesn't support "pwdreset_time":null 2019-05-26 15:49:44 +02:00
Philipp Holzer 2652787460
friendica-7130 Edits of images not possible 2019-05-26 15:00:19 +02:00
Philipp 57f6086fcd
Merge pull request #7189 from MrPetovan/bug/7183-archives-profile-widget 
Ensures Widget::postedByYear uid parameter is integer in Module\Profile
 2019-05-26 14:42:25 +02:00
Philipp Holzer b56b56ccb6
friendica-6379 Monolog - logfile permission denied 2019-05-26 14:33:09 +02:00
Hypolite Petovan cc6a17d27a Ensures Widget::postedByYear uid parameter is integer in Module\Profile 2019-05-26 08:18:59 -04:00
Michael ecf4789cc4 Process incoming tag add requests 2019-05-26 11:20:03 +00:00
Philipp ea218438d2
Merge pull request #7186 from MrPetovan/bug/7183-archives-profile-widget 
Restore profile archives widget
 2019-05-26 08:16:54 +02:00
Philipp 6ceb74c365
Merge pull request #7184 from annando/add-tag 
AP: We now transmit "add tag" activity
 2019-05-26 08:14:18 +02:00
Hypolite Petovan 50e44f46ae Add profile archive URL pattern to Router 2019-05-25 19:08:43 -04:00
Hypolite Petovan d27d4d8927 Move posted date widget to Content\Widget 2019-05-25 19:08:15 -04:00
Michael 32b1f75ece AP: We now transmit "add tag" activity / On Diaspora this is now supressed 2019-05-25 19:33:58 +00:00
Philipp 5c2cca432f
Merge pull request #7170 from MrPetovan/bug/6981-contact-request-blocked 
Contact requests blocked
 2019-05-25 20:20:36 +02:00
Philipp bd0c536736
Merge pull request #7156 from MrPetovan/task/add-relationship-filter 
Add contact relationship filter
 2019-05-25 20:17:05 +02:00
Hypolite Petovan 22fc3c8828
Merge pull request #7181 from AndyHee/AndyHee-patch-20190525-1 
Update FAQ.md
 2019-05-24 14:31:06 -04:00
Andy H3 1cab99a712
Update FAQ.md 
Reworded and added line breaks after fullstops.
 2019-05-25 01:10:00 +07:00
Andy H3 218deed874
Update FAQ.md 2019-05-25 00:26:56 +07:00
Philipp c98da2fe43
Merge pull request #7180 from MrPetovan/bug/fatal-errors 
Ensures Search methods return an empty ResultList instead of null
 2019-05-24 16:31:42 +02:00
Hypolite Petovan 08d7d42f81 Ensures Search methods return an empty ResultList instead of null 
- Addresses https://github.com/friendica/friendica/issues/6916#issuecomment-494876901
 2019-05-24 08:13:36 -04:00
Philipp fc0733d1ec
Merge pull request #7179 from friendica/MrPetovan-patch-module-contact 
Fix typo in Module\Contact
 2019-05-23 20:31:03 +02:00
Hypolite Petovan 0dae4f9492
Fix typo in Module\Contact 
Follow-up to #7154, thanks to @AlfredSK
 2019-05-23 13:01:40 -04:00
Philipp c1366e23fb
Merge pull request #7177 from MrPetovan/bug/admin-summary-sql 
Fix SQL error in Module\Admin\Summary
 2019-05-22 06:31:16 +02:00
Hypolite Petovan 40ca25f4f7 Fix SQL error in Module\Admin\Summary 2019-05-21 17:01:15 -04:00
Hypolite Petovan 80f9487216
Merge pull request #7175 from annando/db-table-escape 
Fix table name sanitation / enable table schemes
 2019-05-21 16:56:56 -04:00