keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
28052 commits 4 branches 0 tags 179 MiB
Commit graph

6088 commits

Author SHA1 Message Date
Hypolite Petovan
6d5437721e Remove HTML escaping in config file template, add quote escaping 
- Allows HTML special characters and quotes in DB password
 2020-05-19 21:07:55 -04:00
Michael
2a56370cf4 Merge remote-tracking branch 'upstream/develop' into annando/issue8514 2020-05-18 21:38:17 +00:00
Michael
3b1d89252a Issue 8582: "cid" in "network" is now "contactid" 
Fixes #8582
 2020-05-17 15:01:27 +00:00
Michael
a3c4021f12 Issue 8514: Make paging for searcg items work again 
Fixes #8514
 2020-05-17 13:51:56 +00:00
Hypolite Petovan
eb09bdfc96 [vier] Fix accordion logic in templates/settings/profile/index 2020-05-08 09:06:28 -04:00
Hypolite Petovan
e0e131b620 Move perfect-scrollbar dependency back to composer.json 2020-05-06 21:49:34 -04:00
Michael
f3bf723cc7 Moved to view/js 2020-05-05 12:42:30 +00:00
Michael
6d47324342 Integrate perfect-scrollbar to make tests happy 2020-05-05 05:22:14 +00:00
Michael
729c6b67aa the "term" field now is called "name", workaround removed 2020-05-01 15:18:48 +00:00
Hypolite Petovan
50622d27d1 [frio] Restore focus styles 
- Replace .btn-main by .btn-primary
- Harmonize focus styles between buttons and form controls based on the theme scheme
 2020-04-27 09:43:46 -04:00
Michael
af97df96bd Merge remote-tracking branch 'upstream/develop' into views 2020-04-26 09:21:57 +00:00
Hypolite Petovan
66021480a7 [frio] Align brand name color on nav icon 2020-04-25 15:36:29 -04:00
Michael
ee3a724b41 Three more joins replaced with views 2020-04-24 20:39:14 +00:00
Hypolite Petovan
16f48731b1 Remove album name bin2hex conversion in file browser 
- Avoids Javascript hex2bin() limitation to Latin-1 string encoding
 2020-04-21 22:14:11 -04:00
Michael Vogel
461e01bd33
Merge pull request #8531 from MrPetovan/bug/8523-frio-jot-close-button 
[frio] Remove duplicate jot modal close button
 2020-04-21 05:59:21 +02:00
Michael Vogel
ee098277b9
Merge pull request #8530 from MrPetovan/task/8498-move-poke-to-src 
Move poke module to src/
 2020-04-21 05:56:59 +02:00
Hypolite Petovan
79b21e6627 [frio] Remove duplicate jot modal close button 
- Fixes display issue on XS view
- Unable to reproduce mentioned Bootstrap bug
 2020-04-20 18:09:57 -04:00
Hypolite Petovan
7f04aea8b1 Move poke module to src/ 
- Add new route contact/<cid>/poke and update all references
- Rework template with form field includes
- [frio] Enable modal behavior
 2020-04-20 11:47:08 -04:00
Hypolite Petovan
4b8aaeceea Regenerate master messages.po 
- Fix translation text error in include/enotify
 2020-04-05 11:12:41 -04:00
Michael
e7ce2bfd82 Fix weird call to "l10n" 2020-04-05 13:26:22 +00:00
Tobias Diekershoff
ad68aaae3f
Merge pull request #8492 from MrPetovan/task/8400-frio-jot-compose-link 
[frio] Add link to Compose page in jot
 2020-04-04 07:49:30 +02:00
Hypolite Petovan
40a7a43bd2 [frio] Add link to Compose page in jot 2020-04-03 16:33:00 -04:00
Hypolite Petovan
c882ab2674 Updated FR translation 2020-04-03 15:45:14 -04:00
Hypolite Petovan
7d8fc8527e [frio] Remove obsolete CSS 2020-04-01 19:45:41 -04:00
Hypolite Petovan
cc15381007 Refactor admin user settings page 
- Fix header hierarchy
- [frio] Fix panel display
 2020-04-01 19:45:31 -04:00
Hypolite Petovan
76feae2203 Refactor connector settings page 
- Fix header hierarchy
- [frio] Fix panel display
 2020-04-01 19:20:18 -04:00
Hypolite Petovan
91fb396ec1 Refactor profile edit page 
- Fix header hierarchy
- [frio] Fix panel display
 2020-04-01 19:14:37 -04:00
Hypolite Petovan
b480e4eaa9 Refactor display page 
- Fix header hierarchy
- Fix panel display
 2020-04-01 19:06:11 -04:00
