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

5089 Commits

Author SHA1 Message Date
Tobias Diekershoff 72638acac3 admins can forbid some nicknames from being registered 2018-07-06 15:32:56 +02:00
Tobias Diekershoff 100c5e33ac CS translation update THX Aditoo 2018-07-06 06:27:59 +02:00
Tobias Diekershoff fef252736b CS translation update THX Aditoo 2018-07-02 07:04:43 +02:00
Tobias Diekershoff c2496ccc9d update for DE translation 2018-07-01 11:08:12 +02:00
hoergen eb5edad07a
Add files via upload 
frio: new scheme Plusminus aims to minimize empty design spaces
 2018-06-30 13:39:11 +02:00
Tobias Diekershoff 85392963cf CS translation update THX Aditoo 2018-06-25 07:39:48 +02:00
Tobias Diekershoff 6800c89ea5 update PL translations THX waldis 2018-06-22 07:37:50 +02:00
Hypolite Petovan a5550b4702
Merge pull request #5253 from rabuzarus/20180616_-_magic_auth_test_2 
Port hubzillas OpenWebAuth - remote authentification
 2018-06-20 17:46:04 -04:00
Roland Häder 8ad523fbc8
Continued a bit: 
- removed/fixed whitespaces and mixture of spaces/tabs (some)
- added new-line character at end of files (POSIX-compilant)
- reverted some code which I had messed up (compared to upstream/develop)
- removed duplicate dba::update() invocation in src/Protocol/DFRN.php
- also removed no longer valid TODO

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-06-20 22:19:54 +02:00
Tobias Diekershoff dbe1d5adc7 update DE translations 2018-06-20 17:34:23 +02:00
rabuzarus 0a97a3f822 Bugfix: hide savedsearch butten and subthread button for non local_users 2018-06-19 18:27:54 +02:00
rabuzarus 1c7f4e3c63 port hubzillas OpenWebAuth - remote authentification 2018-06-18 23:05:44 +02:00
Tobias Diekershoff ca85fa2272 update to the zh-cn translation THX 朱陈锬 2018-06-18 11:41:29 +02:00
Tobias Diekershoff 7a84252233 NL translation update 2018-06-18 08:24:00 +02:00
Tobias Diekershoff c39a5f6faa CS translation update 2018-06-18 08:23:05 +02:00
rabuzarus 1a8d3c460e add class "wall-item-body" to all themes 2018-06-16 13:50:56 +02:00
rabuzarus d0ea208d04 main.js - move some code of liveUpdate() into updateConvItems() for readability 2018-06-16 13:38:32 +02:00
rabuzarus a2fc1be187 fix scroll position in stream while ajax update 2018-06-16 13:05:33 +02:00
rabuzarus 2b69571cbf Frio: add addon_hooks to head.tpl 2018-06-15 22:55:00 +02:00
Hypolite Petovan f0c2b77157
Merge pull request #5215 from rabuzarus/20180614_-_frio_contact_suggestion_template 
Frio: provide a template for received contact suggestions
 2018-06-14 13:56:30 -04:00
rabuzarus 02344ce78c Frio: background color for fsuggest module 2018-06-14 18:57:30 +02:00
rabuzarus aaeb85c944 Frio: scroll to the contact request in notifications module 2018-06-14 18:49:53 +02:00
rabuzarus b8186ba98b Frio: provide a template for received contact suggestions 2018-06-14 17:05:23 +02:00
rabuzarus 0db6002e3c Frio: fix contact filtering on contacts page 2018-06-13 23:04:07 +02:00
Hypolite Petovan 97e95473a1
Merge pull request #5179 from abanink/5118 
5118 Create Javascript hook mechanism
 2018-06-13 15:35:13 -04:00
