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

4952 commits

Author SHA1 Message Date
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
fabrixxm
23e5225b20 Frio admn/users: use icons for page flags and account type in table 
to have more space
 2018-04-20 14:11:34 +02:00
fabrixxm
516eb2b9ea Frio admin/users template: fix users avatars, table cols width to have more space 2018-04-20 14:07:11 +02:00
Tobias Diekershoff
3a52ffc1b8 IT, FI and ZH_CN translation updates 2018-04-20 08:30:40 +02:00
fabrixxm
abd7b2666c Frio: admin/users template 
- replace last a href=# with button
- use smallest breakpoint for panels footers
 2018-04-19 19:00:16 +02:00
fabrixxm
e909beee04 Frio: admin/users template 
- move checkboxes on first column
- move select/deselect all as button group on panel footer
- use existing jquery in mod_admin.js for select/deselect all functionality
- add page content wrapper, without padding
- fix user avatar size in "pending deletion" table
 2018-04-19 18:17:46 +02:00
fabrixxm
20a2918bda Frio: admin/user template fixes 
- small fixes to html
- move js and css to extern files
- move checkboxes to first column
 2018-04-18 21:43:33 +02:00
fabrixxm
362654abf0 Fix indentation 2018-04-18 19:44:10 +02:00
fabrixxm
1017e244ca Frio: add template for admin/users 2018-04-18 17:52:34 +02:00
Tobias Diekershoff
9cb2369c15 update to the FI translation THX Kris 2018-04-18 07:57:16 +02:00
Marcus Müller
fc8b11283a
[TASK] Template: Environment variables for MySQL 2018-04-17 18:40:24 +02:00
Tobias Diekershoff
6f7de87088 update to the FI translation THX Kris 2018-04-17 07:17:46 +02:00
Tobias Diekershoff
f3c8631cbd display the thing 2018-04-16 10:25:39 +02:00
Tobias Diekershoff
537394e45c update to the PL translation THX waldis 2018-04-16 07:09:08 +02:00
Tobias Diekershoff
27267d8e63 update to the FI translation THX Kris 2018-04-13 07:21:05 +02:00
Tobias Diekershoff
053cad1de5 update to the NL translation THX Karel 2018-04-13 07:20:36 +02:00
Michael Vogel
7e004aab9b
Merge pull request #4821 from tobiasd/20180412-lng 
DE and NL translation updates THX Karel and S.Krumbholz
 2018-04-12 11:03:49 +02:00
Tobias Diekershoff
9cadee1d32 DE and NL translation updates THX Karel and S.Krumbholz 2018-04-12 10:41:49 +02:00
Tobias Diekershoff
00311af79b added missiing information to theme templates 2018-04-12 10:33:28 +02:00
Tobias Diekershoff
4fbea5088a translation updates 2018-04-11 08:02:38 +02:00
Tobias Diekershoff
3119eabce5 IS translation THX Sveinn í Felli 2018-04-10 18:30:59 +02:00
Tobias Diekershoff
71218ecff9 DE translations THX Copiis 2018-04-10 18:30:17 +02:00
Tobias Diekershoff
6928f0bd02 Updates to the EN-GB, EN-US and FI-FI translations 2018-04-10 07:23:50 +02:00
Tobias Diekershoff
ca3325bcbb updated translations 2018-04-09 10:17:25 +02:00
Tobias Diekershoff
65b738ecfa update for PL translation THX waldis 2018-04-08 11:02:31 +02:00
Tobias Diekershoff
575ddc83e2 DE translations 2018-04-07 08:36:48 +02:00
Hypolite Petovan
60f3a6aac0 [frio] Add color to group membership action buttons 2018-04-06 23:55:29 -04:00
Hypolite Petovan
59d42e9681
Merge pull request #4762 from annando/frio-accessibility 
Some more accessibility for "Frio"
 2018-04-06 17:07:25 -04:00
Michael
ed316b38ee Some more accessibility for "Frio" 2018-04-06 20:42:38 +00:00
Tobias Diekershoff
a787f80bbd added FI translation as core translation is now over 50% THX Kris 2018-04-06 09:27:39 +02:00
Tobias Diekershoff
13470cbd75 update to the NL translation THX Karel 2018-04-06 09:25:21 +02:00
Michael Vogel
05cff59f70
Merge pull request #4722 from MrPetovan/task/add-content_filter-hook 
Add content_filter hook
 2018-04-06 06:42:52 +02:00
Michael
3792012723 Improved accessibility for "Frio" 2018-04-05 21:50:34 +00:00
Tobias Diekershoff
909d542c4a update for DE translation THX Andreas 2018-04-05 08:36:16 +02:00
Hypolite Petovan
180f7d8218 Add disabled_cw user setting 2018-04-04 23:08:47 -04:00
Hypolite Petovan
580b7f4e81
Merge pull request #4733 from tobiasd/20180403-pl 
update for PL translation THX waldis
 2018-04-03 11:27:13 -04:00
Tobias Diekershoff
59fe47ccee update for PL translation THX waldis 2018-04-03 17:19:18 +02:00
Tobias Diekershoff
ca0b0e92c8 indentation 2018-04-03 06:58:21 +02:00