Tobias Diekershoff
34a24711a3
check more PHP version
2 years ago
Michael Vogel
25662eb6f4
Merge pull request #4892 from MrPetovan/bug/infinite-loop-in-dba-delete
Prevent infinite loop when a dbstructure_definition hook is orphan
2 years ago
Michael Vogel
39edd086e0
Merge pull request #4893 from MrPetovan/bug/4879-remove-backslash-in-birthday-events
Fix quoting style in DFRN::birthdayEvent()
2 years ago
Hypolite Petovan
851c5d841f
Fix quoting style in DFRN::birthdayEvent()
2 years ago
Hypolite Petovan
18078ce7a4
Prevent infinite loop when a dbstructure_definition hook is orphan
- Add cascade option to dba::delete
- use cascade = false for orphan hook deletion
2 years ago
Hypolite Petovan
daf94a8f63
Merge pull request #4891 from annando/private-forum-redux
Better working with private forums
2 years ago
Michael
16beab4652
Better working with private forums
2 years ago
Tobias Diekershoff
5dda815521
Merge pull request #4887 from rabuzarus/20180421_-_frio_add_missing_settings_css
frio - add missing page styles for user setting pages
2 years ago
Tobias Diekershoff
0700452c49
Merge pull request #4888 from friendica/revert-4883-install_config
Revert "Moved .htconfig.php file & extracted Install business logic"
2 years ago
Tobias Diekershoff
f63be91bd5
Revert "Moved .htconfig.php file & extracted Install business logic"
2 years ago
rabuzarus
7e41f62809
frio - add missing page styles for user setting pages
2 years ago
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
2 years ago
rabuzarus
8f6e018958
frio - remove $baseurl variable from default template because we don't need it anymore
2 years ago
Hypolite Petovan
401934f21f
Merge pull request #4883 from nupplaphil/install_config
Moved .htconfig.php file & extracted Install business logic
2 years ago
Hypolite Petovan
d08ddaa116
Merge pull request #4884 from rabuzarus/20180421_-_fix_image_upload_for_msg
frio - fix image upload for prv messages
2 years ago
rabuzarus
a65e93faea
frio - fix default template if friendica is installed into a subdirectory
2 years ago
rabuzarus
54c3efccab
frio - don't show the "insert image" button in modals (because it doesn't work at the current state)
2 years ago
Philipp Holzer
334d392154
Merge remote-tracking branch 'origin/develop' into install_config
2 years ago
Philipp Holzer
346697d771
Moved .htconfig file
Extracted install business functions to new Class `Install.php`
2 years ago
rabuzarus
4285cd5dc7
frio - fix image upload for prv messages
2 years ago
Tobias Diekershoff
ebe203336f
Merge pull request #4882 from annando/private-forums
Contact requests from Diaspora for private forums aren't accepted automatically anymore
2 years ago
Michael
fd7658a70a
Contact requests from Diaspora for private forums aren't accepted automatically anymore
2 years ago
Hypolite Petovan
c57f0bcce6
Merge pull request #4880 from tobiasd/20180421-lng
translation updates to DE, FI and PL
2 years ago
Tobias Diekershoff
e65395a17f
update PL translations THX waldis
2 years ago
Tobias Diekershoff
b3e10f96a8
update PL translations THX waldis
2 years ago
Tobias Diekershoff
87d55e69e2
update FI translations THX Kris
2 years ago
Tobias Diekershoff
ec8720224d
update DE translations
2 years ago
Hypolite Petovan
69a7afc577
Merge pull request #4855 from M-arcus/env-var-mysql
[TASK] Config: Add MySQL environment variables
2 years ago
Marcus Müller
26ba5edda7
[TASK] Template: Add check for environment values
2 years ago
Marcus Müller
19cddd2bc8
[TASK] Config: Add check for environment values
2 years ago
Tobias Diekershoff
ea1a434dc1
Merge pull request #4877 from fabrixxm/dev/followup-pr4861
Frio admin/users : follow up of 4861 - "more space"
2 years ago
fabrixxm
f976361935
Frio admin/users template: show account type in user details
2 years ago
fabrixxm
12b7bce1cc
admin users, don't set account-type if page flag isn't PAGE_NORMAL
2 years ago
fabrixxm
23e5225b20
Frio admn/users: use icons for page flags and account type in table
to have more space
2 years ago
fabrixxm
516eb2b9ea
Frio admin/users template: fix users avatars, table cols width to have more space
2 years ago
fabrixxm
9a7f508550
Admin users: Update page type names, add raw flags template context
Change user table header "Account" to "Type": it use less space :-)
2 years ago
Hypolite Petovan
92473e15b5
Merge pull request #4875 from tobiasd/20180420-msg
regenerated master messages.po file
2 years ago
Hypolite Petovan
12e79a68b7
Merge pull request #4874 from tobiasd/20180420-lng
IT, FI and ZH_CN translation updates
2 years ago
Tobias Diekershoff
da541513ad
regenerated master messages.po file
2 years ago
Tobias Diekershoff
4d4ed6fb17
Merge pull request #4863 from MrPetovan/task/4860-add-hidden-input-in-console
Add hidden input in newpassword console
2 years ago
Tobias Diekershoff
3a52ffc1b8
IT, FI and ZH_CN translation updates
2 years ago
Hypolite Petovan
e2ded28504
Merge pull request #4870 from astifter/develop
Add space before Impressum.
2 years ago
Friendica
dc4b384414
Merge branch 'develop' of https://github.com/friendica/friendica into develop
2 years ago
Friendica
400bab676d
Add space before Impressum.
The page /friendica/ contains an Impressum section which is activated with an AddOn.
Add more space after last paragraph of information, before impressum, because site
looks quite cramped otherwise.
2 years ago
Hypolite Petovan
53b7e4b102
Merge pull request #4861 from fabrixxm/issue/3395
Frio: add template for admin/users
2 years ago
fabrixxm
abd7b2666c
Frio: admin/users template
- replace last a href=# with button
- use smallest breakpoint for panels footers
2 years ago
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
2 years ago
Hypolite Petovan
f043554ab7
Merge pull request #4849 from M-arcus/installation-script
[FEATURE] Install Script: Add first version
2 years ago
Hypolite Petovan
f65a7b3130
Add hidden password input to Console\NewPassword
- Add Exception when password is empty
2 years ago
Hypolite Petovan
0496822ca3
Add Exception when password is empty in User::hashPassword()
2 years ago