]>
git.mxchange.org Git - friendica.git/log
Tobias Diekershoff [Sat, 21 Apr 2018 14:28:22 +0000 (16:28 +0200)]
Revert "Moved .htconfig.php file & extracted Install business logic"
Hypolite Petovan [Sat, 21 Apr 2018 14:10:32 +0000 (10:10 -0400)]
Merge pull request #4885 from rabuzarus/20180421_-_fix_frio_in_directory
frio - fix default template if friendica is installed into a subdirectory
rabuzarus [Sat, 21 Apr 2018 14:04:11 +0000 (16:04 +0200)]
frio - remove $baseurl variable from default template because we don't need it anymore
Hypolite Petovan [Sat, 21 Apr 2018 13:59:57 +0000 (09:59 -0400)]
Merge pull request #4883 from nupplaphil/install_config
Moved .htconfig.php file & extracted Install business logic
Hypolite Petovan [Sat, 21 Apr 2018 13:58:54 +0000 (09:58 -0400)]
Merge pull request #4884 from rabuzarus/20180421_-_fix_image_upload_for_msg
frio - fix image upload for prv messages
rabuzarus [Sat, 21 Apr 2018 13:43:11 +0000 (15:43 +0200)]
frio - fix default template if friendica is installed into a subdirectory
rabuzarus [Sat, 21 Apr 2018 12:27:57 +0000 (14:27 +0200)]
frio - don't show the "insert image" button in modals (because it doesn't work at the current state)
Philipp Holzer [Sat, 21 Apr 2018 12:23:49 +0000 (14:23 +0200)]
Merge remote-tracking branch 'origin/develop' into install_config
Philipp Holzer [Sat, 21 Apr 2018 12:10:53 +0000 (14:10 +0200)]
Moved .htconfig file
Extracted install business functions to new Class `Install.php`
rabuzarus [Sat, 21 Apr 2018 12:05:40 +0000 (14:05 +0200)]
frio - fix image upload for prv messages
Tobias Diekershoff [Sat, 21 Apr 2018 11:54:10 +0000 (13:54 +0200)]
Merge pull request #4882 from annando/private-forums
Contact requests from Diaspora for private forums aren't accepted automatically anymore
Michael [Sat, 21 Apr 2018 10:39:46 +0000 (10:39 +0000)]
Contact requests from Diaspora for private forums aren't accepted automatically anymore
Hypolite Petovan [Sat, 21 Apr 2018 06:40:30 +0000 (02:40 -0400)]
Merge pull request #4880 from tobiasd/
20180421 -lng
translation updates to DE, FI and PL
Tobias Diekershoff [Sat, 21 Apr 2018 05:45:06 +0000 (07:45 +0200)]
update PL translations THX waldis
Tobias Diekershoff [Sat, 21 Apr 2018 05:44:54 +0000 (07:44 +0200)]
update PL translations THX waldis
Tobias Diekershoff [Sat, 21 Apr 2018 05:43:29 +0000 (07:43 +0200)]
update FI translations THX Kris
Tobias Diekershoff [Sat, 21 Apr 2018 05:42:31 +0000 (07:42 +0200)]
update DE translations
Hypolite Petovan [Fri, 20 Apr 2018 16:30:17 +0000 (12:30 -0400)]
Merge pull request #4855 from M-arcus/env-var-mysql
[TASK] Config: Add MySQL environment variables
Marcus Müller [Fri, 20 Apr 2018 16:24:28 +0000 (18:24 +0200)]
[TASK] Template: Add check for environment values
Marcus Müller [Fri, 20 Apr 2018 16:21:00 +0000 (18:21 +0200)]
[TASK] Config: Add check for environment values
Tobias Diekershoff [Fri, 20 Apr 2018 12:36:54 +0000 (14:36 +0200)]
Merge pull request #4877 from fabrixxm/dev/followup-pr4861
Frio admin/users : follow up of 4861 - "more space"
fabrixxm [Fri, 20 Apr 2018 12:30:04 +0000 (14:30 +0200)]
Frio admin/users template: show account type in user details
fabrixxm [Fri, 20 Apr 2018 12:27:36 +0000 (14:27 +0200)]
admin users, don't set account-type if page flag isn't PAGE_NORMAL
fabrixxm [Fri, 20 Apr 2018 12:11:34 +0000 (14:11 +0200)]
Frio admn/users: use icons for page flags and account type in table
to have more space
fabrixxm [Fri, 20 Apr 2018 12:07:11 +0000 (14:07 +0200)]
Frio admin/users template: fix users avatars, table cols width to have more space
fabrixxm [Fri, 20 Apr 2018 12:02:45 +0000 (14:02 +0200)]
Admin users: Update page type names, add raw flags template context
Change user table header "Account" to "Type": it use less space :-)
Hypolite Petovan [Fri, 20 Apr 2018 11:57:59 +0000 (07:57 -0400)]
Merge pull request #4875 from tobiasd/
20180420 -msg
regenerated master messages.po file
Hypolite Petovan [Fri, 20 Apr 2018 11:57:13 +0000 (07:57 -0400)]
Merge pull request #4874 from tobiasd/
20180420 -lng
IT, FI and ZH_CN translation updates
Tobias Diekershoff [Fri, 20 Apr 2018 07:31:27 +0000 (09:31 +0200)]
regenerated master messages.po file
Tobias Diekershoff [Fri, 20 Apr 2018 07:29:17 +0000 (09:29 +0200)]
Merge pull request #4863 from MrPetovan/task/4860-add-hidden-input-in-console
Add hidden input in newpassword console
Tobias Diekershoff [Fri, 20 Apr 2018 06:30:40 +0000 (08:30 +0200)]
IT, FI and ZH_CN translation updates
Hypolite Petovan [Thu, 19 Apr 2018 19:35:48 +0000 (15:35 -0400)]
Merge pull request #4870 from astifter/develop
Add space before Impressum.
Friendica [Thu, 19 Apr 2018 19:24:35 +0000 (19:24 +0000)]
Merge branch 'develop' of https://github.com/friendica/friendica into develop
Friendica [Thu, 19 Apr 2018 19:03:29 +0000 (19:03 +0000)]
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.
Hypolite Petovan [Thu, 19 Apr 2018 17:03:03 +0000 (13:03 -0400)]
Merge pull request #4861 from fabrixxm/issue/3395
Frio: add template for admin/users
fabrixxm [Thu, 19 Apr 2018 17:00:16 +0000 (19:00 +0200)]
Frio: admin/users template
- replace last a href=# with button
- use smallest breakpoint for panels footers
fabrixxm [Thu, 19 Apr 2018 16:17:46 +0000 (18:17 +0200)]
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
Hypolite Petovan [Thu, 19 Apr 2018 11:57:02 +0000 (07:57 -0400)]
Merge pull request #4849 from M-arcus/installation-script
[FEATURE] Install Script: Add first version
Hypolite Petovan [Thu, 19 Apr 2018 02:56:52 +0000 (22:56 -0400)]
Add hidden password input to Console\NewPassword
- Add Exception when password is empty
Hypolite Petovan [Thu, 19 Apr 2018 02:49:14 +0000 (22:49 -0400)]
Add Exception when password is empty in User::hashPassword()
Hypolite Petovan [Thu, 19 Apr 2018 02:47:27 +0000 (22:47 -0400)]
[Composer] Add seld/cli-prompt dependency
Marcus Müller [Thu, 19 Apr 2018 08:21:41 +0000 (10:21 +0200)]
[DOCS] Auto Install: Add description
Tobias Diekershoff [Thu, 19 Apr 2018 06:43:18 +0000 (08:43 +0200)]
Merge pull request #4865 from annando/dfrn-reshare
Diaspora: Improved reshared coding
Michael Vogel [Thu, 19 Apr 2018 06:21:53 +0000 (08:21 +0200)]
Merge pull request #4851 from MrPetovan/task/4709-add-query-based-content-filter
Add query based content filter
Michael Vogel [Thu, 19 Apr 2018 06:16:18 +0000 (08:16 +0200)]
Merge pull request #4864 from MrPetovan/bug/fix-memcached-delete
Fix MemcachedCacheDrive::delete() method
Michael [Thu, 19 Apr 2018 06:07:23 +0000 (06:07 +0000)]
Code simplified
Michael [Thu, 19 Apr 2018 05:44:06 +0000 (05:44 +0000)]
Merge remote-tracking branch 'upstream/develop' into dfrn-reshare
Hypolite Petovan [Thu, 19 Apr 2018 03:37:06 +0000 (23:37 -0400)]
Improve CacheSessionhandler
- Replace !x() by empty()
- Add return values to read() and destroy()
Hypolite Petovan [Thu, 19 Apr 2018 03:36:23 +0000 (23:36 -0400)]
Add hostname prefix in MemcachedCacheDriver
fabrixxm [Wed, 18 Apr 2018 19:43:33 +0000 (21:43 +0200)]
Frio: admin/user template fixes
- small fixes to html
- move js and css to extern files
- move checkboxes to first column
fabrixxm [Wed, 18 Apr 2018 17:44:10 +0000 (19:44 +0200)]
Fix indentation
fabrixxm [Wed, 18 Apr 2018 15:52:34 +0000 (17:52 +0200)]
Frio: add template for admin/users
Marcus Müller [Wed, 18 Apr 2018 12:30:42 +0000 (14:30 +0200)]
[TASK] Auto install: Rework class
Marcus Müller [Wed, 18 Apr 2018 12:21:40 +0000 (14:21 +0200)]
[TASK] Auto install: Rename script command
Marcus Müller [Wed, 18 Apr 2018 12:20:21 +0000 (14:20 +0200)]
[TASK] Auto install: Rename script command
Marcus Müller [Wed, 18 Apr 2018 09:46:27 +0000 (11:46 +0200)]
[TASK] Install Script: Register installation class
Marcus Müller [Wed, 18 Apr 2018 09:43:23 +0000 (11:43 +0200)]
[TASK] Install script: Add installation class
Marcus Müller [Wed, 18 Apr 2018 09:40:16 +0000 (11:40 +0200)]
[TASK] Remove auto_install.php
Michael Vogel [Wed, 18 Apr 2018 06:17:16 +0000 (08:17 +0200)]
Merge pull request #4859 from tobiasd/
20180418 -lng
update to the FI translation THX Kris
Tobias Diekershoff [Wed, 18 Apr 2018 05:57:16 +0000 (07:57 +0200)]
update to the FI translation THX Kris
Tobias Diekershoff [Wed, 18 Apr 2018 05:50:56 +0000 (07:50 +0200)]
Merge pull request #4857 from annando/duplicated-tags
Avoid duplicated multibyte tags
Tobias Diekershoff [Wed, 18 Apr 2018 05:50:34 +0000 (07:50 +0200)]
Merge pull request #4858 from annando/issue-4655
Issue 4655: Avoid multiplicated contact requests from the same account
Michael [Wed, 18 Apr 2018 05:02:59 +0000 (05:02 +0000)]
Issue 4655: Avoid multiplicated contact requests from the same account
Michael [Wed, 18 Apr 2018 05:00:28 +0000 (05:00 +0000)]
Avoid duplicated multibyte tags
Michael [Wed, 18 Apr 2018 04:59:33 +0000 (04:59 +0000)]
Replaced queries
Michael [Wed, 18 Apr 2018 03:12:13 +0000 (03:12 +0000)]
Merge remote-tracking branch 'upstream/develop' into dfrn-reshare
Hypolite Petovan [Tue, 17 Apr 2018 23:56:47 +0000 (19:56 -0400)]
[Composer] Add bower-asset/vue dependency
Hypolite Petovan [Tue, 17 Apr 2018 16:50:06 +0000 (12:50 -0400)]
Merge pull request #4856 from annando/dandelion
better support for the Diaspora app "Dandelion"
Michael [Tue, 17 Apr 2018 16:46:57 +0000 (16:46 +0000)]
better support for the Diaspora app "Dandelion"
Marcus Müller [Tue, 17 Apr 2018 16:40:24 +0000 (18:40 +0200)]
[TASK] Template: Environment variables for MySQL
Marcus Müller [Tue, 17 Apr 2018 16:37:59 +0000 (18:37 +0200)]
[TASK] Config: Add MySQL environment variables
Hypolite Petovan [Tue, 17 Apr 2018 11:25:52 +0000 (07:25 -0400)]
Merge pull request #4782 from Alkarex/fix-update-password
Fix update password rehash
Tobias Diekershoff [Tue, 17 Apr 2018 08:12:11 +0000 (10:12 +0200)]
Merge pull request #4853 from annando/site-defaults
Default values for site configuration
Michael Vogel [Tue, 17 Apr 2018 05:24:48 +0000 (07:24 +0200)]
Merge pull request #4852 from tobiasd/
20180417 -fi
update to the FI translation THX Kris
Michael [Tue, 17 Apr 2018 05:18:26 +0000 (05:18 +0000)]
Default values for site configuration
Tobias Diekershoff [Tue, 17 Apr 2018 05:17:46 +0000 (07:17 +0200)]
update to the FI translation THX Kris
Hypolite Petovan [Sat, 14 Apr 2018 21:55:07 +0000 (17:55 -0400)]
Replace duplicate behaviors by Model\Term::populateTagsFromItem
- Replaced in include/conversation
- Replaced in include/text
Hypolite Petovan [Sat, 14 Apr 2018 21:54:16 +0000 (17:54 -0400)]
Add Model\Term::populateTagsFromItem method
Hypolite Petovan [Thu, 12 Apr 2018 03:28:51 +0000 (23:28 -0400)]
Add header support for security token check
Hypolite Petovan [Thu, 12 Apr 2018 03:28:05 +0000 (23:28 -0400)]
Add dbstructure_definition hook call
Hypolite Petovan [Mon, 16 Apr 2018 18:35:57 +0000 (14:35 -0400)]
Merge pull request #4850 from tobiasd/
20180416 -newinfo
new info mail address
Tobias Diekershoff [Mon, 16 Apr 2018 15:28:19 +0000 (17:28 +0200)]
new info mail address
Marcus Müller [Mon, 16 Apr 2018 12:56:02 +0000 (14:56 +0200)]
[CLEANUP] Code: Remove function
Hypolite Petovan [Mon, 16 Apr 2018 11:35:59 +0000 (07:35 -0400)]
Merge pull request #4848 from tobiasd/
20180416 -tos2
display the thing
Marcus Müller [Mon, 16 Apr 2018 08:57:27 +0000 (10:57 +0200)]
[FEATURE] Install Script: Add first version
Tobias Diekershoff [Mon, 16 Apr 2018 08:25:39 +0000 (10:25 +0200)]
display the thing
Michael Vogel [Mon, 16 Apr 2018 08:12:17 +0000 (10:12 +0200)]
Merge pull request #4847 from tobiasd/
20180416 -tos
profile data is transmitted to other nodes
Tobias Diekershoff [Mon, 16 Apr 2018 07:27:16 +0000 (09:27 +0200)]
profile data is transmitted to other nodes
Michael Vogel [Mon, 16 Apr 2018 06:50:47 +0000 (08:50 +0200)]
Merge pull request #4846 from tobiasd/
20180416 -lng
update to the PL translation THX waldis
Tobias Diekershoff [Mon, 16 Apr 2018 05:09:08 +0000 (07:09 +0200)]
update to the PL translation THX waldis
Hypolite Petovan [Sun, 15 Apr 2018 20:35:30 +0000 (16:35 -0400)]
Merge pull request #4845 from annando/diaspora-forums
Forum posts now show the author when posted to Diaspora
Michael [Sun, 15 Apr 2018 19:01:19 +0000 (19:01 +0000)]
Forum posts now show the author when posted to Diaspora
Hypolite Petovan [Sun, 15 Apr 2018 10:41:44 +0000 (06:41 -0400)]
Merge pull request #4842 from tobiasd/
20180415 -deluser
notify admin when user deletes account
Tobias Diekershoff [Sun, 15 Apr 2018 09:39:05 +0000 (11:39 +0200)]
notify admin when user deletes account
Alexandre Alapetite [Sun, 15 Apr 2018 09:12:32 +0000 (11:12 +0200)]
Revert removal of legacy_password column
https://github.com/friendica/friendica/pull/4782#issuecomment-
380978218
Alexandre Alapetite [Sun, 15 Apr 2018 08:51:22 +0000 (10:51 +0200)]
Revert "Remove SQL column legacy_password"
This reverts commit
82f1f2f00e4493c3d1d4ff1df9161cc0957defee .
Hypolite Petovan [Sat, 14 Apr 2018 11:50:08 +0000 (07:50 -0400)]
Merge pull request #4840 from AndyHee/doc20180413
Update Making-Friends.md
Andy H3 [Sat, 14 Apr 2018 09:27:49 +0000 (16:27 +0700)]
Update Making-Friends.md
Major changes to some outdated sections.
Minor improvements, elsewhere.
Tobias Diekershoff [Sat, 14 Apr 2018 09:04:33 +0000 (11:04 +0200)]
Merge pull request #4839 from annando/profile-update
Update the "photo" and "thumb" field in the "profile" table
Michael [Sat, 14 Apr 2018 08:03:15 +0000 (08:03 +0000)]
Update the "photo" and "thumb" field in the "profile" table