Commit graph

5987 commits

Author SHA1 Message Date
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