Hypolite Petovan
6bb210ff7a Refactor features pages 
- Create frio template for admin features page
- Fix header hierarchy
 2020-04-01 19:06:10 -04:00
Hypolite Petovan
fd89572606 Refactor admin site settings templates 
- Fix header hierarchy in admin/site.tpl
- Fix panel display in frio/templates/admin/site.tpl
 2020-04-01 19:06:10 -04:00
Hypolite Petovan
5ce404f517 Refactor user settings page 
- Fix header hierarchy
- [frio] Fix panel display
- Move checkbox sub-template calls to template
 2020-04-01 19:06:00 -04:00
Hypolite Petovan
3c50f985a9 Remove modal window for default post permission setting 2020-04-01 09:21:26 -04:00
Tobias Diekershoff
20f6948541 NL translation update THX Casper 2020-03-23 18:55:14 +01:00
Tobias Diekershoff
b191c437bb PL translation update THX waldis 2020-03-21 20:08:22 +01:00
Tobias Diekershoff
ec6c338257 regen messages.po 2020-03-21 15:23:42 +01:00
Tobias Diekershoff
88d0a12a83 RU translations THX Alexander An 2020-03-16 10:21:40 +01:00
Tobias Diekershoff
730be894c8 DE translation update 2020-03-14 13:07:35 +01:00
Tobias Diekershoff
8e0b91b64d Issue #8417 RU translation 2020-03-13 13:40:25 +01:00
Michael Vogel
7625eba86d
Merge pull request #8407 from MrPetovan/bug/8358-markdown-double-decode 
Remove extraneous HTML decode in Markdown::toBBCode
 2020-03-11 21:18:36 +01:00
Hypolite Petovan
b0dc3d6cf9 Improve Babel code 
- Add Diaspora source text choice
- Simplify escaped display
 2020-03-11 09:01:17 -04:00
Hypolite Petovan
49b71546ec Normalize vcard across themes display after profile fields reorganization 2020-03-11 08:19:28 -04:00
Hypolite Petovan
bbb397db20 Use correct variable name for deny input value concatenation 2020-03-11 00:42:37 -04:00
Michael
f27900ad78 Reduce the load of "gfollower" 2020-03-10 21:10:59 +00:00
Steffen K9
61f0fb9dcf
Remove orphaned checkbox for compose page 2020-03-09 21:22:10 +01:00
Tobias Diekershoff
c8328a8446 update to the zh-cn translation THX Tomacat 2020-03-09 11:14:31 +01:00
Tobias Diekershoff
4683cfee12 updated JA translation THX Ozero Dien 2020-03-09 11:13:58 +01:00
Tobias Diekershoff
53cd36885d update FR translations THX Pbutterflyoffire_temp 2020-03-09 11:13:18 +01:00
Tobias Diekershoff
ddb6335d22 DE translation update 2020-03-09 10:59:00 +01:00
Hypolite Petovan
f788cd5851
Merge pull request #8384 from annando/issue-8371 
Issue 8371: Improvements for picture permissions
 2020-03-09 01:25:13 -04:00
Michael Vogel
02027fff13
Merge pull request #8386 from nupplaphil/bug/fix_mail 
Fix & align HTML mail text
 2020-03-08 22:27:02 +01:00
nupplaPhil
06b0df8e46
Fix mail text ... again 2020-03-08 20:24:17 +01:00
Michael
37376fa715 Issue 8371: Improvements for picture permissions 2020-03-08 13:16:59 +00:00
Michael
0e22036d0e issue 8268: Birthday reminders are now more visible 2020-03-08 09:33:17 +00:00
nupplaPhil
70f35565e1
Fix & align mail text ... again 2020-03-08 08:26:21 +01:00
Tobias Diekershoff
c9c612598d regen messages.po 2020-03-07 18:09:42 +01:00
Michael
a6e7b5f295 GContact discovery added 2020-03-05 22:03:24 +00:00
Michael
825a7f9f93 Issue 8321: Follow items now work again 2020-03-05 07:16:47 +00:00
Michael
d63e903d9f Changed template for direction 2020-03-03 21:29:51 +00:00
Michael
0e0de5fcad Debug switch added, output added 2020-03-03 21:25:18 +00:00
Michael
72c198990e Merge remote-tracking branch 'upstream/develop' into private 2020-03-02 15:05:00 +00:00
Michael
ca1b92bb34 Support unlisted public posts 2020-03-02 07:57:23 +00:00
Philipp
27b60b200e
Merge pull request #8352 from MrPetovan/bug/8002-album-drop-cancel 
Use sensible URLs for return after album actions instead of $_SESSION['photo_return'] in mod/photos
 2020-03-01 22:21:33 +01:00