Pascal Deklerck ba4ddb1d8d Test if addon_hooks is an array before using it 2018-06-13 21:05:54 +02:00
Pascal Deklerck b54d1b708a Code standards updates 2018-06-13 21:03:19 +02:00
Pascal Deklerck a11103a3a7 Code organisation and documentation of JS hook code 2018-06-13 09:31:08 +02:00
Tobias Diekershoff 138355838f EN US translation update THX miqrogroove 2018-06-13 07:43:49 +02:00
Tobias Diekershoff 3895c87e75 update CS translation THX Aditoo 2018-06-12 15:58:35 +02:00
Tobias Diekershoff 32129d07e5 update CS translation THX Aditoo 2018-06-10 07:51:35 +02:00
Tobias Diekershoff bb20204fea IT translations THX Fabio 2018-06-09 10:38:22 +02:00
Tobias Diekershoff bcf1f9fd19 update FI translations THX Kris 2018-06-09 10:22:45 +02:00
Tobias Diekershoff c37d141654 update NL translations THX Pascal 2018-06-09 10:21:53 +02:00
Tobias Diekershoff de822f01e6 update DE translations 2018-06-09 10:19:49 +02:00
Tobias Diekershoff 7986d36a6d update PL translations THX waldis 2018-06-09 10:13:15 +02:00
Pascal Deklerck ef01dfefd4 Remove console logging 2018-06-07 22:25:39 +02:00
Pascal Deklerck d488512ca0 5118 Create Javascript hook mechanism 2018-06-07 22:23:30 +02:00
Tobias Diekershoff 90be8b47d6 update to the NL translation THX Pascal 2018-06-04 12:09:33 +02:00
Hypolite Petovan bb11969c72
Merge pull request #5162 from tobiasd/20180602-de 
update DE translations
 2018-06-02 10:09:44 -04:00
Tobias Diekershoff 4cca036a1b update DE translations 2018-06-02 15:56:57 +02:00
Michael 8a34895a23 Use magicLink whenever possible 2018-06-02 08:05:06 +00:00
Tobias Diekershoff d1a27550fa update to the NL translation THX Pascal Deklerck 2018-05-31 16:38:31 +02:00
Tobias Diekershoff b130fad1c5 update DE translations 2018-05-31 06:37:54 +02:00
Tobias Diekershoff 703f886492 IT translations THX Fabio 2018-05-28 13:50:56 +02:00
rabuzarus 9c9b82ba59 Frio: move tos link to a another place in the nave menu 2018-05-27 09:55:05 +02:00
rabuzarus 58f9498c7e Frio: tos page background for frio 2018-05-27 09:48:27 +02:00
Hypolite Petovan 36591249b1
Merge pull request #5131 from nupplaphil/htconfig_mariadb 
Make `htconfig.php` fit for MariaDB
 2018-05-26 08:58:55 -04:00
Hypolite Petovan 7d565d8bff
Merge pull request #5132 from tobiasd/20180526-zhcn 
update to the zh-cn translation THX 朱陈锬
 2018-05-26 08:36:09 -04:00
Tobias Diekershoff a465f5c5f0 update to the zh-cn translation THX 朱陈锬 2018-05-26 14:22:01 +02:00
Philipp Holzer bc9140affd
Make htconfig.php fit for MariaDB 2018-05-26 13:31:07 +02:00
Tobias Diekershoff 571311a80b removed deprecated themes frost(-mobile) 2018-05-26 10:25:42 +02:00
Tobias Diekershoff 5c6b9cb64a update IS translations THX Sveinn í Felli 2018-05-25 08:58:00 +02:00
Tobias Diekershoff 22e78c1bed update PL translations THX waldis 2018-05-25 08:56:34 +02:00
Tobias Diekershoff 3e51a23bd5
Merge pull request #5109 from rabuzarus/20180522_-_frio_nav_about_instance 
frio - add "info about the instance" link into the navbar for non-authed users
 2018-05-22 15:10:44 +02:00
rabuzarus 0d7d688649 frio - add "info about the instance" link into the navbar for non-authed users 2018-05-22 12:44:35 +02:00
Tobias Diekershoff 5de562d381 update DE translations THX hauke 2018-05-22 07:12:43 +02:00
Tobias Diekershoff 8fd9916aa5 EN US and GB translation updates THX AndyH3 2018-05-21 16:08:07 +02:00
Michael Vogel f7e6178fd3
Merge pull request #5103 from tobiasd/20180521-ru 
RU translations THX pztrn
 2018-05-21 08:47:42 +02:00
Tobias Diekershoff 1d78fa9645 RU translations THX pztrn 2018-05-21 07:31:35 +02:00
Tobias Diekershoff becd9b4879 forgot to rename vars in TOS template 2018-05-21 06:02:49 +02:00
Tobias Diekershoff a4d11db74e update PL translations THX waldis 2018-05-20 18:11:42 +02:00
Tobias Diekershoff 56f7fe636a update FI translations THX kris 2018-05-20 18:09:09 +02:00
Tobias Diekershoff 9a860984d6 update FR translations THX vindarel 2018-05-20 18:08:07 +02:00
Tobias Diekershoff 99b8947c0b update DE translations 2018-05-20 18:05:50 +02:00
Hypolite Petovan c41332364f
Merge pull request #5089 from tobiasd/20180519-tos 
privacy statement
 2018-05-20 08:20:16 -04:00
