19086 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
fabrixxm	9a7f508550	Admin users: Update page type names, add raw flags template context ... Change user table header "Account" to "Type": it use less space :-)	2018-04-20 14:02:45 +02:00
Hypolite Petovan	92473e15b5	Merge pull request #4875 from tobiasd/20180420-msg ... regenerated master messages.po file	2018-04-20 07:57:59 -04:00
Hypolite Petovan	12e79a68b7	Merge pull request #4874 from tobiasd/20180420-lng ... IT, FI and ZH_CN translation updates	2018-04-20 07:57:13 -04:00
Tobias Diekershoff	da541513ad	regenerated master messages.po file	2018-04-20 09:31:27 +02:00
Tobias Diekershoff	4d4ed6fb17	Merge pull request #4863 from MrPetovan/task/4860-add-hidden-input-in-console ... Add hidden input in newpassword console	2018-04-20 09:29:17 +02:00
Tobias Diekershoff	3a52ffc1b8	IT, FI and ZH_CN translation updates	2018-04-20 08:30:40 +02:00
Hypolite Petovan	e2ded28504	Merge pull request #4870 from astifter/develop ... Add space before Impressum.	2018-04-19 15:35:48 -04:00
Friendica	dc4b384414	Merge branch 'develop' of https://github.com/friendica/friendica into develop	2018-04-19 19:24:35 +00:00
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.	2018-04-19 19:03:29 +00:00
Hypolite Petovan	53b7e4b102	Merge pull request #4861 from fabrixxm/issue/3395 ... Frio: add template for admin/users	2018-04-19 13:03:03 -04: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
Hypolite Petovan	f043554ab7	Merge pull request #4849 from M-arcus/installation-script ... [FEATURE] Install Script: Add first version	2018-04-19 07:57:02 -04:00
Hypolite Petovan	f65a7b3130	Add hidden password input to Console\NewPassword ... - Add Exception when password is empty	2018-04-19 07:51:26 -04:00
Hypolite Petovan	0496822ca3	Add Exception when password is empty in User::hashPassword()	2018-04-19 07:51:26 -04:00
Hypolite Petovan	b73d5a641f	[Composer] Add seld/cli-prompt dependency	2018-04-19 07:51:26 -04:00
Marcus Müller	e2a58a791c	[DOCS] Auto Install: Add description	2018-04-19 10:21:41 +02:00
Tobias Diekershoff	ab82c6df03	Merge pull request #4865 from annando/dfrn-reshare ... Diaspora: Improved reshared coding	2018-04-19 08:43:18 +02:00
Michael Vogel	10465110c1	Merge pull request #4851 from MrPetovan/task/4709-add-query-based-content-filter ... Add query based content filter	2018-04-19 08:21:53 +02:00
Michael Vogel	32f78a4b01	Merge pull request #4864 from MrPetovan/bug/fix-memcached-delete ... Fix MemcachedCacheDrive::delete() method	2018-04-19 08:16:18 +02:00
Michael	c507cdf946	Code simplified	2018-04-19 06:07:23 +00:00
Michael	da06416426	Merge remote-tracking branch 'upstream/develop' into dfrn-reshare	2018-04-19 05:44:06 +00:00
Hypolite Petovan	87f638bdc9	Improve CacheSessionhandler ... - Replace !x() by empty() - Add return values to read() and destroy()	2018-04-18 23:37:06 -04:00
Hypolite Petovan	ca4ca51c6a	Add hostname prefix in MemcachedCacheDriver	2018-04-18 23:36:23 -04: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
Marcus Müller	457b86711d	[TASK] Auto install: Rework class	2018-04-18 14:30:42 +02:00
Marcus Müller	24626f5fd2	[TASK] Auto install: Rename script command	2018-04-18 14:21:40 +02:00
Marcus Müller	7b7ca71bf6	[TASK] Auto install: Rename script command	2018-04-18 14:20:21 +02:00
Marcus Müller	d53e64a583	[TASK] Install Script: Register installation class	2018-04-18 11:46:27 +02:00
Marcus Müller	1d552b5e66	[TASK] Install script: Add installation class	2018-04-18 11:43:23 +02:00
Marcus Müller	96d8591b95	[TASK] Remove auto_install.php	2018-04-18 11:40:16 +02:00
Michael Vogel	21dbe233cb	Merge pull request #4859 from tobiasd/20180418-lng ... update to the FI translation THX Kris	2018-04-18 08:17:16 +02:00
Tobias Diekershoff	9cb2369c15	update to the FI translation THX Kris	2018-04-18 07:57:16 +02:00
Tobias Diekershoff	fda5ad647d	Merge pull request #4857 from annando/duplicated-tags ... Avoid duplicated multibyte tags	2018-04-18 07:50:56 +02:00
Tobias Diekershoff	596b934a02	Merge pull request #4858 from annando/issue-4655 ... Issue 4655: Avoid multiplicated contact requests from the same account	2018-04-18 07:50:34 +02:00
Michael	8a730b2d85	Issue 4655: Avoid multiplicated contact requests from the same account	2018-04-18 05:02:59 +00:00
Michael	ed87e634ed	Avoid duplicated multibyte tags	2018-04-18 05:00:28 +00:00
Michael	f99af007ae	Replaced queries	2018-04-18 04:59:33 +00:00
Michael	88353ce56f	Merge remote-tracking branch 'upstream/develop' into dfrn-reshare	2018-04-18 03:12:13 +00:00
Hypolite Petovan	188158274c	[Composer] Add bower-asset/vue dependency	2018-04-17 19:56:47 -04:00
Hypolite Petovan	961a6d29a9	Merge pull request #4856 from annando/dandelion ... better support for the Diaspora app "Dandelion"	2018-04-17 12:50:06 -04:00
Michael	229d8eb0e9	better support for the Diaspora app "Dandelion"	2018-04-17 16:46:57 +00:00
Marcus Müller	fc8b11283a	[TASK] Template: Environment variables for MySQL	2018-04-17 18:40:24 +02:00
Marcus Müller	2cdcd13e68	[TASK] Config: Add MySQL environment variables	2018-04-17 18:37:59 +02:00
Hypolite Petovan	6d2d15a80d	Merge pull request #4782 from Alkarex/fix-update-password ... Fix update password rehash	2018-04-17 07:25:52 -04:00
Tobias Diekershoff	7b6d1e1ab3	Merge pull request #4853 from annando/site-defaults ... Default values for site configuration	2018-04-17 10:12:11 +02:00