Commit graph

25216 commits

Author SHA1 Message Date
Tobias Diekershoff
1377d13055 ypot 2019-11-03 17:37:53 +01:00
Tobias Diekershoff
0215ceeecd use placeholder 2019-11-03 17:11:24 +01:00
Tobias Diekershoff
7ca202baad add a tar pid to the registration form 2019-11-03 17:05:06 +01:00
Philipp
7534a6cde9
Merge pull request #7809 from hoergen/Plusminus
Plusminus Scheme for Frio improved contacts and visibility
2019-11-03 14:45:57 +01:00
Tobias Diekershoff
ac9b3b7845
Merge pull request #7810 from annando/diaspora-add-contact
Diaspora: Use the standard function for adding a relationship
2019-11-03 14:42:07 +01:00
Michael
17704d2458 Diaspora: Use the standard function for adding a relationship 2019-11-03 13:35:41 +00:00
hoergen
63305d06ab improved contacts and visibility 2019-11-03 13:39:42 +01:00
Tobias Diekershoff
86a3167ad2
Merge pull request #7805 from annando/duplicated-system
Another duplicated "use" removed
2019-11-02 22:31:01 +01:00
Michael
6f9302f389 Another duplicated "use" removed 2019-11-02 21:29:16 +00:00
Tobias Diekershoff
fa7dbab1b2
Merge pull request #7804 from annando/duplicated-system
Removed duplicated "use system"
2019-11-02 22:26:26 +01:00
Michael
04c889270b Removed duplicated "use system" 2019-11-02 21:24:22 +00:00
Michael Vogel
6ba7b5961c
Merge pull request #7798 from MrPetovan/task/rework-photo-functions
Rework photo functions
2019-11-02 21:20:38 +01:00
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
Hypolite Petovan
58737c7bd8 Skip Imagick Installer test until we can mock class_exists 2019-11-02 13:06:49 -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
dca1b8b580 Add URL decoding to query string in App\Arguments
- Slashes were stored url encoded
2019-11-02 07:48:45 -04:00
Hypolite Petovan
26b5de9a76 Rename Photo::newResource() result variable from $hash to $resource_id 2019-11-02 07:48:45 -04:00
Hypolite Petovan
03bf1dcbd3 Move Object\Image static methods to Util\Images
- Optimize imports in modified files
2019-11-02 07:48:45 -04: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