Hypolite Petovan
a344809d3c [frio] Enable file upload in settings form 2020-03-01 10:15:56 -05:00
Hypolite Petovan
b6fa528b63 Remove duplicate photo album edit link 2020-03-01 09:55:31 -05:00
nupplaPhil
4f2bea5cb1
Move "regmod" functionality into Admin Users page 2020-02-29 17:10:29 +01:00
Michael Vogel
fccecf92cd
Merge pull request #8337 from MrPetovan/task/8323-protect-target-blank 
Add rel="noopener noreferrer" to all target="_blank" links
 2020-02-25 05:50:33 +01:00
Hypolite Petovan
b100b9600e Add rel="noopener noreferrer" to all target="_blank" links 
See https://mathiasbynens.github.io/rel-noopener/
 2020-02-24 20:07:34 -05:00
Hypolite Petovan
e230619a84 Move actions dropdown in search item view 2020-02-23 20:20:20 -05:00
Michael
1b87a97a81 Remove "hidewall" check from ACL 2020-02-22 08:54:28 +00:00
Hypolite Petovan
637e38e535 User hide_dislike user setting to hide dislike button and conversation responses 2020-02-20 05:37:07 -05:00
Hypolite Petovan
96ba2ac00d Add new hide dislike user setting 2020-02-20 05:37:07 -05:00
Michael Vogel
eefa699bb2
Merge pull request #8317 from MrPetovan/task/frio-remove-compose-setting 
[frio] Remove "Enable Compose page" setting
 2020-02-20 09:35:48 +01:00
Michael Vogel
b6b567fc97
Merge pull request #8315 from MrPetovan/task/8310-improve-manifest 
Update manifest output with config/theme info
 2020-02-20 09:34:36 +01:00
Hypolite Petovan
cf99c752ea [frio] Remove "Enable Compose page" setting 2020-02-19 15:11:54 -05:00
Hypolite Petovan
2791d70655 [frio] Merge compose/jot buttons features 2020-02-19 15:11:35 -05:00
Michael
7ee9aad6ca Some more unneeded settings removed 2020-02-19 19:31:55 +00:00
Hypolite Petovan
33c7b62326 Move manifest JSON from template to array 2020-02-19 13:29:55 -05:00
Hypolite Petovan
858b63656e
Merge pull request #8306 from annando/contact-unfollow-delete 
Don't show "delete contact" when there is a follow or unfollow option
 2020-02-19 11:44:49 -05:00
Hypolite Petovan
930d395d7b Update manifest output with config/theme info 2020-02-19 10:29:13 -05:00
Hypolite Petovan
b9325251e8 Add Theme::getBackgroundColor and Theme::getThemeColor methods 2020-02-19 10:28:57 -05:00
Hypolite Petovan
61cc047611
Merge pull request #8309 from annando/remote-comment 
Remotely load posts to comment on them on the own page
 2020-02-18 13:29:11 -05:00
Michael
d64bb0dd8f Remotely load posts to comment on them on the own page 2020-02-18 06:57:38 +00:00
Michael
f8670b6268 Don't show "delete contact" when there is a follow or unfollow option 2020-02-17 22:25:12 +00:00
Steffen K9
e342d2bd81
fix view profile link vier 2020-02-17 20:19:10 +01:00
Steffen K9
4f8027116e
fix view profile link frio 2020-02-17 20:18:01 +01:00
Steffen K9
8c6c442003
fix profile link 2020-02-17 20:15:31 +01:00
Michael
1d3586623c Replace "suggestme" with "net-publish" 2020-02-17 07:16:45 +00:00
Michael
101251668c Reworked expiration settings 2020-02-16 20:44:55 +00:00
Philipp
da124af6ed
Merge pull request #8293 from MrPetovan/task/5562-community-pagination 
Improve community pagination
 2020-02-16 19:38:49 +01:00
Michael
3bd1f3a836 No more gender 2020-02-16 10:55:18 +00:00
Hypolite Petovan
797e3a2079
Merge pull request #8292 from annando/issue-8290 
Issue 8290: Clicking on the notification count does work again
 2020-02-16 04:42:12 -05:00
Hypolite Petovan
682fb7e4e2 Move community module to src/ 
- Use boundaries pagination instead of number pages
- Trim down community update module output
- Part of https://github.com/friendica/friendica/issues/4090
 2020-02-16 04:41:22 -05:00