Michael c70ebadd7d Issue-3412 related: Don't send connection posts anymore 2018-05-19 19:34:51 +00:00
Tobias Diekershoff dd629d5fa4 registration: added display of privacy statement if enabled 2018-05-19 18:53:54 +02:00
Tobias Diekershoff ae62c1d1ea admin panel: added privacy statement preview 2018-05-19 18:52:23 +02:00
Alexandre Alapetite 102377f19f Rebuild PO to strings 
```sh
for i in view/lang/*/messages.po; do bin/console po2php $i; done
```
 2018-05-17 09:31:29 +02:00
Alexandre Alapetite 2a9d364bb7 i18n ru intval bug 
Should fix: Got error 'PHP message: PHP Warning:  A non-numeric value
encountered in /home/alex/public_html/f.a80.fr/view/lang/ru/strings.php
on line 5\n

PHP 7.2.5 / Ubuntu 18.04 LTS
 2018-05-17 07:57:55 +02:00
Tobias Diekershoff f285d9c7eb add link to TOS in frios registration template if enabled 2018-05-16 13:41:56 +02:00
Tobias Diekershoff eec0826750 added link to the TOS page if it is activated 2018-05-16 11:57:06 +02:00
Tobias Diekershoff 2a75c7aa00 update FI translations THX Kris 2018-05-13 12:02:09 +02:00
Tobias Diekershoff 78330c44a8 update PL translations THX waldis 2018-05-13 12:01:25 +02:00
Tobias Diekershoff f34ee8f858 update FI translations THX Kris 2018-05-12 10:36:59 +02:00
Tobias Diekershoff 75982db524 update PL translations THX waldis 2018-05-12 10:36:18 +02:00
Tobias Diekershoff 2435388aa7 update DE translations 2018-05-12 10:35:32 +02:00
Tobias Diekershoff 41d301b496 update DE translations 2018-05-08 18:55:18 +02:00
Tobias Diekershoff 2db9f8a2cc update PL translations THX waldis 2018-05-08 18:55:14 +02:00
Tobias Diekershoff 4e3784de6b update FI translations THX Kris 2018-05-08 18:55:10 +02:00
Michael eb4650ff23 dbclean settings are now available from the frontend 2018-05-07 05:37:20 +00:00
Tobias Diekershoff cf13511066 update PL translations THX waldis 2018-05-06 11:18:56 +02:00
Tobias Diekershoff bfca51c450 update FI translations THX Samuli Valavuo 2018-05-06 11:18:08 +02:00
Tobias Diekershoff d98d9a5e60 update to the zh-cn translation THX 朱陈锬 2018-05-06 11:17:15 +02:00
Andreas Neustifter 59b57459c6 Fix layout issue introduced with PR #4873. 
The find button in the find-people widget was badly layouted on Firefox under Debian.
Remove the width constraint and float: left so the button gracely drops to the next
line when necessary.
 2018-04-30 21:22:59 +00:00
Hypolite Petovan 2975d1a0be
Merge pull request #4959 from koyuawsmbrtn/develop 
Added dark scheme to frio
 2018-04-30 10:30:01 -04:00
Koyu Berteon 90b24251d2 Renamed files as requested 2018-04-30 15:38:46 +02:00
Koyu Berteon 125c3e7cab Corrected time 2018-04-30 15:34:23 +02:00
Koyu Berteon 01bd3a3a7b Fixed identation in dark.php 2018-04-30 15:27:40 +02:00
Koyu Berteon 72cab9bb93 Added dark scheme to frio 2018-04-30 15:25:31 +02:00
rabuzarus 0c0b715c63 Merge develop into 20180425_-_fix_help_aside 2018-04-30 14:56:25 +02:00
Tobias Diekershoff 839fd9f17e update FI translations THX Kris 2018-04-30 08:34:47 +02:00
Michael Vogel bd0ba24518
Merge pull request #4951 from MrPetovan/bug/4946-move-current-theme-to-app 
Move current_theme() to App
 2018-04-29 19:11:49 +02:00
