Commit graph

16758 commits

Author SHA1 Message Date
hoergen c32b6000cb removed blank lines 2017-11-26 21:56:39 +01:00
Hypolite Petovan 9ddb81ce5f Fix function name typo 2017-11-26 15:51:07 -05:00
Hypolite Petovan 2a60146a43 Revert "Add new legacy password field"
This reverts commit 2236f60cfa.
2017-11-26 15:45:59 -05:00
Hypolite Petovan 456dfbe486 Forgotten change in src/Worker/Queue.php 2017-11-26 14:56:50 -05:00
Hypolite Petovan 2196a0577b Remove unused upubkey and uprvkey from queries
- Switched queries to new dba::* functions
2017-11-26 14:55:47 -05:00
hoergen b348692a47 added plusminus style sheet and sort the style sheets alphabetically 2017-11-26 20:46:55 +01:00
hoergen 887655c1bd added new style sheet plusminus 2017-11-26 20:46:20 +01:00
Hypolite Petovan ec6f5193e2 Switch to User::authenticate
- Removed hash('whirlpool') to check password
2017-11-26 14:46:08 -05:00
hoergen 7a8fb79fc5 Adding new stylesheet to theme vier. It aims a more clean visual 2017-11-26 20:45:17 +01:00
Hypolite Petovan 483603e77c Add User::authenticate() 2017-11-26 14:25:25 -05:00
Hypolite Petovan 90a8ae2cb8 Fix formatting
- include/auth.php
- include/oauth.php
- include/user.php
- mod/removeme.php
- src/Worker/Queue.php
2017-11-26 14:18:45 -05:00
Tobias Diekershoff b1b4359fae
Merge pull request #3967 from annando/forum-group
Network page: Selecting a forum overrides the group selection
2017-11-26 17:19:31 +01:00
Michael 661f9af93a Network page: Selecting a forum overrides the group selection 2017-11-26 16:17:32 +00:00
Hypolite Petovan 3fbf2e3bcf
Merge pull request #3966 from rabuzarus/20171122_-_port_tagcloud
A tag cloud widget for the profile page
2017-11-26 11:16:14 -05:00
rabuzarus 7d8370a178 tag cloud: fix query 2017-11-26 16:24:26 +01:00
rabuzarus ac6b191976 tag cloud: use dba for db request 2017-11-26 16:14:16 +01:00
Hypolite Petovan 09667dd82b
Merge pull request #3965 from tobiasd/20171126-docGettingStarted
this and should be an or
2017-11-26 09:23:50 -05:00
Tobias Diekershoff 2bf8ebaab9 this and should be an or 2017-11-26 15:19:40 +01:00
Tobias Diekershoff 0d7b3b4007
Merge pull request #3964 from annando/uexport-json
Avoid empty user export when there are UTF8 problems
2017-11-26 15:01:06 +01:00
Michael f059b33390 Avoid empty user export when there are UTF8 problems 2017-11-26 13:58:24 +00:00
Hypolite Petovan e82bbc75cd
Merge pull request #3963 from annando/default-features
Additional features should now work with the forumlist as well
2017-11-26 08:51:14 -05:00
Michael Vogel 28594f6d25
Merge pull request #3961 from MrPetovan/task/3946-use-random-bytes
Use random_bytes() in random_string()
2017-11-26 14:24:48 +01:00
Michael e4995dbad5 Good looking and better performance 2017-11-26 13:12:54 +00:00
Hypolite Petovan d5c38b9fc9 Add odd number of character support to random_string() 2017-11-26 07:57:29 -05:00
Michael Vogel 324b2dd014
Merge pull request #3962 from tobiasd/20171126-makecredits
add Ratten to the special contributors
2017-11-26 12:44:49 +01:00
Michael 774a7193d2 Added clarification 2017-11-26 11:43:02 +00:00
Michael 6cb637e8ab Default features should now work with the forumwidget again 2017-11-26 11:31:07 +00:00
Tobias Diekershoff d459a825ae add Ratten to the special contributors who are not found in git and messages.po files 2017-11-26 10:58:15 +01:00
rabuzarus 655b2cd0d3 tag cloud: clear align settings in the tagcloud widget 2017-11-26 04:36:45 +01:00
rabuzarus 2844947f5c tag cloud: add doxygen docu 2017-11-26 04:33:21 +01:00
Hypolite Petovan 068d3dc746
Merge pull request #3959 from annando/image-forum
Images that are uploaded to public forums are now public
2017-11-25 21:40:33 -05:00
Hypolite Petovan 2a204ecdfd
Merge pull request #3960 from annando/awaiting-acknowledge
When we are requesting a connection, the contact is no longer "blocked"
2017-11-25 21:39:41 -05:00
Michael cb7648359c When we are requesting a conneczion, the contactis no longer "blocked" 2017-11-26 02:31:26 +00:00
Hypolite Petovan d38c040d50 Update random_string with random_bytes
- Updated update.php
2017-11-25 21:15:50 -05:00
Michael Vogel dfccd2184e
Merge pull request #3958 from tobiasd/20171125-docEventsObsolete
Events docs had an obsolete paragraph
2017-11-26 03:05:54 +01:00
Michael a7088f5b67 Images that are uploaded to public forums are now public 2017-11-26 02:03:59 +00:00
Tobias Diekershoff 797aac9a3b Events docs had an obsolete paragraph 2017-11-26 00:59:27 +01:00
Hypolite Petovan 8b38f7f012 Add paragonie/random_compat to Composer dependencies 2017-11-25 18:42:00 -05:00
Hypolite Petovan 2236f60cfa Add new legacy password field 2017-11-25 18:05:32 -05:00
Hypolite Petovan e74d9d1113
Merge pull request #3957 from tobiasd/20171125-docEvents
calendar documentation
2017-11-25 17:58:16 -05:00
Hypolite Petovan 3c581b0dcc
Merge pull request #3956 from tobiasd/20171125-FAQlinks
updated links to Friendiqa
2017-11-25 17:57:00 -05:00
rabuzarus 4224209497 Merge develop into 20171122_-_port_tagcloud
Conflicts:
	include/features.php
2017-11-25 23:41:20 +01:00
Tobias Diekershoff add6f85cdf added German translation to the events documentation, THX Ratten 2017-11-25 22:57:00 +01:00
Tobias Diekershoff 5c7694d00e export cal is now in core 2017-11-25 21:57:19 +01:00
Tobias Diekershoff 9bb1be91d9 updated links to Friendiqa 2017-11-25 21:43:36 +01:00
Tobias Diekershoff 712efd9875
Merge pull request #3955 from silke/develop
Markdown formatting and minor changes
2017-11-25 18:16:30 +01:00
Silke Meyer 21a3a6f45b Markdown formatting and minor changes 2017-11-25 17:26:36 +01:00
Hypolite Petovan 05a09adb3b
Merge pull request #3952 from tobiasd/20171125-silentium2
update to the silence script
2017-11-25 11:14:54 -05:00
Tobias Diekershoff 2ac797be8e let there be SPACE 2017-11-25 17:10:29 +01:00
Hypolite Petovan e6a8cac147
Merge pull request #3953 from annando/preview-again
Show the preview picture even if the posting contains the huge image
2017-11-25 11:06:23 -05:00