Michael
15f37a6ef4 Issue 8290: Clicking on the notification count does work again 2020-02-16 09:35:10 +00:00
Steffen K9
ddaf4d1240
Fix tagcloud widget 2020-02-16 02:05:38 +01:00
Hypolite Petovan
0b0309ce8f Remove pager parameter from conversation() 
- Add getUrlParameter() Javascript function to determine current page
 2020-02-13 23:40:00 -05:00
Hypolite Petovan
756de11cda
Merge pull request #8282 from AlfredSK/AlfredSK-frio-notif-bgcolor 
Frio: unseen notifications background adjustment
 2020-02-13 19:53:17 -05:00
Michael
303fb65574 Frio: Only display item menu separator when there is something to separate 2020-02-13 22:46:27 +00:00
Steffen K9
eb1cddae82
Also change the color value in plusminus 2020-02-13 23:18:08 +01:00
Steffen K9
1efc47c88c
Frio: unseen notifications background adjustment 
Background color for unseen notifications slightly changed for better visibility.
 2020-02-13 23:15:29 +01:00
Michael Vogel
e757d16fc1
Merge pull request #8279 from MrPetovan/task/frio-mobile-actions-buttons 
[frio] Add narrow screen short item action button row
 2020-02-13 05:38:26 +01:00
Hypolite Petovan
2afdc69c20 [frio] Add narrow screen short item action button row 2020-02-12 21:26:49 -05:00
Hypolite Petovan
95b09aaec4 [frio] Add loading animation on comment form submit 2020-02-11 23:45:47 -05:00
Michael Vogel
13a10b8f20
Merge pull request #8277 from MrPetovan/task/8251-use-about-for-pdesc 
Remove profile about field double HTML escaping
 2020-02-12 05:23:04 +01:00
Hypolite Petovan
1ce5b1d65b Remove profile about field double HTML escaping 
- Add BBcode conversion for profile.about in widget/vcard.tpl
 2020-02-11 21:38:42 -05:00
Michael
8969af04f9 Duplicated "hide-friends" setting removed 2020-02-10 23:11:28 +00:00
Michael Vogel
e80d68ba53
Merge pull request #8261 from MrPetovan/task/8251-use-about-for-pdesc 
Use profile.about for profile description
 2020-02-10 23:36:59 +01:00
Hypolite Petovan
3e5ec95dcd [frio] Fix more action button position on Firefox 2020-02-10 08:06:12 -05:00
Michael Vogel
0e05ff6868 Merge pull request #8269 from MrPetovan/bug/frio-more-actions 
[frio] Prevent more action menu to be clipped by the post box
 2020-02-10 05:28:58 +01:00
Michael Vogel
8293d5ed0a Merge pull request #8271 from MrPetovan/bug/8229-frio-mobile-back-to-top 
[frio] Improve back to top button behavior at bottom of page
 2020-02-10 05:08:30 +01:00
Hypolite Petovan
5930d94c91 [frio] Improve back to top button behavior at bottom of page 2020-02-09 18:14:06 -05:00
Hypolite Petovan
2ec3a97393
Merge pull request #8263 from annando/remote-follow 
New page for remote follow requests
 2020-02-09 17:53:13 -05:00
Hypolite Petovan
4e17aab96a [frio] Prevent more action menu to be clipped by the post box 
- Address https://friendica.mrpetovan.com/display/0b6b25a8-615e-3dda-937e-21e937937450
- Move external link back to the post top right
- Prevent more action menu to become semi-transparent on post mouseout
 2020-02-09 17:47:41 -05:00
Michael
2eebeeaa32 New page for remote follow requests 2020-02-09 17:04:35 +00:00
nupplaPhil
7d714319c8
Add license info at Friendica PHP files 2020-02-09 16:34:23 +01:00
nupplaPhil
85dc9bb96b
Add license info at Friendica PHP files 2020-02-09 16:18:46 +01:00
Hypolite Petovan
a42104ce43 Use profile.about instead of profile.pdesc for profile description 2020-02-09 02:36:19 -05:00
Hypolite Petovan
59840d2c11 [frio] Improve contrast of open notification dropdown button 2020-02-09 02:09:09 -05:00
Hypolite Petovan
6c152a3204 [frio] Remove unwanted navbar-nav behavior for top nav bar on mobile 
- Rename overly generic notification menu button id
 2020-02-09 01:43:53 -05:00
Michael Vogel
1400e99618
Merge pull request #8244 from MrPetovan/task/8234-add-ap-to-dfrn-request 
Add ActivityPub in the protocol list in dfrn_request
 2020-02-09 06:50:40 +01:00
