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

25200 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philipp ebef0d5cd4
Merge pull request #7749 from MrPetovan/bug/7740-frio-hovercard-add-unfollow 
[frio] Rework hovercard actions
 2019-11-02 20:36:39 +01:00
Hypolite Petovan f5ba6f1721
Merge pull request #7801 from annando/network-label2 
Changed label for network sorting
 2019-11-02 13:13:33 -04:00
Michael 421db4e454 Changed label for network sorting 2019-11-02 17:03:40 +00:00
Hypolite Petovan e67833a784 [frio] Add click card on contact avatars 2019-11-02 12:48:04 -04:00
Hypolite Petovan eb3cf5a764 Replace indenting spaces by tabs in templates/contact/hovercard.tpl 2019-11-02 12:48:04 -04:00
Hypolite Petovan 50a2e7001e Replace last instance of local_user() used to guess authentication status in Module/Contact/Hovercard 2019-11-02 12:48:04 -04:00
Hypolite Petovan e3e2b0e6d0 Remove mod/hovercard file 2019-11-02 12:48:04 -04:00
Hypolite Petovan 707d9efed5 [frio] Remove jSmart dependency 2019-11-02 12:48:03 -04:00
Hypolite Petovan ff27f45cb9 Move mod/hovercard to src/Module/Contact/Hovercard 
- Rework hovercard.js to remove JS template interpolation
- Remove template/json output from Module/Contact/Hovercard
 2019-11-02 12:48:03 -04:00
Hypolite Petovan 5cd8cb7134 Add unfollow link to output of Contact::photoMenu 
- Add rel and pending keys to output of Contact::getDetailsByURL
- Add rel and pending keys to output of Contact::getDetailsByAddr
 2019-11-02 12:48:03 -04:00
Hypolite Petovan b8a22de2d2
Merge pull request #7800 from annando/manually-improve 
AP: Respect "manually approve" during contact request
 2019-11-02 12:45:43 -04:00
Michael 9461446374 Respect "manually-improve" during contact request 2019-11-02 16:24:54 +00:00
Michael e27ebaee48 Respect "manually improve" during contact request 2019-11-02 16:20:17 +00:00
Tobias Diekershoff 9f215fc33b
Merge pull request #7797 from annando/arrival-order 
Posted order is now arrival order
 2019-11-02 16:02:27 +01:00
Michael 682001ab0a And some other renaming 2019-11-02 13:55:55 +00:00
Michael 6e11419e00 Aligned code 2019-11-02 12:59:57 +00:00
Michael f97de52694 Renamed labels 2019-11-02 12:54:26 +00:00
Hypolite Petovan b543ee8ac7
Merge pull request #7726 from tobiasd/20191010-uexport 
move uexport module to src
 2019-11-02 07:46:57 -04:00
Tobias Diekershoff 8bea9e7523 mv URL path uexport -> userexport 2019-11-02 12:44:46 +01:00
Michael 01142cb4d0 Remove debug logging 2019-11-02 11:17:47 +00:00
Tobias Diekershoff 34932e12bf mv q() to DBA::p() 2019-11-02 12:12:29 +01:00
Michael b81ab4f9a4 Posted order is now arrival order 2019-11-02 10:39:51 +00:00
Tobias Diekershoff 15cdfdd414 mv Uexport to UserExport 2019-11-02 11:36:31 +01:00
Tobias Diekershoff 048b693fbf some more change requests 2019-11-02 11:24:46 +01:00
Hypolite Petovan ca5caa69f3
Merge pull request #7794 from AlfredSK/sorting-saved-folders-widget 
Added usort() to the saved folders widget
 2019-11-01 22:58:37 -04:00
Steffen K9 7d51d45c17
Changing asort() to usort() 2019-11-02 03:44:54 +01:00
Steffen K9 fd5c122667
Added asort() to the saved folders widget 2019-11-01 22:22:52 +01:00
Hypolite Petovan 41261ba7e1
Merge pull request #7785 from nupplaphil/bug/7676-is_file_warning 
Fix wrong check for logfile in admin summary
 2019-11-01 11:06:52 -04:00
Hypolite Petovan 291bc621b2
Merge pull request #7793 from nupplaphil/bug/fix_travis_test 
Fix/FollowUp ACLFormatter
 2019-11-01 11:05:15 -04:00
Philipp Holzer f8e43ddf8d
rename developer to debug :-) 2019-11-01 15:59:00 +01:00
Philipp Holzer c1c4640c1b
remove unneeded todo 2019-11-01 15:49:18 +01:00
Philipp Holzer f4ad82bcfb
make ACLFormatter::expand() nullable and return an empty array 
- optimize tests
 2019-11-01 15:43:16 +01:00
Philipp Holzer aa7be41728
Fix ACLFormatterTest 
- Add nullable to expand() function again
- Add angle bracket support to toString()
 2019-11-01 14:13:29 +01:00
Tobias Diekershoff bc18cde412
Merge pull request #7791 from annando/more-warnings 
Some more warnings removed
 2019-10-31 10:06:15 +01:00
Michael 44cc750f79 Some more warnings removed 2019-10-31 07:33:25 +00:00
Philipp 9033a94873
Merge pull request #7789 from annando/warnings 
Solve warning
 2019-10-30 11:07:05 +01:00
Michael 422f0cbdbc Solve warning 2019-10-30 09:44:07 +00:00
Tobias Diekershoff ad4485f4ee
Merge pull request #7788 from annando/errors 
Fix several warnings and errors
 2019-10-30 09:20:13 +01:00
Michael dc065eed42 Fix several warnings and errors 2019-10-30 06:50:20 +00:00
Hypolite Petovan d6ff89d7b4
Merge pull request #7769 from annando/issue-3229 
Changed OpenID registration
 2019-10-29 10:32:02 -04:00
Michael eb0d8c1ed0 Uswe default value 2019-10-29 13:26:54 +00:00
Tobias Diekershoff 5e55aa41cb
Merge pull request #7787 from annando/issue-7778 
Fix 7778: Don't return empty string in permissions
 2019-10-29 07:24:02 +01:00
Michael bef7eeed13 Fix 7778: Don't return empty string in permissions 2019-10-29 06:01:50 +00:00
Tobias Diekershoff ccec35bbf0
Merge pull request #7783 from nupplaphil/bug/travis_ci 
Fix travis - Remove APCu setting for PHP 7.2/7.3
 2019-10-29 06:50:19 +01:00
Tobias Diekershoff 8262e82e27
Merge pull request #7786 from nupplaphil/task/improve_drone_io 
[Drone.io] Add node info for better routing
 2019-10-29 06:47:28 +01:00
Philipp Holzer 186a43843b
Add node info for better routing 2019-10-28 23:17:12 +01:00
Philipp Holzer dc4d3842e0
Fix wrong check for logfile in admin summary 2019-10-28 22:26:34 +01:00
Philipp Holzer 3e2a4f3f73
Fix travis - Remove 7.2/7.3 setting 2019-10-28 22:05:38 +01:00
Hypolite Petovan f2c0877d70
Merge pull request #7784 from nupplaphil/bug/mediumtext_default 
Revert "Add not null/default value for ACL in fields"
 2019-10-28 17:03:16 -04:00
Philipp Holzer a94c4fc440
Revert "Add not null/default value for ACL in fields" 
This reverts commit 1f535016 due incompatible combination
 2019-10-28 21:59:55 +01:00