Hypolite Petovan fde3d6f870 Replace current_theme() and current_theme_url() calls 2018-04-28 18:37:25 -04:00
Hypolite Petovan 3213715b60 Fix formatting in frio_boot.php 2018-04-28 18:36:32 -04:00
Tobias Diekershoff 24da379c06 update PL translations THX waldis 2018-04-28 10:08:52 +02:00
Hypolite Petovan 5bb35756dc Update directory URL protocol 2018-04-27 20:56:34 -04:00
Hypolite Petovan 66e5586d21
Merge pull request #4939 from astifter/better_curl_error_during_install 
Better curl error during install.
 2018-04-27 16:57:01 -04:00
Andreas Neustifter babb45efd8 Fix login page layout without OpenId. 
When OpenId is disabled and the input therefore is missing from the login the page looks
weird. Fix that.
 2018-04-27 20:00:46 +00:00
Andreas Neustifter 70a781fa5a Proper error when rewrite fails during install. 
When Curl tries to fetch the rewrite test URL and something goes wrong the user
has no clue what was the problem. This problems can include:
- The rewriting not working at all.
- HTTPS redirects do not work.
- Curl does not accept the presented SSL cert.

This commit fixes this by providing the Curl error message to the user to further
debug the problem.

Fixes #3629.~
 2018-04-27 21:27:55 +02:00
rabuzarus a19784d209
Merge pull request #4890 from astifter/reorganize_login 
Reorganize Login to Fix #4878
 2018-04-27 19:56:25 +02:00
Hypolite Petovan 2d6dafc057 [frio] Improve background styles' description 2018-04-26 07:50:05 -04:00
Hypolite Petovan 1ce999a4ab [frio] Fix quoting style in php/Image 2018-04-26 07:46:59 -04:00
Hypolite Petovan 7feeb0af78 Add backward-compatibility for config variables after schema rename 2018-04-26 04:22:04 -04:00
rabuzarus 3fb993f37b frio - fix help toc aside 2018-04-25 23:30:56 +02:00
Hypolite Petovan 86e4690b5f [frio] Add background-repeat attribute to background image options 
- Update background image options names and labels
- Add background image option label tag
 2018-04-24 20:42:23 -04:00
Hypolite Petovan 4307a87d6a [frio] Rename "Default" color scheme as "Custom" 
- Capitalize scheme name
 2018-04-24 20:40:29 -04:00
Hypolite Petovan 0f82c3348d [frio] Rename bgcolor to background-color 2018-04-24 20:39:34 -04:00
Hypolite Petovan 3bfa6facfc [frio] Fix typo schema -> scheme 2018-04-24 20:26:14 -04:00
Hypolite Petovan eb9b832c3a [frio] Normalize quoting style in PHP files 2018-04-24 20:12:43 -04:00
Hypolite Petovan b65c8c55a4 [frio] Fix formatting in PHP files 2018-04-24 20:05:20 -04:00
Andreas Neustifter d06a174f0c Make register-link less obtrusive. 2018-04-24 21:18:31 +00:00
Andreas Neustifter 1a69265da4 Fix missing background tiles. 2018-04-24 21:16:15 +00:00
rabuzarus ac753e3320 frio - provide a template for invite page 2018-04-24 17:33:48 +02:00
Tobias Diekershoff c458a12135 update FI translations THX Kris 2018-04-24 07:58:31 +02:00
Andreas Neustifter 6a1ce9c9c0 Fix login dialog layout for frio. 
Rearrange login dialog distinguish better between logging und registering.
 2018-04-23 20:29:55 +00:00
Andreas Neustifter e5ed2fdede Remove complete section when registering disabled. 
Move out the check so that the complete div containing the register-link is removed.
 2018-04-23 20:29:55 +00:00
Andreas Neustifter fe74a3d697 Remove empty help spans from templates. 
The empty spans from the templates mess up the layout sometimes, and are useless weight anyway.
Lets get rid of them.
 2018-04-23 20:29:55 +00:00
Andreas Neustifter 2d8a4a923f Fix login dialog layout. 
Rearrange login dialog distinguish better between logging und registering.
 2018-04-23 20:29:55 +00:00
Andreas Neustifter 5d1d0d1a9f Remove empty help spans from templates. 
The empty spans from the templates mess up the layout sometimes, and are useless weight anyway.
Lets get rid of them.
 2018-04-23 20:29:55 +00:00
Hypolite Petovan a66e9b81ba
Merge pull request #4873 from astifter/develop 
Remove pagination when empty, move new Member Tips and use common widget to find people.
 2018-04-23 10:23:21 -04:00