Hypolite Petovan
2fb1819e57 Simplify dfrn_request and auto_request templates 
- Limit template variables
 2020-02-08 17:08:01 -05:00
Tobias Diekershoff
7072e21344 regen messages.po 2020-02-08 08:00:04 +01:00
Hypolite Petovan
45f6707ff4 Reformat dfrn_request and auto_request templates 2020-02-07 21:27:36 -05:00
Hypolite Petovan
1a3807d598
Merge pull request #8249 from annando/a11y-4 
Useless links removed / Item menu is moved to the item actions bar
 2020-02-07 06:55:20 -05:00
Michael
d37fd69477 Replaced spaces with tabs 2020-02-07 05:57:41 +00:00
Michael
6e02105d88 Useless links removed / Item menu is moved to the item actions bar 2020-02-06 22:06:24 +00:00
Hypolite Petovan
f2732a4ad7 Update desktop notifications logic without yesno field 2020-02-06 10:25:33 -05:00
Hypolite Petovan
40db6baa6b Rename hide friends checkbox field variable 2020-02-05 21:37:58 -05:00
Hypolite Petovan
1595cf413d
Merge pull request #8240 from annando/a11y-3 
Accessibility again: Notifications are now accessible
 2020-02-05 16:22:26 -05:00
Michael
d8a19f7a27 Remove unneeded stuff 2020-02-05 21:10:17 +00:00
Michael
ace3c52c8e Accessibility again: Notifications are now accessible 2020-02-05 21:06:03 +00:00
Hypolite Petovan
e42b843505
Merge pull request #8232 from nupplaphil/task/notify_email_builder 
Introduce NotifyEmailBuilder
 2020-02-05 13:00:14 -05:00
Hypolite Petovan
16c2705016
Merge pull request #8237 from annando/a11y-2 
Accessibility: Improve navigation and contact approval
 2020-02-05 12:11:53 -05:00
Hypolite Petovan
3f57e16a1a
Merge pull request #8236 from annando/a11y-1 
Accessibility: A checkbox is a checkbox
 2020-02-05 12:10:16 -05:00
Michael
2ba3cfb42c Use labels 2020-02-05 16:54:44 +00:00
Michael
cf9070c396 Removed unneeded CSS and JS stuff 2020-02-05 16:30:35 +00:00
Michael
0b66970ec9 Acessibility: Improve navigation and contact approval 2020-02-05 16:14:04 +00:00
Michael
07148ecf6b Acessibility: A checkbox is a checkbox 2020-02-05 08:08:32 +00:00
nupplaPhil
1fa69b3e43
Added EOF EOL :) 2020-02-04 21:29:49 +01:00
nupplaPhil
34dce9fd76
Introduce NotifyEmailBuilder 2020-02-04 21:14:39 +01:00
nupplaPhil
9f95b975b4
Improve HTML message 2020-02-04 20:54:26 +01:00
nupplaPhil
6e91f1be83
Add own table for header 2020-02-02 22:55:18 +01:00
nupplaPhil
7fb913eb86
Add extra email banner (including setting) 2020-02-02 22:43:44 +01:00
nupplaPhil
0966cdbb26
cleanup template 2020-02-02 22:43:38 +01:00
nupplaPhil
7a8eca90f9
renamed templates for notify 2020-02-02 22:43:37 +01:00
nupplaPhil
3291728059
Extract System emails from enotify 
- Removed every SYSTEM_EMAIL occurrence in enotify
- Introduced a "SystemMailBuilder" for build system emails
- Replaced every SYSTEM_EMAIL usage in the classes with calling this builder
- Added tests for this new Builder
- Split the email templates between "base" template for email and concrete usages for different use cases
 2020-02-02 22:43:35 +01:00
nupplaPhil
74490d6594
Cleanup enotify email 
- Removing unused fields
- Move notify template to email subdirectory
 2020-02-02 22:43:34 +01:00
nupplaPhil
41ec7d8370
Replace stylesheet names 2020-02-02 20:56:31 +01:00
nupplaPhil
8632c90327
Fix crepair links 2020-02-02 20:50:53 +01:00
Philipp
346da998df
Merge pull request #8212 from MrPetovan/task/release-cache-buster 
Release Cache Buster
 2020-02-01 18:45:58 +01:00
Hypolite Petovan
a3028e69aa
Merge pull request #8211 from nupplaphil/task/mod_crepair 
Move mod/crepair to src/Module/Contact/Repair
 2020-02-01 08:28:29 -05:00