Commit graph

25238 commits

Author SHA1 Message Date
Philipp
4daa3d37c1
Merge pull request #7812 from tobiasd/20191103-tarpid
a hidden field for the registration form
2019-11-04 11:03:54 +01:00
Philipp
745e8089bf
Merge pull request #7816 from tobiasd/20191104-msg
regen messages.po after Hackathon 2019
2019-11-04 10:38:18 +01:00
3978b279bb regen messages.po after Hackathon 2019 2019-11-04 10:30:15 +01:00
Michael Vogel
de015f88d7
Merge pull request #7815 from tobiasd/20191104-template
add missing template for userexport
2019-11-04 07:51:37 +01:00
58ac1a29b1 add missing frio template 2019-11-04 07:44:47 +01:00
9f9dd18adc move frio template 2019-11-04 07:21:45 +01:00
Philipp
7ea98869cc
Merge pull request #7814 from tobiasd/20191103-maxsize
Add missing quotation
2019-11-04 00:37:38 +01:00
9fad4abcec add missing quotation 2019-11-03 22:47:57 +01:00
Philipp
d0068170db
Merge pull request #7806 from tobiasd/20191102-csvexport
added export and import of followed contacts to and from  CSV files
2019-11-03 20:28:08 +01:00
Philipp
4e6dcf537d
Merge pull request #7813 from tobiasd/20191103-cats
move link generation into the loop
2019-11-03 20:26:14 +01:00
b7ecc62cc8 move link generation into the loop 2019-11-03 19:57:32 +01:00
1377d13055 ypot 2019-11-03 17:37:53 +01:00
9815d63352 use config var in settings form 2019-11-03 17:31:01 +01:00
9ceda398ae add config variable for max file size of CSV file 2019-11-03 17:25:09 +01:00
0215ceeecd use placeholder 2019-11-03 17:11:24 +01:00
7ca202baad add a tar pid to the registration form 2019-11-03 17:05:06 +01:00
17061b22d2
Merge pull request #7811 from tobiasd/20191103-clickoncat
categories of postings linked
2019-11-03 10:58:33 -05:00
f45d39c05b create URL for categories 2019-11-03 16:34:58 +01:00
ebfedbc449 add links to cat.url 2019-11-03 15:55:58 +01:00
d3122c396e really there is no App 2019-11-03 15:53:32 +01:00
9b03e2a564 there was no App 2019-11-03 15:07:29 +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
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
17704d2458 Diaspora: Use the standard function for adding a relationship 2019-11-03 13:35:41 +00:00
299b0d643b add documentation for contact exports 2019-11-03 14:34:36 +01:00
0c873a0548 mv q() to DBA::select() 2019-11-03 14:03:11 +01:00
63305d06ab improved contacts and visibility 2019-11-03 13:39:42 +01:00
e5e87d546d we only need one contact export, D* _only_ exports the entire profile 2019-11-03 12:59:14 +01:00
955a84a266 added export and import of followed contacts to and from CSV files 2019-11-03 00:12:16 +01:00
86a3167ad2
Merge pull request #7805 from annando/duplicated-system
Another duplicated "use" removed
2019-11-02 22:31:01 +01:00
6f9302f389 Another duplicated "use" removed 2019-11-02 21:29:16 +00:00
fa7dbab1b2
Merge pull request #7804 from annando/duplicated-system
Removed duplicated "use system"
2019-11-02 22:26:26 +01:00
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
f5ba6f1721
Merge pull request #7801 from annando/network-label2
Changed label for network sorting
2019-11-02 13:13:33 -04:00
58737c7bd8 Skip Imagick Installer test until we can mock class_exists 2019-11-02 13:06:49 -04:00
421db4e454 Changed label for network sorting 2019-11-02 17:03:40 +00:00
e67833a784 [frio] Add click card on contact avatars 2019-11-02 12:48:04 -04:00
eb3cf5a764 Replace indenting spaces by tabs in templates/contact/hovercard.tpl 2019-11-02 12:48:04 -04:00
50a2e7001e Replace last instance of local_user() used to guess authentication status in Module/Contact/Hovercard 2019-11-02 12:48:04 -04:00
e3e2b0e6d0 Remove mod/hovercard file 2019-11-02 12:48:04 -04:00
707d9efed5 [frio] Remove jSmart dependency 2019-11-02 12:48:03 -04:00
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
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
b8a22de2d2
Merge pull request #7800 from annando/manually-improve
AP: Respect "manually approve" during contact request
2019-11-02 12:45:43 -04:00
9461446374 Respect "manually-improve" during contact request 2019-11-02 16:24:54 +00:00
e27ebaee48 Respect "manually improve" during contact request 2019-11-02 16:20:17 +00:00
9f215fc33b
Merge pull request #7797 from annando/arrival-order
Posted order is now arrival order
2019-11-02 16:02:27 +01:00
682001ab0a And some other renaming 2019-11-02 13:55:55 +00:00