Tobias Diekershoff 82bf2d984e update DE translations 2018-04-23 07:13:10 +02:00
Tobias Diekershoff fa38089a95 update FI translations THX Kris 2018-04-23 07:13:02 +02:00
Michael Vogel 0ff51c2b13
Merge pull request #4908 from rabuzarus/20180421_frio_some_missing_admin_templates 
frio - Bugfix - there was a wrong user count in admin-users template
 2018-04-23 00:32:52 +02:00
rabuzarus 763b061a2b frio - Bugfix - there was a wrong user count in admin-users template 2018-04-23 00:26:00 +02:00
Hypolite Petovan 4e9236e9e9
Merge pull request #4907 from rabuzarus/20180421_frio_some_missing_admin_templates 
Frio - rework admin users  and admin  contactblock template to be more consistant with other setting pages
 2018-04-22 18:14:50 -04:00
Hypolite Petovan 087bfbc6a7 Forgot new line at end of file in templates/wall/content_filter.tpl 2018-04-22 18:13:13 -04:00
Hypolite Petovan 48122733b8 Move content filter HTML in a template 2018-04-22 18:02:00 -04:00
rabuzarus 04bdba0d78 frio - some work on the admin contactblock template to be more consistant with other setting pages 2018-04-22 23:06:06 +02:00
Friendica 390983a331 Haromonize Find People Widget. 
In the right_aside on the /contacts page in the left aside there are
almost identical widgets to search for contacts. Drop one and use common
widget in both places.
 2018-04-22 20:44:22 +00:00
Friendica 666375fed1 Move new member tips to tab bar. 
The new member tips link looks very misplaced and forlorn at the current position.
Move it to the tab-bar (in a somewhat crude fashion, but its for 14 days/user only.)
 2018-04-22 20:44:22 +00:00
Friendica 54cfbe039b Only shown pagination when not empty. 
Currenty the pagination bar is always shown, even when no prev/next buttons are active.
This only shows the bar when actual navigation is possible.
 2018-04-22 20:44:22 +00:00
Friendica 226d90ad5a Image in /contacts/xx is shifted. 
The contact image for a single contact in /contacts/xx is next to the contact name
instead of below, fix that.
 2018-04-22 20:44:22 +00:00
rabuzarus 5a82ee04bc frio - some work on the admin users template to be more consistant with other setting pages 2018-04-22 20:23:24 +02:00
Tobias Diekershoff c44df2ae94 update FI translations THX Kris 2018-04-22 08:28:53 +02:00
rabuzarus 7e41f62809 frio - add missing page styles for user setting pages 2018-04-21 16:22:11 +02:00
Hypolite Petovan afced187bc
Merge pull request #4885 from rabuzarus/20180421_-_fix_frio_in_directory 
frio - fix default template if friendica is installed into a subdirectory
 2018-04-21 10:10:32 -04:00
rabuzarus 8f6e018958 frio - remove $baseurl variable from default template because we don't need it anymore 2018-04-21 16:04:11 +02:00
rabuzarus a65e93faea frio - fix default template if friendica is installed into a subdirectory 2018-04-21 15:43:11 +02:00
rabuzarus 54c3efccab frio - don't show the "insert image" button in modals (because it doesn't work at the current state) 2018-04-21 14:27:57 +02:00
rabuzarus 4285cd5dc7 frio - fix image upload for prv messages 2018-04-21 14:05:40 +02:00
Tobias Diekershoff e65395a17f update PL translations THX waldis 2018-04-21 07:45:06 +02:00
Tobias Diekershoff b3e10f96a8 update PL translations THX waldis 2018-04-21 07:44:54 +02:00
Tobias Diekershoff 87d55e69e2 update FI translations THX Kris 2018-04-21 07:43:29 +02:00
Tobias Diekershoff ec8720224d update DE translations 2018-04-21 07:42:31 +02:00
Hypolite Petovan 69a7afc577
Merge pull request #4855 from M-arcus/env-var-mysql 
[TASK] Config: Add MySQL environment variables
 2018-04-20 12:30:17 -04:00
Marcus Müller 26ba5edda7
[TASK] Template: Add check for environment values 2018-04-20 18:24:28 +02:00
Tobias Diekershoff ea1a434dc1
Merge pull request #4877 from fabrixxm/dev/followup-pr4861 
Frio admin/users : follow up of  4861 - "more space"
 2018-04-20 14:36:54 +02:00
fabrixxm f976361935 Frio admin/users template: show account type in user details 2018-04-20 14:30:04 +02:00